refactor(更新)

- 界面名称修改
- 欢迎界面完成

app/src/main/AndroidManifest.xml

@@ -36,7 +36,7 @@
         android:theme="@style/Theme.ISCS_BASE_APP"
         tools:targetApi="31">
         <activity
-            android:name=".features.login.activity.LoginActivity"
+            android:name=".features.splash.activity.SplashActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -44,9 +44,14 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity android:name=".features.init.activity.InitActivity" />
+        <activity
+            android:name=".features.login.activity.LoginActivity"
+            android:exported="true" />
         <activity
             android:name=".features.main.activity.MainActivity"
             android:exported="true" />
+
         <receiver
             android:name=".receivers.BootReceiver"
             android:enabled="true"

app/src/main/java/com/grkj/iscs/features/init/activity/InitActivity.kt

@@ -0,0 +1,20 @@
+package com.grkj.iscs.features.init.activity
+
+import com.grkj.iscs.R
+import com.grkj.iscs.databinding.ActivityInitBinding
+import com.grkj.ui_base.base.BaseActivity
+
+/**
+ * 初始化
+ */
+class InitActivity: BaseActivity<ActivityInitBinding>() {
+
+    override fun navHostFragmentId() = R.id.nav_host_fragment
+    override fun getLayoutId(): Int {
+        return R.layout.activity_init
+    }
+
+    override fun initView() {
+
+    }
+}

app/src/main/java/com/grkj/iscs/features/init/fragment/InitCardRegistrationFragment.kt

@@ -0,0 +1,18 @@
+package com.grkj.iscs.features.init.fragment
+
+import com.grkj.iscs.R
+import com.grkj.iscs.databinding.FragmentInitCardRegistrationBinding
+import com.grkj.ui_base.base.BaseFragment
+
+/**
+ * 卡片录入
+ */
+class InitCardRegistrationFragment: BaseFragment<FragmentInitCardRegistrationBinding>() {
+    override fun getLayoutId(): Int {
+        return R.layout.fragment_init_card_registration
+    }
+
+    override fun initView() {
+
+    }
+}

app/src/main/java/com/grkj/iscs/features/init/fragment/InitDeviceRegistrationKeyAndLockFragment.kt

@@ -0,0 +1,18 @@
+package com.grkj.iscs.features.init.fragment
+
+import com.grkj.iscs.R
+import com.grkj.iscs.databinding.FragmentInitDeviceRegistrationKeyAndLockBinding
+import com.grkj.ui_base.base.BaseFragment
+
+/**
+ * 钥匙和挂锁的识别检测
+ */
+class InitDeviceRegistrationKeyAndLockFragment: BaseFragment<FragmentInitDeviceRegistrationKeyAndLockBinding>() {
+    override fun getLayoutId(): Int {
+        return R.layout.fragment_init_device_registration_key_and_lock
+    }
+
+    override fun initView() {
+
+    }
+}

app/src/main/java/com/grkj/iscs/features/init/fragment/InitPointRfidRegistrationFragment.kt

@@ -0,0 +1,18 @@
+package com.grkj.iscs.features.init.fragment
+
+import com.grkj.iscs.R
+import com.grkj.iscs.databinding.FragmentInitPointRfidRegistrationBinding
+import com.grkj.ui_base.base.BaseFragment
+
+/**
+ * 点位rfid录入
+ */
+class InitPointRfidRegistrationFragment: BaseFragment<FragmentInitPointRfidRegistrationBinding>() {
+    override fun getLayoutId(): Int {
+        return R.layout.fragment_init_point_rfid_registration
+    }
+
+    override fun initView() {
+
+    }
+}

app/src/main/java/com/grkj/iscs/features/init/fragment/InitSetAdminAccountFragment.kt

@@ -0,0 +1,24 @@
+package com.grkj.iscs.features.init.fragment
+
+import androidx.fragment.app.viewModels
+import com.grkj.iscs.R
+import com.grkj.iscs.databinding.FragmentInitSetAdminAccountBinding
+import com.grkj.iscs.features.init.viewmodel.InitViewModel
+import com.grkj.ui_base.base.BaseFragment
+import dagger.hilt.android.AndroidEntryPoint
+
+/**
+ * 设置管理员账号
+ */
+@AndroidEntryPoint
+class InitSetAdminAccountFragment : BaseFragment<FragmentInitSetAdminAccountBinding>() {
+    private val viewModel: InitViewModel by viewModels()
+
+    override fun getLayoutId(): Int {
+        return R.layout.fragment_init_set_admin_account
+    }
+
+    override fun initView() {
+        viewModel.removeAdminUser().observe(this) { }
+    }
+}

app/src/main/java/com/grkj/iscs/features/init/fragment/InitSetRemoteServerFragment.kt

@@ -0,0 +1,18 @@
+package com.grkj.iscs.features.init.fragment
+
+import com.grkj.iscs.R
+import com.grkj.iscs.databinding.FragmentInitSetRemoteServerBinding
+import com.grkj.ui_base.base.BaseFragment
+
+/**
+ * 服务器配置
+ */
+class InitSetRemoteServerFragment: BaseFragment<FragmentInitSetRemoteServerBinding>() {
+    override fun getLayoutId(): Int {
+        return R.layout.fragment_init_set_remote_server
+    }
+
+    override fun initView() {
+
+    }
+}

app/src/main/java/com/grkj/iscs/features/init/fragment/InitWelcomeFragment.kt

@@ -0,0 +1,21 @@
+package com.grkj.iscs.features.init.fragment
+
+import com.grkj.iscs.R
+import com.grkj.iscs.databinding.FragmentInitWelcomeBinding
+import com.grkj.ui_base.base.BaseFragment
+import com.sik.sikcore.extension.setDebouncedClickListener
+
+/**
+ * 初始化欢迎界面
+ */
+class InitWelcomeFragment : BaseFragment<FragmentInitWelcomeBinding>() {
+    override fun getLayoutId(): Int {
+        return R.layout.fragment_init_welcome
+    }
+
+    override fun initView() {
+        binding.startBtn.setDebouncedClickListener {
+            navController.navigate(R.id.action_initWelcomeFragment_to_initSetAdminAccountFragment)
+        }
+    }
+}

app/src/main/java/com/grkj/iscs/features/init/viewmodel/InitViewModel.kt

@@ -0,0 +1,25 @@
+package com.grkj.iscs.features.init.viewmodel
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.liveData
+import com.grkj.data.repository.IUserRepository
+import com.grkj.ui_base.base.BaseViewModel
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.Dispatchers
+import javax.inject.Inject
+
+/**
+ * 初始化数据存储
+ */
+@HiltViewModel
+class InitViewModel @Inject constructor(val userRepository: IUserRepository) : BaseViewModel() {
+    /**
+     * 移除超级管理员用户
+     */
+    fun removeAdminUser(): LiveData<Boolean> {
+        return liveData(Dispatchers.IO) {
+            userRepository.removeAdminUser()
+            emit(true)
+        }
+    }
+}

app/src/main/java/com/grkj/iscs/features/login/activity/LoginActivity.kt

@@ -7,10 +7,8 @@ import android.view.KeyEvent
 import android.widget.LinearLayout
 import androidx.activity.viewModels
 import androidx.core.view.isVisible
-import androidx.lifecycle.ViewModelProvider
 import com.drake.brv.BindingAdapter
 import com.drake.brv.annotaion.DividerOrientation
-import com.drake.brv.annotaion.ItemOrientation
 import com.drake.brv.utils.divider
 import com.drake.brv.utils.grid
 import com.drake.brv.utils.linear
@@ -142,7 +140,6 @@ class LoginActivity : BaseActivity<ActivityLoginBinding>() {
     override fun onResume() {
         super.onResume()
         MainDomainData.clear()
-        viewModel.checkSysMenu().observe(this){}
         FingerprintUtil.init(this)
         FingerprintUtil.start()
         FingerprintUtil.setScanListener(object : FingerprintUtil.OnScanListener {

app/src/main/java/com/grkj/iscs/features/login/viewmodel/LoginViewModel.kt

@@ -15,7 +15,6 @@ import javax.inject.Inject
 @HiltViewModel
 class LoginViewModel @Inject constructor(
     val userRepository: IUserRepository,
-    val sysMenuRepository: ISysMenuRepository
 ) : BaseViewModel() {
 
     /**
@@ -70,14 +69,4 @@ class LoginViewModel @Inject constructor(
             emit(logoutSuccess)
         }
     }
-
-    /**
-     * 检查菜单
-     */
-    fun checkSysMenu(): LiveData<Boolean> {
-        return liveData(Dispatchers.IO) {
-            sysMenuRepository.checkSysMenu()
-            emit(true)
-        }
-    }
 }

app/src/main/java/com/grkj/iscs/features/main/activity/MainActivity.kt

@@ -9,16 +9,16 @@ import androidx.activity.viewModels
 import androidx.core.view.get
 import androidx.core.view.isNotEmpty
 import androidx.core.view.isVisible
+import com.grkj.data.data.EventConstants
 import com.grkj.data.data.MainDomainData
 import com.grkj.data.enums.RoleFunctionalPermissionsEnum
 import com.grkj.data.model.local.TabConfig
 import com.grkj.iscs.R
 import com.grkj.iscs.databinding.ActivityMainBinding
+import com.grkj.iscs.features.login.activity.LoginActivity
 import com.grkj.iscs.features.main.viewmodel.MainViewModel
 import com.grkj.shared.model.EventBean
 import com.grkj.ui_base.base.BaseActivity
-import com.grkj.data.data.EventConstants
-import com.grkj.iscs.features.login.activity.LoginActivity
 import com.grkj.ui_base.utils.event.BottomNavVisibilityEvent
 import com.grkj.ui_base.utils.extension.toByteArrays
 import com.grkj.ui_base.utils.extension.toHexStrings
@@ -69,7 +69,6 @@ class MainActivity() : BaseActivity<ActivityMainBinding>() {
         ),
     )
 
-    override fun enableNavigation() = true
     override fun navHostFragmentId() = R.id.nav_host_fragment
     override fun getLayoutId(): Int {
         return R.layout.activity_main
@@ -77,37 +76,65 @@ class MainActivity() : BaseActivity<ActivityMainBinding>() {
 
     override fun initView() {
         binding.nickname.text = MainDomainData.userInfo?.nickName ?: ""
-        binding.bottomNav.isItemActiveIndicatorEnabled = false
-        binding.bottomNav.menu.clear()
-        tabConfigs.forEachIndexed { index, cfg ->
-            if (MainDomainData.permissions.contains(cfg.permission)) {
-                binding.bottomNav.menu.add(Menu.NONE, cfg.id, index, cfg.title).setIcon(cfg.icon)
-            }
+        // 1. 拆出两个可选控件
+        val bottomNav = binding.bottomNav
+        val navRail = binding.navRail
+        // 2. 清空原有菜单
+        bottomNav?.let {
+            it.isItemActiveIndicatorEnabled = false
+            it.menu.clear()
+        }
+        navRail?.let {
+            it.isItemActiveIndicatorEnabled = false
+            it.menu.clear()
         }
 
-        // 构造 map: menuItemId -> navGraphId
-        val graphMap = tabConfigs.filter { binding.bottomNav.menu.findItem(it.id) != null }
-            .associate { it.id to it.graphRes }
-        // 把 BottomNavigationView 和 NavController 绑定
-        setupBottomNavigation(binding.bottomNav, graphMap)
+        bottomNav?.let {
+            tabConfigs.forEachIndexed { index, cfg ->
+                if (MainDomainData.permissions.contains(cfg.permission)) {
+                    bottomNav.menu.add(Menu.NONE, cfg.id, index, cfg.title).setIcon(cfg.icon)
+                }
+            }
+            // 构造 map: menuItemId -> navGraphId
+            val graphMap = tabConfigs.filter { bottomNav.menu.findItem(it.id) != null }
+                .associate { it.id to it.graphRes }
+            setupBottomNavigation(it, graphMap)
+            // 默认选中第一个
+            if (bottomNav.menu.isNotEmpty()) {
+                val firstId = bottomNav.menu[0].itemId
+                bottomNav.selectedItemId = firstId
+            }
+        }
+        navRail?.let {
+            tabConfigs.forEachIndexed { index, cfg ->
+                if (MainDomainData.permissions.contains(cfg.permission)) {
+                    navRail.menu.add(Menu.NONE, cfg.id, index, cfg.title).setIcon(cfg.icon)
+                }
+            }
+            val graphMap = tabConfigs.filter { navRail.menu.findItem(it.id) != null }
+                .associate { it.id to it.graphRes }
+            setupBottomNavigation(it, graphMap)
+            // 默认选中第一个
+            if (navRail.menu.isNotEmpty()) {
+                val firstId = navRail.menu[0].itemId
+                navRail.selectedItemId = firstId
+            }
+        }
         binding.nickname.setOnClickListener {
             if (MainDomainData.permissions.contains(RoleFunctionalPermissionsEnum.USER_INFO_HOME.functionalPermission)) {
-                binding.bottomNav.isVisible = true
+                bottomNav?.isVisible = true
+                navRail?.isVisible = true
                 replaceNavGraph(R.navigation.nav_user_info)
             }
         }
-        // 默认选中第一个
-        if (binding.bottomNav.menu.isNotEmpty()) {
-            val firstId = binding.bottomNav.menu[0].itemId
-            binding.bottomNav.selectedItemId = firstId
-        }
     }
 
     override fun onEvent(event: EventBean<Any>) {
         super.onEvent(event)
         when (event.code) {
             EventConstants.EVENT_BOTTOM_NAV_VISIBILITY -> {
-                binding.bottomNav.isVisible = (event.data as BottomNavVisibilityEvent).show
+                binding.bottomNav?.isVisible = (event.data as BottomNavVisibilityEvent).show
+                binding.navRail?.isVisible = (event.data as BottomNavVisibilityEvent).show
             }
 
             EventConstants.EVENT_LOGOUT -> {

app/src/main/java/com/grkj/iscs/features/main/fragment/data_manage/DataManageHomeFragment.kt

@@ -1,5 +1,6 @@
 package com.grkj.iscs.features.main.fragment.data_manage
 
+import android.widget.LinearLayout
 import androidx.annotation.OptIn
 import com.drake.brv.BindingAdapter
 import com.drake.brv.annotaion.DividerOrientation
@@ -61,7 +62,7 @@ class DataManageHomeFragment : BaseFragment<FragmentDataManageHomeBinding>() {
     override fun initView() {
         binding.homeMenuRv.apply {
             if (isLandscape()) {
-                linear()
+                grid(9)
             } else {
                 grid(3)
             }

app/src/main/java/com/grkj/iscs/features/main/fragment/exception_manage/ExceptionManageHomeFragment.kt

@@ -1,5 +1,6 @@
 package com.grkj.iscs.features.main.fragment.exception_manage
 
+import android.widget.LinearLayout
 import com.drake.brv.BindingAdapter
 import com.drake.brv.annotaion.DividerOrientation
 import com.drake.brv.utils.dividerSpace
@@ -49,7 +50,7 @@ class ExceptionManageHomeFragment : BaseFragment<FragmentExceptionManageHomeBind
     override fun initView() {
         binding.homeMenuRv.apply {
             if (isLandscape()) {
-                linear()
+                grid(9)
             } else {
                 grid(3)
             }

app/src/main/java/com/grkj/iscs/features/main/fragment/hardware_manage/HardwareManageHomeFragment.kt

@@ -1,5 +1,6 @@
 package com.grkj.iscs.features.main.fragment.hardware_manage
 
+import android.widget.LinearLayout
 import com.drake.brv.BindingAdapter
 import com.drake.brv.annotaion.DividerOrientation
 import com.drake.brv.utils.dividerSpace
@@ -62,7 +63,7 @@ class HardwareManageHomeFragment : BaseFragment<FragmentHardwareManageHomeBindin
     override fun initView() {
         binding.homeMenuRv.apply {
             if (isLandscape()) {
-                linear()
+                grid(9)
             } else {
                 grid(3)
             }

app/src/main/java/com/grkj/iscs/features/main/fragment/job_manage/JobManageHomeFragment.kt

@@ -80,7 +80,7 @@ class JobManageHomeFragment : BaseFragment<FragmentJobManageHomeBinding>() {
     override fun initView() {
         binding.homeMenuRv.apply {
             if (isLandscape()) {
-                linear()
+                grid(9)
             } else {
                 grid(3)
             }

app/src/main/java/com/grkj/iscs/features/main/fragment/user_info/UserInfoHomeFragment.kt

@@ -74,7 +74,7 @@ class UserInfoHomeFragment : BaseFragment<FragmentUserInfoHomeBinding>() {
     override fun initView() {
         binding.homeMenuRv.apply {
             if (isLandscape()) {
-                linear()
+                grid(9)
             } else {
                 grid(3)
             }

app/src/main/java/com/grkj/iscs/features/splash/activity/SplashActivity.kt

@@ -0,0 +1,32 @@
+package com.grkj.iscs.features.splash.activity
+
+import android.content.Intent
+import androidx.activity.viewModels
+import com.grkj.data.data.MMKVConstants
+import com.grkj.iscs.R
+import com.grkj.iscs.databinding.ActivitySplashBinding
+import com.grkj.iscs.features.init.activity.InitActivity
+import com.grkj.iscs.features.login.activity.LoginActivity
+import com.grkj.iscs.features.splash.viewmodel.SplashViewModel
+import com.grkj.ui_base.base.BaseActivity
+import com.sik.sikcore.extension.getMMKVData
+import dagger.hilt.android.AndroidEntryPoint
+
+@AndroidEntryPoint
+class SplashActivity : BaseActivity<ActivitySplashBinding>() {
+    private val viewModel: SplashViewModel by viewModels()
+    override fun getLayoutId(): Int {
+        return R.layout.activity_splash
+    }
+
+    override fun initView() {
+        viewModel.checkSysMenuAndRole().observe(this){
+            val isAppInit = MMKVConstants.APP_INIT.getMMKVData(false)
+            if (isAppInit){
+                startActivity(Intent(this, LoginActivity::class.java))
+            }else{
+                startActivity(Intent(this, InitActivity::class.java))
+            }
+        }
+    }
+}

app/src/main/java/com/grkj/iscs/features/splash/viewmodel/SplashViewModel.kt

@@ -0,0 +1,26 @@
+package com.grkj.iscs.features.splash.viewmodel
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.liveData
+import com.grkj.data.repository.ISysMenuRepository
+import com.grkj.ui_base.base.BaseViewModel
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.Dispatchers
+import javax.inject.Inject
+
+@HiltViewModel
+class SplashViewModel @Inject constructor(
+    val sysMenuRepository: ISysMenuRepository
+) : BaseViewModel() {
+
+
+    /**
+     * 检查菜单和角色
+     */
+    fun checkSysMenuAndRole(): LiveData<Boolean> {
+        return liveData(Dispatchers.IO) {
+            sysMenuRepository.checkSysMenuAndRole()
+            emit(true)
+        }
+    }
+}

app/src/main/java/com/grkj/iscs/receivers/BootReceiver.kt

@@ -6,6 +6,7 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import com.grkj.iscs.features.login.activity.LoginActivity
+import com.grkj.iscs.features.splash.activity.SplashActivity
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import kotlin.apply
@@ -23,7 +24,7 @@ class BootReceiver : BroadcastReceiver() {
             logger.debug("接收到启动通知，开始启动应用")
             //开机2秒后启动程序
             val startAppIntent = Intent(
-                context, LoginActivity::class.java
+                context, SplashActivity::class.java
             ).apply {
                 flags = Intent.FLAG_ACTIVITY_NEW_TASK
             }

app/src/main/res/drawable/bg_card_white_r8.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/white" />
+    <corners android:radius="8dp" />
+</shape>

app/src/main/res/drawable/init_step_circle.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <size
+        android:width="@dimen/common_spacing"
+        android:height="@dimen/common_spacing" />
+    <solid android:color="@color/init_step_circle" />
+</shape>

app/src/main/res/layout-land/activity_main.xml

@@ -14,7 +14,6 @@
             android:id="@+id/header_layout"
             android:layout_width="match_parent"
             android:layout_height="@dimen/header_height"
-            android:layout_toRightOf="@+id/bottom_nav"
             android:paddingHorizontal="@dimen/common_spacing_small">
 
             <ImageView
@@ -61,7 +60,6 @@
             android:layout_width="match_parent"
             android:layout_height="@dimen/line_height"
             android:layout_below="@+id/header_layout"
-            android:layout_toRightOf="@+id/bottom_nav"
             android:background="@color/white30" />
 
         <androidx.fragment.app.FragmentContainerView
@@ -70,21 +68,22 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_below="@+id/header_line"
-            android:layout_toRightOf="@+id/bottom_nav"
+            android:layout_toRightOf="@+id/navRail"
             app:defaultNavHost="true"
             app:navGraph="@navigation/nav_home" />
 
-        <com.google.android.material.bottomnavigation.BottomNavigationView
-            android:id="@+id/bottom_nav"
-            android:layout_width="@dimen/home_bottom_nav_width"
+        <com.google.android.material.navigationrail.NavigationRailView
+            android:id="@+id/navRail"
+            android:layout_width="@dimen/home_bottom_nav_height"
+            android:layout_below="@+id/header_line"
             android:layout_height="match_parent"
-            android:background="@color/white80"
+            android:background="@color/white"
             android:textSize="@dimen/home_bottom_nav_text_size"
-            app:itemBackground="@color/white80"
+            app:itemBackground="@color/white"
             app:itemIconSize="@dimen/home_bottom_nav_icon_size"
             app:itemIconTint="@color/nav_item_color"
             app:itemTextColor="@color/nav_item_color"
             app:labelVisibilityMode="labeled"
-            tools:ignore="SmallSp" />
+            app:menuGravity="center" />
     </RelativeLayout>
 </layout>

app/src/main/res/layout-land/dialog_login.xml

@@ -3,8 +3,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <com.google.android.material.card.MaterialCardView
-        android:layout_width="248.5dp"
-        android:layout_height="219dp"
+        android:layout_width="497dp"
+        android:layout_height="438dp"
         android:gravity="center"
         app:cardBackgroundColor="@color/dialog_card_login_bg"
         app:strokeColor="@color/common_transparent">
@@ -16,19 +16,18 @@
             android:layout_gravity="center"
             android:gravity="center"
             android:orientation="vertical"
-            android:visibility="gone">
+            android:visibility="visible">
 
             <ImageView
                 android:id="@+id/iv_icon"
-                android:layout_width="150dp"
-                android:layout_height="150dp"
-                android:layout_marginBottom="2.5dp"
-                android:adjustViewBounds="false" />
+                android:layout_width="@dimen/dialog_common_root_height_normal"
+                android:layout_height="@dimen/dialog_common_root_height_normal"
+                android:layout_marginBottom="@dimen/common_spacing_small" />
 
             <TextView
                 android:id="@+id/tv_tip"
                 style="@style/CommonTextView"
-                android:textSize="@dimen/common_text_size_land" />
+                android:textSize="@dimen/common_text_size_big" />
         </LinearLayout>
 
         <FrameLayout
@@ -49,44 +48,44 @@
             android:layout_gravity="center"
             android:gravity="center"
             android:orientation="vertical"
-            android:padding="@dimen/common_spacing">
+            android:padding="@dimen/common_spacing_2x">
 
             <EditText
                 android:id="@+id/et_account"
-                style="@style/CommonEdit_land"
+                style="@style/CommonEdit"
                 android:layout_width="match_parent"
-                android:layout_height="34dp"
-                android:layout_marginBottom="@dimen/common_spacing_small"
+                android:layout_height="68dp"
+                android:layout_marginBottom="@dimen/common_spacing"
                 android:hint="@string/please_input_account"
-                android:textSize="12.5sp" />
+                android:textSize="25sp" />
 
             <EditText
                 android:id="@+id/et_password"
-                style="@style/CommonEdit_land"
+                style="@style/CommonEdit"
                 android:layout_width="match_parent"
-                android:layout_height="34dp"
-                android:layout_marginBottom="@dimen/common_spacing_small"
+                android:layout_height="68dp"
+                android:layout_marginBottom="@dimen/common_spacing"
                 android:hint="@string/please_input_password"
                 android:inputType="textPassword"
-                android:textSize="12.5sp" />
+                android:textSize="25sp" />
 
             <TextView
                 android:id="@+id/tv_login"
-                style="@style/CommonBtn_land"
+                style="@style/CommonBtn"
                 android:layout_width="match_parent"
-                android:layout_height="30dp"
-                android:layout_marginBottom="@dimen/common_spacing_small"
+                android:layout_height="60dp"
+                android:layout_marginBottom="@dimen/common_spacing"
                 android:text="@string/login"
-                android:textSize="12.5sp" />
+                android:textSize="25sp" />
 
             <TextView
                 android:id="@+id/tv_cancel"
-                style="@style/CommonBtn_land"
+                style="@style/CommonBtn"
                 android:layout_width="match_parent"
-                android:layout_height="30dp"
+                android:layout_height="60dp"
                 android:background="@drawable/white_stroke_bg"
                 android:text="@string/cancel"
-                android:textSize="12.5sp" />
+                android:textSize="25sp" />
         </LinearLayout>
     </com.google.android.material.card.MaterialCardView>
 </layout>

app/src/main/res/layout-land/fragment_home.xml

@@ -15,14 +15,14 @@
             android:layout_marginTop="@dimen/common_spacing_2x"
             android:text="@string/loto"
             android:textColor="@color/white"
-            android:textSize="@dimen/common_btn_text_size"
+            android:textSize="50sp"
             android:textStyle="bold" />
 
         <FrameLayout
             android:layout_width="match_parent"
-            android:layout_height="90dp"
-            android:layout_marginHorizontal="@dimen/common_spacing"
-            android:layout_marginTop="@dimen/common_spacing_2x"
+            android:layout_height="180dp"
+            android:layout_marginHorizontal="@dimen/common_spacing_2x"
+            android:layout_marginTop="@dimen/common_spacing"
             android:background="@drawable/home_card_bg">
 
             <androidx.recyclerview.widget.RecyclerView
@@ -30,15 +30,15 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:layout_gravity="center_vertical"
-                android:layout_margin="@dimen/common_spacing"
+                android:layout_margin="@dimen/common_spacing_2x"
                 tools:listitem="@layout/item_home_quick_entrance" />
         </FrameLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginHorizontal="@dimen/common_spacing"
-            android:layout_marginVertical="@dimen/common_spacing_2x"
+            android:layout_marginHorizontal="@dimen/common_spacing_2x"
+            android:layout_marginVertical="@dimen/common_spacing"
             android:divider="@drawable/common_divider_large_space_grid_land"
             android:orientation="vertical"
             android:showDividers="middle">
@@ -56,10 +56,10 @@
                     android:layout_height="wrap_content"
                     android:background="@color/home_card_title_bg"
                     android:paddingVertical="@dimen/common_spacing_small"
-                    android:paddingLeft="@dimen/common_spacing_small"
+                    android:paddingLeft="@dimen/common_spacing"
                     android:text="@string/home_realtime_data_title"
                     android:textColor="@color/white"
-                    android:textSize="12sp" />
+                    android:textSize="24sp" />
 
                 <LinearLayout
                     android:id="@+id/realtime_data_filter_layout"
@@ -67,7 +67,7 @@
                     android:layout_height="wrap_content"
                     android:gravity="center_vertical"
                     android:orientation="horizontal"
-                    android:padding="@dimen/common_spacing_small">
+                    android:padding="@dimen/common_spacing">
 
                     <LinearLayout
                         android:layout_width="wrap_content"
@@ -79,19 +79,19 @@
                             android:layout_height="wrap_content"
                             android:text="@string/zone"
                             android:textColor="@color/black"
-                            android:textSize="11sp" />
+                            android:textSize="22sp" />
 
                         <TextView
                             android:id="@+id/real_time_data_zone"
-                            android:layout_width="180dp"
+                            android:layout_width="230dp"
                             android:layout_height="wrap_content"
-                            android:layout_marginLeft="@dimen/common_spacing_small"
-                            android:background="@drawable/bg_common_input_land"
+                            android:layout_marginLeft="@dimen/common_spacing"
+                            android:background="@drawable/bg_common_input"
                             android:drawableRight="@drawable/icon_drop_down"
                             android:gravity="center_vertical"
-                            android:paddingHorizontal="@dimen/common_spacing_small"
-                            android:paddingVertical="@dimen/divider_line_space"
-                            android:textSize="11sp" />
+                            android:paddingHorizontal="@dimen/common_spacing"
+                            android:paddingVertical="2dp"
+                            android:textSize="22sp" />
                     </LinearLayout>
 
                     <LinearLayout
@@ -106,37 +106,37 @@
                             android:layout_height="wrap_content"
                             android:text="@string/lock_mode"
                             android:textColor="@color/black"
-                            android:textSize="11sp" />
+                            android:textSize="22sp" />
 
                         <TextView
                             android:id="@+id/lock_mode"
-                            android:layout_width="180dp"
+                            android:layout_width="230dp"
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="@dimen/common_spacing"
-                            android:background="@drawable/bg_common_input_land"
+                            android:background="@drawable/bg_common_input"
                             android:drawableRight="@drawable/icon_drop_down"
                             android:gravity="center_vertical"
-                            android:paddingHorizontal="@dimen/common_spacing_small"
-                            android:paddingVertical="@dimen/divider_line_space"
-                            android:textSize="11sp" />
+                            android:paddingHorizontal="@dimen/common_spacing"
+                            android:paddingVertical="2dp"
+                            android:textSize="22sp" />
                     </LinearLayout>
                 </LinearLayout>
 
                 <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="40dp"
-                    android:layout_marginBottom="@dimen/common_spacing_small"
-                    android:divider="@drawable/common_divider_normal_space_horizontal_land"
+                    android:layout_height="80dp"
+                    android:layout_marginBottom="@dimen/common_spacing"
+                    android:layout_marginTop="@dimen/common_spacing_2x"
+                    android:divider="@drawable/common_divider_normal_space_horizontal"
                     android:orientation="horizontal"
-                    android:layout_marginTop="@dimen/common_spacing"
-                    android:paddingHorizontal="@dimen/common_spacing_small"
+                    android:paddingHorizontal="@dimen/common_spacing"
                     android:showDividers="middle">
 
                     <LinearLayout
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
                         android:layout_weight="1"
-                        android:divider="@drawable/common_divider_small_space_horizontal_land"
+                        android:divider="@drawable/common_divider_small_space_horizontal"
                         android:gravity="center_vertical"
                         android:orientation="horizontal"
                         android:showDividers="middle">
@@ -148,7 +148,7 @@
                             android:gravity="center"
                             android:text="@string/ongoing_job_tv"
                             android:textColor="@color/black"
-                            android:textSize="11sp" />
+                            android:textSize="22sp" />
 
                         <TextView
                             android:id="@+id/ongoing_job_num"
@@ -161,14 +161,14 @@
                             android:padding="@dimen/common_spacing"
                             android:text="2"
                             android:textColor="@color/black"
-                            android:textSize="15sp" />
+                            android:textSize="30sp" />
                     </LinearLayout>
 
                     <LinearLayout
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
                         android:layout_weight="1"
-                        android:divider="@drawable/common_divider_small_space_horizontal_land"
+                        android:divider="@drawable/common_divider_small_space_horizontal"
                         android:gravity="center_vertical"
                         android:orientation="horizontal"
                         android:showDividers="middle">
@@ -180,7 +180,7 @@
                             android:gravity="center"
                             android:text="@string/locked_points_tv"
                             android:textColor="@color/black"
-                            android:textSize="11sp" />
+                            android:textSize="22sp" />
 
                         <TextView
                             android:id="@+id/locked_points_num"
@@ -193,14 +193,14 @@
                             android:padding="@dimen/common_spacing"
                             android:text="2"
                             android:textColor="@color/black"
-                            android:textSize="15sp" />
+                            android:textSize="30sp" />
                     </LinearLayout>
 
                     <LinearLayout
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
                         android:layout_weight="1"
-                        android:divider="@drawable/common_divider_small_space_horizontal_land"
+                        android:divider="@drawable/common_divider_small_space_horizontal"
                         android:gravity="center_vertical"
                         android:orientation="horizontal"
                         android:showDividers="middle">
@@ -212,7 +212,7 @@
                             android:gravity="center"
                             android:text="@string/hardware_in_use_tv"
                             android:textColor="@color/black"
-                            android:textSize="11sp" />
+                            android:textSize="22sp" />
 
                         <TextView
                             android:id="@+id/hardware_in_use_num"
@@ -225,7 +225,7 @@
                             android:padding="@dimen/common_spacing"
                             android:text="2"
                             android:textColor="@color/black"
-                            android:textSize="15sp" />
+                            android:textSize="30sp" />
                     </LinearLayout>
                 </LinearLayout>
 
@@ -242,11 +242,11 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:background="@color/home_card_title_bg"
-                    android:paddingVertical="2.5dp"
-                    android:paddingLeft="@dimen/common_spacing_small"
+                    android:paddingVertical="@dimen/common_spacing_small"
+                    android:paddingLeft="@dimen/common_spacing"
                     android:text="@string/home_overview_data_title"
                     android:textColor="@color/white"
-                    android:textSize="12sp" />
+                    android:textSize="24sp" />
 
                 <LinearLayout
                     android:id="@+id/overview_data_filter_layout"
@@ -254,11 +254,11 @@
                     android:layout_height="wrap_content"
                     android:layout_below="@+id/overview_data_title"
                     android:gravity="center_vertical"
-                    android:orientation="vertical"
-                    android:padding="@dimen/common_spacing_small">
+                    android:orientation="horizontal"
+                    android:padding="@dimen/common_spacing">
 
                     <LinearLayout
-                        android:layout_width="match_parent"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:orientation="horizontal">
 
@@ -267,45 +267,45 @@
                             android:layout_height="wrap_content"
                             android:text="@string/time_frame_tv"
                             android:textColor="@color/black"
-                            android:textSize="11sp" />
+                            android:textSize="22sp" />
 
                         <TextView
                             android:id="@+id/start_time"
                             android:layout_width="210dp"
                             android:layout_height="wrap_content"
-                            android:layout_marginLeft="@dimen/common_spacing_small"
-                            android:background="@drawable/bg_common_input_land"
+                            android:layout_marginLeft="@dimen/common_spacing"
+                            android:background="@drawable/bg_common_input"
                             android:gravity="center_vertical"
                             android:paddingHorizontal="@dimen/common_spacing"
-                            android:paddingVertical="@dimen/common_spacing_small"
-                            android:textSize="11sp"
+                            android:paddingVertical="2dp"
+                            android:textSize="22sp"
                             tools:text="2025-04-01 12:00" />
 
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_marginLeft="2.5dp"
+                            android:layout_marginLeft="@dimen/common_spacing_small"
                             android:gravity="center_vertical"
                             android:text="-"
-                            android:textSize="11sp" />
+                            android:textSize="22sp" />
 
                         <TextView
                             android:id="@+id/end_time"
                             android:layout_width="210dp"
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="@dimen/common_spacing_small"
-                            android:background="@drawable/bg_common_input_land"
+                            android:background="@drawable/bg_common_input"
                             android:gravity="center_vertical"
-                            android:paddingHorizontal="@dimen/common_spacing_small"
-                            android:paddingVertical="2.5dp"
-                            android:textSize="11sp"
+                            android:paddingHorizontal="@dimen/common_spacing"
+                            android:paddingVertical="2dp"
+                            android:textSize="22sp"
                             tools:text="2025-04-01 12:00" />
                     </LinearLayout>
 
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/common_spacing_small"
+                        android:layout_marginLeft="@dimen/common_spacing"
                         android:gravity="center_vertical"
                         android:orientation="horizontal">
 
@@ -314,31 +314,31 @@
                             android:layout_height="wrap_content"
                             android:text="@string/zone"
                             android:textColor="@color/black"
-                            android:textSize="11sp" />
+                            android:textSize="22sp" />
 
                         <TextView
                             android:id="@+id/overview_data_zone"
-                            android:layout_width="210dp"
+                            android:layout_width="230dp"
                             android:layout_height="wrap_content"
-                            android:layout_marginLeft="@dimen/common_spacing_small"
-                            android:background="@drawable/bg_common_input_land"
+                            android:layout_marginLeft="@dimen/common_spacing"
+                            android:background="@drawable/bg_common_input"
                             android:drawableRight="@drawable/icon_drop_down"
                             android:gravity="center_vertical"
                             android:paddingHorizontal="@dimen/common_spacing"
                             android:paddingVertical="2dp"
-                            android:textSize="11sp" />
+                            android:textSize="22sp" />
                     </LinearLayout>
                 </LinearLayout>
 
                 <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="40dp"
+                    android:layout_height="80dp"
                     android:layout_below="@+id/overview_data_filter_layout"
-                    android:layout_marginBottom="@dimen/common_spacing_small"
-                    android:layout_marginTop="@dimen/common_spacing"
+                    android:layout_marginBottom="@dimen/common_spacing"
+                    android:layout_marginTop="@dimen/common_spacing_2x"
                     android:divider="@drawable/common_divider_normal_space_horizontal"
                     android:orientation="horizontal"
-                    android:paddingHorizontal="@dimen/common_spacing_small"
+                    android:paddingHorizontal="@dimen/common_spacing"
                     android:showDividers="middle">
 
                     <LinearLayout
@@ -357,7 +357,7 @@
                             android:gravity="center"
                             android:text="@string/all_job_tv"
                             android:textColor="@color/black"
-                            android:textSize="11sp" />
+                            android:textSize="22sp" />
 
                         <TextView
                             android:id="@+id/all_job_num"
@@ -367,10 +367,10 @@
                             android:background="@drawable/bg_home_card_num"
                             android:backgroundTint="@color/color_ffec99"
                             android:gravity="center"
-                            android:padding="@dimen/common_spacing_small"
+                            android:padding="@dimen/common_spacing"
                             android:text="2"
                             android:textColor="@color/black"
-                            android:textSize="15sp" />
+                            android:textSize="30sp" />
                     </LinearLayout>
 
                     <LinearLayout
@@ -389,7 +389,7 @@
                             android:gravity="center"
                             android:text="@string/all_points_tv"
                             android:textColor="@color/black"
-                            android:textSize="11sp" />
+                            android:textSize="22sp" />
 
                         <TextView
                             android:id="@+id/all_points_num"
@@ -399,10 +399,10 @@
                             android:background="@drawable/bg_home_card_num"
                             android:backgroundTint="@color/color_ffc9c9"
                             android:gravity="center"
-                            android:padding="@dimen/common_spacing_small"
+                            android:padding="@dimen/common_spacing"
                             android:text="2"
                             android:textColor="@color/black"
-                            android:textSize="15sp" />
+                            android:textSize="30sp" />
                     </LinearLayout>
 
                     <LinearLayout
@@ -421,7 +421,7 @@
                             android:gravity="center"
                             android:text="@string/all_hardware_tv"
                             android:textColor="@color/black"
-                            android:textSize="11sp" />
+                            android:textSize="22sp" />
 
                         <TextView
                             android:id="@+id/all_hardware_num"
@@ -431,10 +431,10 @@
                             android:background="@drawable/bg_home_card_num"
                             android:backgroundTint="@color/color_a5d8ff"
                             android:gravity="center"
-                            android:padding="@dimen/common_spacing_small"
+                            android:padding="@dimen/common_spacing"
                             android:text="2"
                             android:textColor="@color/black"
-                            android:textSize="15sp" />
+                            android:textSize="30sp" />
                     </LinearLayout>
                 </LinearLayout>
             </RelativeLayout>

app/src/main/res/layout-land/item_home_menu.xml

@@ -2,30 +2,30 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android">
 
     <LinearLayout
-        android:layout_width="80dp"
-        android:layout_height="80dp"
+        android:layout_width="160dp"
+        android:layout_height="160dp"
         android:gravity="center_horizontal"
         android:orientation="vertical">
 
         <FrameLayout
             android:id="@+id/home_menu_layout"
-            android:layout_width="60dp"
-            android:layout_height="60dp"
-            android:background="@drawable/bg_home_menu_item_land">
+            android:layout_width="120dp"
+            android:layout_height="120dp"
+            android:background="@drawable/bg_home_menu_item">
 
             <ImageView
                 android:id="@+id/home_menu_iv"
-                android:layout_width="50dp"
-                android:layout_height="50dp"
-                android:layout_gravity="center"/>
+                android:layout_width="100dp"
+                android:layout_height="100dp"
+                android:layout_gravity="center" />
         </FrameLayout>
 
         <TextView
             android:id="@+id/home_menu_tv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="2.5dp"
+            android:layout_marginTop="@dimen/common_spacing_small"
             android:textColor="@color/color_d7d2d2"
-            android:textSize="12.5sp" />
+            android:textSize="25sp" />
     </LinearLayout>
 </layout>

app/src/main/res/layout-land/item_home_quick_entrance.xml

@@ -3,20 +3,20 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <LinearLayout
-        android:layout_width="70dp"
-        android:layout_height="70dp"
+        android:layout_width="140dp"
+        android:layout_height="140dp"
         android:gravity="center_horizontal"
         android:orientation="vertical">
 
         <FrameLayout
-            android:layout_width="50dp"
-            android:layout_height="50dp"
+            android:layout_width="100dp"
+            android:layout_height="100dp"
             android:background="@drawable/bg_home_menu_item">
 
             <ImageView
                 android:id="@+id/home_menu_iv"
-                android:layout_width="40dp"
-                android:layout_height="40dp"
+                android:layout_width="80dp"
+                android:layout_height="80dp"
                 android:layout_gravity="center"
                 app:tint="@color/black" />
         </FrameLayout>
@@ -25,8 +25,8 @@
             android:id="@+id/home_menu_tv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="2.5dp"
+            android:layout_marginTop="@dimen/common_spacing_small"
             android:textColor="@color/black"
-            android:textSize="12sp" />
+            android:textSize="24sp" />
     </LinearLayout>
 </layout>

app/src/main/res/layout-land/item_login_method.xml

@@ -6,8 +6,8 @@
         android:layout_height="match_parent">
 
         <RelativeLayout
-            android:layout_width="100.5dp"
-            android:layout_height="113dp"
+            android:layout_width="201dp"
+            android:layout_height="226dp"
             android:layout_gravity="center"
             android:background="@drawable/bg_card_item_land">
 
@@ -16,29 +16,29 @@
                 android:layout_width="@dimen/common_spacing"
                 android:layout_height="@dimen/common_spacing"
                 android:layout_alignParentRight="true"
-                android:layout_marginTop="9.5dp"
-                android:layout_marginRight="7dp"
+                android:layout_marginTop="19dp"
+                android:layout_marginRight="14dp"
                 android:background="@drawable/login_tip_circle"
                 android:visibility="gone" />
 
             <ImageView
                 android:id="@+id/login_method_iv"
-                android:layout_width="60.5dp"
-                android:layout_height="60.5dp"
+                android:layout_width="121dp"
+                android:layout_height="121dp"
                 android:layout_centerHorizontal="true"
-                android:layout_marginTop="11.25dp"
+                android:layout_marginTop="22.5dp"
                 android:adjustViewBounds="false"
-                android:scaleType="center" />
+                android:scaleType="center"/>
 
             <TextView
                 android:id="@+id/login_method_tv"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_below="@+id/login_method_iv"
-                android:layout_marginTop="@dimen/common_spacing"
+                android:layout_marginTop="@dimen/common_spacing_2x"
                 android:gravity="center_horizontal"
                 android:textColor="@color/login_method_tv_color"
-                android:textSize="17.5sp" />
+                android:textSize="35sp" />
         </RelativeLayout>
     </FrameLayout>
 </layout>

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

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@mipmap/bg_main"
+        android:fitsSystemWindows="true">
+
+        <androidx.fragment.app.FragmentContainerView
+            android:id="@+id/nav_host_fragment"
+            android:name="androidx.navigation.fragment.NavHostFragment"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:padding="@dimen/common_spacing_2x"
+            app:defaultNavHost="true"
+            app:navGraph="@navigation/nav_init" />
+    </FrameLayout>
+</layout>

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

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@mipmap/bg_main"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:gravity="center"
+            android:orientation="vertical">
+
+            <ImageView
+                android:layout_width="300dp"
+                android:layout_height="100dp"
+                android:src="@mipmap/icon_logo" />
+
+            <com.grkj.ui_base.widget.ShadowTextView
+                android:id="@+id/title_cn"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:text="@string/loto"
+                android:textColor="@color/white"
+                android:textSize="@dimen/login_main_title_text_size"
+                android:textStyle="bold" />
+
+            <com.grkj.ui_base.widget.ShadowTextView
+                android:id="@+id/title_en"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginTop="@dimen/login_sub_title_margin_top"
+                android:text="@string/loto_en"
+                android:textColor="@color/white"
+                android:textSize="@dimen/login_sub_title_text_size"
+                android:textStyle="bold" />
+        </LinearLayout>
+
+
+        <TextView
+            android:id="@+id/tec_support"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_marginBottom="@dimen/login_tec_support_margin_bottom"
+            android:gravity="center_horizontal"
+            android:text="@string/tec_support"
+            android:textColor="@color/white"
+            android:textSize="@dimen/login_tec_support_text_size" />
+    </RelativeLayout>
+</layout>

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

@@ -209,7 +209,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/confirm"
                 android:textColor="@color/black"
@@ -220,7 +220,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/cancel"
                 android:textColor="@color/black"

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

@@ -214,7 +214,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/confirm"
                 android:textColor="@color/black"
@@ -225,7 +225,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/cancel"
                 android:textColor="@color/black"

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

@@ -86,7 +86,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/confirm"
                 android:textColor="@color/black"
@@ -97,7 +97,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/cancel"
                 android:textColor="@color/black"

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

@@ -214,7 +214,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/confirm"
                 android:textColor="@color/black"
@@ -225,7 +225,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/cancel"
                 android:textColor="@color/black"

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

@@ -155,7 +155,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/confirm"
                 android:textColor="@color/black"
@@ -166,7 +166,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/cancel"
                 android:textColor="@color/black"

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

@@ -186,7 +186,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/confirm"
                 android:textColor="@color/black"
@@ -197,7 +197,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/cancel"
                 android:textColor="@color/black"

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

@@ -209,7 +209,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/confirm"
                 android:textColor="@color/black"
@@ -220,7 +220,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/cancel"
                 android:textColor="@color/black"

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

@@ -214,7 +214,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/confirm"
                 android:textColor="@color/black"
@@ -225,7 +225,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/cancel"
                 android:textColor="@color/black"

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

@@ -36,9 +36,9 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
-                android:paddingHorizontal="@dimen/common_spacing_2x"
+                android:background="@drawable/common_btn"
                 android:text="@string/back"
+                android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
@@ -205,7 +205,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/common_spacing"
                         android:layout_marginRight="@dimen/common_spacing"
-                        android:background="@drawable/common_dialog_btn"
+                        android:background="@drawable/common_btn"
                         android:paddingHorizontal="@dimen/common_spacing_2x"
                         android:text="@string/select"
                         android:textColor="@color/black"
@@ -285,7 +285,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/common_spacing"
                         android:layout_marginRight="@dimen/common_spacing"
-                        android:background="@drawable/common_dialog_btn"
+                        android:background="@drawable/common_btn"
                         android:paddingHorizontal="@dimen/common_spacing_2x"
                         android:text="@string/select"
                         android:textColor="@color/black"
@@ -435,7 +435,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginRight="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/save_and_execute"
                 android:textColor="@color/black"
@@ -445,7 +445,7 @@
                 android:id="@+id/save"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/save"
                 android:textColor="@color/black"
@@ -456,7 +456,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/cancel"
                 android:textColor="@color/black"

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

@@ -36,7 +36,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/back"
                 android:textColor="@color/black"
@@ -203,7 +203,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/common_spacing"
                         android:layout_marginRight="@dimen/common_spacing"
-                        android:background="@drawable/common_dialog_btn"
+                        android:background="@drawable/common_btn"
                         android:paddingHorizontal="@dimen/common_spacing_2x"
                         android:text="@string/select"
                         android:textColor="@color/black"
@@ -284,7 +284,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/common_spacing"
                         android:layout_marginRight="@dimen/common_spacing"
-                        android:background="@drawable/common_dialog_btn"
+                        android:background="@drawable/common_btn"
                         android:paddingHorizontal="@dimen/common_spacing_2x"
                         android:text="@string/select"
                         android:textColor="@color/black"
@@ -422,7 +422,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/confirm"
                 android:textColor="@color/black"
@@ -433,7 +433,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/cancel"
                 android:textColor="@color/black"

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

@@ -36,7 +36,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/back"
                 android:textColor="@color/black"
@@ -270,7 +270,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/common_spacing"
                         android:layout_marginRight="@dimen/common_spacing"
-                        android:background="@drawable/common_dialog_btn"
+                        android:background="@drawable/common_btn"
                         android:paddingHorizontal="@dimen/common_spacing_2x"
                         android:text="@string/select"
                         android:textColor="@color/black"
@@ -402,7 +402,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginRight="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/save_and_execute"
                 android:textColor="@color/black"
@@ -412,7 +412,7 @@
                 android:id="@+id/save"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/save"
                 android:textColor="@color/black"
@@ -423,7 +423,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/cancel"
                 android:textColor="@color/black"

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

@@ -36,7 +36,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/back"
                 android:textColor="@color/black"
@@ -205,7 +205,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/common_spacing"
                         android:layout_marginRight="@dimen/common_spacing"
-                        android:background="@drawable/common_dialog_btn"
+                        android:background="@drawable/common_btn"
                         android:paddingHorizontal="@dimen/common_spacing_2x"
                         android:text="@string/select"
                         android:textColor="@color/black"
@@ -256,7 +256,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/common_spacing"
                         android:layout_marginRight="@dimen/common_spacing"
-                        android:background="@drawable/common_dialog_btn"
+                        android:background="@drawable/common_btn"
                         android:paddingHorizontal="@dimen/common_spacing_2x"
                         android:text="@string/select"
                         android:textColor="@color/black"
@@ -369,7 +369,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginRight="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/save_and_execute"
                 android:textColor="@color/black"
@@ -379,7 +379,7 @@
                 android:id="@+id/save"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/save"
                 android:textColor="@color/black"
@@ -390,7 +390,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/cancel"
                 android:textColor="@color/black"

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

@@ -36,7 +36,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/back"
                 android:textColor="@color/black"
@@ -205,7 +205,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/common_spacing"
                         android:layout_marginRight="@dimen/common_spacing"
-                        android:background="@drawable/common_dialog_btn"
+                        android:background="@drawable/common_btn"
                         android:paddingHorizontal="@dimen/common_spacing_2x"
                         android:text="@string/select"
                         android:textColor="@color/black"
@@ -257,7 +257,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/common_spacing"
                         android:layout_marginRight="@dimen/common_spacing"
-                        android:background="@drawable/common_dialog_btn"
+                        android:background="@drawable/common_btn"
                         android:paddingHorizontal="@dimen/common_spacing_2x"
                         android:text="@string/select"
                         android:textColor="@color/black"
@@ -365,7 +365,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/confirm"
                 android:textColor="@color/black"
@@ -376,7 +376,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/cancel"
                 android:textColor="@color/black"

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

@@ -36,7 +36,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/back"
                 android:textColor="@color/black"
@@ -246,7 +246,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/common_spacing"
                         android:layout_marginRight="@dimen/common_spacing"
-                        android:background="@drawable/common_dialog_btn"
+                        android:background="@drawable/common_btn"
                         android:paddingHorizontal="@dimen/common_spacing_2x"
                         android:text="@string/select"
                         android:textColor="@color/black"
@@ -354,7 +354,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginRight="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/save_and_execute"
                 android:textColor="@color/black"
@@ -364,7 +364,7 @@
                 android:id="@+id/save"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/save"
                 android:textColor="@color/black"
@@ -375,7 +375,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/cancel"
                 android:textColor="@color/black"

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

@@ -36,7 +36,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/back"
                 android:textColor="@color/black"

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

@@ -36,7 +36,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/back"
                 android:textColor="@color/black"

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+    </RelativeLayout>
+</layout>

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+    </RelativeLayout>
+</layout>

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+    </RelativeLayout>
+</layout>

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

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/step_tv"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:background="@drawable/init_step_circle"
+                android:gravity="center"
+                android:text="@string/init_set_admin_account_step"
+                android:textColor="@color/white"
+                android:textSize="@dimen/normal_text_size" />
+        </LinearLayout>
+    </RelativeLayout>
+</layout>

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+    </RelativeLayout>
+</layout>

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

@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@drawable/bg_card_white_r8">
+
+        <TextView
+            android:id="@+id/welcome_tip"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginLeft="120dp"
+            android:layout_marginTop="120dp"
+            android:text="@string/welcome_tip"
+            android:textColor="@color/black"
+            android:textSize="@dimen/login_sub_title_text_size"
+            android:textStyle="bold" />
+
+        <TextView
+            android:id="@+id/title_cn"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/welcome_tip"
+            android:layout_alignLeft="@+id/welcome_tip"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="@dimen/common_margin_spacing_big"
+            android:text="@string/loto"
+            android:textColor="@color/black"
+            android:textSize="@dimen/login_main_title_text_size"
+            android:textStyle="bold" />
+
+        <TextView
+            android:id="@+id/title_en"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/title_cn"
+            android:layout_alignLeft="@+id/title_cn"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="@dimen/login_sub_title_margin_top"
+            android:text="@string/loto_en"
+            android:textColor="@color/black"
+            android:textSize="@dimen/login_sub_title_text_size"
+            android:textStyle="bold" />
+
+
+        <TextView
+            android:id="@+id/start_tip"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_above="@+id/start_btn"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="@dimen/common_spacing_2x"
+            android:textSize="@dimen/common_btn_text_size"
+            android:text="@string/start_tip" />
+
+        <TextView
+            android:id="@+id/start_btn"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="100dp"
+            android:background="@drawable/common_btn"
+            android:paddingHorizontal="@dimen/common_spacing_2x"
+            android:text="@string/start"
+            android:textColor="@color/black"
+            android:textSize="@dimen/common_btn_text_size" />
+    </RelativeLayout>
+</layout>

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

@@ -38,7 +38,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/back"
                 android:textColor="@color/black"

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

@@ -36,7 +36,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/back"
                 android:textColor="@color/black"
@@ -60,7 +60,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/delete"
                 android:textColor="@color/black"

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

@@ -36,7 +36,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/back"
                 android:textColor="@color/black"

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

@@ -36,7 +36,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/back"
                 android:textColor="@color/black"
@@ -61,7 +61,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/insert"
                 android:textColor="@color/black"
@@ -73,7 +73,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/delete"
                 android:textColor="@color/black"
@@ -90,7 +90,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/filter"
                 android:textColor="@color/black"

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

@@ -38,7 +38,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/back"
                 android:textColor="@color/black"
@@ -167,7 +167,7 @@
                 android:id="@+id/confirm"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/confirm"
                 android:textColor="@color/black"
@@ -178,7 +178,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/cancel"
                 android:textColor="@color/black"

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

@@ -36,7 +36,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/back"
                 android:textColor="@color/black"
@@ -61,7 +61,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/insert"
                 android:textColor="@color/black"
@@ -73,7 +73,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/delete"
                 android:textColor="@color/black"
@@ -90,7 +90,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/filter"
                 android:textColor="@color/black"

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

@@ -60,7 +60,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/back"
                 android:textColor="@color/black"
@@ -200,7 +200,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/confirm"
                 android:textColor="@color/black"
@@ -211,7 +211,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/cancel"
                 android:textColor="@color/black"

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

@@ -60,7 +60,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/back"
                 android:textColor="@color/black"
@@ -148,7 +148,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/confirm"
                 android:textColor="@color/black"
@@ -159,7 +159,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/cancel"
                 android:textColor="@color/black"

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

@@ -36,7 +36,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/back"
                 android:textColor="@color/black"
@@ -60,7 +60,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/delete"
                 android:textColor="@color/black"

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

@@ -38,7 +38,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/back"
                 android:textColor="@color/black"
@@ -164,7 +164,7 @@
                 android:id="@+id/confirm"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/confirm"
                 android:textColor="@color/black"
@@ -175,7 +175,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/cancel"
                 android:textColor="@color/black"

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

@@ -36,7 +36,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/back"
                 android:textColor="@color/black"
@@ -61,7 +61,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/insert"
                 android:textColor="@color/black"
@@ -73,7 +73,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/delete"
                 android:textColor="@color/black"
@@ -90,7 +90,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/filter"
                 android:textColor="@color/black"

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

@@ -36,7 +36,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/back"
                 android:textColor="@color/black"
@@ -61,7 +61,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/insert"
                 android:textColor="@color/black"
@@ -73,7 +73,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/delete"
                 android:textColor="@color/black"
@@ -85,7 +85,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/move_up"
                 android:textColor="@color/black"
@@ -96,7 +96,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/move_down"
                 android:textColor="@color/black"

app/src/main/res/navigation/nav_init.xml

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<navigation xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/nav_init"
+    app:startDestination="@id/initWelcomeFragment">
+
+    <fragment
+        android:id="@+id/initWelcomeFragment"
+        android:name="com.grkj.iscs.features.init.fragment.InitWelcomeFragment"
+        android:label="InitWelcomeFragment" >
+        <action
+            android:id="@+id/action_initWelcomeFragment_to_initSetAdminAccountFragment"
+            app:destination="@id/initSetAdminAccountFragment" />
+    </fragment>
+    <fragment
+        android:id="@+id/initSetAdminAccountFragment"
+        android:name="com.grkj.iscs.features.init.fragment.InitSetAdminAccountFragment"
+        android:label="InitSetAdminAccountFragment" >
+        <action
+            android:id="@+id/action_initSetAdminAccountFragment_to_initDeviceRegistrationKeyAndLockFragment"
+            app:destination="@id/initDeviceRegistrationKeyAndLockFragment" />
+    </fragment>
+    <fragment
+        android:id="@+id/initDeviceRegistrationKeyAndLockFragment"
+        android:name="com.grkj.iscs.features.init.fragment.InitDeviceRegistrationKeyAndLockFragment"
+        android:label="InitDeviceRegistrationKeyAndLockFragment" >
+        <action
+            android:id="@+id/action_initDeviceRegistrationKeyAndLockFragment_to_initCardRegistrationFragment"
+            app:destination="@id/initCardRegistrationFragment" />
+    </fragment>
+    <fragment
+        android:id="@+id/initCardRegistrationFragment"
+        android:name="com.grkj.iscs.features.init.fragment.InitCardRegistrationFragment"
+        android:label="InitCardRegistrationFragment" >
+        <action
+            android:id="@+id/action_initCardRegistrationFragment_to_initPointRfidRegistrationFragment"
+            app:destination="@id/initPointRfidRegistrationFragment" />
+    </fragment>
+    <fragment
+        android:id="@+id/initPointRfidRegistrationFragment"
+        android:name="com.grkj.iscs.features.init.fragment.InitPointRfidRegistrationFragment"
+        android:label="InitPointRfidRegistrationFragment" >
+        <action
+            android:id="@+id/action_initPointRfidRegistrationFragment_to_initSetRemoteServerFragment"
+            app:destination="@id/initSetRemoteServerFragment" />
+    </fragment>
+    <fragment
+        android:id="@+id/initSetRemoteServerFragment"
+        android:name="com.grkj.iscs.features.init.fragment.InitSetRemoteServerFragment"
+        android:label="InitSetRemoteServerFragment" />
+</navigation>

app/src/main/res/values-en/strings.xml

@@ -194,4 +194,8 @@
     <string name="job_create_failed">Job save failed</string>
     <string name="sop_job_save_and_execute_succeed">SOP job execute succeed</string>
     <string name="sop_job_save_and_execute_failed">SOP job execute failed</string>
+    <string name="welcome_tip">Hello, welcome to use</string>
+    <string name="start">Start</string>
+    <string name="start_tip">Initialize the system according to the prompts</string>
+    <string name="init_set_admin_account_step">1</string>
 </resources>

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

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <dimen name="header_height">70dp</dimen>
-    <dimen name="normal_layout_margin_top">20dp</dimen>
-    <dimen name="common_margin_spacing_big">40dp</dimen>
-</resources>

app/src/main/res/values-zh/strings.xml

@@ -194,4 +194,8 @@
     <string name="job_create_failed">作业保存失败</string>
     <string name="sop_job_save_and_execute_succeed">SOP作业执行成功</string>
     <string name="sop_job_save_and_execute_failed">SOP作业执行失败</string>
+    <string name="welcome_tip">您好，欢迎您使用</string>
+    <string name="start">开始</string>
+    <string name="start_tip">根据提示对系统进⾏初始化</string>
+    <string name="init_set_admin_account_step">1</string>
 </resources>

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

@@ -11,4 +11,5 @@
     <color name="color_ffec99">#ffec99</color>
     <color name="color_ffc9c9">#ffc9c9</color>
     <color name="color_a5d8ff">#a5d8ff</color>
+    <color name="init_step_circle">#228be6</color>
 </resources>

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

@@ -193,4 +193,8 @@
     <string name="job_create_failed">作业保存失败</string>
     <string name="sop_job_save_and_execute_succeed">SOP作业执行成功</string>
     <string name="sop_job_save_and_execute_failed">SOP作业执行失败</string>
+    <string name="welcome_tip">您好，欢迎您使用</string>
+    <string name="start">开始</string>
+    <string name="start_tip">根据提示对系统进⾏初始化</string>
+    <string name="init_set_admin_account_step">1</string>
 </resources>

data/src/main/java/com/grkj/data/dao/SysMenuDao.kt

@@ -29,7 +29,7 @@ interface SysMenuDao {
     /**
      * 添加角色菜单关联
      */
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    @Insert(onConflict = OnConflictStrategy.IGNORE)
     fun insertRoleMenus(sysRoleMenus: MutableList<SysRoleMenu>)
 
     /**

data/src/main/java/com/grkj/data/dao/UserDao.kt

@@ -152,4 +152,16 @@ interface UserDao {
      */
     @Update
     fun updateUserData(userDo: SysUserDo)
+
+    /**
+     * 获取指定角色的用户id
+     */
+    @Query("""
+        SELECT u.user_id
+            FROM sys_user AS u
+            JOIN sys_user_role AS ur ON u.user_id = ur.user_id
+            JOIN sys_role       AS r  ON ur.role_id  = r.role_id
+            WHERE r.role_key = :roleKey;
+    """)
+    fun getUsersByRoleKey(roleKey: String): List<Long>
 }

data/src/main/java/com/grkj/data/data/MMKVConstants.kt

@@ -23,4 +23,9 @@ object MMKVConstants {
      * 更新隔离点锁模式
      */
     const val UPDATE_LOCK_POINT_MODE= "update_lock_point_mode"
+
+    /**
+     * APP初始化
+     */
+    const val APP_INIT= "APP_INIT"
 }

data/src/main/java/com/grkj/data/enums/RoleFunctionalPermissionsEnum.kt

@@ -83,4 +83,28 @@ enum class RoleFunctionalPermissionsEnum(
     ),
     HOME("Home", "主页", 0, listOf()),
     ;
+    companion object {
+        /**
+         * 返回去除了指定枚举及其所有子节点后的列表
+         */
+        fun except(vararg excludes: RoleFunctionalPermissionsEnum): List<RoleFunctionalPermissionsEnum> {
+            // 收集所有要排除的枚举（包括自己和子孙）
+            val excludeSet = excludes
+                .flatMap { it.collectSelfAndChildren() }
+                .toSet()
+            // 过滤掉
+            return values().filter { it !in excludeSet }
+        }
+
+        /**
+         * 递归收集自己和所有子节点
+         */
+        private fun RoleFunctionalPermissionsEnum.collectSelfAndChildren(): Set<RoleFunctionalPermissionsEnum> {
+            val result = mutableSetOf(this)
+            for (child in children) {
+                result += child.collectSelfAndChildren()
+            }
+            return result
+        }
+    }
 }

data/src/main/java/com/grkj/data/repository/ISysMenuRepository.kt

@@ -9,7 +9,7 @@ interface ISysMenuRepository {
     /**
      * 检查系统菜单
      */
-    fun checkSysMenu()
+    fun checkSysMenuAndRole()
 
     /**
      * 获取菜单数据

data/src/main/java/com/grkj/data/repository/IUserRepository.kt

@@ -68,4 +68,9 @@ interface IUserRepository {
      * 更新用户信息
      */
     fun updateUser(sysUserDo: SysUserDo)
+
+    /**
+     * 移除管理员用户
+     */
+    fun removeAdminUser()
 }

data/src/main/java/com/grkj/data/repository/impl/SysMenuRepository.kt

@@ -1,8 +1,11 @@
 package com.grkj.data.repository.impl
 
+import com.grkj.data.dao.RoleDao
 import com.grkj.data.dao.SysMenuDao
+import com.grkj.data.enums.RoleEnum
 import com.grkj.data.enums.RoleFunctionalPermissionsEnum
 import com.grkj.data.model.dos.SysMenu
+import com.grkj.data.model.dos.SysRoleMenu
 import com.grkj.data.repository.BaseRepository
 import com.grkj.data.repository.ISysMenuRepository
 import javax.inject.Inject
@@ -12,14 +15,120 @@ import javax.inject.Singleton
  * 菜单仓储实现
  */
 @Singleton
-class SysMenuRepository @Inject constructor(val sysMenuDao: SysMenuDao) : BaseRepository(), ISysMenuRepository {
-    override fun checkSysMenu() {
+class SysMenuRepository @Inject constructor(val sysMenuDao: SysMenuDao, val roleDao: RoleDao) :
+    BaseRepository(), ISysMenuRepository {
+    override fun checkSysMenuAndRole() {
         // 找出所有顶层菜单（level == 0），依次递归插入/更新
         RoleFunctionalPermissionsEnum.values()
             .filter { it.level == 0 }
             .forEach { topEnum ->
                 processMenuEnumRecursive(topEnum, parentId = null)
             }
+        val sysMenuData = sysMenuDao.getAll()
+        roleDao.getRoleData().filter { it.roleKey in RoleEnum.values().map { it.roleKey } }
+            .forEach { roleData ->
+                when (roleData.roleKey) {
+                    RoleEnum.ADMIN.roleKey -> {
+                        val roleMenuData = mutableListOf<SysRoleMenu>().apply {
+                            for (permissionsEnum in RoleFunctionalPermissionsEnum.values()) {
+                                sysMenuData.find { it.perms == permissionsEnum.functionalPermission }?.menuId?.let { menuId ->
+                                    val sysRoleMenu = SysRoleMenu()
+                                    sysRoleMenu.roleId = roleData.roleId
+                                    sysRoleMenu.menuId = menuId
+                                    add(sysRoleMenu)
+                                }
+                            }
+                        }
+                        sysMenuDao.insertRoleMenus(roleMenuData)
+                    }
+
+                    RoleEnum.JTDRAWER.roleKey -> {
+                        val roleMenuData = mutableListOf<SysRoleMenu>().apply {
+                            for (permissionsEnum in RoleFunctionalPermissionsEnum.except(
+                                RoleFunctionalPermissionsEnum.USER_MANAGE,
+                                RoleFunctionalPermissionsEnum.ROLE_MANAGE,
+                                RoleFunctionalPermissionsEnum.HARDWARE_HOME_MANAGE
+                            )) {
+                                sysMenuData.find { it.perms == permissionsEnum.functionalPermission }?.menuId?.let { menuId ->
+                                    val sysRoleMenu = SysRoleMenu()
+                                    sysRoleMenu.roleId = roleData.roleId
+                                    sysRoleMenu.menuId = menuId
+                                    add(sysRoleMenu)
+                                }
+                            }
+                        }
+                        sysMenuDao.insertRoleMenus(roleMenuData)
+                    }
+
+                    RoleEnum.JTLOCKER.roleKey -> {
+                        val roleMenuData = mutableListOf<SysRoleMenu>().apply {
+                            for (permissionsEnum in RoleFunctionalPermissionsEnum.except(
+                                RoleFunctionalPermissionsEnum.DATA_HOME_MANAGE,
+                                RoleFunctionalPermissionsEnum.HARDWARE_HOME_MANAGE
+                            )) {
+                                sysMenuData.find { it.perms == permissionsEnum.functionalPermission }?.menuId?.let { menuId ->
+                                    val sysRoleMenu = SysRoleMenu()
+                                    sysRoleMenu.roleId = roleData.roleId
+                                    sysRoleMenu.menuId = menuId
+                                    add(sysRoleMenu)
+                                }
+                            }
+                        }
+                        sysMenuDao.insertRoleMenus(roleMenuData)
+                    }
+
+                    RoleEnum.JTCOLOCKER.roleKey -> {
+                        val roleMenuData = mutableListOf<SysRoleMenu>().apply {
+                            for (permissionsEnum in RoleFunctionalPermissionsEnum.except(
+                                RoleFunctionalPermissionsEnum.DATA_HOME_MANAGE,
+                                RoleFunctionalPermissionsEnum.HARDWARE_HOME_MANAGE
+                            )) {
+                                sysMenuData.find { it.perms == permissionsEnum.functionalPermission }?.menuId?.let { menuId ->
+                                    val sysRoleMenu = SysRoleMenu()
+                                    sysRoleMenu.roleId = roleData.roleId
+                                    sysRoleMenu.menuId = menuId
+                                    add(sysRoleMenu)
+                                }
+                            }
+                        }
+                        sysMenuDao.insertRoleMenus(roleMenuData)
+                    }
+
+                    RoleEnum.JTGUARD.roleKey -> {
+                        val roleMenuData = mutableListOf<SysRoleMenu>().apply {
+                            for (permissionsEnum in RoleFunctionalPermissionsEnum.except(
+                                RoleFunctionalPermissionsEnum.DATA_HOME_MANAGE,
+                                RoleFunctionalPermissionsEnum.HARDWARE_HOME_MANAGE
+                            )) {
+                                sysMenuData.find { it.perms == permissionsEnum.functionalPermission }?.menuId?.let { menuId ->
+                                    val sysRoleMenu = SysRoleMenu()
+                                    sysRoleMenu.roleId = roleData.roleId
+                                    sysRoleMenu.menuId = menuId
+                                    add(sysRoleMenu)
+                                }
+                            }
+                        }
+                        sysMenuDao.insertRoleMenus(roleMenuData)
+                    }
+
+                    RoleEnum.SYSCONFIG.roleKey -> {
+                        val roleMenuData = mutableListOf<SysRoleMenu>().apply {
+                            for (permissionsEnum in RoleFunctionalPermissionsEnum.except(
+                                RoleFunctionalPermissionsEnum.JOB_TICKET_HOME_MANAGE,
+                                RoleFunctionalPermissionsEnum.EXCEPTION_HOME_MANAGE
+                            )) {
+                                sysMenuData.find { it.perms == permissionsEnum.functionalPermission }?.menuId?.let { menuId ->
+                                    val sysRoleMenu = SysRoleMenu()
+                                    sysRoleMenu.roleId = roleData.roleId
+                                    sysRoleMenu.menuId = menuId
+                                    add(sysRoleMenu)
+                                }
+                            }
+                        }
+                        sysMenuDao.insertRoleMenus(roleMenuData)
+                    }
+                }
+            }
     }
 
     override fun getSysMenus(): List<SysMenu> {

data/src/main/java/com/grkj/data/repository/impl/UserRepository.kt

@@ -5,6 +5,7 @@ import com.grkj.data.dao.RoleDao
 import com.grkj.data.dao.SysMenuDao
 import com.grkj.data.dao.UserDao
 import com.grkj.data.data.MainDomainData
+import com.grkj.data.enums.RoleEnum
 import com.grkj.data.enums.RoleFunctionalPermissionsEnum
 import com.grkj.data.model.dos.SysUserDo
 import com.grkj.data.model.vo.AddUserDataVo
@@ -28,7 +29,7 @@ class UserRepository @Inject constructor(
     private val hardwareDao: HardwareDao,
     private val userDao: UserDao,
     private val roleDao: RoleDao,
-    private val sysMenuDao: SysMenuDao
+    private val sysMenuDao: SysMenuDao,
 ) : BaseRepository(), IUserRepository {
 
     override fun loginWithAccount(
@@ -199,4 +200,10 @@ class UserRepository @Inject constructor(
     override fun deleteUserById(userIds: List<Long>) {
         userDao.deleteUserByIds(userIds)
     }
+
+    override fun removeAdminUser() {
+        val adminUserIds = userDao.getUsersByRoleKey(RoleEnum.ADMIN.roleKey)
+        userDao.deleteUserByIds(adminUserIds)
+        roleDao.deleteUserRoleByUserIds(adminUserIds)
+    }
 }

ui-base/src/main/java/com/grkj/ui_base/base/BaseActivity.kt

@@ -10,13 +10,16 @@ import androidx.databinding.ViewDataBinding
 import androidx.navigation.NavController
 import androidx.navigation.fragment.NavHostFragment
 import com.google.android.material.bottomnavigation.BottomNavigationView
+import com.google.android.material.navigation.NavigationBarView
 import com.grkj.shared.model.EventBean
 import com.grkj.data.data.EventConstants
+import com.grkj.ui_base.config.ISCSConfig
 import com.grkj.ui_base.dialog.LoadingDialog
 import com.grkj.ui_base.utils.event.JumpViewEvent
 import com.grkj.ui_base.utils.event.LoadingEvent
 import com.kongzue.dialogx.dialogs.PopTip
 import com.sik.sikandroid.permission.PermissionUtils
+import me.jessyan.autosize.internal.CustomAdapt
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
@@ -26,15 +29,12 @@ import org.slf4j.LoggerFactory
 /**
  * BaseActivity: 支持 ViewBinding, EventBus, 权限管理, 串口 & 蓝牙, 以及 Navigation 多 Graph 切换 & BottomNav
  */
-abstract class BaseActivity<V : ViewDataBinding> : AppCompatActivity() {
+abstract class BaseActivity<V : ViewDataBinding> : AppCompatActivity(), CustomAdapt {
     protected val logger: Logger = LoggerFactory.getLogger(this::class.java)
-    private var bottomNav: BottomNavigationView? = null
+    private var bottomNav: NavigationBarView? = null
     private var graphMap: Map<Int, Int>? = null
     protected lateinit var binding: V
 
-    /** 是否启用 Navigation 多 Graph 与 BottomNav */
-    protected open fun enableNavigation(): Boolean = false
-
     /** NavHostFragment 容器 ID，子类返回对应 fragment 布局 ID */
     protected open fun navHostFragmentId(): Int = 0
     protected val navController: NavController by lazy {
@@ -55,9 +55,6 @@ abstract class BaseActivity<V : ViewDataBinding> : AppCompatActivity() {
             EventBus.getDefault().register(this)
         }
         initView()
-        if (enableNavigation()) {
-
-        }
         initData()
         initListeners()
         initObservers()
@@ -81,7 +78,7 @@ abstract class BaseActivity<V : ViewDataBinding> : AppCompatActivity() {
 
     /** 配置 BottomNavigation 切换 Graph，map: menuItemId -> navGraphId */
     protected fun setupBottomNavigation(
-        bottomNav: BottomNavigationView,
+        bottomNav: NavigationBarView,
         graphMap: Map<Int, Int>
     ) {
         this.bottomNav = bottomNav
@@ -160,6 +157,20 @@ abstract class BaseActivity<V : ViewDataBinding> : AppCompatActivity() {
         return resources.configuration.orientation == Configuration.ORIENTATION_PORTRAIT
     }
 
+    // 是否以“宽度”为基准适配，false 则按“高度”来算缩放比例
+    override fun isBaseOnWidth(): Boolean {
+        return resources.configuration.orientation == Configuration.ORIENTATION_PORTRAIT
+    }
+
+    // 设计图的尺寸 dp。竖屏时用 600dp 作为基准宽度；横屏时用 1024dp 作为基准高度
+    override fun getSizeInDp(): Float {
+        return if (resources.configuration.orientation == Configuration.ORIENTATION_PORTRAIT) {
+            ISCSConfig.designWidth
+        } else {
+            ISCSConfig.desginHeight
+        }
+    }
+
     /** 子类必须实现：布局资源 ID */
     protected abstract fun getLayoutId(): Int
 

ui-base/src/main/java/com/grkj/ui_base/base/BaseFragment.kt

@@ -13,9 +13,11 @@ import androidx.fragment.app.Fragment
 import androidx.navigation.NavController
 import androidx.navigation.fragment.findNavController
 import com.grkj.shared.model.EventBean
+import com.grkj.ui_base.config.ISCSConfig
 import com.grkj.ui_base.utils.event.LoadingEvent
 import com.kongzue.dialogx.dialogs.PopTip
 import com.sik.sikandroid.permission.PermissionUtils
+import me.jessyan.autosize.internal.CustomAdapt
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
@@ -25,7 +27,7 @@ import org.slf4j.LoggerFactory
 /**
  * BaseFragment: 支持 ViewBinding, EventBus, 权限管理, 串口 & 蓝牙, 以及 Navigation 切换
  */
-abstract class BaseFragment<V : ViewDataBinding> : Fragment() {
+abstract class BaseFragment<V : ViewDataBinding> : Fragment(), CustomAdapt {
     protected val logger: Logger = LoggerFactory.getLogger(this::class.java)
     protected lateinit var binding: V
     private var isFirstLoad: Boolean = true
@@ -112,6 +114,20 @@ abstract class BaseFragment<V : ViewDataBinding> : Fragment() {
         return resources.configuration.orientation == Configuration.ORIENTATION_PORTRAIT
     }
 
+    // 是否以“宽度”为基准适配，false 则按“高度”来算缩放比例
+    override fun isBaseOnWidth(): Boolean {
+        return resources.configuration.orientation == Configuration.ORIENTATION_PORTRAIT
+    }
+
+    // 设计图的尺寸 dp。竖屏时用 600dp 作为基准宽度；横屏时用 1024dp 作为基准高度
+    override fun getSizeInDp(): Float {
+        return if (resources.configuration.orientation == Configuration.ORIENTATION_PORTRAIT) {
+            ISCSConfig.designWidth
+        } else {
+            ISCSConfig.desginHeight
+        }
+    }
+
     /** 获取布局资源 ID */
     @LayoutRes
     protected abstract fun getLayoutId(): Int

ui-base/src/main/java/com/grkj/ui_base/config/ISCSConfig.kt

@@ -16,4 +16,14 @@ object ISCSConfig {
      * 是否开启区域
      */
     val isWorkstationOn: Boolean get() = MMKVConstants.WORKSTATION_OPEN.getMMKVData(true)
+
+    /**
+     * 设计图宽度
+     */
+    val designWidth = 600f
+
+    /**
+     * 设计图高度
+     */
+    val desginHeight = 1024f
 }

ui-base/src/main/res/drawable/common_dialog_btn.xml → ui-base/src/main/res/drawable/common_btn.xml

@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <stroke
-        android:width="@dimen/divider_line_height"
+        android:width="@dimen/divider_line_space"
         android:color="@color/black" />
     <corners android:radius="4dp" />
 </shape>

ui-base/src/main/res/drawable/common_divider_normal_space_horizontal.xml

@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <size
         android:width="@dimen/common_spacing"
-        android:height="@dimen/divider_line_height" />
+        android:height="@dimen/divider_line_space" />
 </shape>

ui-base/src/main/res/drawable/common_divider_normal_space_horizontal_land.xml

@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <size
         android:width="@dimen/common_spacing_small"
-        android:height="@dimen/divider_line_height" />
+        android:height="@dimen/divider_line_space" />
 </shape>

ui-base/src/main/res/drawable/common_divider_normal_space_vertical.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <size
-        android:width="@dimen/divider_line_height"
+        android:width="@dimen/divider_line_space"
         android:height="@dimen/common_spacing" />
 </shape>

ui-base/src/main/res/drawable/common_divider_normal_space_vertical_land.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <size
-        android:width="@dimen/divider_line_height"
+        android:width="@dimen/divider_line_space"
         android:height="@dimen/common_spacing_small" />
 </shape>

ui-base/src/main/res/drawable/common_divider_small_space_horizontal.xml

@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <size
         android:width="@dimen/common_spacing_small"
-        android:height="@dimen/divider_line_height" />
+        android:height="@dimen/divider_line_space" />
 </shape>

ui-base/src/main/res/drawable/common_divider_small_space_horizontal_land.xml

@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <size
         android:width="2.5dp"
-        android:height="@dimen/divider_line_height" />
+        android:height="@dimen/divider_line_space" />
 </shape>

ui-base/src/main/res/layout-land/common_dialog_loading_progress.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout  xmlns:android="http://schemas.android.com/apk/res/android"
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
 
@@ -8,8 +8,8 @@
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
         android:orientation="vertical"
-        android:paddingHorizontal="@dimen/common_spacing"
-        android:paddingVertical="1.5dp"
+        android:paddingHorizontal="@dimen/common_spacing_2x"
+        android:paddingVertical="3dp"
         tools:background="@android:color/darker_gray">
 
         <TextView
@@ -17,23 +17,28 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textColor="@android:color/white"
+            android:textSize="28sp"
             android:visibility="gone"
             tools:text="title"
             tools:visibility="visible" />
 
         <com.wang.avi.AVLoadingIndicatorView
             android:id="@+id/avliv_common"
-            style="@style/AVLoadingIndicatorView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:indicatorColor="@android:color/white"
-            app:indicatorName="PacmanIndicator" />
+            app:indicatorName="PacmanIndicator"
+            app:maxHeight="152dp"
+            app:maxWidth="152dp"
+            app:minHeight="152dp"
+            app:minWidth="152dp" />
 
         <TextView
             android:id="@+id/tv_common_progress"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textColor="@android:color/white"
+            android:textSize="28sp"
             android:visibility="gone"
             tools:text="adjfksadfj"
             tools:visibility="visible" />

ui-base/src/main/res/layout-land/dialog_tip.xml

@@ -3,19 +3,19 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <RelativeLayout
-        android:layout_width="250dp"
-        android:layout_height="140dp"
+        android:layout_width="500dp"
+        android:layout_height="280dp"
         android:background="@drawable/common_card_bg">
 
         <TextView
             android:id="@+id/title"
             android:layout_width="match_parent"
-            android:layout_height="22dp"
+            android:layout_height="44dp"
             android:background="@color/common_tip_dialog_info"
             android:gravity="center_vertical"
-            android:paddingHorizontal="@dimen/common_spacing_small"
+            android:paddingHorizontal="@dimen/common_spacing"
             android:textColor="@color/white"
-            android:textSize="10sp"
+            android:textSize="@dimen/common_btn_text_size"
             tools:text="操作确认" />
 
         <TextView
@@ -25,10 +25,10 @@
             android:layout_above="@+id/btn_layout"
             android:layout_below="@+id/title"
             android:gravity="center_vertical"
-            android:paddingHorizontal="@dimen/common_spacing_2x"
-            android:paddingVertical="@dimen/common_spacing"
+            android:paddingHorizontal="40dp"
+            android:paddingVertical="@dimen/common_spacing_2x"
             android:textColor="@color/black"
-            android:textSize="10sp"
+            android:textSize="@dimen/common_btn_text_size"
             tools:text="登录成功" />
 
         <LinearLayout
@@ -36,8 +36,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_alignParentBottom="true"
-            android:layout_marginRight="@dimen/common_spacing_small"
-            android:layout_marginBottom="@dimen/common_spacing_small"
+            android:layout_marginRight="@dimen/common_spacing"
+            android:layout_marginBottom="@dimen/common_spacing"
             android:divider="@drawable/common_divider_normal_space_horizontal"
             android:gravity="right"
             android:orientation="horizontal"
@@ -45,21 +45,21 @@
 
             <TextView
                 android:id="@+id/confirm_btn"
-                android:layout_width="35dp"
-                android:layout_height="15dp"
-                android:background="@drawable/common_dialog_btn"
+                android:layout_width="70dp"
+                android:layout_height="30dp"
+                android:paddingHorizontal="@dimen/common_spacing"
+                android:background="@drawable/common_btn"
                 android:gravity="center"
-                android:paddingHorizontal="@dimen/common_spacing_small"
                 android:text="@string/confirm" />
 
             <TextView
                 android:id="@+id/cancel_btn"
                 android:layout_width="wrap_content"
-                android:layout_height="15dp"
-                android:background="@drawable/common_dialog_btn"
+                android:layout_height="30dp"
+                android:paddingHorizontal="@dimen/common_spacing"
+                android:background="@drawable/common_btn"
                 android:gravity="center"
-                android:minWidth="35dp"
-                android:paddingHorizontal="@dimen/common_spacing_small"
+                android:minWidth="70dp"
                 android:text="@string/cancel" />
         </LinearLayout>
     </RelativeLayout>

ui-base/src/main/res/layout/dialog_tip.xml

@@ -48,7 +48,7 @@
                 android:layout_width="70dp"
                 android:layout_height="30dp"
                 android:paddingHorizontal="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:gravity="center"
                 android:text="@string/confirm" />
 
@@ -57,7 +57,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="30dp"
                 android:paddingHorizontal="@dimen/common_spacing"
-                android:background="@drawable/common_dialog_btn"
+                android:background="@drawable/common_btn"
                 android:gravity="center"
                 android:minWidth="70dp"
                 android:text="@string/cancel" />

ui-base/src/main/res/values-land/dimens.xml

@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="common_text_size">18sp</dimen>
+    <dimen name="common_btn_text_size">20sp</dimen>
+    <dimen name="common_text_size_land">9dp</dimen>
+    <dimen name="common_text_size_big">28dp</dimen>
+    <dimen name="common_text_size_small">16dp</dimen>
+    <dimen name="common_text_padding">5dp</dimen>
+    <dimen name="common_text_padding_land">2.5dp</dimen>
+    <dimen name="common_font_txt_size_page_title">14dp</dimen>
+    <dimen name="common_radius">10dp</dimen>
+    <dimen name="common_radius_small">5dp</dimen>
+    <dimen name="common_spacing">10dp</dimen>
+    <dimen name="common_spacing_2x">20dp</dimen>
+    <dimen name="common_spacing_big">15dp</dimen>
+    <dimen name="common_spacing_small">5dp</dimen>
+    <dimen name="common_spacing_smallest">2dp</dimen>
+    <dimen name="common_margin_spacing_big">40dp</dimen>
+    <dimen name="common_icon_size">15dp</dimen>
+    <dimen name="common_icon_size_small">12dp</dimen>
+    <dimen name="common_status_circle_small">5dp</dimen>
+    <dimen name="common_status_circle_medium">10dp</dimen>
+
+    <dimen name="common_btn_width">150dp</dimen>
+    <dimen name="common_btn_height">50dp</dimen>
+    <dimen name="common_btn_width_land">75dp</dimen>
+    <dimen name="common_btn_height_land">25dp</dimen>
+
+    <dimen name="title_bar_height">50dp</dimen>
+    <dimen name="title_bar_padding">7dp</dimen>
+    <dimen name="title_bar_title_text_size">20dp</dimen>
+    <dimen name="title_bar_sub_title_text_size">10dp</dimen>
+    <dimen name="title_bar_back_size">17dp</dimen>
+
+    <dimen name="switch_width">46dp</dimen>
+    <dimen name="switch_height">26dp</dimen>
+    <dimen name="switch_radius">13dp</dimen>
+    <dimen name="switch_thumb_stroke">2dp</dimen>
+    <dimen name="switch_thumb_size">22dp</dimen>
+
+    <dimen name="home_navi_height">200dp</dimen>
+    <dimen name="home_navi_width">133dp</dimen>
+
+    <!-- 通用tab -->
+    <dimen name="common_rv_tab_item_width">64dp</dimen>
+    <dimen name="common_rv_tab_item_height">19dp</dimen>
+    <dimen name="common_rv_tab_padding">6dp</dimen>
+    <dimen name="common_rv_tab_bg_radius">3dp</dimen>
+
+    <!--  输入选择控件  -->
+    <dimen name="selectable_input_width">83dp</dimen>
+    <dimen name="selectable_input_radius">2dp</dimen>
+    <dimen name="selectable_input_stroke">1dp</dimen>
+    <dimen name="selectable_input_min_height">23dp</dimen>
+    <dimen name="selectable_input_spinner_arrow_size">10dp</dimen>
+    <dimen name="selectable_input_spinner_arrow_margin">3dp</dimen>
+    <dimen name="selectable_input_edit_padding">3dp</dimen>
+
+    <dimen name="rv_item_margin">1dp</dimen>
+
+    <dimen name="close_eyes_width">23dp</dimen>
+    <dimen name="login_btn_radius">20dp</dimen>
+    <dimen name="login_btn_width">157dp</dimen>
+    <dimen name="login_btn_height">40dp</dimen>
+    <dimen name="common_common_btn_elevation">10dp</dimen>
+    <dimen name="login_btn_margin_top">20dp</dimen>
+    <dimen name="login_btn_text_size">13dp</dimen>
+
+    <dimen name="home_module_margin">3dp</dimen>
+
+    <dimen name="dialog_card_login_width">320dp</dimen>
+    <dimen name="dialog_card_login_height">180dp</dimen>
+
+    <dimen name="menu_padding">15dp</dimen>
+    <dimen name="divider_line_width">1dp</dimen>
+    <dimen name="divider_line_margin">5dp</dimen>
+    <dimen name="page_padding">20dp</dimen>
+    <dimen name="item_rv_technology_height">207dp</dimen>
+    <dimen name="item_rv_technology_width">118dp</dimen>
+    <dimen name="item_rv_technology_type_height">17dp</dimen>
+    <dimen name="item_rv_technology_type_width">46dp</dimen>
+    <dimen name="item_rv_technology_type_padding">3dp</dimen>
+    <dimen name="dialog_tip_width">256dp</dimen>
+    <dimen name="dialog_tip_height">144dp</dimen>
+    <dimen name="dialog_ticket_list_height">200dp</dimen>
+
+    <dimen name="item_rv_step_width">80dp</dimen>
+    <dimen name="item_rv_step_height">110dp</dimen>
+    <dimen name="item_rv_menu_size">58dp</dimen>
+    <dimen name="item_rv_menu_icon_size">20dp</dimen>
+    <dimen name="item_rv_login_width">100dp</dimen>
+    <dimen name="item_rv_login_height">130dp</dimen>
+    <dimen name="item_rv_login_margin">7dp</dimen>
+    <dimen name="item_rv_login_icon_size">40dp</dimen>
+    <dimen name="divider_line_space">1dp</dimen>
+</resources>