amend

.idea/deploymentTargetDropDown.xml

@@ -6,12 +6,12 @@
         <type value="RUNNING_DEVICE_TARGET" />
         <deviceKey>
           <Key>
-            <type value="VIRTUAL_DEVICE_PATH" />
-            <value value="$USER_HOME$/.android/avd/Pixel_7_API_33.avd" />
+            <type value="SERIAL_NUMBER" />
+            <value value="8a759d16" />
           </Key>
         </deviceKey>
       </Target>
     </runningDeviceTargetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2025-04-23T06:20:47.641624Z" />
+    <timeTargetWasSelectedWithDropDown value="2025-04-23T06:39:36.995402Z" />
   </component>
 </project>

.idea/deploymentTargetSelector.xml

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

.idea/gradle.xml

@@ -16,6 +16,7 @@
             <option value="$PROJECT_DIR$/jd_sdk_lib" />
           </set>
         </option>
+        <option name="resolveExternalAnnotations" value="false" />
       </GradleProjectSettings>
     </option>
   </component>

app/src/main/java/com/yihucha/hbyhc/presentation/login/view_model/LoginViewModel.java

@@ -229,6 +229,7 @@ public class LoginViewModel extends BaseViewModel {
         map.put("nickname",nickName);
         map.put("avatarUrl",avatar);
 
+        Log.d(TAG, "getWxBinding:api/third/binding wechat " + map);
         AuthService authService = NetworkApi.createService(AuthService.class);
         authService.wxloginbinding(map).compose(NetworkApi.applySchedulers(new BaseObserver<DataResponse<LoginModel>>() {
             @Override

app/src/main/java/com/yihucha/hbyhc/presentation/mine/ThirdPartyBindingActivity.java

@@ -8,6 +8,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.View;
 import android.widget.Toast;
 
@@ -54,12 +55,16 @@ import java.util.Map;
  */
 public class ThirdPartyBindingActivity extends ViewBindingTitleBaseActivity<ActivityThirdPartyBindingBinding> implements View.OnClickListener {
     private static final int SDK_AUTH_FLAG = 2;
+    private static final String TAG = "ThirdPartyBindingActivity";
     private BindingStateBViewModel mBindingStateBViewModel;
 
     private   boolean flagAlipayAuthorization ; //表示支付宝是否授权
     private   boolean flagWechatAuthorization ; //表示微信是否授权
     private BindingStateBean wechatBean;
     private BindingStateBean alipayBean;
+    private  int number = 0;
+    private  boolean alipayBtnClickFlag = false;
+    private  boolean wechatBtnClickFlag = false;
     @SuppressLint("HandlerLeak")
     private final Handler mHandler = new Handler() {
         @SuppressWarnings("unused")
@@ -117,6 +122,7 @@ public class ThirdPartyBindingActivity extends ViewBindingTitleBaseActivity<Acti
     @Override
     protected void onResume() {
         super.onResume();
+        number = 0 ;
         mBindingStateBViewModel.getBindingState();
     }
 
@@ -127,6 +133,7 @@ public class ThirdPartyBindingActivity extends ViewBindingTitleBaseActivity<Acti
         mBindingStateBViewModel.mBindingStateBean.observe(this, new Observer<List<BindingStateBean>>() {
             @Override
             public void onChanged(List<BindingStateBean> bindingStateBeans) {
+
                 for (int i = 0; i < bindingStateBeans.size(); i++) {
                     if (bindingStateBeans.get(i).getType().equals("1")) {
                         wechatBean = bindingStateBeans.get(i);
@@ -145,11 +152,14 @@ public class ThirdPartyBindingActivity extends ViewBindingTitleBaseActivity<Acti
 //                        mViewBinding.llWechatAuthorization.setEnabled(false);
 //                        mViewBinding.llWechatAuthorization.setClickable(false);
                         flagWechatAuthorization = true ;
-                    } else if (bindingStateBeans.get(i).getType().equals("2")) {
+                        wechatBtnClickFlag = false;
+                    }
+                    else if (bindingStateBeans.get(i).getType().equals("2")) {
                         alipayBean = bindingStateBeans.get(i);
                         mViewBinding.tvAlipayBeAuthorized.setVisibility(View.VISIBLE);
                         mViewBinding.tvAlipayUnauthorized.setVisibility(View.GONE);
                         mViewBinding.llAlipayInfo.setVisibility(View.VISIBLE);
+                        alipayBtnClickFlag = false;
 //                        mViewBinding.llAlipayAuthorization.setEnabled(false);
 //                        mViewBinding.llAlipayAuthorization.setClickable(false);
                         String imageUrl = alipayBean.getAvater(); // Replace with your actual IP address and image path
@@ -164,10 +174,18 @@ public class ThirdPartyBindingActivity extends ViewBindingTitleBaseActivity<Acti
                         flagAlipayAuthorization = true;
                     }
                 }
+
+                if(wechatBtnClickFlag || alipayBtnClickFlag){
+                    mBindingStateBViewModel.getBindingState();
+                }
             }
         });
 
-        mBindingStateBViewModel.failed.observe(this, s -> ToastUtils.showLong(s));
+        mBindingStateBViewModel.failed.observe(this, s -> {
+            LogUtil.e("failed.-----","BindingState-----");
+            ToastUtils.showLong(s);
+
+        });
 
         //支付宝链接
         mBindingStateBViewModel.mAuthInfoSucceed.observe(this, new Observer<String>() {
@@ -236,6 +254,7 @@ public class ThirdPartyBindingActivity extends ViewBindingTitleBaseActivity<Acti
                 unbindAccountThird(2);
                 return ;
             }
+            alipayBtnClickFlag = true;
             mBindingStateBViewModel.getAuthInfo();
         }else if (v == mViewBinding.llWechatAuthorization){
 
@@ -244,6 +263,7 @@ public class ThirdPartyBindingActivity extends ViewBindingTitleBaseActivity<Acti
                 unbindAccountThird(1);
                return;
             }
+            wechatBtnClickFlag = true;
             regToWx();
         }
     }
@@ -268,6 +288,7 @@ public class ThirdPartyBindingActivity extends ViewBindingTitleBaseActivity<Acti
                                 mViewBinding.tvWxBeAuthorized.setVisibility(View.GONE);
                                 mViewBinding.tvWxUnauthorized.setVisibility(View.VISIBLE);
                                 flagWechatAuthorization = false;
+                                wechatBtnClickFlag = false ;
                                 mViewBinding.llWechatInfo.setVisibility(View.GONE);
                             }
                             else if(type == 2){
@@ -275,6 +296,7 @@ public class ThirdPartyBindingActivity extends ViewBindingTitleBaseActivity<Acti
                                 mViewBinding.tvAlipayUnauthorized.setVisibility(View.VISIBLE);
                                 mViewBinding.llAlipayInfo.setVisibility(View.GONE);
                                 flagAlipayAuthorization = false ;
+                                alipayBtnClickFlag = false ;
                             }
 
                         } else {

app/src/main/java/com/yihucha/hbyhc/presentation/mine/model/WechatOpenIdBean.java

@@ -17,7 +17,7 @@ public class WechatOpenIdBean {
     private String nickName ;
     private String avater ;
 
-
+    private String headimgurl ;
     public void  setNickname(String nickName){
         this.nickName = nickName ;
 
@@ -31,10 +31,16 @@ public class WechatOpenIdBean {
         this.avater = avater ;
 
     }
-
     public String getAvater() {
         return avater == null ? "" : avater;
     }
+    public void  setHeadimgurl(String headimgurl){
+        this.headimgurl = headimgurl ;
+
+    }
+    public String getHeadimgurl() {
+        return headimgurl == null ? "" : headimgurl;
+    }
     public String getUnionid() {
         return unionid == null ? "" : unionid;
     }

app/src/main/java/com/yihucha/hbyhc/presentation/mine/view_model/BindingStateBViewModel.java

@@ -1,6 +1,7 @@
 package com.yihucha.hbyhc.presentation.mine.view_model;
 
 import android.annotation.SuppressLint;
+import android.util.Log;
 
 import androidx.lifecycle.MutableLiveData;
 
@@ -36,20 +37,24 @@ public class BindingStateBViewModel extends BaseViewModel {
      */
     @SuppressLint("CheckResult")
     public void getBindingState() {
+        LogUtil.e("BindingStateBViewModel.getBindingState-----","BindingState-----");
         UserService userService = NetworkApi.createService(UserService.class);
         userService.getBindingState().compose(NetworkApi.applySchedulers(new BaseObserver<DataResponse<List<BindingStateBean>>>() {
             @Override
             public void onSuccess(DataResponse<List<BindingStateBean>> listDataResponse) {
                 if (listDataResponse.responseCode == 200) {
+                    LogUtil.e("BindingStateBViewModel.getBindingState","200-----BindingState-----");
                     mBindingStateBean.postValue(listDataResponse.getData());
                 } else {
 //                    ToastUtils.showLong(listDataResponse.responseError);
-                    LogUtil.e("BindingStateBViewModel.getBindingState",listDataResponse.responseError);
+                    failed.postValue(listDataResponse.responseError);
+                    LogUtil.e("BindingStateBViewModel.getBindingState ---BindingState- ",listDataResponse.responseError);
                 }
             }
 
             @Override
             public void onFailure(Throwable e) {
+//                failed.postValue(e.responseError);
 //                failed.postValue(getString(R.string.failed_string));
             }
         }));

app/src/main/java/com/yihucha/hbyhc/presentation/pyyx/activity/JDActivity.kt

@@ -1,6 +1,7 @@
 package com.yihucha.hbyhc.presentation.pyyx.activity
 
 import android.os.Bundle
+import android.text.Editable
 import android.view.View
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.widget.NestedScrollView
@@ -13,7 +14,6 @@ import com.yihucha.hbyhc.R
 import com.yihucha.hbyhc.base.BaseActivity
 import com.yihucha.hbyhc.config.BusinessConstants
 import com.yihucha.hbyhc.config.Constants
-import com.yihucha.hbyhc.config.HttpUrl
 import com.yihucha.hbyhc.databinding.ActivityTbBinding
 import com.yihucha.hbyhc.presentation.pyyx.PyyxTvListBean
 import com.yihucha.hbyhc.presentation.pyyx.adapter.ProductThirdPartAdapter
@@ -21,6 +21,7 @@ import com.yihucha.hbyhc.presentation.pyyx.adapter.RvTextViewAdapter
 import com.yihucha.hbyhc.presentation.pyyx.viewmodel.ThirdPartViewModel
 import com.yihucha.hbyhc.utils.DensityUtils
 import com.yihucha.hbyhc.utils.LoginUtils
+import com.yihucha.hbyhc.utils.MyTextWathcer
 import qiu.niorgai.StatusBarCompat
 
 /**
@@ -45,7 +46,8 @@ class JDActivity : BaseActivity() {
     private val viewModel by lazy {
         ViewModelProvider(this)[ThirdPartViewModel::class.java].apply {
             topSelectTitles = listOf(
-                PyyxTvListBean("居家日用", true, 1),
+                PyyxTvListBean("全部", true, -1),
+                PyyxTvListBean("居家日用", false, 1),
                 PyyxTvListBean("食品", false, 2),
                 PyyxTvListBean("生鲜", false, 3),
                 PyyxTvListBean("图书", false, 4),
@@ -157,6 +159,25 @@ class JDActivity : BaseActivity() {
         binding.imgToTop.setOnClickListener {
             binding.scrollView.scrollTo(0, 0)
         }
+
+        binding.edtSearch.addTextChangedListener(object : MyTextWathcer() {
+            override fun afterTextChanged(s: Editable?) {
+                super.afterTextChanged(s)
+                val str = s?.toString()?.trim() ?: ""
+                viewModel.keyWord = str
+                if (str.isEmpty()) {
+                    binding.imgClear.visibility = View.GONE
+                }else{
+                    binding.imgClear.visibility = View.VISIBLE
+                }
+            }
+        })
+        binding.imgClear.setOnClickListener {
+            binding.edtSearch.setText("")
+        }
+        binding.tvSearch.setOnClickListener {
+            viewModel.getJdList(viewModel.currentTitleBean.titleId)
+        }
     }
 
     private fun initData() {

app/src/main/java/com/yihucha/hbyhc/presentation/pyyx/activity/PDDActivity.kt

@@ -1,6 +1,7 @@
 package com.yihucha.hbyhc.presentation.pyyx.activity
 
 import android.os.Bundle
+import android.text.Editable
 import android.view.View
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.widget.NestedScrollView
@@ -13,7 +14,6 @@ import com.yihucha.hbyhc.R
 import com.yihucha.hbyhc.base.BaseActivity
 import com.yihucha.hbyhc.config.BusinessConstants
 import com.yihucha.hbyhc.config.Constants
-import com.yihucha.hbyhc.config.HttpUrl
 import com.yihucha.hbyhc.databinding.ActivityTbBinding
 import com.yihucha.hbyhc.presentation.pyyx.PyyxTvListBean
 import com.yihucha.hbyhc.presentation.pyyx.adapter.ProductThirdPartAdapter
@@ -21,6 +21,7 @@ import com.yihucha.hbyhc.presentation.pyyx.adapter.RvTextViewAdapter
 import com.yihucha.hbyhc.presentation.pyyx.viewmodel.ThirdPartViewModel
 import com.yihucha.hbyhc.utils.DensityUtils
 import com.yihucha.hbyhc.utils.LoginUtils
+import com.yihucha.hbyhc.utils.MyTextWathcer
 import qiu.niorgai.StatusBarCompat
 
 /**
@@ -45,7 +46,8 @@ class PDDActivity : BaseActivity() {
     }
     val catListAdapter by lazy {
         RvTextViewAdapter(
-            this,null)
+            this, null
+        )
     }
 
     private var titleId = 0
@@ -63,7 +65,8 @@ class PDDActivity : BaseActivity() {
         val params = binding.titleLayout.layoutParams as ConstraintLayout.LayoutParams
         params.topMargin = DensityUtils.getStatusBarHeight(this)
         binding.tvTitle.text = "拼多多"
-        Glide.with(this).load(BusinessConstants.HOST+"mweb/img/pinduoduo.jpg").into(binding.banner)
+        Glide.with(this).load(BusinessConstants.HOST + "mweb/img/pinduoduo.jpg")
+            .into(binding.banner)
         binding.bgView.setBackgroundResource(R.mipmap.home_bg)
         binding.rvProductList.layoutManager = LinearLayoutManager(context)
         binding.rvProductList.adapter = adapter
@@ -114,9 +117,9 @@ class PDDActivity : BaseActivity() {
 
         binding.scrollView.setOnScrollChangeListener(NestedScrollView.OnScrollChangeListener { v, scrollX, scrollY, oldScrollX, oldScrollY ->
             val rootPicHeight: Int = binding.banner.height
-            if (scrollY<rootPicHeight){
+            if (scrollY < rootPicHeight) {
                 binding.imgToTop.visibility = View.GONE
-            }else{
+            } else {
                 binding.imgToTop.visibility = View.VISIBLE
             }
         })
@@ -124,6 +127,24 @@ class PDDActivity : BaseActivity() {
             binding.scrollView.scrollTo(0, 0)
         }
 
+        binding.edtSearch.addTextChangedListener(object : MyTextWathcer() {
+            override fun afterTextChanged(s: Editable?) {
+                super.afterTextChanged(s)
+                val str = s?.toString()?.trim() ?: ""
+                viewModel.keyWord = str
+                if (str.isEmpty()) {
+                    binding.imgClear.visibility = View.GONE
+                }else{
+                    binding.imgClear.visibility = View.VISIBLE
+                }
+            }
+        })
+        binding.imgClear.setOnClickListener {
+            binding.edtSearch.setText("")
+        }
+        binding.tvSearch.setOnClickListener {
+            viewModel.getPinduoduoList(titleId)
+        }
     }
 
     private fun initData() {
@@ -141,14 +162,22 @@ class PDDActivity : BaseActivity() {
                 val catBeans = it.mapIndexed { index, bean ->
                     PyyxTvListBean(
                         title = bean.name,
-                        checked = index == 0,
+                        checked = false,
                         titleId = bean.id
                     )
                 }
-                titleId = catBeans.first().titleId
+                val beans = catBeans.toMutableList()
+                beans.add(
+                    0, PyyxTvListBean(
+                        title = "全部",
+                        checked = true,
+                        titleId = -1
+                    )
+                )
+                titleId = beans.first().titleId
                 viewModel.getPinduoduoList(titleId)
                 binding.rvTopSelector.visibility = View.VISIBLE
-                catListAdapter.resetTitles(catBeans)
+                catListAdapter.resetTitles(beans)
             }
         }
 

app/src/main/java/com/yihucha/hbyhc/presentation/pyyx/activity/SNActivity.kt

@@ -1,6 +1,7 @@
 package com.yihucha.hbyhc.presentation.pyyx.activity
 
 import android.os.Bundle
+import android.text.Editable
 import android.view.View
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.widget.NestedScrollView
@@ -9,17 +10,17 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import com.bumptech.glide.Glide
 import com.lcodecore.tkrefreshlayout.RefreshListenerAdapter
 import com.lcodecore.tkrefreshlayout.TwinklingRefreshLayout
-import com.yihucha.hbyhc.R
 import com.yihucha.hbyhc.base.BaseActivity
 import com.yihucha.hbyhc.config.BusinessConstants
 import com.yihucha.hbyhc.config.Constants
-import com.yihucha.hbyhc.config.HttpUrl
 import com.yihucha.hbyhc.databinding.ActivityTbBinding
+import com.yihucha.hbyhc.presentation.pyyx.PyyxTvListBean
 import com.yihucha.hbyhc.presentation.pyyx.adapter.ProductThirdPartAdapter
 import com.yihucha.hbyhc.presentation.pyyx.adapter.RvTextViewAdapter
 import com.yihucha.hbyhc.presentation.pyyx.viewmodel.ThirdPartViewModel
 import com.yihucha.hbyhc.utils.DensityUtils
 import com.yihucha.hbyhc.utils.LoginUtils
+import com.yihucha.hbyhc.utils.MyTextWathcer
 import qiu.niorgai.StatusBarCompat
 
 /**
@@ -59,7 +60,7 @@ class SNActivity : BaseActivity() {
         val params = binding.titleLayout.layoutParams as ConstraintLayout.LayoutParams
         params.topMargin = DensityUtils.getStatusBarHeight(this)
         binding.tvTitle.text = "苏宁"
-        Glide.with(this).load(BusinessConstants.HOST+"mweb/img/suning.jpg").into(binding.banner)
+        Glide.with(this).load(BusinessConstants.HOST + "mweb/img/suning.jpg").into(binding.banner)
         binding.rvProductList.layoutManager =
             LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false)
         binding.rvTopSelector.adapter = titleAdapter
@@ -102,11 +103,11 @@ class SNActivity : BaseActivity() {
 
 
         titleAdapter.setOnItemClickListener { pos ->
-            if (pos<viewModel.topSelectTitles.indexOf(viewModel.currentTitleBean)){
+            if (pos < viewModel.topSelectTitles.indexOf(viewModel.currentTitleBean)) {
                 //选前面的
-                if (pos>0)
+                if (pos > 0)
                     binding.rvTopSelector.smoothScrollToPosition(pos - 1)
-            }else{
+            } else {
                 //选后面的
                 if (pos < viewModel.topSelectTitles.size - 1)
                     binding.rvTopSelector.smoothScrollToPosition(pos + 1)
@@ -119,23 +120,49 @@ class SNActivity : BaseActivity() {
 
         binding.scrollView.setOnScrollChangeListener(NestedScrollView.OnScrollChangeListener { v, scrollX, scrollY, oldScrollX, oldScrollY ->
             val rootPicHeight: Int = binding.banner.height
-            if (scrollY<rootPicHeight){
+            if (scrollY < rootPicHeight) {
                 binding.imgToTop.visibility = View.GONE
-            }else{
+            } else {
                 binding.imgToTop.visibility = View.VISIBLE
             }
         })
         binding.imgToTop.setOnClickListener {
             binding.scrollView.scrollTo(0, 0)
         }
+        binding.edtSearch.addTextChangedListener(object : MyTextWathcer() {
+            override fun afterTextChanged(s: Editable?) {
+                super.afterTextChanged(s)
+                val str = s?.toString()?.trim() ?: ""
+                viewModel.keyWord = str
+                if (str.isEmpty()) {
+                    binding.imgClear.visibility = View.GONE
+                } else {
+                    binding.imgClear.visibility = View.VISIBLE
+                }
+            }
+        })
+        binding.imgClear.setOnClickListener {
+            binding.edtSearch.setText("")
+        }
+        binding.tvSearch.setOnClickListener {
+            viewModel.getSuningList(viewModel.currentTitleBean.titleId)
+        }
     }
 
     private fun initData() {
         viewModel.getClassesType(4)
-        viewModel.classesLiveData.observe(this){
-            viewModel.topSelectTitles = it
+        viewModel.classesLiveData.observe(this) {
+            viewModel.topSelectTitles = it.toMutableList().apply {
+                add(
+                    0, PyyxTvListBean(
+                        title = "全部",
+                        checked = true,
+                        titleId = -1
+                    )
+                )
+            }
             titleAdapter.resetTitles(viewModel.topSelectTitles)
-            viewModel.currentTitleBean=viewModel.topSelectTitles.first { it.checked }
+            viewModel.currentTitleBean = viewModel.topSelectTitles.first { it.checked }
             viewModel.getSuningList(viewModel.currentTitleBean.titleId)
         }
 
@@ -145,7 +172,7 @@ class SNActivity : BaseActivity() {
             binding.llNoData.llNotFound.visibility = if (it.isEmpty()) View.VISIBLE else View.GONE
             adapter.updateData(it)
         }
-        viewModel.failed.observe(this){
+        viewModel.failed.observe(this) {
             binding.refreshLayout.finishRefreshing()
             binding.refreshLayout.finishLoadmore()
         }

app/src/main/java/com/yihucha/hbyhc/presentation/pyyx/activity/VIPActivity.kt

@@ -2,6 +2,7 @@ package com.yihucha.hbyhc.presentation.pyyx.activity
 
 import android.graphics.Color
 import android.os.Bundle
+import android.text.Editable
 import android.view.View
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.widget.NestedScrollView
@@ -13,13 +14,14 @@ import com.lcodecore.tkrefreshlayout.TwinklingRefreshLayout
 import com.yihucha.hbyhc.base.BaseActivity
 import com.yihucha.hbyhc.config.BusinessConstants
 import com.yihucha.hbyhc.config.Constants
-import com.yihucha.hbyhc.config.HttpUrl
 import com.yihucha.hbyhc.databinding.ActivityTbBinding
+import com.yihucha.hbyhc.presentation.pyyx.PyyxTvListBean
 import com.yihucha.hbyhc.presentation.pyyx.adapter.ProductThirdPartAdapter
 import com.yihucha.hbyhc.presentation.pyyx.adapter.RvTextViewAdapter
 import com.yihucha.hbyhc.presentation.pyyx.viewmodel.ThirdPartViewModel
 import com.yihucha.hbyhc.utils.DensityUtils
 import com.yihucha.hbyhc.utils.LoginUtils
+import com.yihucha.hbyhc.utils.MyTextWathcer
 import qiu.niorgai.StatusBarCompat
 
 /**
@@ -128,13 +130,40 @@ class VIPActivity : BaseActivity() {
         binding.imgToTop.setOnClickListener {
             binding.scrollView.scrollTo(0, 0)
         }
+
+        binding.edtSearch.addTextChangedListener(object : MyTextWathcer() {
+            override fun afterTextChanged(s: Editable?) {
+                super.afterTextChanged(s)
+                val str = s?.toString()?.trim() ?: ""
+                viewModel.keyWord = str
+                if (str.isEmpty()) {
+                    binding.imgClear.visibility = View.GONE
+                }else{
+                    binding.imgClear.visibility = View.VISIBLE
+                }
+            }
+        })
+        binding.imgClear.setOnClickListener {
+            binding.edtSearch.setText("")
+        }
+        binding.tvSearch.setOnClickListener {
+            viewModel.getVipList(viewModel.currentTitleBean.titleId)
+        }
     }
 
     private fun initData() {
 
         viewModel.getClassesType(5)
         viewModel.classesLiveData.observe(this) {
-            viewModel.topSelectTitles = it
+            viewModel.topSelectTitles = it.toMutableList().apply {
+                add(
+                    0, PyyxTvListBean(
+                        title = "全部",
+                        checked = true,
+                        titleId = -1
+                    )
+                )
+            }
             titleAdapter.resetTitles(viewModel.topSelectTitles)
             viewModel.currentTitleBean = viewModel.topSelectTitles.first { it.checked }
             viewModel.getVipList(viewModel.currentTitleBean.titleId)

app/src/main/java/com/yihucha/hbyhc/presentation/pyyx/viewmodel/ThirdPartViewModel.kt

@@ -34,11 +34,12 @@ class ThirdPartViewModel : BaseViewModel() {
     val pageDatasLiveData = MutableLiveData<MutableList<HomeProductBean>>()
 
     val classesLiveData = MutableLiveData<List<PyyxTvListBean>>()
-
+    var keyWord = ""
     lateinit var currentTitleBean: PyyxTvListBean
 
     var topSelectTitles = listOf(
-        PyyxTvListBean("美食", true, 6),
+        PyyxTvListBean("全部", true, -1),
+        PyyxTvListBean("美食", false, 6),
         PyyxTvListBean("女装", false, 1),
         PyyxTvListBean("母婴", false, 2),
         PyyxTvListBean("美妆", false, 3),
@@ -67,10 +68,10 @@ class ThirdPartViewModel : BaseViewModel() {
                 BaseObserver<DataResponse<List<ClassesTypeBean>>>() {
                 override fun onSuccess(t: DataResponse<List<ClassesTypeBean>>?) {
                     if (t?.responseCode == 200) {
-                        classesLiveData.postValue(t!!.data.mapIndexed { pos, bean ->
+                        classesLiveData.postValue(t.data.mapIndexed { pos, bean ->
                             PyyxTvListBean(
                                 title = bean.c_name,
-                                checked = pos == 0,
+                                checked = false,
                                 titleId = bean.cid.toInt()
                             )
                         })
@@ -123,7 +124,12 @@ class ThirdPartViewModel : BaseViewModel() {
         val map: MutableMap<String, Any> = HashMap()
         map["page"] = page
         map["limit"] = 10
-        map["cid"] = cid
+        if (cid != -1) {
+            map["cid"] = cid
+        }
+        if (keyWord.isNotEmpty()) {
+            map["keyword"] = keyWord
+        }
         val productService = NetworkApi.createService(ProductService::class.java)
         productService.getJdProductList(map)
             .compose(
@@ -156,7 +162,12 @@ class ThirdPartViewModel : BaseViewModel() {
         val map: MutableMap<String, Any> = java.util.HashMap()
         map["page"] = page
         map["limit"] = 10
-        map["cid"] = cid
+        if (cid != -1) {
+            map["cid"] = cid
+        }
+        if (keyWord.isNotEmpty()) {
+            map["keyword"] = keyWord
+        }
         val productService = NetworkApi.createService(ProductService::class.java)
         productService.getVipProductList(map)
             .compose(
@@ -223,11 +234,16 @@ class ThirdPartViewModel : BaseViewModel() {
      * 拼多多列表
      */
     @SuppressLint("CheckResult")
-    fun getPinduoduoList(catId:Int) {
+    fun getPinduoduoList(catId: Int) {
         val map: MutableMap<String, Any> = java.util.HashMap()
         map["page"] = page
         map["limit"] = 10
-        map["cat_id"] = catId
+        if (catId != -1) {
+            map["cat_id"] = catId
+        }
+        if (keyWord.isNotEmpty()) {
+            map["keyword"] = keyWord
+        }
         val productService = NetworkApi.createService(ProductService::class.java)
         productService.getPinduoduoProductList(map)
             .compose(
@@ -263,7 +279,12 @@ class ThirdPartViewModel : BaseViewModel() {
         val map: MutableMap<String, Any> = java.util.HashMap()
         map["page"] = page
         map["limit"] = 10
-        map["cid"] = cid
+        if (cid != -1) {
+            map["cid"] = cid
+        }
+        if (keyWord.isNotEmpty()) {
+            map["keyword"] = keyWord
+        }
         val productService = NetworkApi.createService(ProductService::class.java)
         productService.getSuningProductList(map)
             .compose(
@@ -292,19 +313,21 @@ class ThirdPartViewModel : BaseViewModel() {
     }
 
     val pddCatLiveData = MutableLiveData<List<PddClassesBean.Data>>()
+
     /**
      * pdd 分类
      */
     @SuppressLint("CheckResult")
-    fun requestPddCat(){
-        val map = mapOf<String,Any>(Pair("parentId","0"))
+    fun requestPddCat() {
+        val map = mapOf<String, Any>(Pair("parentId", "0"))
         val service = NetworkApi.createService(PyyxService::class.java)
-        service.requestPddCat(map).compose(NetworkApi.applySchedulers(object : BaseObserver<DataResponse<PddClassesBean>>(){
+        service.requestPddCat(map).compose(NetworkApi.applySchedulers(object :
+            BaseObserver<DataResponse<PddClassesBean>>() {
             override fun onSuccess(t: DataResponse<PddClassesBean>?) {
                 t?.apply {
-                    if (responseCode==200) {
-                        data?.let { catData->
-                            catData.data?.let { cats->
+                    if (responseCode == 200) {
+                        data?.let { catData ->
+                            catData.data?.let { cats ->
                                 pddCatLiveData.postValue(cats)
                             }
 

app/src/main/java/com/yihucha/hbyhc/wxapi/WXEntryActivity.java

@@ -149,7 +149,7 @@ public class WXEntryActivity extends Activity implements IWXAPIEventHandler {
 //                WXEventBean wxEventBean = new WXEventBean();
 //                wxEventBean.setCode(code);
 //                EventBus.getDefault().postSticky(wxEventBean);
-                    System.out.println(code+"WxEntity  err_ok");
+                    System.out.println(code+"   WxEntity  err_ok");
 //                    EventBus.getDefault().post("success");
                     getOpenId(code);
                     finish();
@@ -198,11 +198,14 @@ public class WXEntryActivity extends Activity implements IWXAPIEventHandler {
                         //绑定
                         //提现微信绑定
                         System.out.println("sssssssssssssssssssssssssssssssss");
-                        getBandOpenid(wechatOpenIdBeanDataJavaResponse.getData().getOpenid());
+                        String nickName = wechatOpenIdBeanDataJavaResponse.getData().getNickName();
+                        String avatar = wechatOpenIdBeanDataJavaResponse.getData().getHeadimgurl();
+                        System.out.println("sssssssssssssssssssssssssssssssss"+ nickName);
+                        Log.d(TAG, "wechat onSuccess:---nickname "+ nickName);
+                        getBandOpenid(wechatOpenIdBeanDataJavaResponse.getData().getOpenid(),nickName,avatar);
 /*                        getUpdateAccount(wechatOpenIdBeanDataJavaResponse.getData().getUnionid(),
                                 wechatOpenIdBeanDataJavaResponse.getData().getUser().getNickname(),
                                 wechatOpenIdBeanDataJavaResponse.getData().getUser().getAvatar());*/
-
                         finish();
                     } else {
 //                    //授权逻辑
@@ -214,7 +217,9 @@ public class WXEntryActivity extends Activity implements IWXAPIEventHandler {
 //                    AuthService authService= NetworkApi.createService(AuthService.class);
                         Log.d(TAG, "wechat onSuccess: "+ wechatOpenIdBeanDataJavaResponse.getData());
                         String nickName = wechatOpenIdBeanDataJavaResponse.getData().getNickName();
-                        String avatar = wechatOpenIdBeanDataJavaResponse.getData().getAvater();
+                        String avatar = wechatOpenIdBeanDataJavaResponse.getData().getHeadimgurl();
+                        System.out.println(nickName+"----"+avatar);
+                        Log.d(TAG, "else wechat onSuccess:---nickname "+ nickName);
 //                        getUpdateAccount(code,nickName,avatar);
                         getWechatLogin(wechatOpenIdBeanDataJavaResponse.getData().getUnionid(),nickName,avatar);
                         finish();
@@ -243,10 +248,14 @@ public class WXEntryActivity extends Activity implements IWXAPIEventHandler {
      * @param openid
      */
     @SuppressLint("CheckResult")
-    private void getBandOpenid(String openid) {
+    private void getBandOpenid(String openid,String nickname,String avatar) {
         ShowLoadingDialog.showLoadingDialog(WXEntryActivity.this);
         Map<String, Object> map = new HashMap<>();
         map.put("openid", openid);
+        map.put("nickname",nickname);
+        map.put("avatar",avatar);
+
+        Log.d(TAG, "getBandOpenid:api/user/extract/band_openid wechat "+ map);
         AuthService authService = NetworkApi.createService(AuthService.class);
         authService.getBandOpenid(map).compose(NetworkApi.applySchedulers(new BaseObserver<DataResponse>() {
             @Override
@@ -323,6 +332,7 @@ public class WXEntryActivity extends Activity implements IWXAPIEventHandler {
         map.put("openid", openid);
         map.put("nickname",nickname);
         map.put("avatar",avatar);
+        Log.d(TAG, "getWechatLogin:api/wechat/check wechat "+ map);
         AuthService authService = NetworkApi.createService(AuthService.class);
         authService.getWechatLogIn(map).compose(NetworkApi.applySchedulers(new BaseObserver<DataResponse<LoginModel>>() {
             @Override

app/src/main/res/layout/activity_tb.xml

@@ -48,6 +48,59 @@
             android:src="@mipmap/back_white"
             android:visibility="invisible" />
     </LinearLayout>
+
+    <RelativeLayout
+        android:id="@+id/layout_search"
+        android:layout_width="match_parent"
+        android:layout_height="35dp"
+        android:layout_marginTop="@dimen/dp_10"
+        android:orientation="horizontal"
+        android:paddingLeft="@dimen/dp_10"
+        android:paddingTop="3dp"
+        android:paddingRight="@dimen/dp_10"
+        android:paddingBottom="3dp"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/title_layout">
+
+        <EditText
+            android:id="@+id/edt_search"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@drawable/shape_white_50dp"
+            android:drawableLeft="@mipmap/img_store_search"
+            android:drawablePadding="3dp"
+            android:gravity="center_vertical"
+            android:hint="请输入搜索内容"
+            android:textSize="14sp"
+            android:paddingLeft="@dimen/dp_10"
+            android:textColor="@color/black_333333"
+            android:layout_toLeftOf="@+id/tv_search"
+            />
+        <ImageView
+            android:id="@+id/img_clear"
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:src="@mipmap/search_cha_220616"
+            android:scaleType="centerInside"
+            android:layout_centerVertical="true"
+            android:layout_alignRight="@id/edt_search"
+            android:layout_marginRight="5dp"
+            android:visibility="gone"
+            />
+        <TextView
+            android:id="@+id/tv_search"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:paddingLeft="@dimen/dp_10"
+            android:text="@string/search"
+            android:textColor="@color/white"
+            android:textSize="16sp"
+            android:layout_alignParentRight="true"
+            />
+    </RelativeLayout>
+
     <com.yihucha.hbyhc.view.RoundCornerImageView
         android:id="@+id/banner"
         android:layout_width="match_parent"
@@ -55,10 +108,10 @@
         android:layout_marginLeft="@dimen/dp_10"
         android:layout_marginTop="10dp"
         android:layout_marginRight="@dimen/dp_10"
-        app:layout_constraintLeft_toLeftOf="parent"
         android:scaleType="centerCrop"
-        app:rciv_radius="10dp"
-        app:layout_constraintTop_toBottomOf="@+id/title_layout" />
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/layout_search"
+        app:rciv_radius="10dp" />
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rv_top_selector"
@@ -107,11 +160,10 @@
         android:id="@+id/img_to_top"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@mipmap/to_top"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
         android:layout_marginRight="@dimen/dp_10"
         android:layout_marginBottom="20dp"
+        android:src="@mipmap/to_top"
         android:visibility="gone"
-        />
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintRight_toRightOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,4 +1,4 @@
-#Sat Apr 19 15:35:25 CST 2025
+#Wed Apr 23 14:26:03 CST 2025
 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
 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
 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