同步优化代码

main/src/main/java/com/yunbao/main/activity/UserHomeActivity.java

@@ -46,6 +46,7 @@ import com.yunbao.common.bean.ActiveBean;
 import com.yunbao.common.bean.ActiveOtherBean;
 import com.yunbao.common.bean.HomeUserExhibitInfoBean;
 import com.yunbao.common.bean.HomeUserInfoBean;
+import com.yunbao.common.bean.IMLoginModel;
 import com.yunbao.common.bean.LabelBean;
 import com.yunbao.common.bean.LiveBean;
 import com.yunbao.common.bean.NewLevelModel;
@@ -59,6 +60,7 @@ import com.yunbao.common.http.LiveHttpUtil;
 import com.yunbao.common.http.base.HttpCallback;
 import com.yunbao.common.http.live.LiveNetManager;
 import com.yunbao.common.interfaces.CommonCallback;
+import com.yunbao.common.manager.IMLoginManager;
 import com.yunbao.common.manager.NewLevelManager;
 import com.yunbao.common.upload.UploadBean;
 import com.yunbao.common.upload.UploadCallback;
@@ -803,7 +805,7 @@ public class UserHomeActivity extends AbsActivity {
             @Override
             public void onClick(View v) {
                 Constants.myIntoIndex = 2;
-                String url = CommonAppConfig.HOST + "/h5/shequ/index.html#/h5/shequ/RongYuQiang??touid=" + uid;
+                String url = CommonAppConfig.HOST + "/h5/shequ/index.html#/h5/shequ/RongYuQiang?touid=" + uid+"&isZh="+(WordUtil.isNewZh() ? "1" : "0");
                 WebViewActivity.forward(mContext, url, false);
             }
         });

main/src/main/java/com/yunbao/main/dialog/MainStartDialogFragment.java

@@ -175,7 +175,7 @@ public class MainStartDialogFragment extends AbsDialogFragment implements View.O
                 String[] permissions;
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
                     permissions = new String[]{
-                            Manifest.permission.READ_MEDIA_IMAGES,
+                            //Manifest.permission.READ_MEDIA_IMAGES, 去掉选择图片的权限，到里面选择封面的时候再去申请
                             Manifest.permission.CAMERA,
                             Manifest.permission.RECORD_AUDIO
                     };

main/src/main/java/com/yunbao/main/views/MainHomeLiveViewHolder.java

@@ -470,8 +470,11 @@ public class MainHomeLiveViewHolder extends AbsMainHomeChildViewHolder implement
                                     } else if ("home_page_banner_battle".equals(link)) {
                                         RouteUtil.forwardBattlePass();
                                     } else if ("home_page_banner_giftwall".equals(link)) {
+                                        if (mShowLoadingDialog != null && mShowLoadingDialog.isShowing()) {
+                                            mShowLoadingDialog.dismiss();
+                                        }
                                         new GiftWallDialog(mContext, IMLoginManager.get(mContext).getUserInfo().getId() + "",
-                                                IMLoginManager.get(mContext).getUserInfo().getUserNicename(),null
+                                                IMLoginManager.get(mContext).getUserInfo().getUserNicename(), null
                                                 , false).setFullWindows(true).setTab2(true).showDialog();
                                     } else {
                                         gotoLive(link);

main/src/main/res/layout/dialog_message_status_config.xml

@@ -23,7 +23,6 @@
             android:background="@drawable/view_btn_chat_status_config"
             android:bufferType="spannable"
             android:button="@null"
-            android:checked="true"
             android:drawableTop="@drawable/view_btn_chat_status_config_online_color"
             android:ellipsize="marquee"
             android:gravity="center"
@@ -39,7 +38,6 @@
             android:layout_height="100dp"
             android:background="@drawable/view_btn_chat_status_config"
             android:button="@null"
-            android:checked="false"
             android:drawableTop="@drawable/view_btn_chat_status_config_off_color"
             android:gravity="center"
             android:paddingTop="30dp"