diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a17b76f2..8752f0be 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -28,6 +28,27 @@ android:theme="@style/AppTheme" tools:ignore="GoogleAppIndexingWarning" tools:node="merge"> + + + + + + + diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/SzActivity.java b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/SzActivity.java index e235c040..1913fecc 100644 --- a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/SzActivity.java +++ b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/SzActivity.java @@ -1,25 +1,52 @@ package com.bonait.bnframework.modules.home.fragment.from; +import android.support.annotation.NonNull; +import android.support.design.widget.BottomNavigationView; +import android.support.v4.view.ViewPager; import android.support.v7.app.AppCompatActivity; import android.os.Bundle; +import android.view.MenuItem; import android.view.View; import com.bonait.bnframework.R; import com.bonait.bnframework.common.base.BaseActivity; +import com.bonait.bnframework.common.constant.MessageName; +import com.bonait.bnframework.common.message.MessageLooper; +import com.bonait.bnframework.common.message.MessageManager; +import com.bonait.bnframework.modules.home.adapter.FragmentAdapter; +import com.bonait.bnframework.modules.home.fragment.Home1Fragment; +import com.bonait.bnframework.modules.home.fragment.Home2Fragment; +import com.bonait.bnframework.modules.home.fragment.from.fragment.SystemDeviceinFragment; +import com.bonait.bnframework.modules.home.fragment.from.fragment.SystemSeasoningsetFragment; +import com.bonait.bnframework.modules.home.fragment.from.fragment.SystemSystemsetFragment; +import com.bonait.bnframework.modules.home.fragment.from.fragment.systeminternetfragment; +import com.bonait.bnframework.modules.mine.fragment.MyFragment; import com.qmuiteam.qmui.widget.QMUITopBar; +import com.qmuiteam.qmui.widget.QMUIViewPager; import butterknife.BindView; import butterknife.ButterKnife; public class SzActivity extends BaseActivity { @BindView(R.id.topbar) - QMUITopBar mTopBar; + QMUITopBar mTopBar;//top标题 + @BindView(R.id.navigation) + BottomNavigationView bottomNavigationView; + @BindView(R.id.viewpager) + QMUIViewPager viewPager; + private MenuItem menuItem; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_sz);//属性绑定 ButterKnife.bind(this); initTopBar(); + + initFragment(); + viewPager.addOnPageChangeListener(pageChangeListener); + // 设置viewPager缓存多少个fragment + viewPager.setOffscreenPageLimit(4); + bottomNavigationView.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener); } private void initTopBar() { mTopBar.setTitle("系统设置"); @@ -31,6 +58,67 @@ public class SzActivity extends BaseActivity { }); } + /** + * viewPager里添加fragment + */ + private void initFragment() { + FragmentAdapter fragmentAdapter = new FragmentAdapter(getSupportFragmentManager()); + fragmentAdapter.addFragment(new systeminternetfragment()); + fragmentAdapter.addFragment(new SystemDeviceinFragment()); + fragmentAdapter.addFragment(new SystemSystemsetFragment()); + fragmentAdapter.addFragment(new SystemSeasoningsetFragment()); + + viewPager.setAdapter(fragmentAdapter); + } + //-------------------------配置viewPager与fragment关联----------------------------// + /** + * 配置bottom底部菜单栏监听器，手指点击底部菜单监听 + */ + private BottomNavigationView.OnNavigationItemSelectedListener mOnNavigationItemSelectedListener + = new BottomNavigationView.OnNavigationItemSelectedListener() { + + @Override + public boolean onNavigationItemSelected(@NonNull MenuItem item) { + switch (item.getItemId()) { + case R.id.bottom_navigation_1: + viewPager.setCurrentItem(0); + return true; + case R.id.bottom_navigation_2: + viewPager.setCurrentItem(1); + return true; + case R.id.bottom_navigation_3: + viewPager.setCurrentItem(2); + return true; + case R.id.bottom_navigation_4: + viewPager.setCurrentItem(3); + return true; + } + return false; + } + }; + + + /** + * 配置ViewPager监听器，手指滑动监听 + */ + private ViewPager.OnPageChangeListener pageChangeListener = new ViewPager.OnPageChangeListener() { + @Override + public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { + MenuItem menuItem = bottomNavigationView.getMenu().getItem(position); + } + + @Override + public void onPageSelected(int position) { + menuItem = bottomNavigationView.getMenu().getItem(position); + menuItem.setChecked(true); + } + + @Override + public void onPageScrollStateChanged(int state) { + + } + }; + @Override public void onDestroy() { super.onDestroy(); 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 d7f6b362..c82400b5 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 @@ -1,13 +1,25 @@ package com.bonait.bnframework.modules.home.fragment.from; +import android.support.annotation.NonNull; +import android.support.design.widget.BottomNavigationView; import android.support.v4.content.ContextCompat; +import android.support.v4.view.ViewPager; import android.support.v7.app.AppCompatActivity; import android.os.Bundle; +import android.view.MenuItem; import android.view.View; import com.bonait.bnframework.R; import com.bonait.bnframework.common.base.BaseActivity; +import com.bonait.bnframework.modules.home.adapter.FragmentAdapter; +import com.bonait.bnframework.modules.home.fragment.Home1Fragment; +import com.bonait.bnframework.modules.home.fragment.Home2Fragment; +import com.bonait.bnframework.modules.home.fragment.from.fragment.SystemCsFltlFragment; +import com.bonait.bnframework.modules.home.fragment.from.fragment.SystemCsJrFragment; +import com.bonait.bnframework.modules.home.fragment.from.fragment.SystemCsTlFragment; +import com.bonait.bnframework.modules.mine.fragment.MyFragment; import com.qmuiteam.qmui.widget.QMUITopBar; +import com.qmuiteam.qmui.widget.QMUIViewPager; import butterknife.BindView; import butterknife.ButterKnife; @@ -15,12 +27,23 @@ import butterknife.ButterKnife; public class WhActivity extends BaseActivity { @BindView(R.id.topbar) QMUITopBar mTopBar; + @BindView(R.id.navigation) + BottomNavigationView bottomNavigationView; + @BindView(R.id.viewpager) + QMUIViewPager viewPager; + private MenuItem menuItem; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_wh);//属性绑定 ButterKnife.bind(this); initTopBar(); + + initFragment(); + viewPager.addOnPageChangeListener(pageChangeListener); + // 设置viewPager缓存多少个fragment + viewPager.setOffscreenPageLimit(4); + bottomNavigationView.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener); } private void initTopBar() { mTopBar.setTitle("系统维护"); @@ -32,6 +55,62 @@ public class WhActivity extends BaseActivity { }); } + /** + * viewPager里添加fragment + */ + private void initFragment() { + FragmentAdapter fragmentAdapter = new FragmentAdapter(getSupportFragmentManager()); + fragmentAdapter.addFragment(new SystemCsJrFragment()); + fragmentAdapter.addFragment(new SystemCsTlFragment()); + fragmentAdapter.addFragment(new SystemCsFltlFragment()); + viewPager.setAdapter(fragmentAdapter); + } + //-------------------------配置viewPager与fragment关联----------------------------// + /** + * 配置bottom底部菜单栏监听器，手指点击底部菜单监听 + */ + private BottomNavigationView.OnNavigationItemSelectedListener mOnNavigationItemSelectedListener + = new BottomNavigationView.OnNavigationItemSelectedListener() { + + @Override + public boolean onNavigationItemSelected(@NonNull MenuItem item) { + switch (item.getItemId()) { + case R.id.bottom_navigation_1: + viewPager.setCurrentItem(0); + return true; + case R.id.bottom_navigation_2: + viewPager.setCurrentItem(1); + return true; + case R.id.bottom_navigation_3: + viewPager.setCurrentItem(2); + return true; + } + return false; + } + }; + + + /** + * 配置ViewPager监听器，手指滑动监听 + */ + private ViewPager.OnPageChangeListener pageChangeListener = new ViewPager.OnPageChangeListener() { + @Override + public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { + MenuItem menuItem = bottomNavigationView.getMenu().getItem(position); + } + + @Override + public void onPageSelected(int position) { + menuItem = bottomNavigationView.getMenu().getItem(position); + menuItem.setChecked(true); + } + + @Override + public void onPageScrollStateChanged(int state) { + + } + }; + @Override public void onDestroy() { super.onDestroy(); diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/SystemCsFltlFragment.java b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/SystemCsFltlFragment.java new file mode 100644 index 00000000..8799f092 --- /dev/null +++ b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/SystemCsFltlFragment.java @@ -0,0 +1,54 @@ +package com.bonait.bnframework.modules.home.fragment.from.fragment; + +import android.content.Context; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; + +import com.bonait.bnframework.R; +import com.bonait.bnframework.common.base.BaseFragment; +import com.orhanobut.logger.Logger; + +import butterknife.ButterKnife; + +public class SystemCsFltlFragment extends BaseFragment { + + + private Context context; + @Override + protected View onCreateView() { + View root = LayoutInflater.from(getActivity()).inflate(R.layout.fragment_system_cs_fltl, null); + ButterKnife.bind(this, root); + return root; + } + + @Override + public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); + Logger.d("我的fragment创建"); + context = getContext(); + } + + @Override + public void onDestroy() { + super.onDestroy(); + Logger.d("我的fragment销毁"); + } + + /** + * 当在activity设置viewPager + BottomNavigation + fragment时， + * 为防止viewPager左滑动切换界面，与fragment左滑返回上一界面冲突引起闪退问题， + * 必须加上此方法，禁止fragment左滑返回上一界面。 + * + * 切记！切记！切记！否则会闪退！ + * + * 当在fragment设置viewPager + BottomNavigation + fragment时，则不会出现这个问题。 + */ + @Override + protected boolean canDragBack() { + return false; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/SystemCsJrFragment.java b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/SystemCsJrFragment.java new file mode 100644 index 00000000..20f5a573 --- /dev/null +++ b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/SystemCsJrFragment.java @@ -0,0 +1,54 @@ +package com.bonait.bnframework.modules.home.fragment.from.fragment; + +import android.content.Context; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; + +import com.bonait.bnframework.R; +import com.bonait.bnframework.common.base.BaseFragment; +import com.orhanobut.logger.Logger; + +import butterknife.ButterKnife; + +public class SystemCsJrFragment extends BaseFragment { + + + private Context context; + @Override + protected View onCreateView() { + View root = LayoutInflater.from(getActivity()).inflate(R.layout.fragment_system_cs_jr, null); + ButterKnife.bind(this, root); + return root; + } + + @Override + public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); + Logger.d("我的fragment创建"); + context = getContext(); + } + + @Override + public void onDestroy() { + super.onDestroy(); + Logger.d("我的fragment销毁"); + } + + /** + * 当在activity设置viewPager + BottomNavigation + fragment时， + * 为防止viewPager左滑动切换界面，与fragment左滑返回上一界面冲突引起闪退问题， + * 必须加上此方法，禁止fragment左滑返回上一界面。 + * + * 切记！切记！切记！否则会闪退！ + * + * 当在fragment设置viewPager + BottomNavigation + fragment时，则不会出现这个问题。 + */ + @Override + protected boolean canDragBack() { + return false; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/SystemCsTlFragment.java b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/SystemCsTlFragment.java new file mode 100644 index 00000000..d7d3e40c --- /dev/null +++ b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/SystemCsTlFragment.java @@ -0,0 +1,54 @@ +package com.bonait.bnframework.modules.home.fragment.from.fragment; + +import android.content.Context; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; + +import com.bonait.bnframework.R; +import com.bonait.bnframework.common.base.BaseFragment; +import com.orhanobut.logger.Logger; + +import butterknife.ButterKnife; + +public class SystemCsTlFragment extends BaseFragment { + + + private Context context; + @Override + protected View onCreateView() { + View root = LayoutInflater.from(getActivity()).inflate(R.layout.fragment_system_cs_tl, null); + ButterKnife.bind(this, root); + return root; + } + + @Override + public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); + Logger.d("我的fragment创建"); + context = getContext(); + } + + @Override + public void onDestroy() { + super.onDestroy(); + Logger.d("我的fragment销毁"); + } + + /** + * 当在activity设置viewPager + BottomNavigation + fragment时， + * 为防止viewPager左滑动切换界面，与fragment左滑返回上一界面冲突引起闪退问题， + * 必须加上此方法，禁止fragment左滑返回上一界面。 + * + * 切记！切记！切记！否则会闪退！ + * + * 当在fragment设置viewPager + BottomNavigation + fragment时，则不会出现这个问题。 + */ + @Override + protected boolean canDragBack() { + return false; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/SystemDeviceinFragment.java b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/SystemDeviceinFragment.java new file mode 100644 index 00000000..2e83fd0a --- /dev/null +++ b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/SystemDeviceinFragment.java @@ -0,0 +1,54 @@ +package com.bonait.bnframework.modules.home.fragment.from.fragment; + +import android.content.Context; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; + +import com.bonait.bnframework.R; +import com.bonait.bnframework.common.base.BaseFragment; +import com.orhanobut.logger.Logger; + +import butterknife.ButterKnife; + +public class SystemDeviceinFragment extends BaseFragment { + + + private Context context; + @Override + protected View onCreateView() { + View root = LayoutInflater.from(getActivity()).inflate(R.layout.fragment_system_devicein, null); + ButterKnife.bind(this, root); + return root; + } + + @Override + public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); + Logger.d("我的fragment创建"); + context = getContext(); + } + + @Override + public void onDestroy() { + super.onDestroy(); + Logger.d("我的fragment销毁"); + } + + /** + * 当在activity设置viewPager + BottomNavigation + fragment时， + * 为防止viewPager左滑动切换界面，与fragment左滑返回上一界面冲突引起闪退问题， + * 必须加上此方法，禁止fragment左滑返回上一界面。 + * + * 切记！切记！切记！否则会闪退！ + * + * 当在fragment设置viewPager + BottomNavigation + fragment时，则不会出现这个问题。 + */ + @Override + protected boolean canDragBack() { + return false; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/SystemSeasoningsetFragment.java b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/SystemSeasoningsetFragment.java new file mode 100644 index 00000000..cd4cbea4 --- /dev/null +++ b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/SystemSeasoningsetFragment.java @@ -0,0 +1,54 @@ +package com.bonait.bnframework.modules.home.fragment.from.fragment; + +import android.content.Context; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; + +import com.bonait.bnframework.R; +import com.bonait.bnframework.common.base.BaseFragment; +import com.orhanobut.logger.Logger; + +import butterknife.ButterKnife; + +public class SystemSeasoningsetFragment extends BaseFragment { + + + private Context context; + @Override + protected View onCreateView() { + View root = LayoutInflater.from(getActivity()).inflate(R.layout.fragment_system_seasoningset, null); + ButterKnife.bind(this, root); + return root; + } + + @Override + public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); + Logger.d("我的fragment创建"); + context = getContext(); + } + + @Override + public void onDestroy() { + super.onDestroy(); + Logger.d("我的fragment销毁"); + } + + /** + * 当在activity设置viewPager + BottomNavigation + fragment时， + * 为防止viewPager左滑动切换界面，与fragment左滑返回上一界面冲突引起闪退问题， + * 必须加上此方法，禁止fragment左滑返回上一界面。 + * + * 切记！切记！切记！否则会闪退！ + * + * 当在fragment设置viewPager + BottomNavigation + fragment时，则不会出现这个问题。 + */ + @Override + protected boolean canDragBack() { + return false; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/SystemSystemsetFragment.java b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/SystemSystemsetFragment.java new file mode 100644 index 00000000..e92eaa55 --- /dev/null +++ b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/SystemSystemsetFragment.java @@ -0,0 +1,54 @@ +package com.bonait.bnframework.modules.home.fragment.from.fragment; + +import android.content.Context; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; + +import com.bonait.bnframework.R; +import com.bonait.bnframework.common.base.BaseFragment; +import com.orhanobut.logger.Logger; + +import butterknife.ButterKnife; + +public class SystemSystemsetFragment extends BaseFragment { + + + private Context context; + @Override + protected View onCreateView() { + View root = LayoutInflater.from(getActivity()).inflate(R.layout.fragment_system_systemset, null); + ButterKnife.bind(this, root); + return root; + } + + @Override + public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); + Logger.d("我的fragment创建"); + context = getContext(); + } + + @Override + public void onDestroy() { + super.onDestroy(); + Logger.d("我的fragment销毁"); + } + + /** + * 当在activity设置viewPager + BottomNavigation + fragment时， + * 为防止viewPager左滑动切换界面，与fragment左滑返回上一界面冲突引起闪退问题， + * 必须加上此方法，禁止fragment左滑返回上一界面。 + * + * 切记！切记！切记！否则会闪退！ + * + * 当在fragment设置viewPager + BottomNavigation + fragment时，则不会出现这个问题。 + */ + @Override + protected boolean canDragBack() { + return false; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/systeminternetfragment.java b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/systeminternetfragment.java new file mode 100644 index 00000000..ee0cd27b --- /dev/null +++ b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/systeminternetfragment.java @@ -0,0 +1,53 @@ +package com.bonait.bnframework.modules.home.fragment.from.fragment; + +import android.content.Context; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; + +import com.bonait.bnframework.R; +import com.bonait.bnframework.common.base.BaseFragment; +import com.orhanobut.logger.Logger; + +import butterknife.ButterKnife; + +public class systeminternetfragment extends BaseFragment { + + private Context context; + @Override + protected View onCreateView() { + View root = LayoutInflater.from(getActivity()).inflate(R.layout.fragment_system_internet, null); + ButterKnife.bind(this, root); + return root; + } + + @Override + public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); + Logger.d("我的fragment创建"); + context = getContext(); + } + + @Override + public void onDestroy() { + super.onDestroy(); + Logger.d("我的fragment销毁"); + } + + /** + * 当在activity设置viewPager + BottomNavigation + fragment时， + * 为防止viewPager左滑动切换界面，与fragment左滑返回上一界面冲突引起闪退问题， + * 必须加上此方法，禁止fragment左滑返回上一界面。 + * + * 切记！切记！切记！否则会闪退！ + * + * 当在fragment设置viewPager + BottomNavigation + fragment时，则不会出现这个问题。 + */ + @Override + protected boolean canDragBack() { + return false; + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/icon_deviceinformation.xml b/app/src/main/res/drawable/icon_deviceinformation.xml new file mode 100644 index 00000000..df1e451c --- /dev/null +++ b/app/src/main/res/drawable/icon_deviceinformation.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/icon_networkmanagement.xml b/app/src/main/res/drawable/icon_networkmanagement.xml new file mode 100644 index 00000000..6b0bfd01 --- /dev/null +++ b/app/src/main/res/drawable/icon_networkmanagement.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/icon_seasoningsettings.xml b/app/src/main/res/drawable/icon_seasoningsettings.xml new file mode 100644 index 00000000..2b8d3775 --- /dev/null +++ b/app/src/main/res/drawable/icon_seasoningsettings.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/icon_systemsettings.xml b/app/src/main/res/drawable/icon_systemsettings.xml new file mode 100644 index 00000000..1d244591 --- /dev/null +++ b/app/src/main/res/drawable/icon_systemsettings.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_sz.xml b/app/src/main/res/layout/activity_sz.xml index 0ef1357f..3bf83ab8 100644 --- a/app/src/main/res/layout/activity_sz.xml +++ b/app/src/main/res/layout/activity_sz.xml @@ -12,17 +12,25 @@ android:id="@+id/topbar" android:layout_width="match_parent" android:layout_height="?attr/qmui_topbar_height"/> - - - - - - + android:background="@color/qmui_config_color_white" + android:orientation="vertical"> + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_wh.xml b/app/src/main/res/layout/activity_wh.xml index 10a41187..6b7e5501 100644 --- a/app/src/main/res/layout/activity_wh.xml +++ b/app/src/main/res/layout/activity_wh.xml @@ -11,17 +11,26 @@ android:id="@+id/topbar" android:layout_width="match_parent" android:layout_height="?attr/qmui_topbar_height"/> - - - - - - + android:background="@color/qmui_config_color_white" + android:orientation="vertical"> + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home1.xml b/app/src/main/res/layout/fragment_home1.xml index e663512f..c6934cf0 100644 --- a/app/src/main/res/layout/fragment_home1.xml +++ b/app/src/main/res/layout/fragment_home1.xml @@ -275,11 +275,12 @@ android:orientation="vertical"> + + android:layout_centerInParent="true" + android:src="@mipmap/zhanting" /> + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_system_cs_jr.xml b/app/src/main/res/layout/fragment_system_cs_jr.xml new file mode 100644 index 00000000..1f3ab921 --- /dev/null +++ b/app/src/main/res/layout/fragment_system_cs_jr.xml @@ -0,0 +1,19 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_system_cs_tl.xml b/app/src/main/res/layout/fragment_system_cs_tl.xml new file mode 100644 index 00000000..9fafbde6 --- /dev/null +++ b/app/src/main/res/layout/fragment_system_cs_tl.xml @@ -0,0 +1,19 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_system_devicein.xml b/app/src/main/res/layout/fragment_system_devicein.xml new file mode 100644 index 00000000..c3d0058b --- /dev/null +++ b/app/src/main/res/layout/fragment_system_devicein.xml @@ -0,0 +1,19 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_system_internet.xml b/app/src/main/res/layout/fragment_system_internet.xml new file mode 100644 index 00000000..448d2db5 --- /dev/null +++ b/app/src/main/res/layout/fragment_system_internet.xml @@ -0,0 +1,19 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_system_seasoningset.xml b/app/src/main/res/layout/fragment_system_seasoningset.xml new file mode 100644 index 00000000..524a3616 --- /dev/null +++ b/app/src/main/res/layout/fragment_system_seasoningset.xml @@ -0,0 +1,19 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_system_systemset.xml b/app/src/main/res/layout/fragment_system_systemset.xml new file mode 100644 index 00000000..83f6d9e1 --- /dev/null +++ b/app/src/main/res/layout/fragment_system_systemset.xml @@ -0,0 +1,19 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/menu/maintenance.xml b/app/src/main/res/menu/maintenance.xml new file mode 100644 index 00000000..1ca40e54 --- /dev/null +++ b/app/src/main/res/menu/maintenance.xml @@ -0,0 +1,15 @@ + + + + + + + + + diff --git a/app/src/main/res/menu/system.xml b/app/src/main/res/menu/system.xml new file mode 100644 index 00000000..19d00567 --- /dev/null +++ b/app/src/main/res/menu/system.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-xhdpi/cssz.png b/app/src/main/res/mipmap-xhdpi/cssz.png new file mode 100644 index 00000000..640c9d4c Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/cssz.png differ diff --git a/app/src/main/res/mipmap-xhdpi/cssz_selected.png b/app/src/main/res/mipmap-xhdpi/cssz_selected.png new file mode 100644 index 00000000..8ccac994 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/cssz_selected.png differ diff --git a/app/src/main/res/mipmap-xhdpi/sbxx.png b/app/src/main/res/mipmap-xhdpi/sbxx.png new file mode 100644 index 00000000..5ef1c318 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/sbxx.png differ diff --git a/app/src/main/res/mipmap-xhdpi/sbxx_selected.png b/app/src/main/res/mipmap-xhdpi/sbxx_selected.png new file mode 100644 index 00000000..da440f90 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/sbxx_selected.png differ diff --git a/app/src/main/res/mipmap-xhdpi/wl.png b/app/src/main/res/mipmap-xhdpi/wl.png new file mode 100644 index 00000000..2bb572be Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/wl.png differ diff --git a/app/src/main/res/mipmap-xhdpi/wl_selected.png b/app/src/main/res/mipmap-xhdpi/wl_selected.png new file mode 100644 index 00000000..b1c61222 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/wl_selected.png differ diff --git a/app/src/main/res/mipmap-xhdpi/xtsz.png b/app/src/main/res/mipmap-xhdpi/xtsz.png new file mode 100644 index 00000000..382a4b24 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/xtsz.png differ diff --git a/app/src/main/res/mipmap-xhdpi/xtsz_selected.png b/app/src/main/res/mipmap-xhdpi/xtsz_selected.png new file mode 100644 index 00000000..0ccad969 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/xtsz_selected.png differ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c5bf461a..5c2857b0 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -13,4 +13,10 @@ 示例图片 + + 网络管理 + 设备信息 + 系统设置 + 调料设置 +