Selaa lähdekoodia

2025-4-23
添加三方搜索功能

zhangbing 1 vuosi sitten
vanhempi
commit
848e6cdead
44 muutettua tiedostoa jossa 317 lisäystä ja 136 poistoa
  1. 2 2
      .idea/deploymentTargetSelector.xml
  2. 1 1
      .idea/gradle.xml
  3. 7 7
      app/src/main/java/com/yihucha/hbyhc/config/Constants.java
  4. 23 2
      app/src/main/java/com/yihucha/hbyhc/presentation/pyyx/activity/JDActivity.kt
  5. 37 8
      app/src/main/java/com/yihucha/hbyhc/presentation/pyyx/activity/PDDActivity.kt
  6. 39 12
      app/src/main/java/com/yihucha/hbyhc/presentation/pyyx/activity/SNActivity.kt
  7. 31 2
      app/src/main/java/com/yihucha/hbyhc/presentation/pyyx/activity/VIPActivity.kt
  8. 38 15
      app/src/main/java/com/yihucha/hbyhc/presentation/pyyx/viewmodel/ThirdPartViewModel.kt
  9. 2 2
      app/src/main/java/com/yihucha/hbyhc/wxapi/WXEntryActivity.java
  10. 59 7
      app/src/main/res/layout/activity_tb.xml
  11. BIN
      jd_sdk_lib/build/intermediates/compiled_local_resources/debug/out/drawable-xxhdpi-v4_kepler_back_normal.png.flat
  12. BIN
      jd_sdk_lib/build/intermediates/compiled_local_resources/debug/out/drawable-xxhdpi-v4_kepler_back_pressed.png.flat
  13. BIN
      jd_sdk_lib/build/intermediates/compiled_local_resources/debug/out/drawable-xxhdpi-v4_kepler_selcet_more_normal.png.flat
  14. BIN
      jd_sdk_lib/build/intermediates/compiled_local_resources/debug/out/drawable-xxhdpi-v4_kepler_selcet_more_pressed.png.flat
  15. BIN
      jd_sdk_lib/build/intermediates/compiled_local_resources/debug/out/drawable-xxhdpi-v4_neterror.png.flat
  16. BIN
      jd_sdk_lib/build/intermediates/compiled_local_resources/debug/out/drawable-xxhdpi-v4_seclect_item_has_message.png.flat
  17. BIN
      jd_sdk_lib/build/intermediates/compiled_local_resources/debug/out/drawable-xxhdpi-v4_seclect_item_history.png.flat
  18. BIN
      jd_sdk_lib/build/intermediates/compiled_local_resources/debug/out/drawable-xxhdpi-v4_seclect_item_logout.png.flat
  19. BIN
      jd_sdk_lib/build/intermediates/compiled_local_resources/debug/out/drawable-xxhdpi-v4_seclect_item_no_has_message.png.flat
  20. BIN
      jd_sdk_lib/build/intermediates/compiled_local_resources/debug/out/drawable-xxhdpi-v4_seclect_item_orderlist.png.flat
  21. BIN
      jd_sdk_lib/build/intermediates/compiled_local_resources/debug/out/drawable-xxhdpi-v4_seclect_item_serch.png.flat
  22. BIN
      jd_sdk_lib/build/intermediates/compiled_local_resources/debug/out/drawable-xxhdpi-v4_select_bg.9.png.flat
  23. BIN
      jd_sdk_lib/build/intermediates/compiled_local_resources/debug/out/drawable-xxhdpi-v4_white.png.flat
  24. BIN
      jd_sdk_lib/build/intermediates/compiled_local_resources/debug/out/drawable_btn_reload.xml.flat
  25. BIN
      jd_sdk_lib/build/intermediates/compiled_local_resources/debug/out/drawable_kepler_btn_back.xml.flat
  26. BIN
      jd_sdk_lib/build/intermediates/compiled_local_resources/debug/out/drawable_kepler_btn_select_more.xml.flat
  27. BIN
      jd_sdk_lib/build/intermediates/compiled_local_resources/debug/out/drawable_kepler_dialog_bk.xml.flat
  28. BIN
      jd_sdk_lib/build/intermediates/compiled_local_resources/debug/out/drawable_kepler_dialog_button_ne.xml.flat
  29. BIN
      jd_sdk_lib/build/intermediates/compiled_local_resources/debug/out/drawable_kepler_dialog_button_po.xml.flat
  30. BIN
      jd_sdk_lib/build/intermediates/compiled_local_resources/debug/out/drawable_pressbar_color.xml.flat
  31. BIN
      jd_sdk_lib/build/intermediates/compiled_local_resources/debug/out/drawable_sdk_title_bg_with_shadow.xml.flat
  32. BIN
      jd_sdk_lib/build/intermediates/compiled_local_resources/debug/out/layout_item_tab_layout.xml.flat
  33. BIN
      jd_sdk_lib/build/intermediates/compiled_local_resources/debug/out/layout_kepler_mid_lin.xml.flat
  34. BIN
      jd_sdk_lib/build/intermediates/compiled_local_resources/debug/out/layout_kepler_simple_dialog_lay.xml.flat
  35. BIN
      jd_sdk_lib/build/intermediates/compiled_local_resources/debug/out/layout_more_select_item.xml.flat
  36. BIN
      jd_sdk_lib/build/intermediates/compiled_local_resources/debug/out/layout_neterror_layout.xml.flat
  37. BIN
      jd_sdk_lib/build/intermediates/compiled_local_resources/debug/out/layout_sdk_title_layout.xml.flat
  38. BIN
      jd_sdk_lib/build/intermediates/compiled_local_resources/debug/out/layout_web_bottom_layout.xml.flat
  39. BIN
      jd_sdk_lib/build/intermediates/compiled_local_resources/debug/out/raw_safe.jpg.flat
  40. 30 30
      jd_sdk_lib/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
  41. 2 2
      jd_sdk_lib/build/intermediates/incremental/debug/packageDebugResources/merger.xml
  42. 15 15
      jd_sdk_lib/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
  43. 31 31
      jd_sdk_lib/build/outputs/logs/manifest-merger-debug-report.txt
  44. BIN
      jd_sdk_lib/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin

+ 2 - 2
.idea/deploymentTargetSelector.xml

@@ -4,10 +4,10 @@
4
     <selectionStates>
4
     <selectionStates>
5
       <SelectionState runConfigName="app">
5
       <SelectionState runConfigName="app">
6
         <option name="selectionMode" value="DROPDOWN" />
6
         <option name="selectionMode" value="DROPDOWN" />
7
-        <DropdownSelection timestamp="2025-04-19T06:37:06.884508Z">
7
+        <DropdownSelection timestamp="2025-04-23T05:51:25.734909100Z">
8
           <Target type="DEFAULT_BOOT">
8
           <Target type="DEFAULT_BOOT">
9
             <handle>
9
             <handle>
10
-              <DeviceId pluginId="LocalEmulator" identifier="path=/Users/swj/.android/avd/Pixel4API30.avd" />
10
+              <DeviceId pluginId="Default" identifier="serial=emulator-5554;connection=343b6e12" />
11
             </handle>
11
             </handle>
12
           </Target>
12
           </Target>
13
         </DropdownSelection>
13
         </DropdownSelection>

+ 1 - 1
.idea/gradle.xml

@@ -4,7 +4,6 @@
4
   <component name="GradleSettings">
4
   <component name="GradleSettings">
5
     <option name="linkedExternalProjectsSettings">
5
     <option name="linkedExternalProjectsSettings">
6
       <GradleProjectSettings>
6
       <GradleProjectSettings>
7
-        <option name="testRunner" value="GRADLE" />
8
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
7
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
9
         <option name="gradleJvm" value="jbr-17" />
8
         <option name="gradleJvm" value="jbr-17" />
10
         <option name="modules">
9
         <option name="modules">
@@ -16,6 +15,7 @@
16
             <option value="$PROJECT_DIR$/jd_sdk_lib" />
15
             <option value="$PROJECT_DIR$/jd_sdk_lib" />
17
           </set>
16
           </set>
18
         </option>
17
         </option>
18
+        <option name="resolveExternalAnnotations" value="false" />
19
       </GradleProjectSettings>
19
       </GradleProjectSettings>
20
     </option>
20
     </option>
21
   </component>
21
   </component>

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 7 - 7
app/src/main/java/com/yihucha/hbyhc/config/Constants.java


+ 23 - 2
app/src/main/java/com/yihucha/hbyhc/presentation/pyyx/activity/JDActivity.kt

@@ -1,6 +1,7 @@
1
 package com.yihucha.hbyhc.presentation.pyyx.activity
1
 package com.yihucha.hbyhc.presentation.pyyx.activity
2
 
2
 
3
 import android.os.Bundle
3
 import android.os.Bundle
4
+import android.text.Editable
4
 import android.view.View
5
 import android.view.View
5
 import androidx.constraintlayout.widget.ConstraintLayout
6
 import androidx.constraintlayout.widget.ConstraintLayout
6
 import androidx.core.widget.NestedScrollView
7
 import androidx.core.widget.NestedScrollView
@@ -13,7 +14,6 @@ import com.yihucha.hbyhc.R
13
 import com.yihucha.hbyhc.base.BaseActivity
14
 import com.yihucha.hbyhc.base.BaseActivity
14
 import com.yihucha.hbyhc.config.BusinessConstants
15
 import com.yihucha.hbyhc.config.BusinessConstants
15
 import com.yihucha.hbyhc.config.Constants
16
 import com.yihucha.hbyhc.config.Constants
16
-import com.yihucha.hbyhc.config.HttpUrl
17
 import com.yihucha.hbyhc.databinding.ActivityTbBinding
17
 import com.yihucha.hbyhc.databinding.ActivityTbBinding
18
 import com.yihucha.hbyhc.presentation.pyyx.PyyxTvListBean
18
 import com.yihucha.hbyhc.presentation.pyyx.PyyxTvListBean
19
 import com.yihucha.hbyhc.presentation.pyyx.adapter.ProductThirdPartAdapter
19
 import com.yihucha.hbyhc.presentation.pyyx.adapter.ProductThirdPartAdapter
@@ -21,6 +21,7 @@ import com.yihucha.hbyhc.presentation.pyyx.adapter.RvTextViewAdapter
21
 import com.yihucha.hbyhc.presentation.pyyx.viewmodel.ThirdPartViewModel
21
 import com.yihucha.hbyhc.presentation.pyyx.viewmodel.ThirdPartViewModel
22
 import com.yihucha.hbyhc.utils.DensityUtils
22
 import com.yihucha.hbyhc.utils.DensityUtils
23
 import com.yihucha.hbyhc.utils.LoginUtils
23
 import com.yihucha.hbyhc.utils.LoginUtils
24
+import com.yihucha.hbyhc.utils.MyTextWathcer
24
 import qiu.niorgai.StatusBarCompat
25
 import qiu.niorgai.StatusBarCompat
25
 
26
 
26
 /**
27
 /**
@@ -45,7 +46,8 @@ class JDActivity : BaseActivity() {
45
     private val viewModel by lazy {
46
     private val viewModel by lazy {
46
         ViewModelProvider(this)[ThirdPartViewModel::class.java].apply {
47
         ViewModelProvider(this)[ThirdPartViewModel::class.java].apply {
47
             topSelectTitles = listOf(
48
             topSelectTitles = listOf(
48
-                PyyxTvListBean("居家日用", true, 1),
49
+                PyyxTvListBean("全部", true, -1),
50
+                PyyxTvListBean("居家日用", false, 1),
49
                 PyyxTvListBean("食品", false, 2),
51
                 PyyxTvListBean("食品", false, 2),
50
                 PyyxTvListBean("生鲜", false, 3),
52
                 PyyxTvListBean("生鲜", false, 3),
51
                 PyyxTvListBean("图书", false, 4),
53
                 PyyxTvListBean("图书", false, 4),
@@ -157,6 +159,25 @@ class JDActivity : BaseActivity() {
157
         binding.imgToTop.setOnClickListener {
159
         binding.imgToTop.setOnClickListener {
158
             binding.scrollView.scrollTo(0, 0)
160
             binding.scrollView.scrollTo(0, 0)
159
         }
161
         }
162
+
163
+        binding.edtSearch.addTextChangedListener(object : MyTextWathcer() {
164
+            override fun afterTextChanged(s: Editable?) {
165
+                super.afterTextChanged(s)
166
+                val str = s?.toString()?.trim() ?: ""
167
+                viewModel.keyWord = str
168
+                if (str.isEmpty()) {
169
+                    binding.imgClear.visibility = View.GONE
170
+                }else{
171
+                    binding.imgClear.visibility = View.VISIBLE
172
+                }
173
+            }
174
+        })
175
+        binding.imgClear.setOnClickListener {
176
+            binding.edtSearch.setText("")
177
+        }
178
+        binding.tvSearch.setOnClickListener {
179
+            viewModel.getJdList(viewModel.currentTitleBean.titleId)
180
+        }
160
     }
181
     }
161
 
182
 
162
     private fun initData() {
183
     private fun initData() {

+ 37 - 8
app/src/main/java/com/yihucha/hbyhc/presentation/pyyx/activity/PDDActivity.kt

@@ -1,6 +1,7 @@
1
 package com.yihucha.hbyhc.presentation.pyyx.activity
1
 package com.yihucha.hbyhc.presentation.pyyx.activity
2
 
2
 
3
 import android.os.Bundle
3
 import android.os.Bundle
4
+import android.text.Editable
4
 import android.view.View
5
 import android.view.View
5
 import androidx.constraintlayout.widget.ConstraintLayout
6
 import androidx.constraintlayout.widget.ConstraintLayout
6
 import androidx.core.widget.NestedScrollView
7
 import androidx.core.widget.NestedScrollView
@@ -13,7 +14,6 @@ import com.yihucha.hbyhc.R
13
 import com.yihucha.hbyhc.base.BaseActivity
14
 import com.yihucha.hbyhc.base.BaseActivity
14
 import com.yihucha.hbyhc.config.BusinessConstants
15
 import com.yihucha.hbyhc.config.BusinessConstants
15
 import com.yihucha.hbyhc.config.Constants
16
 import com.yihucha.hbyhc.config.Constants
16
-import com.yihucha.hbyhc.config.HttpUrl
17
 import com.yihucha.hbyhc.databinding.ActivityTbBinding
17
 import com.yihucha.hbyhc.databinding.ActivityTbBinding
18
 import com.yihucha.hbyhc.presentation.pyyx.PyyxTvListBean
18
 import com.yihucha.hbyhc.presentation.pyyx.PyyxTvListBean
19
 import com.yihucha.hbyhc.presentation.pyyx.adapter.ProductThirdPartAdapter
19
 import com.yihucha.hbyhc.presentation.pyyx.adapter.ProductThirdPartAdapter
@@ -21,6 +21,7 @@ import com.yihucha.hbyhc.presentation.pyyx.adapter.RvTextViewAdapter
21
 import com.yihucha.hbyhc.presentation.pyyx.viewmodel.ThirdPartViewModel
21
 import com.yihucha.hbyhc.presentation.pyyx.viewmodel.ThirdPartViewModel
22
 import com.yihucha.hbyhc.utils.DensityUtils
22
 import com.yihucha.hbyhc.utils.DensityUtils
23
 import com.yihucha.hbyhc.utils.LoginUtils
23
 import com.yihucha.hbyhc.utils.LoginUtils
24
+import com.yihucha.hbyhc.utils.MyTextWathcer
24
 import qiu.niorgai.StatusBarCompat
25
 import qiu.niorgai.StatusBarCompat
25
 
26
 
26
 /**
27
 /**
@@ -45,7 +46,8 @@ class PDDActivity : BaseActivity() {
45
     }
46
     }
46
     val catListAdapter by lazy {
47
     val catListAdapter by lazy {
47
         RvTextViewAdapter(
48
         RvTextViewAdapter(
48
-            this,null)
49
+            this, null
50
+        )
49
     }
51
     }
50
 
52
 
51
     private var titleId = 0
53
     private var titleId = 0
@@ -63,7 +65,8 @@ class PDDActivity : BaseActivity() {
63
         val params = binding.titleLayout.layoutParams as ConstraintLayout.LayoutParams
65
         val params = binding.titleLayout.layoutParams as ConstraintLayout.LayoutParams
64
         params.topMargin = DensityUtils.getStatusBarHeight(this)
66
         params.topMargin = DensityUtils.getStatusBarHeight(this)
65
         binding.tvTitle.text = "拼多多"
67
         binding.tvTitle.text = "拼多多"
66
-        Glide.with(this).load(BusinessConstants.HOST+"mweb/img/pinduoduo.jpg").into(binding.banner)
68
+        Glide.with(this).load(BusinessConstants.HOST + "mweb/img/pinduoduo.jpg")
69
+            .into(binding.banner)
67
         binding.bgView.setBackgroundResource(R.mipmap.home_bg)
70
         binding.bgView.setBackgroundResource(R.mipmap.home_bg)
68
         binding.rvProductList.layoutManager = LinearLayoutManager(context)
71
         binding.rvProductList.layoutManager = LinearLayoutManager(context)
69
         binding.rvProductList.adapter = adapter
72
         binding.rvProductList.adapter = adapter
@@ -114,9 +117,9 @@ class PDDActivity : BaseActivity() {
114
 
117
 
115
         binding.scrollView.setOnScrollChangeListener(NestedScrollView.OnScrollChangeListener { v, scrollX, scrollY, oldScrollX, oldScrollY ->
118
         binding.scrollView.setOnScrollChangeListener(NestedScrollView.OnScrollChangeListener { v, scrollX, scrollY, oldScrollX, oldScrollY ->
116
             val rootPicHeight: Int = binding.banner.height
119
             val rootPicHeight: Int = binding.banner.height
117
-            if (scrollY<rootPicHeight){
120
+            if (scrollY < rootPicHeight) {
118
                 binding.imgToTop.visibility = View.GONE
121
                 binding.imgToTop.visibility = View.GONE
119
-            }else{
122
+            } else {
120
                 binding.imgToTop.visibility = View.VISIBLE
123
                 binding.imgToTop.visibility = View.VISIBLE
121
             }
124
             }
122
         })
125
         })
@@ -124,6 +127,24 @@ class PDDActivity : BaseActivity() {
124
             binding.scrollView.scrollTo(0, 0)
127
             binding.scrollView.scrollTo(0, 0)
125
         }
128
         }
126
 
129
 
130
+        binding.edtSearch.addTextChangedListener(object : MyTextWathcer() {
131
+            override fun afterTextChanged(s: Editable?) {
132
+                super.afterTextChanged(s)
133
+                val str = s?.toString()?.trim() ?: ""
134
+                viewModel.keyWord = str
135
+                if (str.isEmpty()) {
136
+                    binding.imgClear.visibility = View.GONE
137
+                }else{
138
+                    binding.imgClear.visibility = View.VISIBLE
139
+                }
140
+            }
141
+        })
142
+        binding.imgClear.setOnClickListener {
143
+            binding.edtSearch.setText("")
144
+        }
145
+        binding.tvSearch.setOnClickListener {
146
+            viewModel.getPinduoduoList(titleId)
147
+        }
127
     }
148
     }
128
 
149
 
129
     private fun initData() {
150
     private fun initData() {
@@ -141,14 +162,22 @@ class PDDActivity : BaseActivity() {
141
                 val catBeans = it.mapIndexed { index, bean ->
162
                 val catBeans = it.mapIndexed { index, bean ->
142
                     PyyxTvListBean(
163
                     PyyxTvListBean(
143
                         title = bean.name,
164
                         title = bean.name,
144
-                        checked = index == 0,
165
+                        checked = false,
145
                         titleId = bean.id
166
                         titleId = bean.id
146
                     )
167
                     )
147
                 }
168
                 }
148
-                titleId = catBeans.first().titleId
169
+                val beans = catBeans.toMutableList()
170
+                beans.add(
171
+                    0, PyyxTvListBean(
172
+                        title = "全部",
173
+                        checked = true,
174
+                        titleId = -1
175
+                    )
176
+                )
177
+                titleId = beans.first().titleId
149
                 viewModel.getPinduoduoList(titleId)
178
                 viewModel.getPinduoduoList(titleId)
150
                 binding.rvTopSelector.visibility = View.VISIBLE
179
                 binding.rvTopSelector.visibility = View.VISIBLE
151
-                catListAdapter.resetTitles(catBeans)
180
+                catListAdapter.resetTitles(beans)
152
             }
181
             }
153
         }
182
         }
154
 
183
 

+ 39 - 12
app/src/main/java/com/yihucha/hbyhc/presentation/pyyx/activity/SNActivity.kt

@@ -1,6 +1,7 @@
1
 package com.yihucha.hbyhc.presentation.pyyx.activity
1
 package com.yihucha.hbyhc.presentation.pyyx.activity
2
 
2
 
3
 import android.os.Bundle
3
 import android.os.Bundle
4
+import android.text.Editable
4
 import android.view.View
5
 import android.view.View
5
 import androidx.constraintlayout.widget.ConstraintLayout
6
 import androidx.constraintlayout.widget.ConstraintLayout
6
 import androidx.core.widget.NestedScrollView
7
 import androidx.core.widget.NestedScrollView
@@ -9,17 +10,17 @@ import androidx.recyclerview.widget.LinearLayoutManager
9
 import com.bumptech.glide.Glide
10
 import com.bumptech.glide.Glide
10
 import com.lcodecore.tkrefreshlayout.RefreshListenerAdapter
11
 import com.lcodecore.tkrefreshlayout.RefreshListenerAdapter
11
 import com.lcodecore.tkrefreshlayout.TwinklingRefreshLayout
12
 import com.lcodecore.tkrefreshlayout.TwinklingRefreshLayout
12
-import com.yihucha.hbyhc.R
13
 import com.yihucha.hbyhc.base.BaseActivity
13
 import com.yihucha.hbyhc.base.BaseActivity
14
 import com.yihucha.hbyhc.config.BusinessConstants
14
 import com.yihucha.hbyhc.config.BusinessConstants
15
 import com.yihucha.hbyhc.config.Constants
15
 import com.yihucha.hbyhc.config.Constants
16
-import com.yihucha.hbyhc.config.HttpUrl
17
 import com.yihucha.hbyhc.databinding.ActivityTbBinding
16
 import com.yihucha.hbyhc.databinding.ActivityTbBinding
17
+import com.yihucha.hbyhc.presentation.pyyx.PyyxTvListBean
18
 import com.yihucha.hbyhc.presentation.pyyx.adapter.ProductThirdPartAdapter
18
 import com.yihucha.hbyhc.presentation.pyyx.adapter.ProductThirdPartAdapter
19
 import com.yihucha.hbyhc.presentation.pyyx.adapter.RvTextViewAdapter
19
 import com.yihucha.hbyhc.presentation.pyyx.adapter.RvTextViewAdapter
20
 import com.yihucha.hbyhc.presentation.pyyx.viewmodel.ThirdPartViewModel
20
 import com.yihucha.hbyhc.presentation.pyyx.viewmodel.ThirdPartViewModel
21
 import com.yihucha.hbyhc.utils.DensityUtils
21
 import com.yihucha.hbyhc.utils.DensityUtils
22
 import com.yihucha.hbyhc.utils.LoginUtils
22
 import com.yihucha.hbyhc.utils.LoginUtils
23
+import com.yihucha.hbyhc.utils.MyTextWathcer
23
 import qiu.niorgai.StatusBarCompat
24
 import qiu.niorgai.StatusBarCompat
24
 
25
 
25
 /**
26
 /**
@@ -59,7 +60,7 @@ class SNActivity : BaseActivity() {
59
         val params = binding.titleLayout.layoutParams as ConstraintLayout.LayoutParams
60
         val params = binding.titleLayout.layoutParams as ConstraintLayout.LayoutParams
60
         params.topMargin = DensityUtils.getStatusBarHeight(this)
61
         params.topMargin = DensityUtils.getStatusBarHeight(this)
61
         binding.tvTitle.text = "苏宁"
62
         binding.tvTitle.text = "苏宁"
62
-        Glide.with(this).load(BusinessConstants.HOST+"mweb/img/suning.jpg").into(binding.banner)
63
+        Glide.with(this).load(BusinessConstants.HOST + "mweb/img/suning.jpg").into(binding.banner)
63
         binding.rvProductList.layoutManager =
64
         binding.rvProductList.layoutManager =
64
             LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false)
65
             LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false)
65
         binding.rvTopSelector.adapter = titleAdapter
66
         binding.rvTopSelector.adapter = titleAdapter
@@ -102,11 +103,11 @@ class SNActivity : BaseActivity() {
102
 
103
 
103
 
104
 
104
         titleAdapter.setOnItemClickListener { pos ->
105
         titleAdapter.setOnItemClickListener { pos ->
105
-            if (pos<viewModel.topSelectTitles.indexOf(viewModel.currentTitleBean)){
106
+            if (pos < viewModel.topSelectTitles.indexOf(viewModel.currentTitleBean)) {
106
                 //选前面的
107
                 //选前面的
107
-                if (pos>0)
108
+                if (pos > 0)
108
                     binding.rvTopSelector.smoothScrollToPosition(pos - 1)
109
                     binding.rvTopSelector.smoothScrollToPosition(pos - 1)
109
-            }else{
110
+            } else {
110
                 //选后面的
111
                 //选后面的
111
                 if (pos < viewModel.topSelectTitles.size - 1)
112
                 if (pos < viewModel.topSelectTitles.size - 1)
112
                     binding.rvTopSelector.smoothScrollToPosition(pos + 1)
113
                     binding.rvTopSelector.smoothScrollToPosition(pos + 1)
@@ -119,23 +120,49 @@ class SNActivity : BaseActivity() {
119
 
120
 
120
         binding.scrollView.setOnScrollChangeListener(NestedScrollView.OnScrollChangeListener { v, scrollX, scrollY, oldScrollX, oldScrollY ->
121
         binding.scrollView.setOnScrollChangeListener(NestedScrollView.OnScrollChangeListener { v, scrollX, scrollY, oldScrollX, oldScrollY ->
121
             val rootPicHeight: Int = binding.banner.height
122
             val rootPicHeight: Int = binding.banner.height
122
-            if (scrollY<rootPicHeight){
123
+            if (scrollY < rootPicHeight) {
123
                 binding.imgToTop.visibility = View.GONE
124
                 binding.imgToTop.visibility = View.GONE
124
-            }else{
125
+            } else {
125
                 binding.imgToTop.visibility = View.VISIBLE
126
                 binding.imgToTop.visibility = View.VISIBLE
126
             }
127
             }
127
         })
128
         })
128
         binding.imgToTop.setOnClickListener {
129
         binding.imgToTop.setOnClickListener {
129
             binding.scrollView.scrollTo(0, 0)
130
             binding.scrollView.scrollTo(0, 0)
130
         }
131
         }
132
+        binding.edtSearch.addTextChangedListener(object : MyTextWathcer() {
133
+            override fun afterTextChanged(s: Editable?) {
134
+                super.afterTextChanged(s)
135
+                val str = s?.toString()?.trim() ?: ""
136
+                viewModel.keyWord = str
137
+                if (str.isEmpty()) {
138
+                    binding.imgClear.visibility = View.GONE
139
+                } else {
140
+                    binding.imgClear.visibility = View.VISIBLE
141
+                }
142
+            }
143
+        })
144
+        binding.imgClear.setOnClickListener {
145
+            binding.edtSearch.setText("")
146
+        }
147
+        binding.tvSearch.setOnClickListener {
148
+            viewModel.getSuningList(viewModel.currentTitleBean.titleId)
149
+        }
131
     }
150
     }
132
 
151
 
133
     private fun initData() {
152
     private fun initData() {
134
         viewModel.getClassesType(4)
153
         viewModel.getClassesType(4)
135
-        viewModel.classesLiveData.observe(this){
136
-            viewModel.topSelectTitles = it
154
+        viewModel.classesLiveData.observe(this) {
155
+            viewModel.topSelectTitles = it.toMutableList().apply {
156
+                add(
157
+                    0, PyyxTvListBean(
158
+                        title = "全部",
159
+                        checked = true,
160
+                        titleId = -1
161
+                    )
162
+                )
163
+            }
137
             titleAdapter.resetTitles(viewModel.topSelectTitles)
164
             titleAdapter.resetTitles(viewModel.topSelectTitles)
138
-            viewModel.currentTitleBean=viewModel.topSelectTitles.first { it.checked }
165
+            viewModel.currentTitleBean = viewModel.topSelectTitles.first { it.checked }
139
             viewModel.getSuningList(viewModel.currentTitleBean.titleId)
166
             viewModel.getSuningList(viewModel.currentTitleBean.titleId)
140
         }
167
         }
141
 
168
 
@@ -145,7 +172,7 @@ class SNActivity : BaseActivity() {
145
             binding.llNoData.llNotFound.visibility = if (it.isEmpty()) View.VISIBLE else View.GONE
172
             binding.llNoData.llNotFound.visibility = if (it.isEmpty()) View.VISIBLE else View.GONE
146
             adapter.updateData(it)
173
             adapter.updateData(it)
147
         }
174
         }
148
-        viewModel.failed.observe(this){
175
+        viewModel.failed.observe(this) {
149
             binding.refreshLayout.finishRefreshing()
176
             binding.refreshLayout.finishRefreshing()
150
             binding.refreshLayout.finishLoadmore()
177
             binding.refreshLayout.finishLoadmore()
151
         }
178
         }

+ 31 - 2
app/src/main/java/com/yihucha/hbyhc/presentation/pyyx/activity/VIPActivity.kt

@@ -2,6 +2,7 @@ package com.yihucha.hbyhc.presentation.pyyx.activity
2
 
2
 
3
 import android.graphics.Color
3
 import android.graphics.Color
4
 import android.os.Bundle
4
 import android.os.Bundle
5
+import android.text.Editable
5
 import android.view.View
6
 import android.view.View
6
 import androidx.constraintlayout.widget.ConstraintLayout
7
 import androidx.constraintlayout.widget.ConstraintLayout
7
 import androidx.core.widget.NestedScrollView
8
 import androidx.core.widget.NestedScrollView
@@ -13,13 +14,14 @@ import com.lcodecore.tkrefreshlayout.TwinklingRefreshLayout
13
 import com.yihucha.hbyhc.base.BaseActivity
14
 import com.yihucha.hbyhc.base.BaseActivity
14
 import com.yihucha.hbyhc.config.BusinessConstants
15
 import com.yihucha.hbyhc.config.BusinessConstants
15
 import com.yihucha.hbyhc.config.Constants
16
 import com.yihucha.hbyhc.config.Constants
16
-import com.yihucha.hbyhc.config.HttpUrl
17
 import com.yihucha.hbyhc.databinding.ActivityTbBinding
17
 import com.yihucha.hbyhc.databinding.ActivityTbBinding
18
+import com.yihucha.hbyhc.presentation.pyyx.PyyxTvListBean
18
 import com.yihucha.hbyhc.presentation.pyyx.adapter.ProductThirdPartAdapter
19
 import com.yihucha.hbyhc.presentation.pyyx.adapter.ProductThirdPartAdapter
19
 import com.yihucha.hbyhc.presentation.pyyx.adapter.RvTextViewAdapter
20
 import com.yihucha.hbyhc.presentation.pyyx.adapter.RvTextViewAdapter
20
 import com.yihucha.hbyhc.presentation.pyyx.viewmodel.ThirdPartViewModel
21
 import com.yihucha.hbyhc.presentation.pyyx.viewmodel.ThirdPartViewModel
21
 import com.yihucha.hbyhc.utils.DensityUtils
22
 import com.yihucha.hbyhc.utils.DensityUtils
22
 import com.yihucha.hbyhc.utils.LoginUtils
23
 import com.yihucha.hbyhc.utils.LoginUtils
24
+import com.yihucha.hbyhc.utils.MyTextWathcer
23
 import qiu.niorgai.StatusBarCompat
25
 import qiu.niorgai.StatusBarCompat
24
 
26
 
25
 /**
27
 /**
@@ -128,13 +130,40 @@ class VIPActivity : BaseActivity() {
128
         binding.imgToTop.setOnClickListener {
130
         binding.imgToTop.setOnClickListener {
129
             binding.scrollView.scrollTo(0, 0)
131
             binding.scrollView.scrollTo(0, 0)
130
         }
132
         }
133
+
134
+        binding.edtSearch.addTextChangedListener(object : MyTextWathcer() {
135
+            override fun afterTextChanged(s: Editable?) {
136
+                super.afterTextChanged(s)
137
+                val str = s?.toString()?.trim() ?: ""
138
+                viewModel.keyWord = str
139
+                if (str.isEmpty()) {
140
+                    binding.imgClear.visibility = View.GONE
141
+                }else{
142
+                    binding.imgClear.visibility = View.VISIBLE
143
+                }
144
+            }
145
+        })
146
+        binding.imgClear.setOnClickListener {
147
+            binding.edtSearch.setText("")
148
+        }
149
+        binding.tvSearch.setOnClickListener {
150
+            viewModel.getVipList(viewModel.currentTitleBean.titleId)
151
+        }
131
     }
152
     }
132
 
153
 
133
     private fun initData() {
154
     private fun initData() {
134
 
155
 
135
         viewModel.getClassesType(5)
156
         viewModel.getClassesType(5)
136
         viewModel.classesLiveData.observe(this) {
157
         viewModel.classesLiveData.observe(this) {
137
-            viewModel.topSelectTitles = it
158
+            viewModel.topSelectTitles = it.toMutableList().apply {
159
+                add(
160
+                    0, PyyxTvListBean(
161
+                        title = "全部",
162
+                        checked = true,
163
+                        titleId = -1
164
+                    )
165
+                )
166
+            }
138
             titleAdapter.resetTitles(viewModel.topSelectTitles)
167
             titleAdapter.resetTitles(viewModel.topSelectTitles)
139
             viewModel.currentTitleBean = viewModel.topSelectTitles.first { it.checked }
168
             viewModel.currentTitleBean = viewModel.topSelectTitles.first { it.checked }
140
             viewModel.getVipList(viewModel.currentTitleBean.titleId)
169
             viewModel.getVipList(viewModel.currentTitleBean.titleId)

+ 38 - 15
app/src/main/java/com/yihucha/hbyhc/presentation/pyyx/viewmodel/ThirdPartViewModel.kt

@@ -34,11 +34,12 @@ class ThirdPartViewModel : BaseViewModel() {
34
     val pageDatasLiveData = MutableLiveData<MutableList<HomeProductBean>>()
34
     val pageDatasLiveData = MutableLiveData<MutableList<HomeProductBean>>()
35
 
35
 
36
     val classesLiveData = MutableLiveData<List<PyyxTvListBean>>()
36
     val classesLiveData = MutableLiveData<List<PyyxTvListBean>>()
37
-
37
+    var keyWord = ""
38
     lateinit var currentTitleBean: PyyxTvListBean
38
     lateinit var currentTitleBean: PyyxTvListBean
39
 
39
 
40
     var topSelectTitles = listOf(
40
     var topSelectTitles = listOf(
41
-        PyyxTvListBean("美食", true, 6),
41
+        PyyxTvListBean("全部", true, -1),
42
+        PyyxTvListBean("美食", false, 6),
42
         PyyxTvListBean("女装", false, 1),
43
         PyyxTvListBean("女装", false, 1),
43
         PyyxTvListBean("母婴", false, 2),
44
         PyyxTvListBean("母婴", false, 2),
44
         PyyxTvListBean("美妆", false, 3),
45
         PyyxTvListBean("美妆", false, 3),
@@ -67,10 +68,10 @@ class ThirdPartViewModel : BaseViewModel() {
67
                 BaseObserver<DataResponse<List<ClassesTypeBean>>>() {
68
                 BaseObserver<DataResponse<List<ClassesTypeBean>>>() {
68
                 override fun onSuccess(t: DataResponse<List<ClassesTypeBean>>?) {
69
                 override fun onSuccess(t: DataResponse<List<ClassesTypeBean>>?) {
69
                     if (t?.responseCode == 200) {
70
                     if (t?.responseCode == 200) {
70
-                        classesLiveData.postValue(t!!.data.mapIndexed { pos, bean ->
71
+                        classesLiveData.postValue(t.data.mapIndexed { pos, bean ->
71
                             PyyxTvListBean(
72
                             PyyxTvListBean(
72
                                 title = bean.c_name,
73
                                 title = bean.c_name,
73
-                                checked = pos == 0,
74
+                                checked = false,
74
                                 titleId = bean.cid.toInt()
75
                                 titleId = bean.cid.toInt()
75
                             )
76
                             )
76
                         })
77
                         })
@@ -123,7 +124,12 @@ class ThirdPartViewModel : BaseViewModel() {
123
         val map: MutableMap<String, Any> = HashMap()
124
         val map: MutableMap<String, Any> = HashMap()
124
         map["page"] = page
125
         map["page"] = page
125
         map["limit"] = 10
126
         map["limit"] = 10
126
-        map["cid"] = cid
127
+        if (cid != -1) {
128
+            map["cid"] = cid
129
+        }
130
+        if (keyWord.isNotEmpty()) {
131
+            map["keyword"] = keyWord
132
+        }
127
         val productService = NetworkApi.createService(ProductService::class.java)
133
         val productService = NetworkApi.createService(ProductService::class.java)
128
         productService.getJdProductList(map)
134
         productService.getJdProductList(map)
129
             .compose(
135
             .compose(
@@ -156,7 +162,12 @@ class ThirdPartViewModel : BaseViewModel() {
156
         val map: MutableMap<String, Any> = java.util.HashMap()
162
         val map: MutableMap<String, Any> = java.util.HashMap()
157
         map["page"] = page
163
         map["page"] = page
158
         map["limit"] = 10
164
         map["limit"] = 10
159
-        map["cid"] = cid
165
+        if (cid != -1) {
166
+            map["cid"] = cid
167
+        }
168
+        if (keyWord.isNotEmpty()) {
169
+            map["keyword"] = keyWord
170
+        }
160
         val productService = NetworkApi.createService(ProductService::class.java)
171
         val productService = NetworkApi.createService(ProductService::class.java)
161
         productService.getVipProductList(map)
172
         productService.getVipProductList(map)
162
             .compose(
173
             .compose(
@@ -223,11 +234,16 @@ class ThirdPartViewModel : BaseViewModel() {
223
      * 拼多多列表
234
      * 拼多多列表
224
      */
235
      */
225
     @SuppressLint("CheckResult")
236
     @SuppressLint("CheckResult")
226
-    fun getPinduoduoList(catId:Int) {
237
+    fun getPinduoduoList(catId: Int) {
227
         val map: MutableMap<String, Any> = java.util.HashMap()
238
         val map: MutableMap<String, Any> = java.util.HashMap()
228
         map["page"] = page
239
         map["page"] = page
229
         map["limit"] = 10
240
         map["limit"] = 10
230
-        map["cat_id"] = catId
241
+        if (catId != -1) {
242
+            map["cat_id"] = catId
243
+        }
244
+        if (keyWord.isNotEmpty()) {
245
+            map["keyword"] = keyWord
246
+        }
231
         val productService = NetworkApi.createService(ProductService::class.java)
247
         val productService = NetworkApi.createService(ProductService::class.java)
232
         productService.getPinduoduoProductList(map)
248
         productService.getPinduoduoProductList(map)
233
             .compose(
249
             .compose(
@@ -263,7 +279,12 @@ class ThirdPartViewModel : BaseViewModel() {
263
         val map: MutableMap<String, Any> = java.util.HashMap()
279
         val map: MutableMap<String, Any> = java.util.HashMap()
264
         map["page"] = page
280
         map["page"] = page
265
         map["limit"] = 10
281
         map["limit"] = 10
266
-        map["cid"] = cid
282
+        if (cid != -1) {
283
+            map["cid"] = cid
284
+        }
285
+        if (keyWord.isNotEmpty()) {
286
+            map["keyword"] = keyWord
287
+        }
267
         val productService = NetworkApi.createService(ProductService::class.java)
288
         val productService = NetworkApi.createService(ProductService::class.java)
268
         productService.getSuningProductList(map)
289
         productService.getSuningProductList(map)
269
             .compose(
290
             .compose(
@@ -292,19 +313,21 @@ class ThirdPartViewModel : BaseViewModel() {
292
     }
313
     }
293
 
314
 
294
     val pddCatLiveData = MutableLiveData<List<PddClassesBean.Data>>()
315
     val pddCatLiveData = MutableLiveData<List<PddClassesBean.Data>>()
316
+
295
     /**
317
     /**
296
      * pdd 分类
318
      * pdd 分类
297
      */
319
      */
298
     @SuppressLint("CheckResult")
320
     @SuppressLint("CheckResult")
299
-    fun requestPddCat(){
300
-        val map = mapOf<String,Any>(Pair("parentId","0"))
321
+    fun requestPddCat() {
322
+        val map = mapOf<String, Any>(Pair("parentId", "0"))
301
         val service = NetworkApi.createService(PyyxService::class.java)
323
         val service = NetworkApi.createService(PyyxService::class.java)
302
-        service.requestPddCat(map).compose(NetworkApi.applySchedulers(object : BaseObserver<DataResponse<PddClassesBean>>(){
324
+        service.requestPddCat(map).compose(NetworkApi.applySchedulers(object :
325
+            BaseObserver<DataResponse<PddClassesBean>>() {
303
             override fun onSuccess(t: DataResponse<PddClassesBean>?) {
326
             override fun onSuccess(t: DataResponse<PddClassesBean>?) {
304
                 t?.apply {
327
                 t?.apply {
305
-                    if (responseCode==200) {
306
-                        data?.let { catData->
307
-                            catData.data?.let { cats->
328
+                    if (responseCode == 200) {
329
+                        data?.let { catData ->
330
+                            catData.data?.let { cats ->
308
                                 pddCatLiveData.postValue(cats)
331
                                 pddCatLiveData.postValue(cats)
309
                             }
332
                             }
310
 
333
 

+ 2 - 2
app/src/main/java/com/yihucha/hbyhc/wxapi/WXEntryActivity.java

@@ -149,7 +149,7 @@ public class WXEntryActivity extends Activity implements IWXAPIEventHandler {
149
 //                WXEventBean wxEventBean = new WXEventBean();
149
 //                WXEventBean wxEventBean = new WXEventBean();
150
 //                wxEventBean.setCode(code);
150
 //                wxEventBean.setCode(code);
151
 //                EventBus.getDefault().postSticky(wxEventBean);
151
 //                EventBus.getDefault().postSticky(wxEventBean);
152
-                    System.out.println(code+"WxEntity  err_ok");
152
+                    System.out.println(code+"   WxEntity  err_ok");
153
 //                    EventBus.getDefault().post("success");
153
 //                    EventBus.getDefault().post("success");
154
                     getOpenId(code);
154
                     getOpenId(code);
155
                     finish();
155
                     finish();
@@ -202,7 +202,6 @@ public class WXEntryActivity extends Activity implements IWXAPIEventHandler {
202
 /*                        getUpdateAccount(wechatOpenIdBeanDataJavaResponse.getData().getUnionid(),
202
 /*                        getUpdateAccount(wechatOpenIdBeanDataJavaResponse.getData().getUnionid(),
203
                                 wechatOpenIdBeanDataJavaResponse.getData().getUser().getNickname(),
203
                                 wechatOpenIdBeanDataJavaResponse.getData().getUser().getNickname(),
204
                                 wechatOpenIdBeanDataJavaResponse.getData().getUser().getAvatar());*/
204
                                 wechatOpenIdBeanDataJavaResponse.getData().getUser().getAvatar());*/
205
-
206
                         finish();
205
                         finish();
207
                     } else {
206
                     } else {
208
 //                    //授权逻辑
207
 //                    //授权逻辑
@@ -215,6 +214,7 @@ public class WXEntryActivity extends Activity implements IWXAPIEventHandler {
215
                         Log.d(TAG, "wechat onSuccess: "+ wechatOpenIdBeanDataJavaResponse.getData());
214
                         Log.d(TAG, "wechat onSuccess: "+ wechatOpenIdBeanDataJavaResponse.getData());
216
                         String nickName = wechatOpenIdBeanDataJavaResponse.getData().getNickName();
215
                         String nickName = wechatOpenIdBeanDataJavaResponse.getData().getNickName();
217
                         String avatar = wechatOpenIdBeanDataJavaResponse.getData().getAvater();
216
                         String avatar = wechatOpenIdBeanDataJavaResponse.getData().getAvater();
217
+                        System.out.println(nickName+"----"+avatar);
218
 //                        getUpdateAccount(code,nickName,avatar);
218
 //                        getUpdateAccount(code,nickName,avatar);
219
                         getWechatLogin(wechatOpenIdBeanDataJavaResponse.getData().getUnionid(),nickName,avatar);
219
                         getWechatLogin(wechatOpenIdBeanDataJavaResponse.getData().getUnionid(),nickName,avatar);
220
                         finish();
220
                         finish();

+ 59 - 7
app/src/main/res/layout/activity_tb.xml

@@ -48,6 +48,59 @@
48
             android:src="@mipmap/back_white"
48
             android:src="@mipmap/back_white"
49
             android:visibility="invisible" />
49
             android:visibility="invisible" />
50
     </LinearLayout>
50
     </LinearLayout>
51
+
52
+    <RelativeLayout
53
+        android:id="@+id/layout_search"
54
+        android:layout_width="match_parent"
55
+        android:layout_height="35dp"
56
+        android:layout_marginTop="@dimen/dp_10"
57
+        android:orientation="horizontal"
58
+        android:paddingLeft="@dimen/dp_10"
59
+        android:paddingTop="3dp"
60
+        android:paddingRight="@dimen/dp_10"
61
+        android:paddingBottom="3dp"
62
+        app:layout_constraintLeft_toLeftOf="parent"
63
+        app:layout_constraintRight_toRightOf="parent"
64
+        app:layout_constraintTop_toBottomOf="@+id/title_layout">
65
+
66
+        <EditText
67
+            android:id="@+id/edt_search"
68
+            android:layout_width="match_parent"
69
+            android:layout_height="match_parent"
70
+            android:background="@drawable/shape_white_50dp"
71
+            android:drawableLeft="@mipmap/img_store_search"
72
+            android:drawablePadding="3dp"
73
+            android:gravity="center_vertical"
74
+            android:hint="请输入搜索内容"
75
+            android:textSize="14sp"
76
+            android:paddingLeft="@dimen/dp_10"
77
+            android:textColor="@color/black_333333"
78
+            android:layout_toLeftOf="@+id/tv_search"
79
+            />
80
+        <ImageView
81
+            android:id="@+id/img_clear"
82
+            android:layout_width="20dp"
83
+            android:layout_height="20dp"
84
+            android:src="@mipmap/search_cha_220616"
85
+            android:scaleType="centerInside"
86
+            android:layout_centerVertical="true"
87
+            android:layout_alignRight="@id/edt_search"
88
+            android:layout_marginRight="5dp"
89
+            android:visibility="gone"
90
+            />
91
+        <TextView
92
+            android:id="@+id/tv_search"
93
+            android:layout_width="wrap_content"
94
+            android:layout_height="match_parent"
95
+            android:gravity="center"
96
+            android:paddingLeft="@dimen/dp_10"
97
+            android:text="@string/search"
98
+            android:textColor="@color/white"
99
+            android:textSize="16sp"
100
+            android:layout_alignParentRight="true"
101
+            />
102
+    </RelativeLayout>
103
+
51
     <com.yihucha.hbyhc.view.RoundCornerImageView
104
     <com.yihucha.hbyhc.view.RoundCornerImageView
52
         android:id="@+id/banner"
105
         android:id="@+id/banner"
53
         android:layout_width="match_parent"
106
         android:layout_width="match_parent"
@@ -55,10 +108,10 @@
55
         android:layout_marginLeft="@dimen/dp_10"
108
         android:layout_marginLeft="@dimen/dp_10"
56
         android:layout_marginTop="10dp"
109
         android:layout_marginTop="10dp"
57
         android:layout_marginRight="@dimen/dp_10"
110
         android:layout_marginRight="@dimen/dp_10"
58
-        app:layout_constraintLeft_toLeftOf="parent"
59
         android:scaleType="centerCrop"
111
         android:scaleType="centerCrop"
60
-        app:rciv_radius="10dp"
61
-        app:layout_constraintTop_toBottomOf="@+id/title_layout" />
112
+        app:layout_constraintLeft_toLeftOf="parent"
113
+        app:layout_constraintTop_toBottomOf="@+id/layout_search"
114
+        app:rciv_radius="10dp" />
62
 
115
 
63
     <androidx.recyclerview.widget.RecyclerView
116
     <androidx.recyclerview.widget.RecyclerView
64
         android:id="@+id/rv_top_selector"
117
         android:id="@+id/rv_top_selector"
@@ -107,11 +160,10 @@
107
         android:id="@+id/img_to_top"
160
         android:id="@+id/img_to_top"
108
         android:layout_width="wrap_content"
161
         android:layout_width="wrap_content"
109
         android:layout_height="wrap_content"
162
         android:layout_height="wrap_content"
110
-        android:src="@mipmap/to_top"
111
-        app:layout_constraintRight_toRightOf="parent"
112
-        app:layout_constraintBottom_toBottomOf="parent"
113
         android:layout_marginRight="@dimen/dp_10"
163
         android:layout_marginRight="@dimen/dp_10"
114
         android:layout_marginBottom="20dp"
164
         android:layout_marginBottom="20dp"
165
+        android:src="@mipmap/to_top"
115
         android:visibility="gone"
166
         android:visibility="gone"
116
-        />
167
+        app:layout_constraintBottom_toBottomOf="parent"
168
+        app:layout_constraintRight_toRightOf="parent" />
117
 </androidx.constraintlayout.widget.ConstraintLayout>
169
 </androidx.constraintlayout.widget.ConstraintLayout>

BIN
jd_sdk_lib/build/intermediates/compiled_local_resources/debug/out/drawable-xxhdpi-v4_kepler_back_normal.png.flat


BIN
jd_sdk_lib/build/intermediates/compiled_local_resources/debug/out/drawable-xxhdpi-v4_kepler_back_pressed.png.flat


BIN
jd_sdk_lib/build/intermediates/compiled_local_resources/debug/out/drawable-xxhdpi-v4_kepler_selcet_more_normal.png.flat


BIN
jd_sdk_lib/build/intermediates/compiled_local_resources/debug/out/drawable-xxhdpi-v4_kepler_selcet_more_pressed.png.flat


BIN
jd_sdk_lib/build/intermediates/compiled_local_resources/debug/out/drawable-xxhdpi-v4_neterror.png.flat


BIN
jd_sdk_lib/build/intermediates/compiled_local_resources/debug/out/drawable-xxhdpi-v4_seclect_item_has_message.png.flat


BIN
jd_sdk_lib/build/intermediates/compiled_local_resources/debug/out/drawable-xxhdpi-v4_seclect_item_history.png.flat


BIN
jd_sdk_lib/build/intermediates/compiled_local_resources/debug/out/drawable-xxhdpi-v4_seclect_item_logout.png.flat


BIN
jd_sdk_lib/build/intermediates/compiled_local_resources/debug/out/drawable-xxhdpi-v4_seclect_item_no_has_message.png.flat


BIN
jd_sdk_lib/build/intermediates/compiled_local_resources/debug/out/drawable-xxhdpi-v4_seclect_item_orderlist.png.flat


BIN
jd_sdk_lib/build/intermediates/compiled_local_resources/debug/out/drawable-xxhdpi-v4_seclect_item_serch.png.flat


BIN
jd_sdk_lib/build/intermediates/compiled_local_resources/debug/out/drawable-xxhdpi-v4_select_bg.9.png.flat


BIN
jd_sdk_lib/build/intermediates/compiled_local_resources/debug/out/drawable-xxhdpi-v4_white.png.flat


BIN
jd_sdk_lib/build/intermediates/compiled_local_resources/debug/out/drawable_btn_reload.xml.flat


BIN
jd_sdk_lib/build/intermediates/compiled_local_resources/debug/out/drawable_kepler_btn_back.xml.flat


BIN
jd_sdk_lib/build/intermediates/compiled_local_resources/debug/out/drawable_kepler_btn_select_more.xml.flat


BIN
jd_sdk_lib/build/intermediates/compiled_local_resources/debug/out/drawable_kepler_dialog_bk.xml.flat


BIN
jd_sdk_lib/build/intermediates/compiled_local_resources/debug/out/drawable_kepler_dialog_button_ne.xml.flat


BIN
jd_sdk_lib/build/intermediates/compiled_local_resources/debug/out/drawable_kepler_dialog_button_po.xml.flat


BIN
jd_sdk_lib/build/intermediates/compiled_local_resources/debug/out/drawable_pressbar_color.xml.flat


BIN
jd_sdk_lib/build/intermediates/compiled_local_resources/debug/out/drawable_sdk_title_bg_with_shadow.xml.flat


BIN
jd_sdk_lib/build/intermediates/compiled_local_resources/debug/out/layout_item_tab_layout.xml.flat


BIN
jd_sdk_lib/build/intermediates/compiled_local_resources/debug/out/layout_kepler_mid_lin.xml.flat


BIN
jd_sdk_lib/build/intermediates/compiled_local_resources/debug/out/layout_kepler_simple_dialog_lay.xml.flat


BIN
jd_sdk_lib/build/intermediates/compiled_local_resources/debug/out/layout_more_select_item.xml.flat


BIN
jd_sdk_lib/build/intermediates/compiled_local_resources/debug/out/layout_neterror_layout.xml.flat


BIN
jd_sdk_lib/build/intermediates/compiled_local_resources/debug/out/layout_sdk_title_layout.xml.flat


BIN
jd_sdk_lib/build/intermediates/compiled_local_resources/debug/out/layout_web_bottom_layout.xml.flat


BIN
jd_sdk_lib/build/intermediates/compiled_local_resources/debug/out/raw_safe.jpg.flat


+ 30 - 30
jd_sdk_lib/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties

@@ -1,30 +1,30 @@
1
-#Sat Apr 19 15:35:25 CST 2025
2
-com.jd.jdsdk.jd_sdk_lib-main-7\:/drawable-xxhdpi/kepler_back_normal.png=/Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/build/intermediates/packaged_res/debug/drawable-xxhdpi-v4/kepler_back_normal.png
3
-com.jd.jdsdk.jd_sdk_lib-main-7\:/drawable-xxhdpi/kepler_back_pressed.png=/Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/build/intermediates/packaged_res/debug/drawable-xxhdpi-v4/kepler_back_pressed.png
4
-com.jd.jdsdk.jd_sdk_lib-main-7\:/drawable-xxhdpi/kepler_selcet_more_normal.png=/Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/build/intermediates/packaged_res/debug/drawable-xxhdpi-v4/kepler_selcet_more_normal.png
5
-com.jd.jdsdk.jd_sdk_lib-main-7\:/drawable-xxhdpi/kepler_selcet_more_pressed.png=/Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/build/intermediates/packaged_res/debug/drawable-xxhdpi-v4/kepler_selcet_more_pressed.png
6
-com.jd.jdsdk.jd_sdk_lib-main-7\:/drawable-xxhdpi/neterror.png=/Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/build/intermediates/packaged_res/debug/drawable-xxhdpi-v4/neterror.png
7
-com.jd.jdsdk.jd_sdk_lib-main-7\:/drawable-xxhdpi/seclect_item_has_message.png=/Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/build/intermediates/packaged_res/debug/drawable-xxhdpi-v4/seclect_item_has_message.png
8
-com.jd.jdsdk.jd_sdk_lib-main-7\:/drawable-xxhdpi/seclect_item_history.png=/Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/build/intermediates/packaged_res/debug/drawable-xxhdpi-v4/seclect_item_history.png
9
-com.jd.jdsdk.jd_sdk_lib-main-7\:/drawable-xxhdpi/seclect_item_logout.png=/Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/build/intermediates/packaged_res/debug/drawable-xxhdpi-v4/seclect_item_logout.png
10
-com.jd.jdsdk.jd_sdk_lib-main-7\:/drawable-xxhdpi/seclect_item_no_has_message.png=/Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/build/intermediates/packaged_res/debug/drawable-xxhdpi-v4/seclect_item_no_has_message.png
11
-com.jd.jdsdk.jd_sdk_lib-main-7\:/drawable-xxhdpi/seclect_item_orderlist.png=/Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/build/intermediates/packaged_res/debug/drawable-xxhdpi-v4/seclect_item_orderlist.png
12
-com.jd.jdsdk.jd_sdk_lib-main-7\:/drawable-xxhdpi/seclect_item_serch.png=/Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/build/intermediates/packaged_res/debug/drawable-xxhdpi-v4/seclect_item_serch.png
13
-com.jd.jdsdk.jd_sdk_lib-main-7\:/drawable-xxhdpi/select_bg.9.png=/Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/build/intermediates/packaged_res/debug/drawable-xxhdpi-v4/select_bg.9.png
14
-com.jd.jdsdk.jd_sdk_lib-main-7\:/drawable-xxhdpi/white.png=/Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/build/intermediates/packaged_res/debug/drawable-xxhdpi-v4/white.png
15
-com.jd.jdsdk.jd_sdk_lib-main-7\:/drawable/btn_reload.xml=/Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/build/intermediates/packaged_res/debug/drawable/btn_reload.xml
16
-com.jd.jdsdk.jd_sdk_lib-main-7\:/drawable/kepler_btn_back.xml=/Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/build/intermediates/packaged_res/debug/drawable/kepler_btn_back.xml
17
-com.jd.jdsdk.jd_sdk_lib-main-7\:/drawable/kepler_btn_select_more.xml=/Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/build/intermediates/packaged_res/debug/drawable/kepler_btn_select_more.xml
18
-com.jd.jdsdk.jd_sdk_lib-main-7\:/drawable/kepler_dialog_bk.xml=/Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/build/intermediates/packaged_res/debug/drawable/kepler_dialog_bk.xml
19
-com.jd.jdsdk.jd_sdk_lib-main-7\:/drawable/kepler_dialog_button_ne.xml=/Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/build/intermediates/packaged_res/debug/drawable/kepler_dialog_button_ne.xml
20
-com.jd.jdsdk.jd_sdk_lib-main-7\:/drawable/kepler_dialog_button_po.xml=/Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/build/intermediates/packaged_res/debug/drawable/kepler_dialog_button_po.xml
21
-com.jd.jdsdk.jd_sdk_lib-main-7\:/drawable/pressbar_color.xml=/Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/build/intermediates/packaged_res/debug/drawable/pressbar_color.xml
22
-com.jd.jdsdk.jd_sdk_lib-main-7\:/drawable/sdk_title_bg_with_shadow.xml=/Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/build/intermediates/packaged_res/debug/drawable/sdk_title_bg_with_shadow.xml
23
-com.jd.jdsdk.jd_sdk_lib-main-7\:/layout/item_tab_layout.xml=/Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/build/intermediates/packaged_res/debug/layout/item_tab_layout.xml
24
-com.jd.jdsdk.jd_sdk_lib-main-7\:/layout/kepler_mid_lin.xml=/Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/build/intermediates/packaged_res/debug/layout/kepler_mid_lin.xml
25
-com.jd.jdsdk.jd_sdk_lib-main-7\:/layout/kepler_simple_dialog_lay.xml=/Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/build/intermediates/packaged_res/debug/layout/kepler_simple_dialog_lay.xml
26
-com.jd.jdsdk.jd_sdk_lib-main-7\:/layout/more_select_item.xml=/Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/build/intermediates/packaged_res/debug/layout/more_select_item.xml
27
-com.jd.jdsdk.jd_sdk_lib-main-7\:/layout/neterror_layout.xml=/Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/build/intermediates/packaged_res/debug/layout/neterror_layout.xml
28
-com.jd.jdsdk.jd_sdk_lib-main-7\:/layout/sdk_title_layout.xml=/Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/build/intermediates/packaged_res/debug/layout/sdk_title_layout.xml
29
-com.jd.jdsdk.jd_sdk_lib-main-7\:/layout/web_bottom_layout.xml=/Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/build/intermediates/packaged_res/debug/layout/web_bottom_layout.xml
30
-com.jd.jdsdk.jd_sdk_lib-main-7\:/raw/safe.jpg=/Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/build/intermediates/packaged_res/debug/raw/safe.jpg
1
+#Wed Apr 23 11:01:06 CST 2025
2
+com.jd.jdsdk.jd_sdk_lib-main-7\:/drawable-xxhdpi/kepler_back_normal.png=E\:\\Android_project\\yihucha\\jd_sdk_lib\\build\\intermediates\\packaged_res\\debug\\drawable-xxhdpi-v4\\kepler_back_normal.png
3
+com.jd.jdsdk.jd_sdk_lib-main-7\:/drawable-xxhdpi/kepler_back_pressed.png=E\:\\Android_project\\yihucha\\jd_sdk_lib\\build\\intermediates\\packaged_res\\debug\\drawable-xxhdpi-v4\\kepler_back_pressed.png
4
+com.jd.jdsdk.jd_sdk_lib-main-7\:/drawable-xxhdpi/kepler_selcet_more_normal.png=E\:\\Android_project\\yihucha\\jd_sdk_lib\\build\\intermediates\\packaged_res\\debug\\drawable-xxhdpi-v4\\kepler_selcet_more_normal.png
5
+com.jd.jdsdk.jd_sdk_lib-main-7\:/drawable-xxhdpi/kepler_selcet_more_pressed.png=E\:\\Android_project\\yihucha\\jd_sdk_lib\\build\\intermediates\\packaged_res\\debug\\drawable-xxhdpi-v4\\kepler_selcet_more_pressed.png
6
+com.jd.jdsdk.jd_sdk_lib-main-7\:/drawable-xxhdpi/neterror.png=E\:\\Android_project\\yihucha\\jd_sdk_lib\\build\\intermediates\\packaged_res\\debug\\drawable-xxhdpi-v4\\neterror.png
7
+com.jd.jdsdk.jd_sdk_lib-main-7\:/drawable-xxhdpi/seclect_item_has_message.png=E\:\\Android_project\\yihucha\\jd_sdk_lib\\build\\intermediates\\packaged_res\\debug\\drawable-xxhdpi-v4\\seclect_item_has_message.png
8
+com.jd.jdsdk.jd_sdk_lib-main-7\:/drawable-xxhdpi/seclect_item_history.png=E\:\\Android_project\\yihucha\\jd_sdk_lib\\build\\intermediates\\packaged_res\\debug\\drawable-xxhdpi-v4\\seclect_item_history.png
9
+com.jd.jdsdk.jd_sdk_lib-main-7\:/drawable-xxhdpi/seclect_item_logout.png=E\:\\Android_project\\yihucha\\jd_sdk_lib\\build\\intermediates\\packaged_res\\debug\\drawable-xxhdpi-v4\\seclect_item_logout.png
10
+com.jd.jdsdk.jd_sdk_lib-main-7\:/drawable-xxhdpi/seclect_item_no_has_message.png=E\:\\Android_project\\yihucha\\jd_sdk_lib\\build\\intermediates\\packaged_res\\debug\\drawable-xxhdpi-v4\\seclect_item_no_has_message.png
11
+com.jd.jdsdk.jd_sdk_lib-main-7\:/drawable-xxhdpi/seclect_item_orderlist.png=E\:\\Android_project\\yihucha\\jd_sdk_lib\\build\\intermediates\\packaged_res\\debug\\drawable-xxhdpi-v4\\seclect_item_orderlist.png
12
+com.jd.jdsdk.jd_sdk_lib-main-7\:/drawable-xxhdpi/seclect_item_serch.png=E\:\\Android_project\\yihucha\\jd_sdk_lib\\build\\intermediates\\packaged_res\\debug\\drawable-xxhdpi-v4\\seclect_item_serch.png
13
+com.jd.jdsdk.jd_sdk_lib-main-7\:/drawable-xxhdpi/select_bg.9.png=E\:\\Android_project\\yihucha\\jd_sdk_lib\\build\\intermediates\\packaged_res\\debug\\drawable-xxhdpi-v4\\select_bg.9.png
14
+com.jd.jdsdk.jd_sdk_lib-main-7\:/drawable-xxhdpi/white.png=E\:\\Android_project\\yihucha\\jd_sdk_lib\\build\\intermediates\\packaged_res\\debug\\drawable-xxhdpi-v4\\white.png
15
+com.jd.jdsdk.jd_sdk_lib-main-7\:/drawable/btn_reload.xml=E\:\\Android_project\\yihucha\\jd_sdk_lib\\build\\intermediates\\packaged_res\\debug\\drawable\\btn_reload.xml
16
+com.jd.jdsdk.jd_sdk_lib-main-7\:/drawable/kepler_btn_back.xml=E\:\\Android_project\\yihucha\\jd_sdk_lib\\build\\intermediates\\packaged_res\\debug\\drawable\\kepler_btn_back.xml
17
+com.jd.jdsdk.jd_sdk_lib-main-7\:/drawable/kepler_btn_select_more.xml=E\:\\Android_project\\yihucha\\jd_sdk_lib\\build\\intermediates\\packaged_res\\debug\\drawable\\kepler_btn_select_more.xml
18
+com.jd.jdsdk.jd_sdk_lib-main-7\:/drawable/kepler_dialog_bk.xml=E\:\\Android_project\\yihucha\\jd_sdk_lib\\build\\intermediates\\packaged_res\\debug\\drawable\\kepler_dialog_bk.xml
19
+com.jd.jdsdk.jd_sdk_lib-main-7\:/drawable/kepler_dialog_button_ne.xml=E\:\\Android_project\\yihucha\\jd_sdk_lib\\build\\intermediates\\packaged_res\\debug\\drawable\\kepler_dialog_button_ne.xml
20
+com.jd.jdsdk.jd_sdk_lib-main-7\:/drawable/kepler_dialog_button_po.xml=E\:\\Android_project\\yihucha\\jd_sdk_lib\\build\\intermediates\\packaged_res\\debug\\drawable\\kepler_dialog_button_po.xml
21
+com.jd.jdsdk.jd_sdk_lib-main-7\:/drawable/pressbar_color.xml=E\:\\Android_project\\yihucha\\jd_sdk_lib\\build\\intermediates\\packaged_res\\debug\\drawable\\pressbar_color.xml
22
+com.jd.jdsdk.jd_sdk_lib-main-7\:/drawable/sdk_title_bg_with_shadow.xml=E\:\\Android_project\\yihucha\\jd_sdk_lib\\build\\intermediates\\packaged_res\\debug\\drawable\\sdk_title_bg_with_shadow.xml
23
+com.jd.jdsdk.jd_sdk_lib-main-7\:/layout/item_tab_layout.xml=E\:\\Android_project\\yihucha\\jd_sdk_lib\\build\\intermediates\\packaged_res\\debug\\layout\\item_tab_layout.xml
24
+com.jd.jdsdk.jd_sdk_lib-main-7\:/layout/kepler_mid_lin.xml=E\:\\Android_project\\yihucha\\jd_sdk_lib\\build\\intermediates\\packaged_res\\debug\\layout\\kepler_mid_lin.xml
25
+com.jd.jdsdk.jd_sdk_lib-main-7\:/layout/kepler_simple_dialog_lay.xml=E\:\\Android_project\\yihucha\\jd_sdk_lib\\build\\intermediates\\packaged_res\\debug\\layout\\kepler_simple_dialog_lay.xml
26
+com.jd.jdsdk.jd_sdk_lib-main-7\:/layout/more_select_item.xml=E\:\\Android_project\\yihucha\\jd_sdk_lib\\build\\intermediates\\packaged_res\\debug\\layout\\more_select_item.xml
27
+com.jd.jdsdk.jd_sdk_lib-main-7\:/layout/neterror_layout.xml=E\:\\Android_project\\yihucha\\jd_sdk_lib\\build\\intermediates\\packaged_res\\debug\\layout\\neterror_layout.xml
28
+com.jd.jdsdk.jd_sdk_lib-main-7\:/layout/sdk_title_layout.xml=E\:\\Android_project\\yihucha\\jd_sdk_lib\\build\\intermediates\\packaged_res\\debug\\layout\\sdk_title_layout.xml
29
+com.jd.jdsdk.jd_sdk_lib-main-7\:/layout/web_bottom_layout.xml=E\:\\Android_project\\yihucha\\jd_sdk_lib\\build\\intermediates\\packaged_res\\debug\\layout\\web_bottom_layout.xml
30
+com.jd.jdsdk.jd_sdk_lib-main-7\:/raw/safe.jpg=E\:\\Android_project\\yihucha\\jd_sdk_lib\\build\\intermediates\\packaged_res\\debug\\raw\\safe.jpg

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 2 - 2
jd_sdk_lib/build/intermediates/incremental/debug/packageDebugResources/merger.xml


+ 15 - 15
jd_sdk_lib/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt

@@ -4,36 +4,36 @@
4
 4
4
 4
5
 5    <uses-sdk
5
 5    <uses-sdk
6
 6        android:minSdkVersion="21"
6
 6        android:minSdkVersion="21"
7
-6-->/Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml
7
+6-->E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml
8
 7        android:targetSdkVersion="29" />
8
 7        android:targetSdkVersion="29" />
9
-7-->/Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml
9
+7-->E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml
10
 8
10
 8
11
 9    <application android:allowBackup="true" >
11
 9    <application android:allowBackup="true" >
12
-9-->/Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml:4:5-14:19
13
-9-->/Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml:4:18-44
12
+9-->E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml:4:5-14:19
13
+9-->E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml:4:18-44
14
 10
14
 10
15
 11        <!-- 直接回呼 -->
15
 11        <!-- 直接回呼 -->
16
 12        <activity
16
 12        <activity
17
-12-->/Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml:7:9-13:20
17
+12-->E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml:7:9-13:20
18
 13            android:name="com.kepler.jd.sdk.KeplerBackActivity"
18
 13            android:name="com.kepler.jd.sdk.KeplerBackActivity"
19
-13-->/Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml:7:43-94
19
+13-->E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml:7:43-94
20
 14            android:exported="true"
20
 14            android:exported="true"
21
-14-->/Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml:7:19-42
21
+14-->E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml:7:19-42
22
 15            android:theme="@android:style/Theme.Translucent" >
22
 15            android:theme="@android:style/Theme.Translucent" >
23
-15-->/Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml:7:95-143
23
+15-->E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml:7:95-143
24
 16            <intent-filter>
24
 16            <intent-filter>
25
-16-->/Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml:8:13-12:29
25
+16-->E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml:8:13-12:29
26
 17                <action android:name="android.intent.action.VIEW" />
26
 17                <action android:name="android.intent.action.VIEW" />
27
-17-->/Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml:9:17-68
28
-17-->/Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml:9:25-66
27
+17-->E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml:9:17-68
28
+17-->E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml:9:25-66
29
 18
29
 18
30
 19                <category android:name="android.intent.category.DEFAULT" />
30
 19                <category android:name="android.intent.category.DEFAULT" />
31
-19-->/Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml:10:17-75
32
-19-->/Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml:10:27-73
31
+19-->E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml:10:17-75
32
+19-->E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml:10:27-73
33
 20
33
 20
34
 21                <data android:scheme="sdkbacke9be0d6a2917e616be98c709acc30b8b" />
34
 21                <data android:scheme="sdkbacke9be0d6a2917e616be98c709acc30b8b" />
35
-21-->/Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml:11:17-81
36
-21-->/Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml:11:23-79
35
+21-->E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml:11:17-81
36
+21-->E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml:11:23-79
37
 22            </intent-filter>
37
 22            </intent-filter>
38
 23        </activity>
38
 23        </activity>
39
 24    </application>
39
 24    </application>

+ 31 - 31
jd_sdk_lib/build/outputs/logs/manifest-merger-debug-report.txt

@@ -1,51 +1,51 @@
1
 -- Merging decision tree log ---
1
 -- Merging decision tree log ---
2
 manifest
2
 manifest
3
-ADDED from /Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml:1:39-18:12
4
-INJECTED from /Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml:1:39-18:12
5
-INJECTED from /Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml:1:39-18:12
3
+ADDED from E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml:1:39-18:12
4
+INJECTED from E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml:1:39-18:12
5
+INJECTED from E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml:1:39-18:12
6
 	package
6
 	package
7
-		ADDED from /Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml:1:108-130
8
-		INJECTED from /Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml
9
-		INJECTED from /Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml
7
+		ADDED from E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml:1:108-130
8
+		INJECTED from E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml
9
+		INJECTED from E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml
10
 	xmlns:android
10
 	xmlns:android
11
-		ADDED from /Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml:1:49-107
11
+		ADDED from E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml:1:49-107
12
 application
12
 application
13
-ADDED from /Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml:4:5-14:19
13
+ADDED from E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml:4:5-14:19
14
 	android:allowBackup
14
 	android:allowBackup
15
-		ADDED from /Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml:4:18-44
15
+		ADDED from E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml:4:18-44
16
 activity#com.kepler.jd.sdk.KeplerBackActivity
16
 activity#com.kepler.jd.sdk.KeplerBackActivity
17
-ADDED from /Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml:7:9-13:20
17
+ADDED from E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml:7:9-13:20
18
 	android:exported
18
 	android:exported
19
-		ADDED from /Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml:7:19-42
19
+		ADDED from E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml:7:19-42
20
 	android:theme
20
 	android:theme
21
-		ADDED from /Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml:7:95-143
21
+		ADDED from E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml:7:95-143
22
 	android:name
22
 	android:name
23
-		ADDED from /Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml:7:43-94
23
+		ADDED from E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml:7:43-94
24
 intent-filter#action:name:android.intent.action.VIEW+category:name:android.intent.category.DEFAULT+data:scheme:sdkbacke9be0d6a2917e616be98c709acc30b8b
24
 intent-filter#action:name:android.intent.action.VIEW+category:name:android.intent.category.DEFAULT+data:scheme:sdkbacke9be0d6a2917e616be98c709acc30b8b
25
-ADDED from /Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml:8:13-12:29
25
+ADDED from E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml:8:13-12:29
26
 action#android.intent.action.VIEW
26
 action#android.intent.action.VIEW
27
-ADDED from /Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml:9:17-68
27
+ADDED from E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml:9:17-68
28
 	android:name
28
 	android:name
29
-		ADDED from /Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml:9:25-66
29
+		ADDED from E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml:9:25-66
30
 category#android.intent.category.DEFAULT
30
 category#android.intent.category.DEFAULT
31
-ADDED from /Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml:10:17-75
31
+ADDED from E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml:10:17-75
32
 	android:name
32
 	android:name
33
-		ADDED from /Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml:10:27-73
33
+		ADDED from E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml:10:27-73
34
 data
34
 data
35
-ADDED from /Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml:11:17-81
35
+ADDED from E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml:11:17-81
36
 	android:scheme
36
 	android:scheme
37
-		ADDED from /Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml:11:23-79
37
+		ADDED from E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml:11:23-79
38
 uses-sdk
38
 uses-sdk
39
-INJECTED from /Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml reason: use-sdk injection requested
40
-INJECTED from /Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml
41
-INJECTED from /Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml
42
-INJECTED from /Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml
43
-INJECTED from /Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml
39
+INJECTED from E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml reason: use-sdk injection requested
40
+INJECTED from E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml
41
+INJECTED from E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml
42
+INJECTED from E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml
43
+INJECTED from E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml
44
 	android:targetSdkVersion
44
 	android:targetSdkVersion
45
-		INJECTED from /Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml
46
-		ADDED from /Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml
47
-		INJECTED from /Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml
45
+		INJECTED from E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml
46
+		ADDED from E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml
47
+		INJECTED from E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml
48
 	android:minSdkVersion
48
 	android:minSdkVersion
49
-		INJECTED from /Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml
50
-		ADDED from /Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml
51
-		INJECTED from /Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml
49
+		INJECTED from E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml
50
+		ADDED from E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml
51
+		INJECTED from E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml

BIN
jd_sdk_lib/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin