修复bug

rong_im/common_im_ui/src/main/res/layout/fragment_contact_list_tab.xml

@@ -2,7 +2,6 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/color_f6f8f9"
     android:orientation="vertical">
 
 

rong_im/kit/src/main/res/layout/rc_conversationlist_fragment.xml

@@ -4,7 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/color_f6f8f9"
     android:orientation="vertical">
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"

student/src/main/java/com/cooleshow/student/ui/main/MallFragment.java

@@ -52,6 +52,7 @@ import com.cooleshow.base.utils.PermissionUtils;
 import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.base.utils.UriUtils;
+import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.base.utils.helper.upload.UploadHelper;
 import com.cooleshow.base.widgets.DialogUtil;
 import com.cooleshow.student.App;
@@ -196,8 +197,6 @@ public class MallFragment extends BaseMVPFragment<FragmentMallBinding, ShopMallP
         initViewLayout();
 
         url = WebConstants.TEACHER_SHOPMALL;
-
-        setStatusBarTextColor(false);
         headerBbarView.setVisibility(View.GONE);
         viewStatusbar.setVisibility(View.VISIBLE);
         try {
@@ -1008,33 +1007,8 @@ public class MallFragment extends BaseMVPFragment<FragmentMallBinding, ShopMallP
 
     @Override
     public void setStatusBarTextColor(boolean statusBarTextColor) {
-        if (statusBarTextColor) {
-            setStatusBarColor();
-        } else {
-            setStatusBlackBarColor();
-        }
     }
 
-    public void setStatusBarColor() {
-        ImmersionBar.with(this)
-                .keyboardEnable(true)
-                .transparentStatusBar()
-                .statusBarDarkFont(false, 0.2f) //原理：如果当前设备支持状态栏字体变色，会设置状态栏字体为黑色，如果当前设备不支持状态栏字体变色，会使当前状态栏加上透明度，否则不执行透明度
-                .autoDarkModeEnable(false)
-                .flymeOSStatusBarFontColor(R.color.white)  //修改flyme OS状态栏字体颜色
-                .init();  //必须调用方可沉浸
-
-    }
-
-    public void setStatusBlackBarColor() {
-        ImmersionBar.with(this)
-                .keyboardEnable(true)
-                .transparentStatusBar()
-                .statusBarDarkFont(true, 0.2f) //原理：如果当前设备支持状态栏字体变色，会设置状态栏字体为黑色，如果当前设备不支持状态栏字体变色，会使当前状态栏加上透明度，否则不执行透明度
-                .autoDarkModeEnable(false)
-                .flymeOSStatusBarFontColor(com.cooleshow.base.R.color.common_black)  //修改flyme OS状态栏字体颜色
-                .init();  //必须调用方可沉浸
-    }
 
     @Override
     public void onAccompanySelecResult(String id, String name) {

student/src/main/java/com/cooleshow/student/ui/web/HtmlActivity.java

@@ -56,6 +56,7 @@ import com.cooleshow.base.utils.PermissionUtils;
 import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.base.utils.UriUtils;
+import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.base.utils.helper.upload.UploadHelper;
 import com.cooleshow.base.widgets.DialogUtil;
 import com.cooleshow.student.App;
@@ -724,7 +725,7 @@ public class HtmlActivity extends BaseActivity<ActivityHtml1Binding> implements
         String type = "";
         try {
             type = content.getString("type");
-            buckName =content.optString("bucket");
+            buckName = content.optString("bucket");
         } catch (JSONException e) {
             e.printStackTrace();
         }
@@ -1118,7 +1119,7 @@ public class HtmlActivity extends BaseActivity<ActivityHtml1Binding> implements
             if (result != null) {
                 File file = UriUtils.uri2File(result);
                 if (file != null && file.exists()) {
-                    UploadHelper uploadHelper = new UploadHelper(HtmlActivity.this,buckName);
+                    UploadHelper uploadHelper = new UploadHelper(HtmlActivity.this, buckName);
                     uploadHelper.uploadFile(file);
                     uploadHelper.setUpLoadCallBack(new UploadHelper.UpLoadCallBack() {
                         @Override
@@ -1211,9 +1212,9 @@ public class HtmlActivity extends BaseActivity<ActivityHtml1Binding> implements
     @Override
     public void setStatusBarTextColor(boolean statusBarTextColor) {
         if (statusBarTextColor) {
-            setStatusBarColor();
+            QMUIStatusBarHelper.setStatusBarDarkMode(this);
         } else {
-            setStatusBlackBarColor();
+            QMUIStatusBarHelper.setStatusBarLightMode(this);
         }
     }
 

student/src/main/java/com/cooleshow/student/ui/web/HtmlHorizontalScreenActivity.java

@@ -54,6 +54,7 @@ import com.cooleshow.base.utils.PermissionUtils;
 import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.base.utils.UriUtils;
+import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.base.utils.helper.upload.UploadHelper;
 import com.cooleshow.base.widgets.DialogUtil;
 import com.cooleshow.student.App;
@@ -681,7 +682,7 @@ public class HtmlHorizontalScreenActivity extends BaseActivity<ActivityHtml1Bind
         String type = "";
         try {
             type = content.getString("type");
-            buckName =content.optString("bucket");
+            buckName = content.optString("bucket");
         } catch (JSONException e) {
             e.printStackTrace();
         }
@@ -1075,7 +1076,7 @@ public class HtmlHorizontalScreenActivity extends BaseActivity<ActivityHtml1Bind
             if (result != null) {
                 File file = UriUtils.uri2File(result);
                 if (file != null && file.exists()) {
-                    UploadHelper uploadHelper = new UploadHelper(HtmlHorizontalScreenActivity.this,buckName);
+                    UploadHelper uploadHelper = new UploadHelper(HtmlHorizontalScreenActivity.this, buckName);
                     uploadHelper.uploadFile(file);
                     uploadHelper.setUpLoadCallBack(new UploadHelper.UpLoadCallBack() {
                         @Override
@@ -1154,9 +1155,9 @@ public class HtmlHorizontalScreenActivity extends BaseActivity<ActivityHtml1Bind
     @Override
     public void setStatusBarTextColor(boolean statusBarTextColor) {
         if (statusBarTextColor) {
-            setStatusBarColor();
+            QMUIStatusBarHelper.setStatusBarDarkMode(this);
         } else {
-            setStatusBlackBarColor();
+            QMUIStatusBarHelper.setStatusBarLightMode(this);
         }
     }
 

teacher/src/main/java/com/cooleshow/teacher/ui/main/MallFragment.java

@@ -49,6 +49,7 @@ import com.cooleshow.base.utils.AppUtils;
 import com.cooleshow.base.utils.PermissionUtils;
 import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtils;
+import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.base.widgets.DialogUtil;
 import com.cooleshow.teacher.App;
 import com.cooleshow.teacher.R;
@@ -192,7 +193,7 @@ public class MallFragment extends BaseMVPFragment<FragmentMallBinding, ShopMallP
 
         url = WebConstants.TEACHER_SHOPMALL;
 
-        setStatusBarTextColor(false);
+//        setStatusBarTextColor(false);
         headerBbarView.setVisibility(View.GONE);
         viewStatusbar.setVisibility(View.VISIBLE);
         try {
@@ -1005,11 +1006,7 @@ public class MallFragment extends BaseMVPFragment<FragmentMallBinding, ShopMallP
 
     @Override
     public void setStatusBarTextColor(boolean statusBarTextColor) {
-        if (statusBarTextColor) {
-            setStatusBarColor();
-        } else {
-            setStatusBlackBarColor();
-        }
+
     }
 
     public void setStatusBarColor() {

teacher/src/main/java/com/cooleshow/teacher/ui/web/HtmlActivity.java

@@ -56,6 +56,7 @@ import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.base.utils.UriUtils;
 import com.cooleshow.base.utils.helper.DialogHelper;
+import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.base.utils.helper.upload.UploadHelper;
 import com.cooleshow.base.widgets.DialogUtil;
 import com.cooleshow.teacher.App;
@@ -1204,9 +1205,9 @@ public class HtmlActivity extends BaseActivity<ActivityHtml1Binding> implements
     @Override
     public void setStatusBarTextColor(boolean statusBarTextColor) {
         if (statusBarTextColor) {
-            setStatusBarColor();
+            QMUIStatusBarHelper.setStatusBarDarkMode(this);
         } else {
-            setStatusBlackBarColor();
+            QMUIStatusBarHelper.setStatusBarLightMode(this);
         }
     }
 

teacher/src/main/java/com/cooleshow/teacher/ui/web/HtmlHorizontalScreenActivity.java

@@ -55,6 +55,7 @@ import com.cooleshow.base.utils.PermissionUtils;
 import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.base.utils.UriUtils;
+import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.base.utils.helper.upload.UploadHelper;
 import com.cooleshow.base.widgets.DialogUtil;
 import com.cooleshow.teacher.App;
@@ -1150,9 +1151,9 @@ public class HtmlHorizontalScreenActivity extends BaseActivity<ActivityHtml1Bind
     @Override
     public void setStatusBarTextColor(boolean statusBarTextColor) {
         if (statusBarTextColor) {
-            setStatusBarColor();
+            QMUIStatusBarHelper.setStatusBarDarkMode(this);
         } else {
-            setStatusBlackBarColor();
+            QMUIStatusBarHelper.setStatusBarLightMode(this);
         }
     }