Merge remote-tracking branch 'origin/PYYX_V1.0_20250417' into PYYX_V1.0_20250417

app/src/main/java/com/yihucha/hbyhc/presentation/login/LoginActivity.java

@@ -62,7 +62,7 @@ public class LoginActivity extends ViewBindingTitleBaseActivity<ActivityLoginPho
         if (mAvatar == null) {
             mAvatar = "";
         }
-
+        System.out.println("接收到的微信参数："+mOpenId+"   "+mNickName+"  "+mAvatar);
         if (EmptyCheckUtils.isNotEmpty(mOpenId)){
             loginType = 1;
             mViewBinding.layoutPhoneCode.setVisibility(View.VISIBLE);

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

@@ -24,13 +24,6 @@ import com.yihucha.hbyhc.view.MyToast;
 import java.util.HashMap;
 import java.util.Map;
 
-import io.reactivex.Observable;
-import io.reactivex.Single;
-import io.reactivex.SingleTransformer;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.schedulers.Schedulers;
-
 public class LoginViewModel extends BaseViewModel {
 
     static final  String TAG = "LoginViewModel";
@@ -226,7 +219,7 @@ public class LoginViewModel extends BaseViewModel {
         if (EmptyCheckUtils.isNotEmpty(uid)){
             map.put("spread", uid);
         }
-        map.put("nickname",nickName);
+        map.put("nickName",nickName);
         map.put("avatarUrl",avatar);
 
         Log.d(TAG, "getWxBinding:api/third/binding wechat " + map);

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

@@ -8,7 +8,6 @@ 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;
 
@@ -33,19 +32,17 @@ import com.yihucha.hbyhc.network.BaseObserver;
 import com.yihucha.hbyhc.network.DataResponse;
 import com.yihucha.hbyhc.network.NetworkApi;
 import com.yihucha.hbyhc.network.service.AuthService;
-import com.yihucha.hbyhc.presentation.agent.IncomeDetailActivity;
-import com.yihucha.hbyhc.presentation.login.model.LoginModel;
 import com.yihucha.hbyhc.presentation.mine.model.BindingStateBean;
 import com.yihucha.hbyhc.presentation.mine.view_model.BindingStateBViewModel;
-import com.yihucha.hbyhc.utils.DataCleanManager;
-import com.yihucha.hbyhc.utils.GlideUtils;
 import com.yihucha.hbyhc.utils.LogUtil;
 import com.yihucha.hbyhc.view.CustomDialog;
 import com.yihucha.hbyhc.view.MyToast;
-import com.yihucha.hbyhc.view.ShowLoadingDialog;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
 
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -117,6 +114,7 @@ public class ThirdPartyBindingActivity extends ViewBindingTitleBaseActivity<Acti
         initView();
         initClick();
         initData();
+        EventBus.getDefault().register(this);
     }
 
     @Override
@@ -125,60 +123,70 @@ public class ThirdPartyBindingActivity extends ViewBindingTitleBaseActivity<Acti
         number = 0 ;
         mBindingStateBViewModel.getBindingState();
     }
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void refreshState(String msg){
+        if ("success".equals(msg)){
+            mBindingStateBViewModel.getBindingState();
+        }
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        EventBus.getDefault().unregister(this);
+    }
 
     private void initData() {
 
         flagWechatAuthorization = false ;
         flagAlipayAuthorization = false;
-        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);
-                        mViewBinding.tvWxBeAuthorized.setVisibility(View.VISIBLE);
-                        mViewBinding.tvWxUnauthorized.setVisibility(View.GONE);
-                        mViewBinding.llWechatInfo.setVisibility(View.VISIBLE);
-                        String imageUrl = wechatBean.getAvater(); // Replace with your actual IP address and image path
-                        Glide.with(ThirdPartyBindingActivity.this)
-                                .load(imageUrl)
-                                .apply(RequestOptions.circleCropTransform()) // Apply circular crop
-                                .placeholder(R.mipmap.wx_sf_220908)        // Optional: Add a placeholder image
-                                .error(R.mipmap.wx_sf_220908)              // Optional: Add an error image
-                                .into(mViewBinding.llWechatProfile);
-                        mViewBinding.llWechatName.setText(wechatBean.getNickname());
+        mBindingStateBViewModel.mBindingStateBean.observe(this, bindingStateBeans -> {
+
+            for (int i = 0; i < bindingStateBeans.size(); i++) {
+                if (bindingStateBeans.get(i).getType().equals("1")) {
+                    wechatBean = bindingStateBeans.get(i);
+                    mViewBinding.tvWxBeAuthorized.setVisibility(View.VISIBLE);
+                    mViewBinding.tvWxUnauthorized.setVisibility(View.GONE);
+                    mViewBinding.llWechatInfo.setVisibility(View.VISIBLE);
+                    String imageUrl = wechatBean.getAvater(); // Replace with your actual IP address and image path
+                    Glide.with(ThirdPartyBindingActivity.this)
+                            .load(imageUrl)
+                            .apply(RequestOptions.circleCropTransform()) // Apply circular crop
+                            .placeholder(R.mipmap.wx_sf_220908)        // Optional: Add a placeholder image
+                            .error(R.mipmap.wx_sf_220908)              // Optional: Add an error image
+                            .into(mViewBinding.llWechatProfile);
+                    mViewBinding.llWechatName.setText(wechatBean.getNickname());
 
 //                        mViewBinding.llWechatAuthorization.setEnabled(false);
 //                        mViewBinding.llWechatAuthorization.setClickable(false);
-                        flagWechatAuthorization = true ;
-                        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
-                        Glide.with(ThirdPartyBindingActivity.this)
-                                .load(imageUrl)
-                                .apply(RequestOptions.circleCropTransform()) // Apply circular crop
-                                .placeholder(R.mipmap.zfb_sf_220908)        // Optional: Add a placeholder image
-                                .error(R.mipmap.zfb_sf_220908)              // Optional: Add an error image
-                                .into(mViewBinding.llAlipayProfile);
-
-                        mViewBinding.llAlipayName.setText(alipayBean.getNickname());
-                        flagAlipayAuthorization = true;
-                    }
-                }
-
-                if(wechatBtnClickFlag || alipayBtnClickFlag){
-                    mBindingStateBViewModel.getBindingState();
+                    flagWechatAuthorization = true;
+                    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;
+                    String imageUrl = alipayBean.getAvater(); // Replace with your actual IP address and image path
+                    Glide.with(ThirdPartyBindingActivity.this)
+                            .load(imageUrl)
+                            .apply(RequestOptions.circleCropTransform()) // Apply circular crop
+                            .placeholder(R.mipmap.zfb_sf_220908)        // Optional: Add a placeholder image
+                            .error(R.mipmap.zfb_sf_220908)              // Optional: Add an error image
+                            .into(mViewBinding.llAlipayProfile);
+
+                    mViewBinding.llAlipayName.setText(alipayBean.getNickname());
+                    flagAlipayAuthorization = true;
                 }
             }
+/*
+            if(wechatBtnClickFlag || alipayBtnClickFlag){
+                mBindingStateBViewModel.getBindingState();
+            }*/
+        });
+
+        mBindingStateBViewModel.mUpdateAccountData.observe(this, updateAccountBean -> {
+            mBindingStateBViewModel.getBindingState();
         });
 
         mBindingStateBViewModel.failed.observe(this, s -> {

app/src/main/java/com/yihucha/hbyhc/presentation/pyyx/fragment/PyyxMineFragment.kt

@@ -107,7 +107,7 @@ class PyyxMineFragment : NewBaseFragment<FragmentPyyxMineBinding>(), View.OnClic
             val serverBean = viewModel.myServer[it]
             when (serverBean.type) {
                 ServerType.YAOQING -> {
-                    Toast.makeText(requireContext(), "功能升级中", Toast.LENGTH_LONG).show()
+                    Toast.makeText(requireContext(), "功能开发中", Toast.LENGTH_LONG).show()
 //                    MyInvitationActivity.launch(activity)
                 }
 
@@ -137,7 +137,7 @@ class PyyxMineFragment : NewBaseFragment<FragmentPyyxMineBinding>(), View.OnClic
                 }
 
                 ServerType.RUZHU -> {
-                    Toast.makeText(requireContext(), "升级中", Toast.LENGTH_LONG).show()/*val api = WXAPIFactory.createWXAPI(activity, Constants.WX_APP_ID)
+                    Toast.makeText(requireContext(), "功能开发中", Toast.LENGTH_LONG).show()/*val api = WXAPIFactory.createWXAPI(activity, Constants.WX_APP_ID)
 
                     val req = WXLaunchMiniProgram.Req()
                     req.userName = Constants.SHOPS_IN_APPLET_ID // 填小程序原始id
@@ -159,7 +159,7 @@ class PyyxMineFragment : NewBaseFragment<FragmentPyyxMineBinding>(), View.OnClic
                     ShopManagerActivity.launch(requireContext())
                 }
                 ServerType.XFXD -> {
-                    Toast.makeText(requireContext(), "升级中", Toast.LENGTH_LONG).show()
+                    Toast.makeText(requireContext(), " 功能开发中", Toast.LENGTH_LONG).show()
                 }
 
                 else -> {}

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

@@ -186,23 +186,24 @@ public class WXEntryActivity extends Activity implements IWXAPIEventHandler {
         map.put("code", code);
         System.out.println("code input ------------>"+code);
         AuthService authService = NetworkApi.createService(AuthService.class);
-        authService.getWechatOpenId(map).compose(NetworkApi.applySchedulers(new BaseObserver<DataJavaResponse<WechatOpenIdBean>>() {
+        authService.getWechatOpenId(map).compose(NetworkApi.applySchedulers(new BaseObserver<>() {
             @Override
             public void onSuccess(DataJavaResponse<WechatOpenIdBean> wechatOpenIdBeanDataJavaResponse) {
                 ShowLoadingDialog.hideLoadingDialog();
-                System.out.println(wechatOpenIdBeanDataJavaResponse.responseCode+"  WXENTITY_activity  "+ wechatOpenIdBeanDataJavaResponse.responseError);
+                System.out.println(wechatOpenIdBeanDataJavaResponse.responseCode + "  WXENTITY_activity  " + wechatOpenIdBeanDataJavaResponse.responseError);
                 if (wechatOpenIdBeanDataJavaResponse.responseCode == 200) {
-                    System.out.println(wechatOpenIdBeanDataJavaResponse.getData().getCode()+"--------------------"+MVUtils.getString(Constants.TOKEN));
+                    System.out.println(wechatOpenIdBeanDataJavaResponse.getData().getCode() + "--------------------" + MVUtils.getString(Constants.TOKEN));
                     //wx0001未绑定
-                    if (!"wx0001".equals(wechatOpenIdBeanDataJavaResponse.getData().getCode()) && !StringsUtil.isEmpty(MVUtils.getString(Constants.TOKEN))) {
+//                    if (!"wx0001".equals(wechatOpenIdBeanDataJavaResponse.getData().getCode()) && !StringsUtil.isEmpty(MVUtils.getString(Constants.TOKEN))) {
+                    if (!StringsUtil.isEmpty(MVUtils.getString(Constants.TOKEN))) {
                         //绑定
                         //提现微信绑定
                         System.out.println("sssssssssssssssssssssssssssssssss");
                         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);
+                        System.out.println("sssssssssssssssssssssssssssssssss" + nickName);
+                        Log.d(TAG, "wechat onSuccess:---nickname " + nickName);
+                        getBandOpenid(wechatOpenIdBeanDataJavaResponse.getData().getUnionid(), nickName, avatar);
 /*                        getUpdateAccount(wechatOpenIdBeanDataJavaResponse.getData().getUnionid(),
                                 wechatOpenIdBeanDataJavaResponse.getData().getUser().getNickname(),
                                 wechatOpenIdBeanDataJavaResponse.getData().getUser().getAvatar());*/
@@ -215,18 +216,18 @@ public class WXEntryActivity extends Activity implements IWXAPIEventHandler {
 //                    map.put("nickname",code);
 //                    map.put("openid",code);
 //                    AuthService authService= NetworkApi.createService(AuthService.class);
-                        Log.d(TAG, "wechat onSuccess: "+ wechatOpenIdBeanDataJavaResponse.getData());
+                        Log.d(TAG, "wechat onSuccess: " + wechatOpenIdBeanDataJavaResponse.getData());
                         String nickName = wechatOpenIdBeanDataJavaResponse.getData().getNickName();
                         String avatar = wechatOpenIdBeanDataJavaResponse.getData().getHeadimgurl();
-                        System.out.println(nickName+"----"+avatar);
-                        Log.d(TAG, "else wechat onSuccess:---nickname "+ nickName);
+                        System.out.println(nickName + "----" + avatar);
+                        Log.d(TAG, "else wechat onSuccess:---nickname " + nickName);
 //                        getUpdateAccount(code,nickName,avatar);
-                        getWechatLogin(wechatOpenIdBeanDataJavaResponse.getData().getUnionid(),nickName,avatar);
+                        getWechatLogin(wechatOpenIdBeanDataJavaResponse.getData().getUnionid(), nickName, avatar);
                         finish();
                     }
                 } else {
                     ToastUtils.showLong(wechatOpenIdBeanDataJavaResponse.responseError);
-                    System.out.println(wechatOpenIdBeanDataJavaResponse.responseCode+"  WXENTITY_activity2  "+ wechatOpenIdBeanDataJavaResponse.responseError);
+                    System.out.println(wechatOpenIdBeanDataJavaResponse.responseCode + "  WXENTITY_activity2  " + wechatOpenIdBeanDataJavaResponse.responseError);
                     finish();
                 }
             }

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

@@ -8,7 +8,7 @@
     <View
         android:id="@+id/bg_view"
         android:layout_width="match_parent"
-        android:layout_height="150dp"
+        android:layout_height="160dp"
         android:background="#ED372E"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -71,7 +71,7 @@
             android:drawableLeft="@mipmap/img_store_search"
             android:drawablePadding="3dp"
             android:gravity="center_vertical"
-            android:hint="请输入搜索内容"
+            android:hint="输入商品名称查找全球好货"
             android:textSize="14sp"
             android:paddingLeft="@dimen/dp_10"
             android:textColor="@color/black_333333"
@@ -104,11 +104,11 @@
     <com.yihucha.hbyhc.view.RoundCornerImageView
         android:id="@+id/banner"
         android:layout_width="match_parent"
-        android:layout_height="150dp"
+        android:layout_height="160dp"
         android:layout_marginLeft="@dimen/dp_10"
         android:layout_marginTop="10dp"
         android:layout_marginRight="@dimen/dp_10"
-        android:scaleType="centerCrop"
+        android:scaleType="fitXY"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/layout_search"
         app:rciv_radius="10dp" />

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

@@ -98,7 +98,7 @@
                 android:layout_width="wrap_content"
                 android:layout_weight="1"
                 android:layout_height="wrap_content"
-
+                android:visibility="gone"
                 android:gravity="center"
                 android:orientation="vertical">
 
@@ -149,7 +149,7 @@
                 android:layout_width="wrap_content"
                 android:layout_weight="1"
                 android:layout_height="wrap_content"
-
+                android:visibility="gone"
                 android:gravity="center"
                 android:orientation="vertical">
 

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

@@ -1,30 +1,30 @@
-#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
-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
-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
-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
-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
-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
-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
-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
-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
-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
-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
-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
-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
-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
-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
-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
-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
-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
-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
-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
-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
-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
-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
-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
-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
-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
-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
+#Wed Apr 23 16:22:21 CST 2025
+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
+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
+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
+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
+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
+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
+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
+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
+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
+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
+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
+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
+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
+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
+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
+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
+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
+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
+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
+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
+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
+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
+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
+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
+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
+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
+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
+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
+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

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

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

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

@@ -1,51 +1,51 @@
 -- Merging decision tree log ---
 manifest
-ADDED from /Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml:1:39-18:12
-INJECTED from /Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml:1:39-18:12
-INJECTED from /Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml:1:39-18:12
+ADDED from E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml:1:39-18:12
+INJECTED from E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml:1:39-18:12
+INJECTED from E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml:1:39-18:12
 	package
-		ADDED from /Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml:1:108-130
-		INJECTED from /Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml
-		INJECTED from /Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml
+		ADDED from E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml:1:108-130
+		INJECTED from E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml
+		INJECTED from E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml
 	xmlns:android
-		ADDED from /Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml:1:49-107
+		ADDED from E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml:1:49-107
 application
-ADDED from /Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml:4:5-14:19
+ADDED from E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml:4:5-14:19
 	android:allowBackup
-		ADDED from /Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml:4:18-44
+		ADDED from E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml:4:18-44
 activity#com.kepler.jd.sdk.KeplerBackActivity
-ADDED from /Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml:7:9-13:20
+ADDED from E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml:7:9-13:20
 	android:exported
-		ADDED from /Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml:7:19-42
+		ADDED from E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml:7:19-42
 	android:theme
-		ADDED from /Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml:7:95-143
+		ADDED from E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml:7:95-143
 	android:name
-		ADDED from /Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml:7:43-94
+		ADDED from E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml:7:43-94
 intent-filter#action:name:android.intent.action.VIEW+category:name:android.intent.category.DEFAULT+data:scheme:sdkbacke9be0d6a2917e616be98c709acc30b8b
-ADDED from /Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml:8:13-12:29
+ADDED from E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml:8:13-12:29
 action#android.intent.action.VIEW
-ADDED from /Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml:9:17-68
+ADDED from E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml:9:17-68
 	android:name
-		ADDED from /Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml:9:25-66
+		ADDED from E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml:9:25-66
 category#android.intent.category.DEFAULT
-ADDED from /Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml:10:17-75
+ADDED from E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml:10:17-75
 	android:name
-		ADDED from /Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml:10:27-73
+		ADDED from E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml:10:27-73
 data
-ADDED from /Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml:11:17-81
+ADDED from E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml:11:17-81
 	android:scheme
-		ADDED from /Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml:11:23-79
+		ADDED from E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml:11:23-79
 uses-sdk
-INJECTED from /Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml reason: use-sdk injection requested
-INJECTED from /Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml
-INJECTED from /Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml
-INJECTED from /Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml
-INJECTED from /Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml
+INJECTED from E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml reason: use-sdk injection requested
+INJECTED from E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml
+INJECTED from E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml
+INJECTED from E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml
+INJECTED from E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml
 	android:targetSdkVersion
-		INJECTED from /Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml
-		ADDED from /Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml
-		INJECTED from /Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml
+		INJECTED from E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml
+		ADDED from E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml
+		INJECTED from E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml
 	android:minSdkVersion
-		INJECTED from /Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml
-		ADDED from /Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml
-		INJECTED from /Users/wenjuan.su/Downloads/yihucha/jd_sdk_lib/src/main/AndroidManifest.xml
+		INJECTED from E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml
+		ADDED from E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml
+		INJECTED from E:\Android_project\yihucha\jd_sdk_lib\src\main\AndroidManifest.xml