diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/WhActivity.java b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/WhActivity.java index c4449034..8b5754f9 100644 --- a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/WhActivity.java +++ b/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); diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/WokSetActivity.java b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/WokSetActivity.java index 3c33588f..ca0e6f25 100644 --- a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/WokSetActivity.java +++ b/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关联----------------------------// diff --git a/app/src/main/res/layout/fragment_my.xml b/app/src/main/res/layout/fragment_my.xml index 4f645ba1..3d698f9c 100644 --- a/app/src/main/res/layout/fragment_my.xml +++ b/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" /> + android:title="PLC#地址" /> + android:title="控制#监控" /> \ No newline at end of file diff --git a/app/src/main/res/menu/maintenance.xml b/app/src/main/res/menu/maintenance.xml index 8ed8679f..bc64d2e3 100644 --- a/app/src/main/res/menu/maintenance.xml +++ b/app/src/main/res/menu/maintenance.xml @@ -2,11 +2,11 @@ + android:title="锅口#朝向" /> + android:title="投菜#控制" />