竖屏奶茶机界面调整

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

@@ -326,7 +326,7 @@ public class MakeGoodFragment extends BaseFragment {
 
         mTopBar.setTitle("智慧菠萝点餐系统"+ConfigName.getInstance().Version);
 
-        mTopBar.addLeftImageButton(R.mipmap.silos1,1).setOnClickListener(new View.OnClickListener() {
+        mTopBar.addLeftImageButton(R.mipmap.silos11,1).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 add_manguan.SetData();

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

@@ -101,7 +101,7 @@ public class Silos_item_fragment extends BaseFragment {
 
         if (index != -1) {
             StaggeredGridLayoutManager layout11 = new StaggeredGridLayoutManager
-                    (4, StaggeredGridLayoutManager.VERTICAL);
+                    (3, StaggeredGridLayoutManager.VERTICAL);
             recycler_view_lll.setLayoutManager(layout11);
 
             liaochang_adapter adapter = new liaochang_adapter(context, DataBus.getInstance().SilosData.get(index).content);

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

@@ -21,6 +21,7 @@ import android.widget.TextView;
 import com.allen.library.SuperTextView;
 import com.bonait.bnframework.R;
 import com.bonait.bnframework.business.ConfigData;
+import com.bonait.bnframework.business.ExecuteTheRecipe;
 import com.bonait.bnframework.common.base.BaseFragment;
 import com.bonait.bnframework.common.constant.ConfigName;
 import com.bonait.bnframework.common.constant.Constants;
@@ -49,8 +50,28 @@ public class MyFragment extends BaseFragment {
     @BindView(R.id.h_user_name)
     TextView hUserName;
 
-    @BindView(R.id.h_user_qianming)
-    TextView h_user_qianming;
+    @BindView(R.id.stv_user_name)
+    SuperTextView stv_user_name;
+    @BindView(R.id.stv_user_sign)
+    SuperTextView stv_user_sign;
+
+    @BindView(R.id.stv_update)
+    SuperTextView stvUpdate;
+
+    @BindView(R.id.stv_logout)
+    SuperTextView stvLogout;
+
+    @BindView(R.id.stv_announcement)
+    SuperTextView stvAnnouncement;
+
+    @BindView(R.id.stv_user)
+    SuperTextView stv_user;
+
+    @BindView(R.id.stv_huifu)
+    SuperTextView stv_huifu;
+
+    @BindView(R.id.stv_change_pwd)
+    SuperTextView stvChangePwd;
 
     /*
     private static final String BUNDLE_TITLE = "key_title";
@@ -81,11 +102,79 @@ public class MyFragment extends BaseFragment {
         initView();
     }
 
-    @OnClick({R.id.stv_user_name, R.id.stv_user_sign, R.id.stv_change_pwd, R.id.stv_user_qx
-            , R.id.stv_update, R.id.stv_announcement, R.id.stv_huifu, R.id.stv_logout})
-    public void onViewClicked(View view) {
-        switch (view.getId()) {
-            case R.id.stv_user_name://
+    private void initData(BPA_USER user) {
+        if (user != null) {
+            ConfigName.getInstance().user = user;
+            hUserName.setText(user.account);
+            stv_user_name.setRightString(user.name);//名称
+            stv_user_sign.setRightString(user.exp);//签名
+        }
+    }
+
+    private void initView() {
+        initData(ConfigName.getInstance().user);
+        stvUpdate.setRightString(ConfigName.getInstance().Version);
+        /*
+         * 版本更新，点击事件
+         * */
+        stvUpdate.setOnSuperTextViewClickListener(new SuperTextView.OnSuperTextViewClickListener() {
+            @Override
+            public void onClickListener(SuperTextView superTextView) {
+                //检查权限，并启动版本更新
+                checkPermission();
+            }
+        });
+
+        /**
+         * 退出按钮
+         */
+        stvLogout.setOnSuperTextViewClickListener(new SuperTextView.OnSuperTextViewClickListener() {
+            @Override
+            public void onClickListener(SuperTextView superTextView) {
+                String title = "温馨提示！";
+                String message = "客官确定要退出程序吗，小菠萝会想你的哦？";
+                AlertDialogUtils.showDialog(context, title, message, new QMUIDialogAction.ActionListener() {
+                    @Override
+                    public void onClick(QMUIDialog dialog, int index) {
+                        skipToLoginActivity();
+                        dialog.dismiss();
+                    }
+                });
+            }
+        });
+
+        /**
+         * 通知按钮
+         */
+        stvAnnouncement.setOnSuperTextViewClickListener(new SuperTextView.OnSuperTextViewClickListener() {
+            @Override
+            public void onClickListener(SuperTextView superTextView) {
+                skipToNoticeActivity();
+            }
+        });
+
+        /**
+         * 用户管理
+         */
+        stv_user.setOnSuperTextViewClickListener(new SuperTextView.OnSuperTextViewClickListener() {
+            @Override
+            public void onClickListener(SuperTextView superTextView) {
+                if(ConfigName.getInstance().user.name.equals("admin")
+                        || ConfigName.getInstance().user.account.equals("admin"))
+                {
+                    skipToUserActivity();
+                }else
+                {
+                    ToastUtils.warning("对不起,你暂无权限！");
+                }
+            }
+        });
+/**
+ * 用户名点击
+ */
+        stv_user_name.setOnSuperTextViewClickListener(new SuperTextView.OnSuperTextViewClickListener() {
+            @Override
+            public void onClickListener(SuperTextView superTextView) {
                 final QMUIDialog.EditTextDialogBuilder builder = new QMUIDialog.EditTextDialogBuilder(context);
                 builder.setTitle("用户名修改")
                         .setPlaceholder("在此输入用户名")
@@ -100,9 +189,16 @@ public class MyFragment extends BaseFragment {
                         .addAction("确定", new QMUIDialogAction.ActionListener() {
                             @Override
                             public void onClick(QMUIDialog dialog, int index) {
+                                String name = ConfigName.getInstance().user.name;
+                                String ac =  ConfigName.getInstance().user.account;
+                                if (name.equals("admin") || ac.equals("admin")) {
+                                    ToastUtils.warning("对不起,admin账户禁止操作！");
+                                    return;
+                                }
+
                                 CharSequence text = builder.getEditText().getText();
                                 if (text != null && text.length() > 0) {
-                                    BPA_USER user = QueryDB.UpdateUserName(ConfigName.getInstance().user.id, text.toString());
+                                    BPA_USER user= QueryDB.UpdateUserName(ConfigName.getInstance().user.id,text.toString());
                                     initData(user);
                                     dialog.dismiss();
                                 } else {
@@ -112,10 +208,16 @@ public class MyFragment extends BaseFragment {
                             }
                         })
                         .show();
-                break;
-            case R.id.stv_user_sign://
-                final QMUIDialog.EditTextDialogBuilder builder1 = new QMUIDialog.EditTextDialogBuilder(context);
-                builder1.setTitle("个人签名修改")
+            }
+        });
+        /**
+         * 签名按钮点击
+         */
+        stv_user_sign.setOnSuperTextViewClickListener(new SuperTextView.OnSuperTextViewClickListener() {
+            @Override
+            public void onClickListener(SuperTextView superTextView) {
+                final QMUIDialog.EditTextDialogBuilder builder = new QMUIDialog.EditTextDialogBuilder(context);
+                builder.setTitle("个人签名修改")
                         .setPlaceholder("在此输入签名")
                         .setDefaultText(ConfigName.getInstance().user.exp)
                         .setInputType(InputType.TYPE_CLASS_TEXT)
@@ -128,9 +230,16 @@ public class MyFragment extends BaseFragment {
                         .addAction("确定", new QMUIDialogAction.ActionListener() {
                             @Override
                             public void onClick(QMUIDialog dialog, int index) {
-                                CharSequence text = builder1.getEditText().getText();
+                                String name = ConfigName.getInstance().user.name;
+                                String ac =  ConfigName.getInstance().user.account;
+                                if (name.equals("admin") || ac.equals("admin")) {
+                                    ToastUtils.warning("对不起,admin账户禁止操作！");
+                                    return;
+                                }
+
+                                CharSequence text = builder.getEditText().getText();
                                 if (text != null && text.length() > 0) {
-                                    BPA_USER user = QueryDB.UpdateUserSign(ConfigName.getInstance().user.id, text.toString());
+                                    BPA_USER user= QueryDB.UpdateUserSign(ConfigName.getInstance().user.id,text.toString());
                                     initData(user);
                                     dialog.dismiss();
                                 } else {
@@ -140,10 +249,16 @@ public class MyFragment extends BaseFragment {
                             }
                         })
                         .show();
-                break;
-            case R.id.stv_change_pwd://
-                final QMUIDialog.EditTextDialogBuilder builder2 = new QMUIDialog.EditTextDialogBuilder(context);
-                builder2.setTitle("个人密码修改")
+            }
+        });
+        /**
+         * 密码修改
+         */
+        stvChangePwd.setOnSuperTextViewClickListener(new SuperTextView.OnSuperTextViewClickListener() {
+            @Override
+            public void onClickListener(SuperTextView superTextView) {
+                final QMUIDialog.EditTextDialogBuilder builder = new QMUIDialog.EditTextDialogBuilder(context);
+                builder.setTitle("个人密码修改")
                         .setPlaceholder("在此输入密码")
                         .setInputType(InputType.TYPE_TEXT_VARIATION_PASSWORD)
                         .addAction("取消", new QMUIDialogAction.ActionListener() {
@@ -155,9 +270,16 @@ public class MyFragment extends BaseFragment {
                         .addAction("确定", new QMUIDialogAction.ActionListener() {
                             @Override
                             public void onClick(QMUIDialog dialog, int index) {
-                                CharSequence text = builder2.getEditText().getText();
+                                String name = ConfigName.getInstance().user.name;
+                                String ac =  ConfigName.getInstance().user.account;
+                                if (name.equals("admin") || ac.equals("admin")) {
+                                    ToastUtils.warning("对不起,admin账户禁止操作！");
+                                    return;
+                                }
+
+                                CharSequence text = builder.getEditText().getText();
                                 if (text != null && text.length() > 0) {
-                                    BPA_USER user = QueryDB.UpdateUserPass(ConfigName.getInstance().user.id, text.toString());
+                                    BPA_USER user= QueryDB.UpdateUserPass(ConfigName.getInstance().user.id,text.toString());
                                     initData(user);
                                     dialog.dismiss();
                                 } else {
@@ -167,25 +289,15 @@ public class MyFragment extends BaseFragment {
                             }
                         })
                         .show();
-                break;
-            case R.id.stv_user_qx://
-                if(ConfigName.getInstance().user.name.equals("admin")
-                        || ConfigName.getInstance().user.account.equals("admin"))
-                {
-                    skipToUserActivity();
-                }else
-                {
-                    ToastUtils.warning("对不起,你暂无权限！");
-                }
-                break;
-            case R.id.stv_update://
-                //检查权限，并启动版本更新
-                checkPermission();
-                break;
-            case R.id.stv_announcement://
-                skipToNoticeActivity();
-                break;
-            case R.id.stv_huifu://
+            }
+        });
+
+        /**
+         * 恢复出厂设置
+         */
+        stv_huifu.setOnSuperTextViewClickListener(new SuperTextView.OnSuperTextViewClickListener() {
+            @Override
+            public void onClickListener(SuperTextView superTextView) {
                 String title = "温馨提示！";
                 String message = "客官确定要恢复出厂设置吗，小菠萝温馨提示你,此操作将会影响到实际运行哦？";
                 AlertDialogUtils.showDialog(context, title, message, new QMUIDialogAction.ActionListener() {
@@ -196,35 +308,24 @@ public class MyFragment extends BaseFragment {
                         dialog.dismiss();
                     }
                 });
-                break;
-            case R.id.stv_logout://
-                String title1 = "温馨提示！";
-                String message1 = "客官确定要退出程序吗，小菠萝会想你的哦？";
-                AlertDialogUtils.showDialog(context, title1, message1, new QMUIDialogAction.ActionListener() {
-                    @Override
-                    public void onClick(QMUIDialog dialog, int index) {
-                        skipToLoginActivity();
-                        dialog.dismiss();
-                    }
-                });
-                break;
-        }
-    }
+            }
+        });
+
+
+
+
+
+
+
+
+
+
 
-    private void initData(BPA_USER user) {
-        if (user != null) {
-            ConfigName.getInstance().user = user;
-            hUserName.setText(user.name);
-            h_user_qianming.setText(user.exp);//签名
-        }
-    }
 
-    private void initView() {
-        initData(ConfigName.getInstance().user);
     }
 
     /**
-     * 跳转登录界面
+     * 跳转信息通知界面
      */
     private void skipToNoticeActivity() {
         // 跳转到登录页面
@@ -234,7 +335,7 @@ public class MyFragment extends BaseFragment {
     }
 
     /**
-     * 跳转登录界面
+     * 跳转用户界面
      */
     private void skipToUserActivity() {
         // 跳转到登录页面

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

@@ -62,9 +62,6 @@ import butterknife.OnClick;
 
 public class LoginActivity extends BaseActivity implements Validator.ValidationListener {
 
-    @BindView(R.id.logo)
-    ImageView mLogo;
-
     @Order(1)
     @NotEmpty(message = "用户名不能为空")
     @BindView(R.id.et_account)
@@ -124,17 +121,17 @@ public class LoginActivity extends BaseActivity implements Validator.ValidationL
         mEtAccount.requestFocus();
         getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN);
 
-        if(ConfigName.getInstance().IsPortraitScreen)//竖屏
-        {
-            RelativeLayout.LayoutParams lp = new RelativeLayout.LayoutParams(mScrollView.getLayoutParams());
-            lp.setMargins(15, 80, 15, 0);
-            mScrollView.setLayoutParams(lp);
-        }else
-        {
-            RelativeLayout.LayoutParams lp = new RelativeLayout.LayoutParams(mScrollView.getLayoutParams());
-            lp.setMargins(15, 40, 15, 0);
-            mScrollView.setLayoutParams(lp);
-        }
+//        if(ConfigName.getInstance().IsPortraitScreen)//竖屏
+//        {
+//            RelativeLayout.LayoutParams lp = new RelativeLayout.LayoutParams(mScrollView.getLayoutParams());
+//            lp.setMargins(15, 80, 15, 0);
+//            mScrollView.setLayoutParams(lp);
+//        }else
+//        {
+//            RelativeLayout.LayoutParams lp = new RelativeLayout.LayoutParams(mScrollView.getLayoutParams());
+//            lp.setMargins(15, 40, 15, 0);
+//            mScrollView.setLayoutParams(lp);
+//        }
     }
 
     @OnClick({R.id.iv_clean_account, R.id.clean_password, R.id.iv_show_pwd,R.id.forget_password, R.id.btn_login})
@@ -304,7 +301,7 @@ public class LoginActivity extends BaseActivity implements Validator.ValidationL
                         mAnimatorTranslateY.setDuration(300);
                         mAnimatorTranslateY.setInterpolator(new LinearInterpolator());
                         mAnimatorTranslateY.start();
-                        AnimationToolUtils.zoomIn(mLogo, scale, dist);
+                        //AnimationToolUtils.zoomIn(mLogo, scale, dist);
                     }
 
                 } else if (oldBottom != 0 && bottom != 0 && (bottom - oldBottom > keyHeight)) {
@@ -314,7 +311,7 @@ public class LoginActivity extends BaseActivity implements Validator.ValidationL
                         mAnimatorTranslateY.setInterpolator(new LinearInterpolator());
                         mAnimatorTranslateY.start();
                         //键盘收回后，logo恢复原来大小，位置同样回到初始位置
-                        AnimationToolUtils.zoomOut(mLogo, scale);
+                        //AnimationToolUtils.zoomOut(mLogo, scale);
                     }
                 }
             }

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

@@ -9,14 +9,15 @@
     android:fitsSystemWindows="true"
     android:orientation="vertical"
     tools:context=".modules.welcome.activity.LoginActivity">
+
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-<!--        <com.bonait.bnframework.common.bg.SnowView-->
-<!--            android:layout_width="match_parent"-->
-<!--            android:layout_height="match_parent"-->
-<!--            android:background="@color/transparent"/>-->
+        <com.bonait.bnframework.common.bg.SnowView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@color/transparent" />
 
         <androidx.core.widget.NestedScrollView
             android:id="@+id/scrollView"
@@ -24,7 +25,6 @@
             android:layout_height="match_parent"
             android:layout_alignParentStart="true"
             android:layout_alignParentTop="true"
-            android:layout_margin="50dp"
             android:fillViewport="true"
             android:scrollbarThumbVertical="@android:color/transparent"
             android:scrollbars="vertical">
@@ -32,49 +32,44 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:orientation="horizontal">
+                android:orientation="vertical">
+
                 <RelativeLayout
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_weight="1"
+                    android:background="@mipmap/login_bj">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerInParent="true"
+                        android:src="@mipmap/login_ico" />
+
                     <ImageView
-                        android:layout_marginBottom="30dp"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:scaleType="fitXY"
-                        android:src="@mipmap/loginbj">
-                    </ImageView>
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentBottom="true"
+                        android:layout_centerHorizontal="true"
+                        android:layout_marginBottom="60dp"
+                        android:src="@mipmap/login_name" />
                 </RelativeLayout>
 
                 <RelativeLayout
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_weight="2">
+
                     <LinearLayout
-                        android:layout_marginLeft="@dimen/dp_40"
-                        android:layout_marginRight="@dimen/dp_40"
                         android:id="@+id/content"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:orientation="vertical">---------------
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="欢迎使用"
-                            android:textSize="30dp">
-                        </TextView>
-
-                        <ImageView
-                            android:layout_marginTop="50dp"
-                            android:id="@+id/logo"
-                            android:layout_width="100dp"
-                            android:layout_height="100dp"
-                            android:layout_centerHorizontal="true"
-                            android:layout_gravity="center"
-                            android:background="@null"
-                            android:scaleType="centerCrop"
-                            android:src="@mipmap/boluo"/>
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerHorizontal="true"
+                        android:layout_marginLeft="100dp"
+                        android:layout_marginTop="100dp"
+                        android:layout_marginRight="100dp"
+                        android:orientation="vertical">
+
                         <LinearLayout
                             android:layout_width="match_parent"
                             android:layout_height="55dp"
@@ -86,7 +81,7 @@
                                 android:layout_height="wrap_content"
                                 android:layout_marginStart="15dp"
                                 android:layout_marginEnd="15dp"
-                                android:src="@drawable/icon_login_user"/>
+                                android:src="@mipmap/login_u" />
 
                             <EditText
                                 android:id="@+id/et_account"
@@ -94,15 +89,15 @@
                                 android:layout_height="match_parent"
                                 android:layout_weight="1"
                                 android:background="@null"
+                                android:focusable="true"
+                                android:focusableInTouchMode="true"
                                 android:hint="@string/user_account"
                                 android:imeOptions="actionNext"
-                                android:textSize="16sp"
+                                android:inputType="text"
                                 android:maxLength="20"
                                 android:maxLines="1"
                                 android:singleLine="true"
-                                android:inputType="text"
-                                android:focusable="true"
-                                android:focusableInTouchMode="true"/>
+                                android:textSize="16sp" />
 
                             <ImageView
                                 android:id="@+id/iv_clean_account"
@@ -110,14 +105,15 @@
                                 android:layout_height="fill_parent"
                                 android:scaleType="centerInside"
                                 android:src="@drawable/delete_selector"
-                                android:visibility="gone"/>
+                                android:visibility="gone" />
 
                         </LinearLayout>
 
                         <View
                             android:layout_width="match_parent"
                             android:layout_height="2px"
-                            android:background="@color/color3"/>
+                            android:layout_marginBottom="30dp"
+                            android:background="@color/color3" />
 
                         <LinearLayout
                             android:layout_width="match_parent"
@@ -130,7 +126,7 @@
                                 android:layout_height="wrap_content"
                                 android:layout_marginStart="15dp"
                                 android:layout_marginEnd="15dp"
-                                android:src="@drawable/icon_login_pwd"/>
+                                android:src="@mipmap/login_p" />
 
                             <EditText
                                 android:id="@+id/et_password"
@@ -143,7 +139,7 @@
                                 android:maxLength="30"
                                 android:singleLine="true"
                                 android:text=""
-                                android:textSize="16sp"/>
+                                android:textSize="16sp" />
 
                             <ImageView
                                 android:id="@+id/clean_password"
@@ -151,27 +147,30 @@
                                 android:layout_height="fill_parent"
                                 android:scaleType="centerInside"
                                 android:src="@drawable/delete_selector"
-                                android:visibility="gone"/>
+                                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"/>
+                                android:src="@drawable/icon_pass_gone" />
 
                         </LinearLayout>
 
                         <View
                             android:layout_width="match_parent"
                             android:layout_height="2px"
-                            android:background="@color/color3"/>
+                            android:layout_marginBottom="50dp"
+                            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">
+                            android:layout_marginTop="10dp"
+                            android:layout_marginBottom="30dp"
+                            android:visibility="gone">
 
                             <CheckBox
                                 android:id="@+id/cb_checkbox"
@@ -179,24 +178,25 @@
                                 android:layout_height="wrap_content"
                                 android:layout_centerVertical="true"
                                 android:background="@null"
+                                android:buttonTint="@color/app_color_blue"
                                 android:checked="false"
                                 android:text="记住密码"
-                                android:textSize="@dimen/sp_14"
                                 android:textColor="@color/blue_primary_dark"
-                                android:buttonTint="@color/app_color_blue" />
+                                android:textSize="@dimen/sp_14" />
 
                             <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:layout_centerVertical="true"
                                 android:text="忘记密码?"
-                                android:textSize="@dimen/sp_14"
-                                android:textColor="@color/blue_primary_dark" />
+                                android:textColor="@color/blue_primary_dark"
+                                android:textSize="@dimen/sp_14" />
                         </RelativeLayout>
 
+
                         <Button
                             android:id="@+id/btn_login"
                             android:layout_width="match_parent"
@@ -205,29 +205,26 @@
                             android:background="@drawable/bg_btn_login_selected"
                             android:text="登    录"
                             android:textColor="@color/white"
-                            android:textSize="18sp"/>
+                            android:textSize="18sp" />
 
                     </LinearLayout>
                 </RelativeLayout>
 
             </LinearLayout>
-
-
-
         </androidx.core.widget.NestedScrollView>
+
         <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_alignParentBottom="true"
-            android:layout_alignParentRight="true"
+            android:layout_centerHorizontal="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"/>
+            android:text="BY © 四川黑菠萝Black pineapple"
+            android:textColor="@color/app_color_description" />
     </RelativeLayout>
 
 
-
     <!--<LinearLayout
         android:id="@+id/service"
         android:layout_width="match_parent"

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

@@ -73,7 +73,7 @@
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:text="料仓物料低于最低值会警示"
+                                android:text="料仓物料不足会警示"
                                 android:textColor="@color/red_primary_dark"/>
                         </LinearLayout>
                     </RelativeLayout>
@@ -103,12 +103,12 @@
             </RelativeLayout>
 
             <RelativeLayout
-                android:layout_width="130dp"
+                android:layout_width="90dp"
                 android:layout_height="match_parent"
                 android:background="@color/white">
                 <LinearLayout
                     android:layout_centerInParent="true"
-                    android:layout_width="130dp"
+                    android:layout_width="90dp"
                     android:layout_height="wrap_content"
                     android:orientation="vertical">
 

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

@@ -16,11 +16,11 @@
             android:layout_marginBottom="50dp">
 
             <LinearLayout
-                android:layout_centerHorizontal="true"
-                android:layout_marginLeft="160dp"
-                android:layout_marginRight="160dp"
+                android:layout_centerInParent="true"
+                android:layout_marginLeft="40dp"
+                android:layout_marginRight="40dp"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_height="500dp"
                 android:orientation="vertical">
                 <LinearLayout
                     android:layout_width="match_parent"

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

@@ -13,229 +13,193 @@
         android:background="@color/main_background">
 
         <LinearLayout
-            android:layout_margin="20dp"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginBottom="30dp">
+            android:layout_margin="20dp"
+            android:layout_marginBottom="30dp"
+            android:orientation="vertical">
 
-            <RelativeLayout
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
                 android:layout_weight="1">
 
-                <LinearLayout
-                    android:layout_width="match_parent"
+                <RelativeLayout
+                    android:id="@+id/lcgl"
+                    android:layout_width="0dp"
                     android:layout_height="match_parent"
-                    android:orientation="vertical">
-
-                    <RelativeLayout
-                        android:id="@+id/lcgl"
-                        android:layout_width="match_parent"
-                        android:layout_height="0dp"
-                        android:layout_margin="5dp"
-                        android:layout_weight="1"
-                        android:background="@drawable/silos_bj">
-
-                        <LinearLayout
-                            android:layout_centerInParent="true"
+                    android:layout_margin="5dp"
+                    android:layout_weight="1.5"
+                    android:background="@drawable/silos_bj">
+
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerInParent="true"
+                        android:focusable="false"
+                        android:orientation="vertical">
+
+                        <ImageView
+                            android:layout_width="match_parent"
+                            android:layout_height="100dp"
+                            android:focusable="false"
+                            android:src="@mipmap/new1" />
+
+                        <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:orientation="vertical"
-                            android:focusable="false">
-                            <ImageView
-                                android:layout_width="match_parent"
-                                android:layout_height="100dp"
-                                android:src="@mipmap/new1"
-                                android:focusable="false"/>
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:fontFamily="sans-serif-condensed-medium"
-                                android:text="料仓管理(绑定物料)"
-                                android:textColor="@color/white"
-                                android:textSize="26dp"
-                                android:focusable="false"/>
-                        </LinearLayout>
-                    </RelativeLayout>
-
-                    <RelativeLayout
-                        android:id="@+id/jcsjgl"
-                        android:layout_width="match_parent"
-                        android:layout_height="0dp"
-                        android:layout_margin="5dp"
-                        android:layout_weight="1.4"
-                        android:background="@drawable/jcsjgl_bj">
-                        <LinearLayout
-                            android:layout_centerInParent="true"
+                            android:focusable="false"
+                            android:fontFamily="sans-serif-condensed-medium"
+                            android:text="料仓管理(绑定物料)"
+                            android:textColor="@color/white"
+                            android:textSize="26dp" />
+                    </LinearLayout>
+                </RelativeLayout>
+
+                <RelativeLayout
+                    android:id="@+id/jcsjgl"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_margin="5dp"
+                    android:layout_weight="1"
+                    android:background="@drawable/jcsjgl_bj">
+
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerInParent="true"
+                        android:focusable="false"
+                        android:orientation="vertical">
+
+                        <ImageView
+                            android:layout_width="match_parent"
+                            android:layout_height="120dp"
+                            android:focusable="false"
+                            android:src="@mipmap/new4" />
+
+                        <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:orientation="vertical"
-                            android:focusable="false">
-                            <ImageView
-                                android:layout_width="match_parent"
-                                android:layout_height="120dp"
-                                android:src="@mipmap/new4"
-                                android:focusable="false"/>
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:fontFamily="sans-serif-condensed-medium"
-                                android:text="基础数据管理"
-                                android:textColor="@color/white"
-                                android:textSize="26dp"
-                                android:focusable="false"/>
-                        </LinearLayout>
-                    </RelativeLayout>
-                </LinearLayout>
-            </RelativeLayout>
-
-            <RelativeLayout
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="2">
-
-                <LinearLayout
-                    android:layout_width="match_parent"
+                            android:focusable="false"
+                            android:fontFamily="sans-serif-condensed-medium"
+                            android:text="基础数据管理"
+                            android:textColor="@color/white"
+                            android:textSize="26dp" />
+                    </LinearLayout>
+                </RelativeLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_marginTop="@dimen/dp_10"
+                android:layout_weight="1">
+
+                <RelativeLayout
+                    android:id="@+id/yfpf"
+                    android:layout_width="0dp"
                     android:layout_height="match_parent"
-                    android:orientation="vertical">
+                    android:layout_weight="2"
+                    android:background="@drawable/goodpf_bj">
 
-                    <RelativeLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="0dp"
-                        android:layout_margin="5dp"
-                        android:layout_weight="1.3">
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerInParent="true"
+                        android:focusable="false"
+                        android:orientation="vertical">
 
-                        <LinearLayout
+                        <ImageView
                             android:layout_width="match_parent"
-                            android:layout_height="match_parent">
-
-                            <RelativeLayout
-                                android:id="@+id/yfpf"
-                                android:layout_width="0dp"
-                                android:layout_height="match_parent"
-                                android:layout_weight="2"
-                                android:background="@drawable/goodpf_bj">
-                                <LinearLayout
-                                    android:layout_centerInParent="true"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:orientation="vertical"
-                                    android:focusable="false">
-                                    <ImageView
-                                        android:layout_width="match_parent"
-                                        android:layout_height="120dp"
-                                        android:src="@mipmap/new2"
-                                        android:focusable="false"/>
-
-                                    <TextView
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="wrap_content"
-                                        android:fontFamily="sans-serif-condensed-medium"
-                                        android:text="饮料配方管理"
-                                        android:textColor="@color/white"
-                                        android:textSize="26dp"
-                                        android:focusable="false"/>
-                                </LinearLayout>
-                            </RelativeLayout>
-                            <RelativeLayout
-                                android:id="@+id/log"
-                                android:layout_marginLeft="5dp"
-                                android:layout_width="0dp"
-                                android:layout_height="match_parent"
-                                android:layout_weight="1"
-                                android:background="@drawable/log_bj">
-                                <LinearLayout
-                                    android:layout_centerInParent="true"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:orientation="vertical"
-                                    android:focusable="false">
-                                    <ImageView
-                                        android:layout_width="match_parent"
-                                        android:layout_height="120dp"
-                                        android:src="@mipmap/new3"
-                                        android:focusable="false"/>
-
-                                    <TextView
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="wrap_content"
-                                        android:fontFamily="sans-serif-condensed-medium"
-                                        android:text="日志管理"
-                                        android:textColor="@color/white"
-                                        android:textSize="26dp"
-                                        android:focusable="false"/>
-                                </LinearLayout>
-                            </RelativeLayout>
-                        </LinearLayout>
-                    </RelativeLayout>
-
-                    <RelativeLayout
-                        android:id="@+id/ssjk"
-                        android:layout_width="match_parent"
-                        android:layout_height="0dp"
-                        android:layout_margin="5dp"
-                        android:layout_weight="1"
-                        android:background="@drawable/ssjk_bj">
-                        <LinearLayout
-                            android:layout_centerInParent="true"
+                            android:layout_height="120dp"
+                            android:focusable="false"
+                            android:src="@mipmap/new2" />
+
+                        <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:orientation="vertical"
-                            android:focusable="false">
-                            <ImageView
-                                android:layout_width="match_parent"
-                                android:layout_height="120dp"
-                                android:src="@mipmap/new5"
-                                android:focusable="false"/>
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:focusable="false"
-                                android:fontFamily="sans-serif-condensed-medium"
-                                android:text="实时监控管理"
-                                android:textColor="@color/white"
-                                android:textSize="26dp"
-                                android:textStyle="bold" />
-                        </LinearLayout>
-                    </RelativeLayout>
-                </LinearLayout>
-            </RelativeLayout>
-
-
-            <!--            <LinearLayout-->
-            <!--                android:layout_centerHorizontal="true"-->
-            <!--                android:layout_marginLeft="160dp"-->
-            <!--                android:layout_marginRight="160dp"-->
-            <!--                android:layout_width="match_parent"-->
-            <!--                android:layout_height="match_parent"-->
-            <!--                android:orientation="vertical">-->
-
-            <!--                <com.bonait.bnframework.modules.home.fragment.mode.caidan_control-->
-            <!--                    android:id="@+id/jcsjgl"-->
-            <!--                    android:layout_width="match_parent"-->
-            <!--                    android:layout_height="match_parent"-->
-            <!--                    app:imagesrc="@mipmap/wlgl"-->
-            <!--                    android:tag="基础数据管理"/>-->
-
-            <!--                <com.bonait.bnframework.modules.home.fragment.mode.caidan_control-->
-            <!--                    android:id="@+id/lcgl"-->
-            <!--                    android:layout_width="match_parent"-->
-            <!--                    android:layout_height="match_parent"-->
-            <!--                    app:imagesrc="@mipmap/lcsz"-->
-            <!--                    android:tag="料仓管理(绑定物料)"/>-->
-
-            <!--                <com.bonait.bnframework.modules.home.fragment.mode.caidan_control-->
-            <!--                    android:id="@+id/yfpf"-->
-            <!--                    android:layout_width="match_parent"-->
-            <!--                    android:layout_height="match_parent"-->
-            <!--                    app:imagesrc="@mipmap/yfpf"-->
-            <!--                    android:tag="商品配方管理"/>-->
-            <!--            </LinearLayout>-->
+                            android:focusable="false"
+                            android:fontFamily="sans-serif-condensed-medium"
+                            android:text="饮料配方管理"
+                            android:textColor="@color/white"
+                            android:textSize="26dp" />
+                    </LinearLayout>
+                </RelativeLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_marginTop="@dimen/dp_10"
+                android:layout_weight="1">
+
+                <RelativeLayout
+                    android:id="@+id/log"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_marginRight="10dp"
+                    android:layout_weight="1"
+                    android:background="@drawable/log_bj">
+
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerInParent="true"
+                        android:focusable="false"
+                        android:orientation="vertical">
+
+                        <ImageView
+                            android:layout_width="match_parent"
+                            android:layout_height="120dp"
+                            android:focusable="false"
+                            android:src="@mipmap/new3" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:focusable="false"
+                            android:fontFamily="sans-serif-condensed-medium"
+                            android:text="日志管理"
+                            android:textColor="@color/white"
+                            android:textSize="26dp" />
+                    </LinearLayout>
+                </RelativeLayout>
+
+                <RelativeLayout
+                    android:id="@+id/ssjk"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:background="@drawable/ssjk_bj">
+
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerInParent="true"
+                        android:focusable="false"
+                        android:orientation="vertical">
+
+                        <ImageView
+                            android:layout_width="match_parent"
+                            android:layout_height="120dp"
+                            android:focusable="false"
+                            android:src="@mipmap/new5" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:focusable="false"
+                            android:fontFamily="sans-serif-condensed-medium"
+                            android:text="实时监控管理"
+                            android:textColor="@color/white"
+                            android:textSize="26dp"
+                            android:textStyle="bold" />
+                    </LinearLayout>
+                </RelativeLayout>
+            </LinearLayout>
 
         </LinearLayout>
+
     </RelativeLayout>
 
     <com.qmuiteam.qmui.widget.QMUITopBarLayout

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

@@ -114,68 +114,73 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:visibility="gone" />
-        <LinearLayout
+        <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
             android:layout_alignParentBottom="true"
+            android:layout_height="wrap_content"
             android:layout_marginLeft="10dp">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="5dp"
-                android:text="设备:"
-                android:textSize="@dimen/TitleSize" />
-
-            <TextView
-                android:id="@+id/plc_status"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="5dp"
-                android:text="正常"
-                android:textColor="@color/green_primary"
-                android:textSize="@dimen/TitleSize" />
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="水箱:"
-                android:textSize="@dimen/TitleSize"
-                android:layout_margin="5dp"/>
-            <TextView
-                android:id="@+id/wendu1"
+            <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textColor="@color/green_primary"
-                android:textSize="@dimen/TitleSize"
-                android:text="12.9°C"
-                android:layout_margin="5dp"/>
+                android:layout_alignParentBottom="true">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="5dp"
+                    android:text="设备:"
+                    android:textSize="@dimen/TitleSize" />
+
+                <TextView
+                    android:id="@+id/plc_status"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="5dp"
+                    android:text="正常"
+                    android:textColor="@color/green_primary"
+                    android:textSize="@dimen/TitleSize" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="水箱:"
+                    android:textSize="@dimen/TitleSize"
+                    android:layout_margin="5dp"/>
+                <TextView
+                    android:id="@+id/wendu1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/green_primary"
+                    android:textSize="@dimen/TitleSize"
+                    android:text="12.9°C"
+                    android:layout_margin="5dp"/>
+            </LinearLayout>
 
-            <TextView
-                android:id="@+id/cheng_clear"
+            <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_margin="5dp"
-                android:text="称(单击清零):"
-                android:textSize="@dimen/TitleSize" />
-
-            <TextView
-                android:id="@+id/dianzichen"
-                android:layout_width="100dp"
-                android:layout_height="wrap_content"
-                android:layout_margin="5dp"
-                android:text="11.9g"
-                android:textColor="@color/green_primary"
-                android:textSize="@dimen/TitleSize" />
-            <!--            <TextView-->
-            <!--                android:id="@+id/pf_ms"-->
-            <!--                android:layout_width="match_parent"-->
-            <!--                android:layout_height="wrap_content"-->
-            <!--                android:paddingLeft="10dp"-->
-            <!--                android:textColor="#730080"-->
-            <!--                android:text="信息配方：正在制作过程中..."-->
-            <!--                android:layout_margin="5dp"/>-->
+                android:layout_alignParentRight="true"
+                android:layout_alignParentBottom="true">
+
+
+                <TextView
+                    android:id="@+id/cheng_clear"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="5dp"
+                    android:text="称(单击清零):"
+                    android:textSize="@dimen/TitleSize" />
+
+                <TextView
+                    android:id="@+id/dianzichen"
+                    android:layout_width="100dp"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="5dp"
+                    android:text="11.9g"
+                    android:textColor="@color/green_primary"
+                    android:textSize="@dimen/TitleSize" />
+            </LinearLayout>
+        </RelativeLayout>
 
-        </LinearLayout>
     </RelativeLayout>
     <com.qmuiteam.qmui.widget.QMUITopBarLayout
         android:id="@+id/topbar"

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

@@ -9,27 +9,28 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:background="@color/white">
+        android:background="@color/white"
+        android:orientation="vertical">
 
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            android:layout_weight="0.5">
-<!--            <ImageView-->
-<!--                android:id="@+id/h_background"-->
-<!--                android:layout_width="match_parent"-->
-<!--                android:layout_height="match_parent"-->
-<!--                android:src="@color/app_color_blue"-->
-<!--                android:scaleType="centerCrop" />-->
+            android:layout_weight="0.3">
+
+            <ImageView
+                android:id="@+id/h_background"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:scaleType="centerCrop"
+                android:src="@color/app_color_blue" />
 
             <ImageView
                 android:id="@+id/h_head"
                 android:layout_width="90dp"
                 android:layout_height="90dp"
-                android:layout_marginTop="20dp"
-                android:layout_centerHorizontal="true"
+                android:layout_centerInParent="true"
                 android:src="@mipmap/tx1" />
+
             <TextView
                 android:id="@+id/h_user_name"
                 android:layout_width="wrap_content"
@@ -38,115 +39,106 @@
                 android:layout_centerInParent="true"
                 android:layout_marginTop="@dimen/dp_10"
                 android:text="用户"
+                android:textColor="@color/white"
                 android:textSize="17sp" />
-            <TextView
-                android:id="@+id/h_user_qianming"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/h_head"
-                android:layout_centerInParent="true"
-                android:layout_marginTop="32dp"
-                android:text="暂无签名信息"
-                android:textSize="12sp"
-                android:textColor="@color/text_color"/>
+
         </RelativeLayout>
 
         <RelativeLayout
-            android:layout_marginLeft="120dp"
-            android:layout_marginRight="120dp"
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1">
-            <LinearLayout
+
+            <ScrollView
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical">
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="我的服务"
-                    android:textSize="@dimen/text_size_16">
-                </TextView>
+                android:layout_height="wrap_content">
 
-                <RelativeLayout
+                <LinearLayout
+                    android:id="@+id/information_layout"
                     android:layout_width="match_parent"
-                    android:layout_height="240dp"
-                    android:background="@mipmap/listbj">
+                    android:layout_height="wrap_content"
+                    android:background="@color/main_background"
+                    android:orientation="vertical">
 
-                    <LinearLayout
-                        android:layout_centerHorizontal="true"
-                        android:layout_marginTop="10dp"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content">
-                        <com.bonait.bnframework.modules.home.fragment.mode.caidan_control
-                            android:id="@+id/stv_user_name"
-                            android:layout_width="120dp"
-                            android:layout_height="wrap_content"
-                            stv:imagesrc="@drawable/icon_personal_user"
-                            android:tag="用户名"
-                            stv:showbk="2"/>
-                        <com.bonait.bnframework.modules.home.fragment.mode.caidan_control
-                            android:id="@+id/stv_user_sign"
-                            android:layout_width="120dp"
-                            android:layout_height="wrap_content"
-                            stv:imagesrc="@drawable/icon_personal_sign"
-                            android:tag="签名"
-                            stv:showbk="2"/>
-                        <com.bonait.bnframework.modules.home.fragment.mode.caidan_control
-                            android:id="@+id/stv_change_pwd"
-                            android:layout_width="120dp"
-                            android:layout_height="wrap_content"
-                            stv:imagesrc="@drawable/icon_personal_pwd"
-                            android:tag="更改密码"
-                            stv:showbk="2"/>
-                        <com.bonait.bnframework.modules.home.fragment.mode.caidan_control
-                            android:id="@+id/stv_user_qx"
-                            android:layout_width="120dp"
-                            android:layout_height="wrap_content"
-                            stv:imagesrc="@drawable/icon_personal_qx"
-                            android:tag="用户管理"
-                            stv:showbk="2"/>
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:layout_centerHorizontal="true"
-                        android:layout_marginTop="120dp"
+                    <com.allen.library.SuperTextView
+                        android:id="@+id/stv_user_name"
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/ll_height"
+                        stv:sBottomDividerLineMarginLeft="@dimen/dp_40"
+                        stv:sLeftIconRes="@drawable/icon_personal_user"
+                        stv:sLeftTextString="用户名"
+                        stv:sRightIconRes="@drawable/icon_right"
+                        stv:sRightTextColor="@color/gray"
+                        stv:sRightTextString="用户" />
+
+                    <com.allen.library.SuperTextView
+                        android:id="@+id/stv_user_sign"
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/ll_height"
+                        stv:sLeftIconRes="@drawable/icon_personal_sign"
+                        stv:sLeftTextString="签名"
+                        stv:sRightIconRes="@drawable/icon_right"
+                        stv:sRightTextColor="@color/gray"
+                        stv:sRightTextString="" />
+
+                    <com.allen.library.SuperTextView
+                        android:id="@+id/stv_change_pwd"
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/ll_height"
+                        android:layout_marginTop="@dimen/dp_10"
+                        stv:sBottomDividerLineMarginLeft="@dimen/dp_40"
+                        stv:sLeftIconRes="@drawable/icon_personal_pwd"
+                        stv:sLeftTextString="更改密码"
+                        stv:sRightIconRes="@drawable/icon_right" />
+
+                    <com.allen.library.SuperTextView
+                        android:id="@+id/stv_announcement"
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/ll_height"
+                        stv:sBottomDividerLineMarginLeft="@dimen/dp_40"
+                        stv:sLeftIconRes="@drawable/icon_personal_announcement"
+                        stv:sLeftTextString="通知"
+                        stv:sRightIconRes="@drawable/icon_right" />
+
+                    <com.allen.library.SuperTextView
+                        android:id="@+id/stv_user"
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/ll_height"
+                        stv:sBottomDividerLineMarginLeft="@dimen/dp_40"
+                        stv:sLeftIconRes="@drawable/user_gl"
+                        stv:sLeftTextString="用户管理"
+                        stv:sRightIconRes="@drawable/icon_right" />
+
+
+                    <com.allen.library.SuperTextView
+                        android:id="@+id/stv_update"
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/ll_height"
+                        stv:sLeftIconRes="@drawable/icon_personal_update"
+                        stv:sLeftTextString="版本更新"
+                        stv:sRightIconRes="@drawable/icon_right" />
+
+                    <com.allen.library.SuperTextView
+                        android:id="@+id/stv_huifu"
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/ll_height"
+                        stv:sLeftIconRes="@drawable/hfccsz"
+                        stv:sLeftTextString="恢复出厂设置"
+                        stv:sRightIconRes="@drawable/icon_right" />
+
+                    <com.allen.library.SuperTextView
+                        android:id="@+id/stv_logout"
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content">
-                        <com.bonait.bnframework.modules.home.fragment.mode.caidan_control
-                            android:id="@+id/stv_update"
-                            android:layout_width="120dp"
-                            android:layout_height="wrap_content"
-                            stv:imagesrc="@drawable/icon_personal_update"
-                            android:tag="版本更新"
-                            stv:showbk="2"/>
-                        <com.bonait.bnframework.modules.home.fragment.mode.caidan_control
-                            android:id="@+id/stv_announcement"
-                            android:layout_width="120dp"
-                            android:layout_height="wrap_content"
-                            stv:imagesrc="@drawable/icon_personal_announcement"
-                            android:tag="通知"
-                            stv:showbk="2"/>
-                        <com.bonait.bnframework.modules.home.fragment.mode.caidan_control
-                            android:id="@+id/stv_huifu"
-                            android:layout_width="120dp"
-                            android:layout_height="wrap_content"
-                            stv:imagesrc="@drawable/hfccsz"
-                            android:tag="恢复出厂设置"
-                            stv:showbk="2"/>
-                        <com.bonait.bnframework.modules.home.fragment.mode.caidan_control
-                            android:id="@+id/stv_logout"
-                            android:layout_width="120dp"
-                            android:layout_height="wrap_content"
-                            stv:imagesrc="@drawable/icon_personal_tc"
-                            android:tag="退出登录"
-                            stv:showbk="2"/>
-                    </LinearLayout>
-
-                </RelativeLayout>
-            </LinearLayout>
+                        android:layout_height="@dimen/ll_height"
+                        android:layout_marginTop="@dimen/dp_10"
+                        stv:sCenterTextColor="@color/red_primary"
+                        stv:sCenterTextString="退出登录" />
+
+                </LinearLayout>
+            </ScrollView>
         </RelativeLayout>
 
+
     </LinearLayout>
 
 </com.qmuiteam.qmui.widget.QMUIWindowInsetLayout>

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

@@ -5,15 +5,18 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/app_color_blue">
+
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginTop="?attr/qmui_topbar_height"
         android:background="@color/main_background">
+
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_marginBottom="30dp">
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -45,7 +48,7 @@
 
                                 <RelativeLayout
                                     android:layout_width="match_parent"
-                                    android:layout_height="120dp"
+                                    android:layout_height="160dp"
                                     android:background="@drawable/goodpf_bj">
 
                                     <ImageView
@@ -88,7 +91,7 @@
 
                                 <RelativeLayout
                                     android:layout_width="match_parent"
-                                    android:layout_height="120dp"
+                                    android:layout_height="160dp"
                                     android:background="@drawable/log_bj">
 
                                     <ImageView
@@ -115,6 +118,20 @@
                             </LinearLayout>
                         </RelativeLayout>
 
+
+                    </LinearLayout>
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_weight="1">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:orientation="horizontal">
+
                         <RelativeLayout
                             android:id="@+id/xtcs"
                             android:layout_width="0dp"
@@ -131,7 +148,7 @@
 
                                 <RelativeLayout
                                     android:layout_width="match_parent"
-                                    android:layout_height="120dp"
+                                    android:layout_height="160dp"
                                     android:background="@drawable/jcsjgl_bj">
 
                                     <ImageView
@@ -157,18 +174,6 @@
                                     android:textSize="26dp" />
                             </LinearLayout>
                         </RelativeLayout>
-                    </LinearLayout>
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="0dp"
-                    android:layout_weight="1">
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:orientation="horizontal">
 
                         <RelativeLayout
                             android:id="@+id/plckz"
@@ -186,7 +191,7 @@
 
                                 <RelativeLayout
                                     android:layout_width="match_parent"
-                                    android:layout_height="120dp"
+                                    android:layout_height="160dp"
                                     android:background="@drawable/plc_bj">
 
                                     <ImageView
@@ -212,6 +217,19 @@
                                     android:textSize="26dp" />
                             </LinearLayout>
                         </RelativeLayout>
+                    </LinearLayout>
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_weight="1">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:orientation="horizontal">
+
 
                         <RelativeLayout
                             android:id="@+id/imagegl"
@@ -229,7 +247,7 @@
 
                                 <RelativeLayout
                                     android:layout_width="match_parent"
-                                    android:layout_height="120dp"
+                                    android:layout_height="160dp"
                                     android:background="@drawable/silos_bj">
 
                                     <ImageView
@@ -263,6 +281,7 @@
                             android:layout_margin="20dp"
                             android:layout_weight="1"
                             android:orientation="vertical">
+
                             <LinearLayout
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
@@ -271,7 +290,7 @@
 
                                 <RelativeLayout
                                     android:layout_width="match_parent"
-                                    android:layout_height="120dp"
+                                    android:layout_height="160dp"
                                     android:background="@drawable/sbxx_bj">
 
                                     <ImageView
@@ -300,11 +319,15 @@
                     </LinearLayout>
                 </LinearLayout>
             </LinearLayout>
+
         </RelativeLayout>
+
     </RelativeLayout>
+
     <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" />
+
 </com.qmuiteam.qmui.widget.QMUIWindowInsetLayout>

app/src/main/res/layout/item/layout/item_zsx.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="200dp"
+    android:layout_width="170dp"
     android:layout_height="150dp">
 
     <LinearLayout

app/src/main/res/values/colors.xml

@@ -21,6 +21,7 @@
     <color name="selebottom">#3604BFEF</color>
     <!-- common -->
     <color name="foreground">#A5000000</color>
+    <color name="transparent">#00000000</color>
 
 
     <!--    <color name="blue_primary_dark">#fcc702</color>-->

app/src/main/res/values/dimens.xml

@@ -15,6 +15,8 @@
     <!-- Default screen margins, per the Android Design guidelines. -->
 
     <!--App item高度调节-->
+    <dimen name="ll_height">50dp</dimen>
+
     <dimen name="def_height">50dp</dimen>
     <dimen name="dp_10">10dp</dimen>
     <dimen name="dp_4">4dp</dimen>