232

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

@@ -5,6 +5,8 @@ import androidx.annotation.NonNull;
 import com.bonait.bnframework.common.constant.ConfigName;
 import com.bonait.bnframework.common.utils.ToastUtils;
 import com.bonait.bnframework.modules.home.fragment.from.fragment.SystemCsPLCFragment;
+import com.bonait.bnframework.modules.home.fragment.from.fragment.WokSetGKCXFragment;
+import com.bonait.bnframework.modules.home.fragment.from.fragment.WokSetTLZZFragment;
 import com.google.android.material.bottomnavigation.BottomNavigationView;
 
 import androidx.viewpager.widget.ViewPager;
@@ -99,9 +101,8 @@ public class WhActivity extends BaseActivity {
      */
     private void initFragment() {
         fragmentAdapter = new FragmentAdapter(getSupportFragmentManager());
-
-        fragmentAdapter.addFragment(new SystemCsPLCFragment());
-        fragmentAdapter.addFragment(new SystemCsControlFragment());
+        fragmentAdapter.addFragment(new WokSetGKCXFragment());
+        fragmentAdapter.addFragment(new WokSetTLZZFragment());
         fragmentAdapter.addFragment(new SystemCsMonitorFragment());
         fragmentAdapter.addFragment(new SystemCsFltlFragment());
         viewPager.setAdapter(fragmentAdapter);

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

@@ -82,7 +82,7 @@ public class WokSetActivity extends BaseActivity {
                 if (s == null || s.isEmpty()) {
                     ToastUtils.warning("权限密码不能为空！");
                 } else {
-                    if (s.equals(ConfigName.getInstance().user.pass)) {
+                    if (s.equals("bpa123456")) {
                         quanxian.setVisibility(View.GONE);
                         viewPager.setVisibility(View.VISIBLE);
                     } else {
@@ -100,8 +100,8 @@ public class WokSetActivity extends BaseActivity {
      */
     private void initFragment() {
         fragmentAdapter = new FragmentAdapter(getSupportFragmentManager());
-        fragmentAdapter.addFragment(new WokSetGKCXFragment());
-        fragmentAdapter.addFragment(new WokSetTLZZFragment());
+        fragmentAdapter.addFragment(new SystemCsPLCFragment());
+        fragmentAdapter.addFragment(new SystemCsControlFragment());
         viewPager.setAdapter(fragmentAdapter);
     }
     //-------------------------配置viewPager与fragment关联----------------------------//

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

@@ -114,7 +114,7 @@
                         android:layout_height="@dimen/ll_height"
                         stv:sBottomDividerLineMarginLeft="@dimen/dp_40"
                         stv:sLeftIconRes="@drawable/device_sz"
-                        stv:sLeftTextString="炒锅出厂调试"
+                        stv:sLeftTextString="炒锅运维调试"
                         stv:sRightIconRes="@drawable/icon_right" />
 
                     <com.allen.library.SuperTextView

app/src/main/res/menu/deviceset.xml

@@ -2,9 +2,9 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@+id/bottom_device_1"
-        android:title="锅口朝向调试" />
+        android:title="PLC#地址" />
 
     <item
         android:id="@+id/bottom_device_2"
-        android:title="投菜结构调试" />
+        android:title="控制#监控" />
 </menu>

app/src/main/res/menu/maintenance.xml

@@ -2,11 +2,11 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@+id/bottom_navigation_0"
-        android:title="PLC#地址" />
+        android:title="锅口#朝向" />
 
     <item
         android:id="@+id/bottom_navigation_1"
-        android:title="控制#监控" />
+        android:title="投菜#控制" />
 
     <item
         android:id="@+id/bottom_navigation_2"