全屏显示修改代码

app/src/main/AndroidManifest.xml

@@ -2,6 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.bonait.bnframework">
+
+    <uses-sdk tools:overrideLibrary="com.aliyun.iot.breeze.biz,com.aliyun.iot.breeze.ota,     com.aliyun.iot.breeze.sdk,com.aliyun.iot.ble,com.aliyun.alink.linksdk.tmp" />
     <!-- 网络权限 -->
     <uses-permission android:name="android.permission.INTERNET" /> <!-- 网络连接 -->
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <!-- 获取网络连接状态 -->
@@ -14,14 +16,9 @@
     <uses-permission android:name="android.permission.RECORD_VIDEO" /> <!-- 录像权限 -->
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
 
-
-    <uses-sdk tools:overrideLibrary="com.aliyun.iot.breeze.biz,com.aliyun.iot.breeze.ota,
-    com.aliyun.iot.breeze.sdk,com.aliyun.iot.ble,com.aliyun.alink.linksdk.tmp"/>
-
     <application
         android:name=".MainApplication"
         android:allowBackup="true"
@@ -38,7 +35,8 @@
         tools:replace="android:icon">
         <activity
             android:name=".modules.home.fragment.from.fragment.SystemCsPLCFragment"
-            android:exported="false" tools:ignore="Instantiatable"/>
+            android:exported="false"
+            tools:ignore="Instantiatable" />
         <activity
             android:name=".modules.home.fragment.from.FileActivity"
             android:exported="false" />
@@ -55,26 +53,31 @@
         <activity
             android:name=".modules.home.fragment.from.fragment.SystemCsFltlFragment"
             android:exported="false"
-            tools:ignore="Instantiatable"/>
+            tools:ignore="Instantiatable" />
         <activity
             android:name=".modules.home.fragment.from.fragment.SystemCsMonitorFragment"
-            android:exported="false" tools:ignore="Instantiatable"/>
+            android:exported="false"
+            tools:ignore="Instantiatable" />
         <activity
             android:name=".modules.home.fragment.from.fragment.SystemCsControlFragment"
-            android:exported="false" tools:ignore="Instantiatable"/>
+            android:exported="false"
+            tools:ignore="Instantiatable" />
         <activity
             android:name=".modules.home.fragment.from.fragment.SystemSeasoningsetFragment"
-            android:exported="false" tools:ignore="Instantiatable"/>
+            android:exported="false"
+            tools:ignore="Instantiatable" />
         <activity
             android:name=".modules.home.fragment.from.fragment.SystemSystemsetFragment"
             android:exported="false"
             tools:ignore="Instantiatable" />
         <activity
             android:name=".modules.home.fragment.from.fragment.SystemDeviceinFragment"
-            android:exported="false" tools:ignore="Instantiatable"/>
+            android:exported="false"
+            tools:ignore="Instantiatable" />
         <activity
             android:name=".modules.home.fragment.from.fragment.systeminternetfragment"
-            android:exported="false" tools:ignore="Instantiatable"/>
+            android:exported="false"
+            tools:ignore="Instantiatable" />
         <activity
             android:name=".modules.home.fragment.from.CpxzActivity"
             android:exported="false" />
@@ -106,8 +109,8 @@
 
         <activity
             android:name=".modules.welcome.activity.WelcomeActivity"
-            android:theme="@style/AppTheme.Launcher"
-            android:exported="true">
+            android:exported="true"
+            android:theme="@style/AppTheme.Launcher">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -134,10 +137,7 @@
             -->
         </activity>
         <activity android:name=".modules.home.activity.BottomNavigation2Activity" />
-        <activity android:name=".modules.home.activity.BottomNavigationActivity" />
-
-<!--        <service android:name="org.eclipse.paho.android.service.MqttService" />-->
-
+        <activity android:name=".modules.home.activity.BottomNavigationActivity" /> <!-- <service android:name="org.eclipse.paho.android.service.MqttService" /> -->
         <receiver
             android:name=".common.base.BootReceiver"
             android:exported="true">
@@ -147,8 +147,6 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </receiver>
-
-
     </application>
 
 </manifest>

app/src/main/java/com/bonait/bnframework/business/ExecuteTheRecipe.java

@@ -285,7 +285,7 @@ public class ExecuteTheRecipe {
                 String key = entry.getKey();
                 String value = entry.getValue();
                 ToastUtils.info("工序:" + key + "," + value);
-                if (key.contains("延迟")) {
+                if (key.contains("(秒)")) {
                     int val = Integer.parseInt(value);
                     Thread.sleep(val * 1000);
                 } else {
@@ -322,7 +322,7 @@ public class ExecuteTheRecipe {
                 String key = entry.getKey();
                 String value = entry.getValue();
                 ToastUtils.info("工序:" + key + "," + value);
-                if (key.contains("延迟")) {
+                if (key.contains("(秒)")) {
                     int val = Integer.parseInt(value);
                     Thread.sleep(val * 1000);
                 } else if (key.contains("速度")) {
@@ -493,7 +493,7 @@ public class ExecuteTheRecipe {
             for (HashMap.Entry<String, String> entry : data.entrySet()) {
                 String key = entry.getKey();
                 String value = entry.getValue();
-                if (key.contains("秒")) {
+                if (key.contains("(秒)")) {
                     val = Integer.parseInt(value);
                 }
             }
@@ -549,7 +549,7 @@ public class ExecuteTheRecipe {
                 String key = entry.getKey();
                 String value = entry.getValue();
                 ToastUtils.info("工序:" + key + "," + value);
-                if (key.contains("延迟")) {
+                if (key.contains("(秒)")) {
                     int val = Integer.parseInt(value);
                     Thread.sleep(val * 1000);
                 } else {
@@ -586,7 +586,7 @@ public class ExecuteTheRecipe {
                 String key = entry.getKey();
                 String value = entry.getValue();
                 ToastUtils.info("工序:" + key + "," + value);
-                if (key.contains("延迟")) {
+                if (key.contains("(秒)")) {
                     int val = Integer.parseInt(value);
                     Thread.sleep(val * 1000);
                 }
@@ -603,15 +603,7 @@ public class ExecuteTheRecipe {
      */
     private static void Write_PLC_Outdishes(HashMap<String, String> data) {
         try {
-            for (HashMap.Entry<String, String> entry : data.entrySet()) {
-                String key = entry.getKey();
-                String value = entry.getValue();
-                ToastUtils.info("工序:" + key + "," + value);
-                if (key.contains("延迟")) {
-                    int val = Integer.parseInt(value);
-                    Thread.sleep(val * 1000);
-                }
-            }
+
             BottomClick("出菜");
 
             //一直等待机器移动到该位置，否则就一直等待 6s超时
@@ -629,6 +621,17 @@ public class ExecuteTheRecipe {
                 }
                 Thread.sleep(100);//10 *6
             }
+
+
+            for (HashMap.Entry<String, String> entry : data.entrySet()) {
+                String key = entry.getKey();
+                String value = entry.getValue();
+                ToastUtils.info("工序:" + key + "," + value);
+                if (key.contains("(秒)")) {
+                    int val = Integer.parseInt(value);
+                    Thread.sleep(val * 1000);
+                }
+            }
             ToastUtils.info("出菜完成,结束制作！");
         } catch (Exception ex) {
             ToastUtils.error("异常信息:" + ex.getMessage());

app/src/main/java/com/bonait/bnframework/common/base/BaseActivity.java

@@ -26,18 +26,15 @@ import pub.devrel.easypermissions.EasyPermissions;
 
 
 /**
- * Created by LY on 2019/3/21.
+ * Created by FYF on 2019/3/21.
  */
 @SuppressLint("Registered")
 public class BaseActivity extends QMUIActivity implements EasyPermissions.PermissionCallbacks {
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
-
-//        QMUIStatusBarHelper.translucent(this);
-//        QMUIStatusBarHelper.setStatusBarLightMode(this);
-        //ActiveMax.MaxFrom(this);
-        //
+        //全屏插件
+        ActiveMax.MaxFrom(this);
         super.onCreate(savedInstanceState);
     }
 

app/src/main/java/com/bonait/bnframework/common/helper/ActiveMax.java

@@ -1,9 +1,14 @@
 package com.bonait.bnframework.common.helper;
 
+import android.annotation.SuppressLint;
+import android.app.ActionBar;
 import android.app.Activity;
 import android.os.Build;
+import android.os.Handler;
+import android.os.Looper;
 import android.view.View;
 import android.view.ViewTreeObserver;
+import android.view.WindowInsets;
 import android.view.WindowManager;
 
 import com.qmuiteam.qmui.util.QMUINotchHelper;
@@ -35,46 +40,29 @@ public class ActiveMax {
             activities.add(activity);
         }
 
-        //QMUINotchHelper.getSafeInsetBottom(activity)
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                // 全屏显示，隐藏状态栏和导航栏，拉出状态栏和导航栏显示一会儿后消失。
-//                activity.getWindow().getDecorView().setSystemUiVisibility(
-//                        View.SYSTEM_UI_FLAG_LAYOUT_STABLE
-//                                | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-//                                | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
-//                                | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
-//                                | View.SYSTEM_UI_FLAG_FULLSCREEN
-//                                | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY);
-               // activity.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_HIDE_NAVIGATION|View.SYSTEM_UI_FLAG_FULLSCREEN);
-               // activity.getWindow().getDecorView().setSystemUiVisibility(View.INVISIBLE);
-
-                activity.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_FULLSCREEN | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION);
-
-
-            } else {
-                // 全屏显示，隐藏状态栏
-                activity.getWindow().getDecorView().setSystemUiVisibility(View.INVISIBLE);
-            }
-        }
+        //显示全屏
+        ShowMaxFrom(activity);
 
         // 注册监听器
         activity.getWindow().getDecorView().getViewTreeObserver().addOnGlobalLayoutListener(keyboardVisibilityListener);
         // 禁用触摸事件触发导航栏显示
-//        activity.getWindow().getDecorView().setOnSystemUiVisibilityChangeListener(new View.OnSystemUiVisibilityChangeListener() {
-//            @Override
-//            public void onSystemUiVisibilityChange(int visibility) {
-//                if ((visibility & View.SYSTEM_UI_FLAG_FULLSCREEN) == 0) {
-//                    // 如果导航栏显示，则重新设置全屏
-//                    activity.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_FULLSCREEN | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION);
-//                }
-//            }
-//        });
-
+        // activity.getWindow().getDecorView().setOnSystemUiVisibilityChangeListener(setOnSystemUiVisibilityChangeListener);
     }
 
     /**
-     *  家农安
+     * 状态栏变化后事件
+     */
+    private static View.OnSystemUiVisibilityChangeListener setOnSystemUiVisibilityChangeListener=new View.OnSystemUiVisibilityChangeListener() {
+        @Override
+        public void onSystemUiVisibilityChange(int visibility) {
+            if ((visibility & View.SYSTEM_UI_FLAG_FULLSCREEN) == 0) {
+                //如果非全屏
+
+            }
+        }
+    };
+    /**
+     *  键盘打开后改变状态栏显示方式->这里启动监听并且设置全屏
      */
     private static ViewTreeObserver.OnGlobalLayoutListener keyboardVisibilityListener = new ViewTreeObserver.OnGlobalLayoutListener() {
         @Override
@@ -83,47 +71,44 @@ public class ActiveMax {
             // 检查键盘的可见性和高度等信息来判断键盘是否关闭
             for (Activity activity:activities)
             {
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                        // 全屏显示，隐藏状态栏和导航栏，拉出状态栏和导航栏显示一会儿后消失。
-//                        activity.getWindow().getDecorView().setSystemUiVisibility(
-//                                View.SYSTEM_UI_FLAG_LAYOUT_STABLE
-//                                        | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-//                                        | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
-//                                        | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
-//                                        | View.SYSTEM_UI_FLAG_FULLSCREEN
-//                                        | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY);
-                        //activity.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_HIDE_NAVIGATION|View.SYSTEM_UI_FLAG_FULLSCREEN);
-                        activity.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_FULLSCREEN | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION);
-
-                    } else {
-                        // 全屏显示，隐藏状态栏
-                        activity.getWindow().getDecorView().setSystemUiVisibility(View.INVISIBLE);
-                    }
-                }
+                ShowMaxFrom(activity);
             }
         }
     };
 
-    public static void closeMaxFrom(Activity activity) {
-        // 全屏展示
+    /**
+     * 显示全屏
+     * @param activity
+     */
+    public static void ShowMaxFrom(Activity activity)
+    {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
                 // 全屏显示，隐藏状态栏和导航栏，拉出状态栏和导航栏显示一会儿后消失。
+                // 启动游戏模式，设置状态栏和导航栏中的图标变小，变模糊或者弱化其效果
                 activity.getWindow().getDecorView().setSystemUiVisibility(
-                        View.SYSTEM_UI_FLAG_LAYOUT_STABLE
+                        View.SYSTEM_UI_FLAG_LOW_PROFILE
+                                | View.SYSTEM_UI_FLAG_LAYOUT_STABLE
                                 | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
                                 | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
                                 | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
                                 | View.SYSTEM_UI_FLAG_FULLSCREEN
                                 | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY);
+                //activity.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_HIDE_NAVIGATION|View.SYSTEM_UI_FLAG_FULLSCREEN);
+                //activity.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_FULLSCREEN | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION);
             } else {
                 // 全屏显示，隐藏状态栏
-                activity.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_FULLSCREEN);
+                activity.getWindow().getDecorView().setSystemUiVisibility(View.INVISIBLE);
             }
         }
+    }
 
-            // 非全屏显示，显示状态栏和导航栏
+    /**
+     * 关闭全屏显示
+     * @param activity
+     */
+    public static void CloseMaxFrom(Activity activity) {
+        // 非全屏显示，显示状态栏和导航栏
         activity.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_VISIBLE);
     }
 }

app/src/main/java/com/bonait/bnframework/modules/home/fragment/Home1Fragment.java

@@ -62,6 +62,7 @@ import com.litao.slider.Utils;
 import com.lzy.okgo.OkGo;
 import com.orhanobut.logger.Logger;
 import com.qmuiteam.qmui.widget.QMUITopBar;
+import com.qmuiteam.qmui.widget.QMUITopBarLayout;
 import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
 import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction;
 import com.qmuiteam.qmui.widget.textview.QMUILinkTextView;
@@ -81,7 +82,7 @@ import butterknife.OnClick;
  */
 public class Home1Fragment extends BaseFragment {
     @BindView(R.id.topbar)
-    QMUITopBar mTopBar;//顶部标题
+    QMUITopBarLayout mTopBar;//顶部标题
     @BindView(R.id.xzcp)
     RelativeLayout xzcp;//选择菜谱
     @BindView(R.id.recycler_view)

app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/CpActivity.java

@@ -33,6 +33,7 @@ import com.bonait.bnframework.modules.home.fragment.mode.SectionHeader;
 import com.bonait.bnframework.modules.home.fragment.mode.SectionItem;
 import com.bonait.bnframework.modules.home.fragment.mode.fragment_plc;
 import com.qmuiteam.qmui.widget.QMUITopBar;
+import com.qmuiteam.qmui.widget.QMUITopBarLayout;
 import com.qmuiteam.qmui.widget.section.QMUISection;
 import com.qmuiteam.qmui.widget.section.QMUIStickySectionAdapter;
 import com.qmuiteam.qmui.widget.section.QMUIStickySectionLayout;
@@ -46,7 +47,7 @@ import butterknife.ButterKnife;
 public class CpActivity extends BaseActivity {
 
     @BindView(R.id.topbar)
-    QMUITopBar mTopBar;
+    QMUITopBarLayout mTopBar;
 
     @BindView(R.id.qmuisection_layout)
     QMUIStickySectionLayout mSectionLayout;

app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/CpxzActivity.java

@@ -15,13 +15,14 @@ import com.bonait.bnframework.common.utils.ToastUtils;
 import com.bonait.bnframework.common.view.MyLayoutManager;
 import com.bonait.bnframework.modules.home.adapter.sp_adapter;
 import com.qmuiteam.qmui.widget.QMUITopBar;
+import com.qmuiteam.qmui.widget.QMUITopBarLayout;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
 public class CpxzActivity extends BaseActivity {
     @BindView(R.id.topbar)
-    QMUITopBar mTopBar;//顶部标题
+    QMUITopBarLayout mTopBar;//顶部标题
     @BindView(R.id.recycler_view)
     RecyclerView recyclerView;//菜谱列表
     @BindView(R.id.search_view)

app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/DiyActivity.java

@@ -46,6 +46,7 @@ import com.bonait.bnframework.modules.home.adapter.lcsz_adapter;
 import com.bonait.bnframework.modules.home.fragment.mode.fragment_gx;
 import com.bonait.bnframework.modules.home.fragment.mode.item_gx;
 import com.qmuiteam.qmui.widget.QMUITopBar;
+import com.qmuiteam.qmui.widget.QMUITopBarLayout;
 import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
 import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction;
 import com.youth.banner.Banner;
@@ -67,7 +68,7 @@ import butterknife.OnClick;
 
 public class DiyActivity extends BaseActivity {
     @BindView(R.id.topbar)
-    QMUITopBar mTopBar;
+    QMUITopBarLayout mTopBar;
     @BindView(R.id.edittext)
     EditText edittext;//菜谱名称
     @BindView(R.id.cpfm)

app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/DiyUpdateActivity.java

@@ -39,6 +39,7 @@ import com.bonait.bnframework.modules.home.adapter.gongxubuzhou_adapter;
 import com.bonait.bnframework.modules.home.fragment.mode.fragment_gx;
 import com.bonait.bnframework.modules.home.fragment.mode.item_gx;
 import com.qmuiteam.qmui.widget.QMUITopBar;
+import com.qmuiteam.qmui.widget.QMUITopBarLayout;
 import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
 import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction;
 import com.youth.banner.Banner;
@@ -57,7 +58,7 @@ import butterknife.OnClick;
 public class DiyUpdateActivity extends BaseActivity {
 
     @BindView(R.id.topbar)
-    QMUITopBar mTopBar;
+    QMUITopBarLayout mTopBar;
     @BindView(R.id.edittext)
     EditText edittext;//菜谱名称
     @BindView(R.id.cpfm)

app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/FileActivity.java

@@ -12,6 +12,7 @@ import android.widget.Button;
 import android.widget.TextView;
 
 import com.bonait.bnframework.R;
+import com.bonait.bnframework.common.base.BaseActivity;
 import com.bonait.bnframework.common.filepicker.FileAllFragment;
 import com.bonait.bnframework.common.filepicker.FileCommonFragment;
 import com.bonait.bnframework.common.filepicker.OnUpdateDataListener;
@@ -19,11 +20,12 @@ import com.bonait.bnframework.common.filepicker.PickerManager;
 import com.bonait.bnframework.common.filepicker.model.FileEntity;
 import com.bonait.bnframework.common.filepicker.util.FileUtils;
 import com.qmuiteam.qmui.widget.QMUITopBar;
+import com.qmuiteam.qmui.widget.QMUITopBarLayout;
 
 import java.io.File;
 
-public class FileActivity extends AppCompatActivity implements View.OnClickListener, OnUpdateDataListener {
-    private QMUITopBar mTopBar;
+public class FileActivity extends BaseActivity implements View.OnClickListener, OnUpdateDataListener {
+    private QMUITopBarLayout mTopBar;
     private Button btn_common,btn_all;
     private TextView tv_size,tv_confirm;
     private Fragment commonFileFragment,allFileFragment;
@@ -139,11 +141,11 @@ public class FileActivity extends AppCompatActivity implements View.OnClickListe
         tv_confirm.setText(getString(R.string.file_select_res,res));
     }
 
-    @Override
-    public void onBackPressed() {
-        super.onBackPressed();
-        if(!isConfirm){
-            PickerManager.getInstance().files.clear();
-        }
-    }
+//    @Override
+//    public void onBackPressed() {
+//        super.onBackPressed();
+//        if(!isConfirm){
+//            PickerManager.getInstance().files.clear();
+//        }
+//    }
 }

app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/ImageChooseActivity.java

@@ -22,6 +22,7 @@ import com.bonait.bnframework.modules.home.adapter.image_sp_adapter;
 import com.bonait.bnframework.modules.home.adapter.sp_adapter;
 import com.bonait.bnframework.modules.home.fragment.mode.image_sp;
 import com.qmuiteam.qmui.widget.QMUITopBar;
+import com.qmuiteam.qmui.widget.QMUITopBarLayout;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -33,7 +34,7 @@ import butterknife.ButterKnife;
 public class ImageChooseActivity extends BaseActivity {
 
     @BindView(R.id.topbar)
-    QMUITopBar mTopBar;//顶部标题
+    QMUITopBarLayout mTopBar;//顶部标题
     @BindView(R.id.recycler_view)
     RecyclerView recyclerView;//image列表
     private static final String CACHE_PATH= Environment.getExternalStorageDirectory().getAbsolutePath()+"/hblxiaochaodb/WebImage";

app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/SzActivity.java

@@ -16,6 +16,7 @@ import com.bonait.bnframework.modules.home.fragment.from.fragment.SystemSeasonin
 import com.bonait.bnframework.modules.home.fragment.from.fragment.SystemSystemsetFragment;
 import com.bonait.bnframework.modules.home.fragment.from.fragment.systeminternetfragment;
 import com.qmuiteam.qmui.widget.QMUITopBar;
+import com.qmuiteam.qmui.widget.QMUITopBarLayout;
 import com.qmuiteam.qmui.widget.QMUIViewPager;
 
 import butterknife.BindView;
@@ -23,7 +24,7 @@ import butterknife.ButterKnife;
 
 public class SzActivity extends BaseActivity {
     @BindView(R.id.topbar)
-    QMUITopBar mTopBar;//top标题
+    QMUITopBarLayout mTopBar;//top标题
     @BindView(R.id.navigation)
     BottomNavigationView bottomNavigationView;
     @BindView(R.id.viewpager)

app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/WhActivity.java

@@ -18,6 +18,7 @@ import com.bonait.bnframework.modules.home.fragment.from.fragment.SystemCsFltlFr
 import com.bonait.bnframework.modules.home.fragment.from.fragment.SystemCsControlFragment;
 import com.bonait.bnframework.modules.home.fragment.from.fragment.SystemCsMonitorFragment;
 import com.qmuiteam.qmui.widget.QMUITopBar;
+import com.qmuiteam.qmui.widget.QMUITopBarLayout;
 import com.qmuiteam.qmui.widget.QMUIViewPager;
 
 import butterknife.BindView;
@@ -25,7 +26,7 @@ import butterknife.ButterKnife;
 
 public class WhActivity extends BaseActivity {
     @BindView(R.id.topbar)
-    QMUITopBar mTopBar;
+    QMUITopBarLayout mTopBar;
     @BindView(R.id.navigation)
     BottomNavigationView bottomNavigationView;
     @BindView(R.id.viewpager)

app/src/main/java/com/bonait/bnframework/modules/mine/fragment/from/NoticeActivity.java

@@ -10,6 +10,7 @@ import com.bonait.bnframework.common.base.BaseActivity;
 import com.bonait.bnframework.common.utils.ToastUtils;
 import com.orhanobut.logger.Logger;
 import com.qmuiteam.qmui.widget.QMUITopBar;
+import com.qmuiteam.qmui.widget.QMUITopBarLayout;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -18,7 +19,7 @@ import butterknife.OnClick;
 public class NoticeActivity extends BaseActivity{
 
     @BindView(R.id.topbar)
-    QMUITopBar mTopBar;
+    QMUITopBarLayout mTopBar;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);

app/src/main/java/com/bonait/bnframework/modules/welcome/activity/WelcomeActivity.java

@@ -11,6 +11,7 @@ import android.view.KeyEvent;
 
 import com.bonait.bnframework.R;
 import com.bonait.bnframework.business.MainInit;
+import com.bonait.bnframework.common.base.BaseActivity;
 import com.bonait.bnframework.common.constant.ConfigName;
 import com.bonait.bnframework.common.constant.Constants;
 import com.bonait.bnframework.manager.ActivityLifecycleManager;
@@ -22,7 +23,7 @@ import okhttp3.OkHttpClient;
 import pub.devrel.easypermissions.AfterPermissionGranted;
 import pub.devrel.easypermissions.EasyPermissions;
 
-public class WelcomeActivity extends AppCompatActivity {
+public class WelcomeActivity extends BaseActivity {
 
     private Handler handler = new Handler();
     /*

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

@@ -1,32 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.qmuiteam.qmui.widget.QMUIWindowInsetLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".modules.home.fragment.from.CpActivity"
-    android:orientation="vertical"
-    android:background="@color/app_color_blue"
-    android:fitsSystemWindows="true">
-    <com.qmuiteam.qmui.widget.QMUITopBar
-        android:id="@+id/topbar"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/qmui_topbar_height"
-        android:fitsSystemWindows="true"
-        app:qmui_layout_collapseMode="pin"
-        android:background="@color/qmui_config_color_transparent"
-        app:qmui_bottomDividerHeight="0px"/>
+    tools:context=".modules.home.fragment.from.CpActivity">
+
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/activity_background">
+        android:layout_marginTop="?attr/qmui_topbar_height"
+        android:background="@color/activity_background"
+        android:fitsSystemWindows="true">
         <RelativeLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content">
             <com.qmuiteam.qmui.widget.section.QMUIStickySectionLayout
                 android:id="@+id/qmuisection_layout"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"/>
+                android:layout_height="match_parent" />
         </RelativeLayout>
     </ScrollView>
-</LinearLayout>
+
+    <com.qmuiteam.qmui.widget.QMUITopBarLayout
+        android:id="@+id/topbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/app_color_blue"
+        android:fitsSystemWindows="true" />
+</com.qmuiteam.qmui.widget.QMUIWindowInsetLayout>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.qmuiteam.qmui.widget.QMUIWindowInsetLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -8,18 +8,13 @@
     android:orientation="vertical"
     android:background="@color/app_color_blue"
     android:fitsSystemWindows="true">
-    <com.qmuiteam.qmui.widget.QMUITopBar
-        android:id="@+id/topbar"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/qmui_topbar_height"
-        android:fitsSystemWindows="true"
-        app:qmui_layout_collapseMode="pin"
-        android:background="@color/qmui_config_color_transparent"
-        app:qmui_bottomDividerHeight="0px"/>
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/activity_background">
+        android:background="@color/activity_background"
+        android:layout_marginTop="?attr/qmui_topbar_height"
+        android:fitsSystemWindows="true"
+        >
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -42,4 +37,11 @@
             </RelativeLayout>
         </LinearLayout>
     </ScrollView>
-</LinearLayout>
+
+    <com.qmuiteam.qmui.widget.QMUITopBarLayout
+        android:id="@+id/topbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/app_color_blue"
+        android:fitsSystemWindows="true" />
+</com.qmuiteam.qmui.widget.QMUIWindowInsetLayout>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.qmuiteam.qmui.widget.QMUIWindowInsetLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -9,18 +9,13 @@
     android:background="@color/app_color_blue"
     android:fitsSystemWindows="true"
     app:qmui_skin_background="?attr/app_skin_common_background">
-    <com.qmuiteam.qmui.widget.QMUITopBar
-        android:id="@+id/topbar"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/qmui_topbar_height"
-        android:fitsSystemWindows="true"
-        app:qmui_layout_collapseMode="pin"
-        android:background="@color/qmui_config_color_transparent"
-        app:qmui_bottomDividerHeight="0px"/>
+
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/qmui_config_color_white">
+        android:layout_marginTop="?attr/qmui_topbar_height"
+        android:background="@color/qmui_config_color_white"
+        android:fitsSystemWindows="true">
         <ScrollView
             android:layout_width="match_parent"
             android:layout_height="match_parent">
@@ -314,4 +309,11 @@
 <!--                app:indicator_width="10dp" />-->
 <!--        </RelativeLayout>-->
     </RelativeLayout>
-</LinearLayout>
+
+    <com.qmuiteam.qmui.widget.QMUITopBarLayout
+        android:id="@+id/topbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/app_color_blue"
+        android:fitsSystemWindows="true" />
+</com.qmuiteam.qmui.widget.QMUIWindowInsetLayout>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.qmuiteam.qmui.widget.QMUIWindowInsetLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -8,18 +8,13 @@
     android:orientation="vertical"
     android:background="@color/app_color_blue"
     android:fitsSystemWindows="true">
-    <com.qmuiteam.qmui.widget.QMUITopBar
-        android:id="@+id/topbar"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/qmui_topbar_height"
-        android:fitsSystemWindows="true"
-        app:qmui_layout_collapseMode="pin"
-        android:background="@color/qmui_config_color_transparent"
-        app:qmui_bottomDividerHeight="0px"/>
+
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/qmui_config_color_white">
+        android:layout_marginTop="?attr/qmui_topbar_height"
+        android:background="@color/qmui_config_color_white"
+        android:fitsSystemWindows="true">
         <ScrollView
             android:layout_width="match_parent"
             android:layout_height="match_parent">
@@ -329,4 +324,11 @@
 <!--                app:indicator_width="10dp" />-->
 <!--        </RelativeLayout>-->
     </RelativeLayout>
-</LinearLayout>
+
+    <com.qmuiteam.qmui.widget.QMUITopBarLayout
+        android:id="@+id/topbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/app_color_blue"
+        android:fitsSystemWindows="true" />
+</com.qmuiteam.qmui.widget.QMUIWindowInsetLayout>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.qmuiteam.qmui.widget.QMUIWindowInsetLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -8,70 +8,76 @@
     tools:context=".modules.home.fragment.from.FileActivity"
     android:background="@color/app_color_blue"
     app:qmui_skin_background="?attr/app_skin_common_background">
-    <com.qmuiteam.qmui.widget.QMUITopBar
-        android:id="@+id/topbar"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/qmui_topbar_height"
-        android:fitsSystemWindows="true"
-        app:qmui_layout_collapseMode="pin"
-        android:background="@color/qmui_config_color_transparent"
-        app:qmui_bottomDividerHeight="0px"/>
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="10dp"
-        android:background="@color/white"
-        android:orientation="horizontal">
-        <Button
-            android:id="@+id/btn_common"
-            android:layout_width="wrap_content"
-            android:layout_height="30dp"
-            android:layout_weight="1"
-            android:background="@mipmap/no_read_pressed"
-            android:textColor="@color/white"
-            android:text="@string/file_normal"/>
-        <Button
-            android:id="@+id/btn_all"
-            android:layout_width="wrap_content"
-            android:layout_height="30dp"
-            android:layout_weight="1"
-            android:background="@mipmap/already_read"
-            android:textColor="@color/blue"
-            android:text="@string/file_all"/>
-    </LinearLayout>
-    <FrameLayout
 
-        android:id="@+id/fl_content"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:background="@color/qmui_config_color_white"
-        />
     <LinearLayout
+        android:layout_marginTop="80dp"
         android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:orientation="horizontal"
-        android:gravity="center_vertical"
-        >
-        <TextView
-            android:id="@+id/tv_size"
-            android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:padding="10dp"
+            android:background="@color/white"
+            android:orientation="horizontal">
+            <Button
+                android:id="@+id/btn_common"
+                android:layout_width="wrap_content"
+                android:layout_height="30dp"
+                android:layout_weight="1"
+                android:background="@mipmap/no_read_pressed"
+                android:textColor="@color/white"
+                android:text="@string/file_normal"/>
+            <Button
+                android:id="@+id/btn_all"
+                android:layout_width="wrap_content"
+                android:layout_height="30dp"
+                android:layout_weight="1"
+                android:background="@mipmap/already_read"
+                android:textColor="@color/blue"
+                android:text="@string/file_all"/>
+        </LinearLayout>
+        <FrameLayout
+
+            android:id="@+id/fl_content"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
             android:layout_weight="1"
-            android:text="已选择：0KB"
-            android:layout_marginLeft="10dp"
-            android:textColor="@color/black"
-            />
-        <TextView
-            android:id="@+id/tv_confirm"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:paddingLeft="10dp"
-            android:paddingRight="10dp"
-            android:gravity="center"
-            android:background="@color/blue"
-            android:textColor="@color/white"
-            android:text="确定(0/3)"
+            android:background="@color/qmui_config_color_white"
             />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="40dp"
+            android:orientation="horizontal"
+            android:gravity="center_vertical"
+            >
+            <TextView
+                android:id="@+id/tv_size"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="已选择：0KB"
+                android:layout_marginLeft="10dp"
+                android:textColor="@color/black"
+                />
+            <TextView
+                android:id="@+id/tv_confirm"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:paddingLeft="10dp"
+                android:paddingRight="10dp"
+                android:gravity="center"
+                android:background="@color/blue"
+                android:textColor="@color/white"
+                android:text="确定(0/3)"
+                />
+        </LinearLayout>
     </LinearLayout>
-</LinearLayout>
+
+    <com.qmuiteam.qmui.widget.QMUITopBarLayout
+        android:id="@+id/topbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/app_color_blue"
+        android:fitsSystemWindows="true" />
+</com.qmuiteam.qmui.widget.QMUIWindowInsetLayout>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.qmuiteam.qmui.widget.QMUIWindowInsetLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -8,18 +8,13 @@
     android:orientation="vertical"
     android:background="@color/app_color_blue"
     android:fitsSystemWindows="true">
-    <com.qmuiteam.qmui.widget.QMUITopBar
-        android:id="@+id/topbar"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/qmui_topbar_height"
-        android:fitsSystemWindows="true"
-        app:qmui_layout_collapseMode="pin"
-        android:background="@color/qmui_config_color_transparent"
-        app:qmui_bottomDividerHeight="0px"/>
+
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/activity_background">
+        android:layout_marginTop="?attr/qmui_topbar_height"
+        android:background="@color/activity_background"
+        android:fitsSystemWindows="true">
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
@@ -29,4 +24,11 @@
                 android:layout_height="wrap_content"/>
         </RelativeLayout>
     </ScrollView>
-</LinearLayout>
+
+    <com.qmuiteam.qmui.widget.QMUITopBarLayout
+        android:id="@+id/topbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:fitsSystemWindows="true"
+        android:background="@color/app_color_blue"/>
+</com.qmuiteam.qmui.widget.QMUIWindowInsetLayout>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.qmuiteam.qmui.widget.QMUIWindowInsetLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/root"
@@ -9,184 +9,191 @@
     android:fitsSystemWindows="true"
     android:orientation="vertical"
     tools:context=".modules.welcome.activity.LoginActivity">
-    <com.bonait.bnframework.common.bg.SnowView
+    <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/transparent"/>
-    <ImageView
-        android:id="@+id/logo"
-        android:layout_width="100dp"
-        android:layout_height="100dp"
-        android:layout_centerHorizontal="true"
-        android:layout_gravity="center"
-        android:layout_marginTop="80dp"
-        android:background="@null"
-        android:scaleType="centerCrop"
-        android:src="@mipmap/ico"/>
-    <androidx.core.widget.NestedScrollView
-        android:id="@+id/scrollView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentTop="true"
-        android:layout_marginLeft="15dp"
-        android:layout_marginRight="15dp"
-        android:fillViewport="true"
-        android:scrollbarThumbVertical="@android:color/transparent"
-        android:scrollbars="vertical">
-        <LinearLayout
-            android:id="@+id/content"
+        android:layout_height="match_parent">
+
+        <com.bonait.bnframework.common.bg.SnowView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="vertical">
-
+            android:background="@color/transparent"/>
+        <ImageView
+            android:id="@+id/logo"
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            android:layout_centerHorizontal="true"
+            android:layout_gravity="center"
+            android:layout_marginTop="80dp"
+            android:background="@null"
+            android:scaleType="centerCrop"
+            android:src="@mipmap/ico"/>
+        <androidx.core.widget.NestedScrollView
+            android:id="@+id/scrollView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentTop="true"
+            android:layout_marginLeft="15dp"
+            android:layout_marginRight="15dp"
+            android:fillViewport="true"
+            android:scrollbarThumbVertical="@android:color/transparent"
+            android:scrollbars="vertical">
             <LinearLayout
+                android:id="@+id/content"
                 android:layout_width="match_parent"
-                android:layout_height="55dp"
-                android:layout_marginTop="200dp"
-                android:gravity="center_vertical"
-                android:orientation="horizontal">
-
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="15dp"
-                    android:layout_marginEnd="15dp"
-                    android:src="@drawable/icon_login_user"/>
-
-                <EditText
-                    android:id="@+id/et_account"
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:background="@null"
-                    android:hint="@string/user_account"
-                    android:imeOptions="actionNext"
-                    android:textSize="16sp"
-                    android:maxLength="20"
-                    android:maxLines="1"
-                    android:singleLine="true"
-                    android:inputType="text"
-                    android:focusable="true"
-                    android:focusableInTouchMode="true"/>
-
-                <ImageView
-                    android:id="@+id/iv_clean_account"
-                    android:layout_width="40dp"
-                    android:layout_height="fill_parent"
-                    android:scaleType="centerInside"
-                    android:src="@drawable/delete_selector"
-                    android:visibility="gone"/>
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="55dp"
+                    android:layout_marginTop="200dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="15dp"
+                        android:layout_marginEnd="15dp"
+                        android:src="@drawable/icon_login_user"/>
+
+                    <EditText
+                        android:id="@+id/et_account"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:background="@null"
+                        android:hint="@string/user_account"
+                        android:imeOptions="actionNext"
+                        android:textSize="16sp"
+                        android:maxLength="20"
+                        android:maxLines="1"
+                        android:singleLine="true"
+                        android:inputType="text"
+                        android:focusable="true"
+                        android:focusableInTouchMode="true"/>
+
+                    <ImageView
+                        android:id="@+id/iv_clean_account"
+                        android:layout_width="40dp"
+                        android:layout_height="fill_parent"
+                        android:scaleType="centerInside"
+                        android:src="@drawable/delete_selector"
+                        android:visibility="gone"/>
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="2px"
+                    android:background="@color/color3"/>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="55dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="15dp"
+                        android:layout_marginEnd="15dp"
+                        android:src="@drawable/icon_login_pwd"/>
+
+                    <EditText
+                        android:id="@+id/et_password"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:background="@null"
+                        android:hint="请输入密码"
+                        android:inputType="textPassword"
+                        android:maxLength="30"
+                        android:singleLine="true"
+                        android:text=""
+                        android:textSize="16sp"/>
+
+                    <ImageView
+                        android:id="@+id/clean_password"
+                        android:layout_width="40dp"
+                        android:layout_height="fill_parent"
+                        android:scaleType="centerInside"
+                        android:src="@drawable/delete_selector"
+                        android:visibility="gone"/>
+
+                    <ImageView
+                        android:id="@+id/iv_show_pwd"
+                        android:layout_width="40dp"
+                        android:layout_height="fill_parent"
+                        android:scaleType="centerInside"
+                        android:src="@drawable/icon_pass_gone"/>
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="2px"
+                    android:background="@color/color3"/>
+
+                <RelativeLayout
+                    android:id="@+id/rl_tow_button"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/dp_40"
+                    android:layout_marginTop="10dp">
+
+                    <CheckBox
+                        android:id="@+id/cb_checkbox"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerVertical="true"
+                        android:background="@null"
+                        android:checked="false"
+                        android:text="记住密码"
+                        android:textSize="@dimen/sp_14"
+                        android:textColor="@color/blue_primary_dark"
+                        android:buttonTint="@color/app_color_blue" />
+
+                    <Button
+                        android:id="@+id/forget_password"
+                        style="@style/Widget.AppCompat.Button.Borderless"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerVertical="true"
+                        android:layout_alignParentEnd="true"
+                        android:text="忘记密码?"
+                        android:textSize="@dimen/sp_14"
+                        android:textColor="@color/blue_primary_dark" />
+                </RelativeLayout>
 
-            </LinearLayout>
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="2px"
-                android:background="@color/color3"/>
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="55dp"
-                android:gravity="center_vertical"
-                android:orientation="horizontal">
-
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="15dp"
-                    android:layout_marginEnd="15dp"
-                    android:src="@drawable/icon_login_pwd"/>
-
-                <EditText
-                    android:id="@+id/et_password"
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:background="@null"
-                    android:hint="请输入密码"
-                    android:inputType="textPassword"
-                    android:maxLength="30"
-                    android:singleLine="true"
-                    android:text=""
-                    android:textSize="16sp"/>
-
-                <ImageView
-                    android:id="@+id/clean_password"
-                    android:layout_width="40dp"
-                    android:layout_height="fill_parent"
-                    android:scaleType="centerInside"
-                    android:src="@drawable/delete_selector"
-                    android:visibility="gone"/>
-
-                <ImageView
-                    android:id="@+id/iv_show_pwd"
-                    android:layout_width="40dp"
-                    android:layout_height="fill_parent"
-                    android:scaleType="centerInside"
-                    android:src="@drawable/icon_pass_gone"/>
+                <Button
+                    android:id="@+id/btn_login"
+                    android:layout_width="match_parent"
+                    android:layout_height="45dp"
+                    android:layout_marginBottom="10dp"
+                    android:background="@drawable/bg_btn_login_selected"
+                    android:text="登    录"
+                    android:textColor="@color/white"
+                    android:textSize="18sp"/>
 
             </LinearLayout>
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="2px"
-                android:background="@color/color3"/>
-
-            <RelativeLayout
-                android:id="@+id/rl_tow_button"
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/dp_40"
-                android:layout_marginTop="10dp">
-
-                <CheckBox
-                    android:id="@+id/cb_checkbox"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:background="@null"
-                    android:checked="false"
-                    android:text="记住密码"
-                    android:textSize="@dimen/sp_14"
-                    android:textColor="@color/blue_primary_dark"
-                    android:buttonTint="@color/app_color_blue" />
-
-                <Button
-                    android:id="@+id/forget_password"
-                    style="@style/Widget.AppCompat.Button.Borderless"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:layout_alignParentEnd="true"
-                    android:text="忘记密码?"
-                    android:textSize="@dimen/sp_14"
-                    android:textColor="@color/blue_primary_dark" />
-            </RelativeLayout>
-
-
-            <Button
-                android:id="@+id/btn_login"
-                android:layout_width="match_parent"
-                android:layout_height="45dp"
-                android:layout_marginBottom="10dp"
-                android:background="@drawable/bg_btn_login_selected"
-                android:text="登    录"
-                android:textColor="@color/white"
-                android:textSize="18sp"/>
+        </androidx.core.widget.NestedScrollView>
+        <TextView
+            android:layout_alignParentBottom="true"
+            android:layout_alignParentRight="true"
+            android:layout_marginRight="20dp"
+            android:layout_marginBottom="@dimen/dp_10"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/app_color_blue"
+            android:text="四川黑菠萝科技有限公司@2023"/>
+    </RelativeLayout>
 
-        </LinearLayout>
 
-    </androidx.core.widget.NestedScrollView>
 
-    <TextView
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
-        android:layout_marginRight="20dp"
-        android:layout_marginBottom="@dimen/dp_10"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textColor="@color/app_color_blue"
-        android:text="四川黑菠萝科技有限公司@2023"/>
     <!--<LinearLayout
         android:id="@+id/service"
         android:layout_width="match_parent"
@@ -219,7 +226,6 @@
             android:text="关于我们"
             android:textColor="#b0b8b2"
             android:textSize="14sp"/>
-
     </LinearLayout>-->
 
-</RelativeLayout>
+</com.qmuiteam.qmui.widget.QMUIWindowInsetLayout>

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

@@ -1,30 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-xmlns:app="http://schemas.android.com/apk/res-auto"
-xmlns:tools="http://schemas.android.com/tools"
-android:layout_width="match_parent"
-android:layout_height="match_parent"
-tools:context=".modules.mine.fragment.from.NoticeActivity"
-android:background="@color/app_color_blue"
-android:fitsSystemWindows="true"
-android:orientation="vertical">
-<com.qmuiteam.qmui.widget.QMUITopBar
-    android:id="@+id/topbar"
-    android:layout_width="match_parent"
-    android:layout_height="?attr/qmui_topbar_height"
-    android:fitsSystemWindows="true"
-    app:qmui_layout_collapseMode="pin"
-    android:background="@color/qmui_config_color_transparent"
-    app:qmui_bottomDividerHeight="0px"/>
-<ScrollView
+<com.qmuiteam.qmui.widget.QMUIWindowInsetLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/qmui_config_color_white">
-    <RelativeLayout style="@style/button_wrapper_style">
-        <com.qmuiteam.qmui.widget.textview.QMUILinkTextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="通知信息"/>
-    </RelativeLayout>
-</ScrollView>
-</LinearLayout>
+    android:background="@color/app_color_blue"
+    android:fitsSystemWindows="true"
+    android:orientation="vertical"
+    tools:context=".modules.mine.fragment.from.NoticeActivity">
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/qmui_config_color_white"
+        android:layout_marginTop="?attr/qmui_topbar_height"
+        android:fitsSystemWindows="true">
+
+        <RelativeLayout style="@style/button_wrapper_style">
+
+            <com.qmuiteam.qmui.widget.textview.QMUILinkTextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="通知信息" />
+        </RelativeLayout>
+    </ScrollView>
+
+    <com.qmuiteam.qmui.widget.QMUITopBarLayout
+        android:id="@+id/topbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/app_color_blue"
+        android:fitsSystemWindows="true" />
+</com.qmuiteam.qmui.widget.QMUIWindowInsetLayout>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.qmuiteam.qmui.widget.QMUIWindowInsetLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -8,33 +8,31 @@
     android:orientation="vertical"
     android:background="@color/app_color_blue"
     android:fitsSystemWindows="true">
-    <com.qmuiteam.qmui.widget.QMUITopBar
-        android:id="@+id/topbar"
+
+
+    <com.google.android.material.bottomnavigation.BottomNavigationView
+        android:id="@+id/navigation"
+        android:layout_marginTop="80dp"
         android:layout_width="match_parent"
-        android:layout_height="?attr/qmui_topbar_height"
-        android:fitsSystemWindows="true"
-        app:qmui_layout_collapseMode="pin"
-        android:background="@color/qmui_config_color_transparent"
-        app:qmui_bottomDividerHeight="0px"/>
-    <LinearLayout
+        android:layout_height="@dimen/home_tab_height"
+        android:layout_gravity="top"
+        android:background="@drawable/qmui_list_item_bg_with_border_bottom"
+        app:itemHorizontalTranslationEnabled="false"
+        app:labelVisibilityMode="labeled"
+        app:menu="@menu/system" />
+
+    <com.qmuiteam.qmui.widget.QMUIViewPager
+        android:layout_marginTop="130dp"
+        android:id="@+id/viewpager"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/qmui_config_color_white"
-        android:orientation="vertical">
-        <com.google.android.material.bottomnavigation.BottomNavigationView
-            android:id="@+id/navigation"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/home_tab_height"
-            android:layout_gravity="bottom"
-            android:background="@drawable/qmui_list_item_bg_with_border_bottom"
-            app:itemHorizontalTranslationEnabled="false"
-            app:labelVisibilityMode="labeled"
-            app:menu="@menu/system" />
-        <com.qmuiteam.qmui.widget.QMUIViewPager
-            android:id="@+id/viewpager"
-            android:background="?attr/app_content_bg_color"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:fitsSystemWindows="true"/>
-    </LinearLayout>
-</LinearLayout>
+        android:background="?attr/app_content_bg_color"
+        android:fitsSystemWindows="true" />
+
+    <com.qmuiteam.qmui.widget.QMUITopBarLayout
+        android:id="@+id/topbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:fitsSystemWindows="true"
+        android:background="@color/app_color_blue"/>
+</com.qmuiteam.qmui.widget.QMUIWindowInsetLayout>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.qmuiteam.qmui.widget.QMUIWindowInsetLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -7,6 +7,7 @@
     tools:context=".modules.welcome.activity.WelcomeActivity">
 
     <RelativeLayout
+        android:fitsSystemWindows="true"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
         <LinearLayout
@@ -37,4 +38,4 @@
 
     </RelativeLayout>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</com.qmuiteam.qmui.widget.QMUIWindowInsetLayout>

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

@@ -1,41 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.qmuiteam.qmui.widget.QMUIWindowInsetLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".modules.home.fragment.from.WhActivity"
-    android:orientation="vertical"
     android:background="@color/app_color_blue">
-    <com.qmuiteam.qmui.widget.QMUITopBar
-        android:id="@+id/topbar"
+
+    <com.google.android.material.bottomnavigation.BottomNavigationView
+        android:id="@+id/navigation"
+        android:layout_marginTop="80dp"
         android:layout_width="match_parent"
-        android:layout_height="?attr/qmui_topbar_height"
-        android:fitsSystemWindows="true"
-        app:qmui_layout_collapseMode="pin"
-        android:background="@color/qmui_config_color_transparent"
-        app:qmui_bottomDividerHeight="0px"/>
-    <LinearLayout
+        android:layout_height="36dp"
+        android:layout_gravity="top"
+        android:background="@drawable/qmui_list_item_bg_with_border_bottom"
+        app:itemHorizontalTranslationEnabled="false"
+        app:labelVisibilityMode="labeled"
+        app:menu="@menu/maintenance"
+        app:itemIconTint="@null"
+        app:itemIconSize="0dp"/>
+
+    <com.qmuiteam.qmui.widget.QMUIViewPager
+        android:id="@+id/viewpager"
+        android:layout_marginTop="110dp"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/qmui_config_color_white"
-        android:orientation="vertical">
-        <com.google.android.material.bottomnavigation.BottomNavigationView
-            android:layout_marginTop="-25dp"
-            android:id="@+id/navigation"
-            android:layout_width="match_parent"
-            android:layout_height="55dp"
-            android:layout_gravity="top"
-            android:background="@drawable/qmui_list_item_bg_with_border_bottom"
+        android:background="?attr/app_content_bg_color"
+        android:fitsSystemWindows="true" />
 
-            app:itemHorizontalTranslationEnabled="false"
-            app:labelVisibilityMode="labeled"
-            app:menu="@menu/maintenance"/>
-        <com.qmuiteam.qmui.widget.QMUIViewPager
-            android:id="@+id/viewpager"
-            android:background="?attr/app_content_bg_color"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:fitsSystemWindows="true"/>
-    </LinearLayout>
-</LinearLayout>
+    <com.qmuiteam.qmui.widget.QMUITopBarLayout
+        android:id="@+id/topbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:fitsSystemWindows="true"
+        android:background="@color/app_color_blue"/>
+</com.qmuiteam.qmui.widget.QMUIWindowInsetLayout>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout
+<com.qmuiteam.qmui.widget.QMUIWindowInsetLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -7,185 +7,189 @@
     android:background="@color/qmui_config_color_white"
     app:qmui_skin_background="?attr/app_skin_common_background">
 
-    <com.qmuiteam.qmui.widget.QMUIAppBarLayout
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
-        android:layout_height="256dp"
-        android:fitsSystemWindows="true">
-
-        <com.qmuiteam.qmui.widget.QMUICollapsingTopBarLayout
-            android:id="@+id/collapsing_topbar_layout"
+        android:layout_height="match_parent">
+        <com.qmuiteam.qmui.widget.QMUIAppBarLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:layout_scrollFlags="scroll|exitUntilCollapsed"
-            app:qmui_collapsedTitleGravity="center"
-            app:qmui_contentScrim="?attr/qmui_config_color_blue"
-            app:qmui_expandedTitleGravity="center_horizontal|bottom"
-            app:qmui_expandedTitleMarginBottom="20dp"
-            app:qmui_statusBarScrim="?attr/qmui_config_color_blue"
-            android:minHeight="?attr/qmui_topbar_height">
-
-            <ImageView
+            android:layout_height="256dp"
+            android:fitsSystemWindows="true">
+
+            <com.qmuiteam.qmui.widget.QMUICollapsingTopBarLayout
+                android:id="@+id/collapsing_topbar_layout"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:fitsSystemWindows="false"
-                android:scaleType="centerCrop"
-                android:contentDescription="@string/common_example"
-                android:src="@mipmap/gongnengbeijing"
-                app:qmui_layout_collapseMode="parallax"
-                app:qmui_layout_collapseParallaxMultiplier="0.7"/>
-
-            <com.qmuiteam.qmui.widget.QMUITopBar
-                android:id="@+id/topbar"
-                android:layout_width="match_parent"
-                android:layout_height="?attr/qmui_topbar_height"
-                android:fitsSystemWindows="true"
-                app:qmui_layout_collapseMode="pin"
-                android:background="@color/qmui_config_color_transparent"
-                app:qmui_bottomDividerHeight="0px"/>
-        </com.qmuiteam.qmui.widget.QMUICollapsingTopBarLayout>
-    </com.qmuiteam.qmui.widget.QMUIAppBarLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:scrollbars="none"
-        android:layout_marginLeft="20dp"
-        android:layout_marginRight="20dp"
-
-        app:layout_behavior="@string/appbar_scrolling_view_behavior"
-        android:orientation="vertical">
-        <com.qmuiteam.qmui.layout.QMUIRelativeLayout
-            android:id="@+id/kshr"
-            android:layout_width="match_parent"
-            android:layout_height="120dp"
-            android:layout_marginTop="10dp"
-            android:background="@drawable/hr_bj">
-            <ImageView
-                android:layout_width="80dp"
-                android:layout_height="80dp"
-                android:src="@mipmap/hr"
-                android:layout_centerVertical="true"
-                android:layout_marginLeft="40dp"/>
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:layout_marginLeft="150dp"
-                android:text="开始烹饪"
-                android:textColor="@color/white"
-                android:textSize="@dimen/card_view_in_height" />
-        </com.qmuiteam.qmui.layout.QMUIRelativeLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-            <com.qmuiteam.qmui.layout.QMUIRelativeLayout
-                android:id="@+id/diy"
-                android:layout_width="140dp"
-                android:layout_height="120dp"
-                android:layout_marginTop="10dp"
-                android:background="@drawable/diy_bj">
-                <ImageView
-                    android:layout_width="80dp"
-                    android:layout_height="80dp"
-                    android:src="@mipmap/diy"
-                    android:layout_centerInParent="true"
-                    android:layout_marginLeft="20dp"/>
-            </com.qmuiteam.qmui.layout.QMUIRelativeLayout>
+                app:layout_scrollFlags="scroll|exitUntilCollapsed"
+                app:qmui_collapsedTitleGravity="center"
+                app:qmui_contentScrim="?attr/qmui_config_color_blue"
+                app:qmui_expandedTitleGravity="center_horizontal|bottom"
+                app:qmui_expandedTitleMarginBottom="20dp"
+                app:qmui_statusBarScrim="?attr/qmui_config_color_blue"
+                android:minHeight="?attr/qmui_topbar_height">
 
-            <com.qmuiteam.qmui.layout.QMUIRelativeLayout
-                android:id="@+id/cp"
-                android:layout_width="match_parent"
-                android:layout_height="120dp"
-                android:layout_marginTop="10dp"
-                android:layout_marginLeft="@dimen/dp_10"
-                android:background="@drawable/cp_bj">
                 <ImageView
-                    android:layout_width="80dp"
-                    android:layout_height="80dp"
-                    android:src="@mipmap/cp"
-                    android:layout_centerVertical="true"
-                    android:layout_marginLeft="20dp"/>
-                <TextView
-                    android:layout_width="200dp"
-                    android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:layout_marginLeft="120dp"
-                    android:text="菜谱"
-                    android:textColor="@color/white"
-                    android:textSize="@dimen/card_view_in_height" />
-            </com.qmuiteam.qmui.layout.QMUIRelativeLayout>
-
-        </LinearLayout>
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:fitsSystemWindows="false"
+                    android:scaleType="centerCrop"
+                    android:contentDescription="@string/common_example"
+                    android:src="@mipmap/gongnengbeijing"
+                    app:qmui_layout_collapseMode="parallax"
+                    app:qmui_layout_collapseParallaxMultiplier="0.7"/>
+
+                <com.qmuiteam.qmui.widget.QMUITopBar
+                    android:id="@+id/topbar"
+                    android:layout_width="match_parent"
+                    android:layout_height="?attr/qmui_topbar_height"
+                    android:fitsSystemWindows="true"
+                    app:qmui_layout_collapseMode="pin"
+                    android:background="@color/qmui_config_color_transparent"
+                    app:qmui_bottomDividerHeight="0px"/>
+            </com.qmuiteam.qmui.widget.QMUICollapsingTopBarLayout>
+        </com.qmuiteam.qmui.widget.QMUIAppBarLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="horizontal">
-            <com.qmuiteam.qmui.layout.QMUIRelativeLayout
-                android:id="@+id/wh"
-                android:layout_width="180dp"
-                android:layout_height="120dp"
-                android:layout_marginTop="10dp"
-                android:background="@drawable/wh_bj">
-                <ImageView
-                    android:layout_width="80dp"
-                    android:layout_height="80dp"
-                    android:src="@mipmap/wh"
-                    android:layout_centerVertical="true"
-                    android:layout_marginLeft="10dp"/>
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:layout_marginLeft="100dp"
-                    android:text="维护"
-                    android:textColor="@color/white"
-                    android:textSize="@dimen/card_view_in_height" />
-            </com.qmuiteam.qmui.layout.QMUIRelativeLayout>
-
+            android:scrollbars="none"
+            android:layout_marginLeft="20dp"
+            android:layout_marginRight="20dp"
 
+            app:layout_behavior="@string/appbar_scrolling_view_behavior"
+            android:orientation="vertical">
             <com.qmuiteam.qmui.layout.QMUIRelativeLayout
-                android:id="@+id/sz"
+                android:id="@+id/kshr"
                 android:layout_width="match_parent"
                 android:layout_height="120dp"
                 android:layout_marginTop="10dp"
-                android:layout_marginLeft="@dimen/dp_10"
-                android:background="@drawable/sz_bj">
+                android:background="@drawable/hr_bj">
                 <ImageView
                     android:layout_width="80dp"
                     android:layout_height="80dp"
-                    android:src="@mipmap/sz"
+                    android:src="@mipmap/hr"
                     android:layout_centerVertical="true"
-                    android:layout_marginLeft="10dp"/>
+                    android:layout_marginLeft="40dp"/>
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
-                    android:layout_marginLeft="100dp"
-                    android:text="设置"
+                    android:layout_marginLeft="150dp"
+                    android:text="开始烹饪"
                     android:textColor="@color/white"
                     android:textSize="@dimen/card_view_in_height" />
             </com.qmuiteam.qmui.layout.QMUIRelativeLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+                <com.qmuiteam.qmui.layout.QMUIRelativeLayout
+                    android:id="@+id/diy"
+                    android:layout_width="140dp"
+                    android:layout_height="120dp"
+                    android:layout_marginTop="10dp"
+                    android:background="@drawable/diy_bj">
+                    <ImageView
+                        android:layout_width="80dp"
+                        android:layout_height="80dp"
+                        android:src="@mipmap/diy"
+                        android:layout_centerInParent="true"
+                        android:layout_marginLeft="20dp"/>
+                </com.qmuiteam.qmui.layout.QMUIRelativeLayout>
+
+                <com.qmuiteam.qmui.layout.QMUIRelativeLayout
+                    android:id="@+id/cp"
+                    android:layout_width="match_parent"
+                    android:layout_height="120dp"
+                    android:layout_marginTop="10dp"
+                    android:layout_marginLeft="@dimen/dp_10"
+                    android:background="@drawable/cp_bj">
+                    <ImageView
+                        android:layout_width="80dp"
+                        android:layout_height="80dp"
+                        android:src="@mipmap/cp"
+                        android:layout_centerVertical="true"
+                        android:layout_marginLeft="20dp"/>
+                    <TextView
+                        android:layout_width="200dp"
+                        android:layout_height="wrap_content"
+                        android:layout_centerVertical="true"
+                        android:layout_marginLeft="120dp"
+                        android:text="菜谱"
+                        android:textColor="@color/white"
+                        android:textSize="@dimen/card_view_in_height" />
+                </com.qmuiteam.qmui.layout.QMUIRelativeLayout>
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+                <com.qmuiteam.qmui.layout.QMUIRelativeLayout
+                    android:id="@+id/wh"
+                    android:layout_width="180dp"
+                    android:layout_height="120dp"
+                    android:layout_marginTop="10dp"
+                    android:background="@drawable/wh_bj">
+                    <ImageView
+                        android:layout_width="80dp"
+                        android:layout_height="80dp"
+                        android:src="@mipmap/wh"
+                        android:layout_centerVertical="true"
+                        android:layout_marginLeft="10dp"/>
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerVertical="true"
+                        android:layout_marginLeft="100dp"
+                        android:text="维护"
+                        android:textColor="@color/white"
+                        android:textSize="@dimen/card_view_in_height" />
+                </com.qmuiteam.qmui.layout.QMUIRelativeLayout>
+
+
+                <com.qmuiteam.qmui.layout.QMUIRelativeLayout
+                    android:id="@+id/sz"
+                    android:layout_width="match_parent"
+                    android:layout_height="120dp"
+                    android:layout_marginTop="10dp"
+                    android:layout_marginLeft="@dimen/dp_10"
+                    android:background="@drawable/sz_bj">
+                    <ImageView
+                        android:layout_width="80dp"
+                        android:layout_height="80dp"
+                        android:src="@mipmap/sz"
+                        android:layout_centerVertical="true"
+                        android:layout_marginLeft="10dp"/>
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerVertical="true"
+                        android:layout_marginLeft="100dp"
+                        android:text="设置"
+                        android:textColor="@color/white"
+                        android:textSize="@dimen/card_view_in_height" />
+                </com.qmuiteam.qmui.layout.QMUIRelativeLayout>
+            </LinearLayout>
         </LinearLayout>
-    </LinearLayout>
 
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-        <TextView
-            android:layout_alignParentBottom="true"
-            android:layout_alignParentRight="true"
-            android:layout_marginRight="20dp"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/app_color_blue"
-            android:text="四川黑菠萝科技有限公司@2023">
-        </TextView>
-    </RelativeLayout>
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+            <TextView
+                android:layout_alignParentBottom="true"
+                android:layout_alignParentRight="true"
+                android:layout_marginRight="20dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="@color/app_color_blue"
+                android:text="四川黑菠萝科技有限公司@2023">
+            </TextView>
+        </RelativeLayout>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
+</com.qmuiteam.qmui.widget.QMUIWindowInsetLayout>
 <!--<com.qmuiteam.qmui.widget.QMUIWindowInsetLayout xmlns:android="http://schemas.android.com/apk/res/android"-->
 <!--    xmlns:app="http://schemas.android.com/apk/res-auto"-->
 <!--    android:layout_width="match_parent"-->