refactor(更新)

- 横屏界面修改

app/src/main/AndroidManifest.xml

@@ -33,6 +33,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
+        android:requestLegacyExternalStorage="true"
         android:theme="@style/Theme.ISCS_BASE_APP"
         tools:targetApi="31">
         <activity

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

@@ -4,10 +4,13 @@ import android.view.InputDevice
 import android.view.KeyEvent
 import com.grkj.iscs.R
 import com.grkj.iscs.databinding.ActivityInitBinding
+import com.grkj.shared.config.Constants
 import com.grkj.ui_base.base.BaseActivity
+import com.grkj.ui_base.config.ISCSConfig
 import com.grkj.ui_base.utils.event.CardSwipeEvent
 import com.grkj.ui_base.utils.extension.toByteArrays
 import com.grkj.ui_base.utils.extension.toHexStrings
+import com.sik.sikandroid.permission.PermissionUtils
 import dagger.hilt.android.AndroidEntryPoint
 
 /**
@@ -25,7 +28,13 @@ class InitActivity : BaseActivity<ActivityInitBinding>() {
     }
 
     override fun initView() {
-
+        requestPermissionsIfNeeded(*Constants.needPermission) {
+            if (it) {
+                logger.info("权限获取成功")
+            } else {
+                logger.info("权限获取失败")
+            }
+        }
     }
 
     override fun dispatchKeyEvent(event: KeyEvent): Boolean {

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

@@ -93,6 +93,8 @@ class LoginActivity : BaseActivity<ActivityLoginBinding>() {
 
     override fun initData() {
         super.initData()
+        //todo 测试用，直接创建管理员账号
+        viewModel.insertAdminAccount().observe(this){}
         requestPermissionsIfNeeded(*Constants.needPermission) {
             if (it) {
                 logger.info("权限获取成功")

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

@@ -17,6 +17,18 @@ class LoginViewModel @Inject constructor(
     val userRepository: IUserRepository,
 ) : BaseViewModel() {
 
+
+    /**
+     * 添加管理员账号
+     */
+    fun insertAdminAccount(username: String = "admin", password: String = "123456"): LiveData<Boolean> {
+        return liveData(Dispatchers.IO) {
+            userRepository.removeAdminUser()
+            userRepository.addAdminUser(username, password)
+            emit(true)
+        }
+    }
+
     /**
      * 用户名登录
      */

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

@@ -3,7 +3,6 @@ package com.grkj.iscs.features.main.fragment.data_manage
 import android.graphics.Color
 import android.view.Gravity
 import androidx.fragment.app.viewModels
-import androidx.lifecycle.ViewModelProvider
 import com.drake.brv.BindingAdapter
 import com.drake.brv.annotaion.DividerOrientation
 import com.drake.brv.utils.divider
@@ -141,13 +140,13 @@ class RoleManageFragment : BaseFragment<FragmentRoleManageBinding>() {
         binding.back.setDebouncedClickListener {
             navController.popBackStack()
         }
-        binding.deleteUser.setDebouncedClickListener {
-            deleteSelectUser()
+        binding.delete.setDebouncedClickListener {
+            deleteSelect()
         }
-        binding.addUser.setDebouncedClickListener {
+        binding.add.setDebouncedClickListener {
             addRoleDialog.showPopupWindow()
         }
-        binding.filterUser.setDebouncedClickListener {
+        binding.filter.setDebouncedClickListener {
             filterRoleDialog.showPopupWindow()
         }
         binding.refreshLayout.setOnRefreshListener {
@@ -228,11 +227,15 @@ class RoleManageFragment : BaseFragment<FragmentRoleManageBinding>() {
         }
     }
 
-    private fun deleteSelectUser() {
+    private fun deleteSelect() {
         if (viewModel.roleManageDataList.none { it.isSelected }) {
             PopTip.tip(R.string.please_select_role)
             return
         }
+        if (viewModel.roleManageDataList.any { it.isSelected&&it.roleKey in RoleEnum.values().map { it.roleKey } }){
+            PopTip.tip(R.string.role_in_preset_tip)
+            return
+        }
         TipDialog.show(
             msg = CommonUtils.getStr(R.string.check_delete_role).toString(),
             countDownTime = 10,

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

@@ -90,7 +90,10 @@ class CardManageFragment : BaseFragment<FragmentCardManageBinding>() {
         binding.refreshLayout.setOnLoadMoreListener { loadCards() }
 
         binding.listRv.linear().divider {
-            setColor(Color.BLACK); orientation = DividerOrientation.VERTICAL
+            this.setColor(Color.BLACK)
+            this.startVisible = false
+            this.endVisible = true
+            this.orientation = DividerOrientation.VERTICAL
         }.setup {
             addType<IsJobCard>(R.layout.item_card_manage)
             onBind { bindCardItem(this) }

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

@@ -100,7 +100,10 @@ class LockManageFragment : BaseFragment<FragmentLockManageBinding>() {
         binding.refreshLayout.setOnLoadMoreListener { loadLocks() }
 
         binding.listRv.linear().divider {
-            setColor(Color.BLACK); orientation = DividerOrientation.VERTICAL
+            this.setColor(Color.BLACK)
+            this.startVisible = false
+            this.endVisible = true
+            this.orientation = DividerOrientation.VERTICAL
         }.setup {
             addType<IsLock>(R.layout.item_lock_manage)
             onBind { bindLockItem(this) }

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

@@ -93,7 +93,10 @@ class RfidTokenManageFragment : BaseFragment<FragmentRfidTokenManageBinding>() {
         binding.refreshLayout.setOnLoadMoreListener { loadTokens() }
 
         binding.listRv.linear().divider {
-            setColor(Color.BLACK); orientation = DividerOrientation.VERTICAL
+            this.setColor(Color.BLACK)
+            this.startVisible = false
+            this.endVisible = true
+            this.orientation = DividerOrientation.VERTICAL
         }.setup {
             addType<IsRfidToken>(R.layout.item_rfid_token_manage)
             onBind { bindTokenItem(this) }

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

@@ -30,16 +30,25 @@ class SplashActivity : BaseActivity<ActivitySplashBinding>() {
             dialogXTextInfo.fontSize = 18
         }
         DialogX.popTextInfo = dialogXTextInfo
+        DialogX.buttonTextInfo = dialogXTextInfo
+        DialogX.tipTextInfo = dialogXTextInfo
+        DialogX.messageTextInfo = dialogXTextInfo
+        DialogX.menuTextInfo = dialogXTextInfo
+        DialogX.okButtonTextInfo = dialogXTextInfo
+        DialogX.titleTextInfo = dialogXTextInfo
         StartModbusEvent.sendStartModbusEvent()
-        viewModel.checkSysMenuAndRole().observe(this) {
-            val isAppInit = MMKVConstants.APP_INIT.getMMKVData(false)
-            if (isAppInit) {
-                startActivity(Intent(this, LoginActivity::class.java))
-                finish()
-            } else {
-                startActivity(Intent(this, InitActivity::class.java))
-                finish()
-            }
-        }
+        //todo 测试用，直接进入，不初始化
+        startActivity(Intent(this, LoginActivity::class.java))
+        finish()
+//        viewModel.checkSysMenuAndRole().observe(this) {
+//            val isAppInit = MMKVConstants.APP_INIT.getMMKVData(false)
+//            if (isAppInit) {
+//                startActivity(Intent(this, LoginActivity::class.java))
+//                finish()
+//            } else {
+//                startActivity(Intent(this, InitActivity::class.java))
+//                finish()
+//            }
+//        }
     }
 }

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

@@ -1,5 +1,13 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
-      
-    <path android:fillColor="@android:color/white" android:pathData="M7,10l5,5 5,-5z"/>
-    
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="@dimen/vector_icon_size"
+    android:height="@dimen/vector_icon_size"
+    android:autoMirrored="true"
+    android:tint="#000000"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M7,10l5,5 5,-5z" />
+
 </vector>

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

@@ -44,6 +44,7 @@
             android:id="@+id/main_content"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_above="@+id/tec_support"
             android:layout_below="@+id/header_line"
             android:orientation="vertical">
 
@@ -80,36 +81,45 @@
                 android:textSize="@dimen/login_sub_title_text_size"
                 android:textStyle="bold" />
 
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/login_type_rv"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginVertical="@dimen/login_menu_margin" />
-
             <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:divider="@drawable/common_divider_normal_space_horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginVertical="@dimen/common_spacing_2x"
                 android:gravity="center_vertical"
-                android:orientation="horizontal"
-                android:showDividers="middle">
+                android:orientation="vertical">
 
-                <View
-                    android:layout_width="@dimen/login_circle_view_size"
-                    android:layout_height="@dimen/login_circle_view_size"
-                    android:background="@drawable/login_tip_circle" />
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/login_type_rv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_weight="1" />
 
-                <TextView
-                    android:id="@+id/login_tip_tv"
-                    android:layout_width="match_parent"
+                <LinearLayout
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentBottom="true"
-                    android:gravity="center_horizontal"
-                    android:text="@string/login_tip"
-                    android:textColor="@color/white"
-                    android:textSize="@dimen/login_tip_text_size" />
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="@dimen/common_spacing_2x"
+                    android:divider="@drawable/common_divider_normal_space_horizontal"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:showDividers="middle">
+
+                    <View
+                        android:layout_width="@dimen/login_circle_view_size"
+                        android:layout_height="@dimen/login_circle_view_size"
+                        android:background="@drawable/login_tip_circle" />
+
+                    <TextView
+                        android:id="@+id/login_tip_tv"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentBottom="true"
+                        android:gravity="center_horizontal"
+                        android:text="@string/login_tip"
+                        android:textColor="@color/white"
+                        android:textSize="@dimen/login_tip_text_size" />
+                </LinearLayout>
             </LinearLayout>
         </LinearLayout>
 

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

@@ -0,0 +1,477 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_margin="@dimen/common_spacing_2x"
+        android:background="@drawable/home_card_bg"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:id="@+id/title_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:paddingHorizontal="@dimen/common_spacing"
+            android:paddingVertical="@dimen/common_spacing_small">
+
+            <ImageView
+                android:layout_width="@dimen/common_spacing_2x"
+                android:layout_height="@dimen/common_spacing_2x"
+                android:src="@mipmap/icon_data_manage_menu_user_manage" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/common_spacing"
+                android:layout_weight="1"
+                android:text="@string/create_job_title"
+                android:textColor="@color/black"
+                android:textSize="24sp" />
+
+            <TextView
+                android:id="@+id/back"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/common_spacing"
+                android:background="@drawable/common_btn"
+                android:paddingHorizontal="@dimen/common_spacing_2x"
+                android:text="@string/back"
+                android:textColor="@color/black"
+                android:textSize="@dimen/common_btn_text_size" />
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/divider_line_space"
+            android:background="@color/black" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="horizontal">
+
+            <LinearLayout
+                android:id="@+id/base_info_layout"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_marginHorizontal="@dimen/common_spacing"
+                android:layout_marginVertical="@dimen/common_spacing"
+                android:layout_weight="1"
+                android:background="@drawable/home_card_bg"
+                android:gravity="center_vertical"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/common_spacing"
+                    android:text="@string/base_info_title"
+                    android:textColor="@color/black"
+                    android:textSize="24sp" />
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/divider_line_space"
+                    android:background="@color/black" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:orientation="vertical">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/common_spacing_2x"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal"
+                        android:paddingHorizontal="@dimen/dialog_content_normal_padding_horizontal">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/job_workstation"
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/common_text_size" />
+
+                        <TextView
+                            android:id="@+id/workstation_tv"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/common_spacing"
+                            android:background="@drawable/bg_common_input"
+                            android:drawableRight="@drawable/icon_drop_down"
+                            android:hint="@string/please_select_job_workstation"
+                            android:maxLines="1"
+                            android:paddingHorizontal="@dimen/common_spacing"
+                            android:paddingVertical="2dp"
+                            android:singleLine="true"
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/common_text_size" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/common_spacing_2x"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal"
+                        android:paddingHorizontal="@dimen/dialog_content_normal_padding_horizontal">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/lock_mode"
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/common_text_size" />
+
+                        <TextView
+                            android:id="@+id/lock_mode_tv"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/common_spacing"
+                            android:background="@drawable/bg_common_input"
+                            android:drawableRight="@drawable/icon_drop_down"
+                            android:hint="@string/please_select_lock_mode"
+                            android:maxLines="1"
+                            android:paddingHorizontal="@dimen/common_spacing"
+                            android:paddingVertical="2dp"
+                            android:singleLine="true"
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/common_text_size" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/common_spacing_2x"
+                        android:layout_marginBottom="@dimen/common_spacing_2x"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal"
+                        android:paddingHorizontal="@dimen/dialog_content_normal_padding_horizontal">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/create_job_name"
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/common_text_size" />
+
+                        <EditText
+                            android:id="@+id/job_name_et"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/common_spacing"
+                            android:background="@drawable/bg_common_input"
+                            android:hint="@string/please_input_job_name"
+                            android:maxLines="1"
+                            android:paddingHorizontal="@dimen/common_spacing"
+                            android:paddingVertical="2dp"
+                            android:singleLine="true"
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/common_text_size" />
+                    </LinearLayout>
+                </LinearLayout>
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:orientation="vertical">
+
+                <LinearLayout
+                    android:id="@+id/point_info_layout"
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_marginHorizontal="@dimen/common_spacing"
+                    android:layout_marginVertical="@dimen/common_spacing"
+                    android:layout_weight="1"
+                    android:background="@drawable/home_card_bg"
+                    android:gravity="center_vertical"
+                    android:orientation="vertical">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/common_spacing"
+                            android:layout_weight="1"
+                            android:text="@string/point_info_title"
+                            android:textColor="@color/black"
+                            android:textSize="24sp" />
+
+                        <TextView
+                            android:id="@+id/select_point_tv"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/common_spacing"
+                            android:layout_marginRight="@dimen/common_spacing"
+                            android:background="@drawable/common_btn"
+                            android:paddingHorizontal="@dimen/common_spacing_2x"
+                            android:text="@string/select"
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/common_btn_text_size" />
+                    </LinearLayout>
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/divider_line_space"
+                        android:background="@color/black" />
+
+                    <FrameLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent">
+
+                        <androidx.recyclerview.widget.RecyclerView
+                            android:id="@+id/point_rv"
+                            android:layout_width="match_parent"
+                            android:layout_height="240dp"
+                            android:paddingBottom="@dimen/common_spacing" />
+
+                        <LinearLayout
+                            android:id="@+id/no_selected_point_layout"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:background="@drawable/card_white_bg"
+                            android:gravity="center"
+                            android:orientation="vertical">
+
+                            <ImageView
+                                android:layout_width="80dp"
+                                android:layout_height="80dp"
+                                android:src="@drawable/icon_add_box" />
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:gravity="center"
+                                android:paddingHorizontal="@dimen/common_spacing_2x"
+                                android:paddingVertical="@dimen/common_spacing"
+                                android:text="@string/please_must_select_at_least_one_point"
+                                android:textColor="@color/black"
+                                android:textSize="24sp" />
+                        </LinearLayout>
+                    </FrameLayout>
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/member_info_layout"
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_marginHorizontal="@dimen/common_spacing"
+                    android:layout_marginVertical="@dimen/common_spacing"
+                    android:layout_weight="1"
+                    android:background="@drawable/home_card_bg"
+                    android:gravity="center_vertical"
+                    android:orientation="vertical">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/common_spacing"
+                            android:layout_weight="1"
+                            android:text="@string/member_info_title"
+                            android:textColor="@color/black"
+                            android:textSize="24sp" />
+
+                        <TextView
+                            android:id="@+id/select_member_tv"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/common_spacing"
+                            android:layout_marginRight="@dimen/common_spacing"
+                            android:background="@drawable/common_btn"
+                            android:paddingHorizontal="@dimen/common_spacing_2x"
+                            android:text="@string/select"
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/common_btn_text_size" />
+                    </LinearLayout>
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/divider_line_space"
+                        android:background="@color/black" />
+
+                    <FrameLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent">
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:gravity="center"
+                            android:orientation="horizontal">
+
+                            <LinearLayout
+                                android:layout_width="wrap_content"
+                                android:layout_height="match_parent"
+                                android:background="@drawable/home_card_bg"
+                                android:orientation="vertical">
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:gravity="center"
+                                    android:paddingHorizontal="@dimen/common_spacing_2x"
+                                    android:paddingVertical="@dimen/common_spacing"
+                                    android:text="@string/locker"
+                                    android:textColor="@color/black"
+                                    android:textSize="24sp" />
+
+                                <View
+                                    android:layout_width="match_parent"
+                                    android:layout_height="@dimen/divider_line_space"
+                                    android:background="@color/black" />
+
+                                <LinearLayout
+                                    android:layout_width="match_parent"
+                                    android:layout_height="match_parent"
+                                    android:gravity="center"
+                                    android:orientation="vertical"
+                                    android:paddingBottom="@dimen/common_spacing">
+
+                                    <ImageView
+                                        android:layout_width="50dp"
+                                        android:layout_height="50dp"
+                                        android:layout_marginTop="@dimen/common_spacing"
+                                        android:src="@mipmap/icon_data_manage_menu_user_manage"
+                                        android:tint="@color/black" />
+
+                                    <TextView
+                                        android:id="@+id/locker_name"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:gravity="center"
+                                        android:textColor="@color/black"
+                                        android:textSize="@dimen/common_btn_text_size" />
+                                </LinearLayout>
+                            </LinearLayout>
+
+                            <LinearLayout
+                                android:id="@+id/select_colocker_layout"
+                                android:layout_width="match_parent"
+                                android:layout_height="match_parent"
+                                android:layout_weight="1"
+                                android:background="@drawable/home_card_bg"
+                                android:orientation="vertical">
+
+                                <TextView
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:gravity="center"
+                                    android:paddingHorizontal="@dimen/common_spacing_2x"
+                                    android:paddingVertical="@dimen/common_spacing"
+                                    android:text="@string/colocker"
+                                    android:textColor="@color/black"
+                                    android:textSize="24sp" />
+
+                                <View
+                                    android:layout_width="match_parent"
+                                    android:layout_height="@dimen/divider_line_space"
+                                    android:background="@color/black" />
+
+                                <androidx.recyclerview.widget.RecyclerView
+                                    android:id="@+id/colocker_rv"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="match_parent" />
+                            </LinearLayout>
+
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:id="@+id/no_selected_member_layout"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:background="@drawable/card_white_bg"
+                            android:gravity="center"
+                            android:orientation="vertical">
+
+                            <ImageView
+                                android:layout_width="80dp"
+                                android:layout_height="80dp"
+                                android:src="@drawable/icon_add_box" />
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:gravity="center"
+                                android:paddingHorizontal="@dimen/common_spacing_2x"
+                                android:paddingVertical="@dimen/common_spacing"
+                                android:text="@string/please_select_member"
+                                android:textColor="@color/black"
+                                android:textSize="24sp" />
+                        </LinearLayout>
+                    </FrameLayout>
+                </LinearLayout>
+            </LinearLayout>
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:padding="@dimen/common_spacing">
+
+            <CheckBox
+                android:id="@+id/save_sop"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/common_spacing"
+                android:text="@string/save_sop_check"
+                android:textColor="@color/black"
+                android:textSize="@dimen/common_btn_text_size" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="@dimen/divider_line_space"
+                android:layout_weight="1" />
+
+            <TextView
+                android:id="@+id/save_and_execute"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="@dimen/common_spacing"
+                android:background="@drawable/common_btn"
+                android:paddingHorizontal="@dimen/common_spacing_2x"
+                android:text="@string/save_and_execute"
+                android:textColor="@color/black"
+                android:textSize="@dimen/common_btn_text_size" />
+
+            <TextView
+                android:id="@+id/save"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@drawable/common_btn"
+                android:paddingHorizontal="@dimen/common_spacing_2x"
+                android:text="@string/save"
+                android:textColor="@color/black"
+                android:textSize="@dimen/common_btn_text_size" />
+
+            <TextView
+                android:id="@+id/cancel"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/common_spacing"
+                android:background="@drawable/common_btn"
+                android:paddingHorizontal="@dimen/common_spacing_2x"
+                android:text="@string/cancel"
+                android:textColor="@color/black"
+                android:textSize="@dimen/common_btn_text_size" />
+        </LinearLayout>
+    </LinearLayout>
+</layout>

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

@@ -0,0 +1,455 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_margin="@dimen/common_spacing_2x"
+        android:background="@drawable/home_card_bg"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:id="@+id/title_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:paddingHorizontal="@dimen/common_spacing"
+            android:paddingVertical="@dimen/common_spacing_small">
+
+            <ImageView
+                android:layout_width="@dimen/common_spacing_2x"
+                android:layout_height="@dimen/common_spacing_2x"
+                android:src="@mipmap/icon_data_manage_menu_user_manage" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/common_spacing"
+                android:layout_weight="1"
+                android:text="@string/create_sop_title"
+                android:textColor="@color/black"
+                android:textSize="24sp" />
+
+            <TextView
+                android:id="@+id/back"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/common_spacing"
+                android:background="@drawable/common_btn"
+                android:paddingHorizontal="@dimen/common_spacing_2x"
+                android:text="@string/back"
+                android:textColor="@color/black"
+                android:textSize="@dimen/common_btn_text_size" />
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/divider_line_space"
+            android:background="@color/black" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="horizontal">
+
+            <LinearLayout
+                android:id="@+id/base_info_layout"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_marginHorizontal="@dimen/common_spacing"
+                android:layout_marginTop="@dimen/common_spacing"
+                android:layout_marginBottom="@dimen/common_spacing"
+                android:layout_weight="1"
+                android:background="@drawable/home_card_bg"
+                android:gravity="center_vertical"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/common_spacing"
+                    android:text="@string/base_info_title"
+                    android:textColor="@color/black"
+                    android:textSize="24sp" />
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/divider_line_space"
+                    android:background="@color/black" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:orientation="vertical">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/common_spacing_2x"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal"
+                        android:paddingHorizontal="@dimen/dialog_content_normal_padding_horizontal">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/sop_workstation"
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/common_text_size" />
+
+                        <TextView
+                            android:id="@+id/workstation_tv"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/common_spacing"
+                            android:background="@drawable/bg_common_input"
+                            android:drawableRight="@drawable/icon_drop_down"
+                            android:hint="@string/please_select_sop_workstation"
+                            android:maxLines="1"
+                            android:paddingHorizontal="@dimen/common_spacing"
+                            android:paddingVertical="2dp"
+                            android:singleLine="true"
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/common_text_size" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/common_spacing_2x"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal"
+                        android:paddingHorizontal="@dimen/dialog_content_normal_padding_horizontal">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/lock_mode"
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/common_text_size" />
+
+                        <TextView
+                            android:id="@+id/lock_mode_tv"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/common_spacing"
+                            android:background="@drawable/bg_common_input"
+                            android:drawableRight="@drawable/icon_drop_down"
+                            android:hint="@string/please_select_lock_mode"
+                            android:maxLines="1"
+                            android:paddingHorizontal="@dimen/common_spacing"
+                            android:paddingVertical="2dp"
+                            android:singleLine="true"
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/common_text_size" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/common_spacing_2x"
+                        android:layout_marginBottom="@dimen/common_spacing_2x"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal"
+                        android:paddingHorizontal="@dimen/dialog_content_normal_padding_horizontal">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/create_sop_name"
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/common_text_size" />
+
+                        <EditText
+                            android:id="@+id/sop_name_et"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/common_spacing"
+                            android:background="@drawable/bg_common_input"
+                            android:hint="@string/please_input_sop_name"
+                            android:maxLines="1"
+                            android:paddingHorizontal="@dimen/common_spacing"
+                            android:paddingVertical="2dp"
+                            android:singleLine="true"
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/common_text_size" />
+                    </LinearLayout>
+                </LinearLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:orientation="vertical">
+
+                <LinearLayout
+                    android:id="@+id/point_info_layout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="@dimen/common_spacing"
+                    android:layout_marginVertical="@dimen/common_spacing"
+                    android:layout_weight="1"
+                    android:background="@drawable/home_card_bg"
+                    android:gravity="center_vertical"
+                    android:orientation="vertical">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/common_spacing"
+                            android:layout_weight="1"
+                            android:text="@string/point_info_title"
+                            android:textColor="@color/black"
+                            android:textSize="24sp" />
+
+                        <TextView
+                            android:id="@+id/select_point_tv"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/common_spacing"
+                            android:layout_marginRight="@dimen/common_spacing"
+                            android:background="@drawable/common_btn"
+                            android:paddingHorizontal="@dimen/common_spacing_2x"
+                            android:text="@string/select"
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/common_btn_text_size" />
+                    </LinearLayout>
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/divider_line_space"
+                        android:background="@color/black" />
+
+                    <FrameLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent">
+
+                        <androidx.recyclerview.widget.RecyclerView
+                            android:id="@+id/point_rv"
+                            android:layout_width="match_parent"
+                            android:layout_height="240dp"
+                            android:paddingBottom="@dimen/common_spacing" />
+
+                        <LinearLayout
+                            android:id="@+id/no_selected_point_layout"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:background="@drawable/card_white_bg"
+                            android:gravity="center"
+                            android:orientation="vertical">
+
+                            <ImageView
+                                android:layout_width="80dp"
+                                android:layout_height="80dp"
+                                android:src="@drawable/icon_add_box" />
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:gravity="center"
+                                android:paddingHorizontal="@dimen/common_spacing_2x"
+                                android:paddingVertical="@dimen/common_spacing"
+                                android:text="@string/please_must_select_at_least_one_point"
+                                android:textColor="@color/black"
+                                android:textSize="24sp" />
+                        </LinearLayout>
+                    </FrameLayout>
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/member_info_layout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="@dimen/common_spacing"
+                    android:layout_marginVertical="@dimen/common_spacing"
+                    android:layout_weight="1"
+                    android:background="@drawable/home_card_bg"
+                    android:gravity="center_vertical"
+                    android:orientation="vertical">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/common_spacing"
+                            android:layout_weight="1"
+                            android:text="@string/member_info_title"
+                            android:textColor="@color/black"
+                            android:textSize="24sp" />
+
+                        <TextView
+                            android:id="@+id/select_member_tv"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/common_spacing"
+                            android:layout_marginRight="@dimen/common_spacing"
+                            android:background="@drawable/common_btn"
+                            android:paddingHorizontal="@dimen/common_spacing_2x"
+                            android:text="@string/select"
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/common_btn_text_size" />
+                    </LinearLayout>
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/divider_line_space"
+                        android:background="@color/black" />
+
+                    <FrameLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent">
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:gravity="center"
+                            android:orientation="horizontal">
+
+                            <LinearLayout
+                                android:layout_width="wrap_content"
+                                android:layout_height="match_parent"
+                                android:background="@drawable/home_card_bg"
+                                android:orientation="vertical">
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:gravity="center"
+                                    android:paddingHorizontal="@dimen/common_spacing_2x"
+                                    android:paddingVertical="@dimen/common_spacing"
+                                    android:text="@string/locker"
+                                    android:textColor="@color/black"
+                                    android:textSize="24sp" />
+
+                                <View
+                                    android:layout_width="match_parent"
+                                    android:layout_height="@dimen/divider_line_space"
+                                    android:background="@color/black" />
+
+                                <LinearLayout
+                                    android:layout_width="match_parent"
+                                    android:layout_height="match_parent"
+                                    android:gravity="center"
+                                    android:orientation="vertical"
+                                    android:paddingBottom="@dimen/common_spacing">
+
+                                    <ImageView
+                                        android:layout_width="50dp"
+                                        android:layout_height="50dp"
+                                        android:layout_marginTop="@dimen/common_spacing"
+                                        android:src="@mipmap/icon_data_manage_menu_user_manage"
+                                        android:tint="@color/black" />
+
+                                    <TextView
+                                        android:id="@+id/locker_name"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:gravity="center"
+                                        android:textColor="@color/black"
+                                        android:textSize="@dimen/common_btn_text_size" />
+                                </LinearLayout>
+                            </LinearLayout>
+
+                            <LinearLayout
+                                android:id="@+id/select_colocker_layout"
+                                android:layout_width="match_parent"
+                                android:layout_height="match_parent"
+                                android:layout_weight="1"
+                                android:background="@drawable/home_card_bg"
+                                android:orientation="vertical">
+
+                                <TextView
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:gravity="center"
+                                    android:paddingHorizontal="@dimen/common_spacing_2x"
+                                    android:paddingVertical="@dimen/common_spacing"
+                                    android:text="@string/colocker"
+                                    android:textColor="@color/black"
+                                    android:textSize="24sp" />
+
+                                <View
+                                    android:layout_width="match_parent"
+                                    android:layout_height="@dimen/divider_line_space"
+                                    android:background="@color/black" />
+
+                                <androidx.recyclerview.widget.RecyclerView
+                                    android:id="@+id/colocker_rv"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="match_parent" />
+                            </LinearLayout>
+
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:id="@+id/no_selected_member_layout"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:background="@drawable/card_white_bg"
+                            android:gravity="center"
+                            android:orientation="vertical">
+
+                            <ImageView
+                                android:layout_width="80dp"
+                                android:layout_height="80dp"
+                                android:src="@drawable/icon_add_box" />
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:gravity="center"
+                                android:paddingHorizontal="@dimen/common_spacing_2x"
+                                android:paddingVertical="@dimen/common_spacing"
+                                android:text="@string/please_select_member"
+                                android:textColor="@color/black"
+                                android:textSize="24sp" />
+                        </LinearLayout>
+                    </FrameLayout>
+                </LinearLayout>
+
+            </LinearLayout>
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="right"
+            android:orientation="horizontal"
+            android:padding="@dimen/common_spacing">
+
+            <TextView
+                android:id="@+id/confirm"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/common_spacing"
+                android:background="@drawable/common_btn"
+                android:paddingHorizontal="@dimen/common_spacing_2x"
+                android:text="@string/confirm"
+                android:textColor="@color/black"
+                android:textSize="@dimen/common_btn_text_size" />
+
+            <TextView
+                android:id="@+id/cancel"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/common_spacing"
+                android:background="@drawable/common_btn"
+                android:paddingHorizontal="@dimen/common_spacing_2x"
+                android:text="@string/cancel"
+                android:textColor="@color/black"
+                android:textSize="@dimen/common_btn_text_size" />
+        </LinearLayout>
+    </LinearLayout>
+</layout>

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

@@ -0,0 +1,446 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_margin="@dimen/common_spacing_2x"
+        android:background="@drawable/home_card_bg"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:id="@+id/title_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:paddingHorizontal="@dimen/common_spacing"
+            android:paddingVertical="@dimen/common_spacing_small">
+
+            <ImageView
+                android:layout_width="@dimen/common_spacing_2x"
+                android:layout_height="@dimen/common_spacing_2x"
+                android:src="@mipmap/icon_data_manage_menu_user_manage" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/common_spacing"
+                android:layout_weight="1"
+                android:text="@string/create_sop_job_title"
+                android:textColor="@color/black"
+                android:textSize="24sp" />
+
+            <TextView
+                android:id="@+id/back"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/common_spacing"
+                android:background="@drawable/common_btn"
+                android:paddingHorizontal="@dimen/common_spacing_2x"
+                android:text="@string/back"
+                android:textColor="@color/black"
+                android:textSize="@dimen/common_btn_text_size" />
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/divider_line_space"
+            android:background="@color/black" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="horizontal">
+
+            <LinearLayout
+                android:id="@+id/base_info_layout"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_marginHorizontal="@dimen/common_spacing"
+                android:layout_marginTop="@dimen/common_spacing"
+                android:layout_marginBottom="@dimen/common_spacing"
+                android:layout_weight="1"
+                android:background="@drawable/home_card_bg"
+                android:gravity="center_vertical"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/common_spacing"
+                    android:text="@string/base_info_title"
+                    android:textColor="@color/black"
+                    android:textSize="24sp" />
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/divider_line_space"
+                    android:background="@color/black" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:orientation="vertical">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/common_spacing_2x"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal"
+                        android:paddingHorizontal="@dimen/dialog_content_normal_padding_horizontal">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/sop_workstation"
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/common_text_size" />
+
+                        <TextView
+                            android:id="@+id/workstation_tv"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/common_spacing"
+                            android:background="@drawable/bg_common_input"
+                            android:drawableRight="@drawable/icon_drop_down"
+                            android:hint="@string/please_select_sop_workstation"
+                            android:maxLines="1"
+                            android:paddingHorizontal="@dimen/common_spacing"
+                            android:paddingVertical="2dp"
+                            android:singleLine="true"
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/common_text_size" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="36dp"
+                        android:layout_marginTop="@dimen/common_spacing_2x"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal"
+                        android:paddingHorizontal="@dimen/dialog_content_normal_padding_horizontal">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/create_sop_job_sop"
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/common_text_size" />
+
+                        <TextView
+                            android:id="@+id/sop_tv"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/common_spacing"
+                            android:background="@drawable/bg_common_input"
+                            android:drawableRight="@drawable/icon_drop_down"
+                            android:hint="@string/please_select_sop"
+                            android:maxLines="1"
+                            android:paddingHorizontal="@dimen/common_spacing"
+                            android:paddingVertical="2dp"
+                            android:singleLine="true"
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/common_text_size" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/common_spacing_2x"
+                        android:layout_marginBottom="@dimen/common_spacing_2x"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal"
+                        android:paddingHorizontal="@dimen/dialog_content_normal_padding_horizontal">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/job_name"
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/common_text_size" />
+
+                        <EditText
+                            android:id="@+id/job_name_et"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/common_spacing"
+                            android:background="@drawable/bg_common_input"
+                            android:hint="@string/please_input_job_name"
+                            android:maxLines="1"
+                            android:paddingHorizontal="@dimen/common_spacing"
+                            android:paddingVertical="2dp"
+                            android:singleLine="true"
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/common_text_size" />
+                    </LinearLayout>
+                </LinearLayout>
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:orientation="vertical">
+
+                <LinearLayout
+                    android:id="@+id/point_info_layout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="@dimen/common_spacing"
+                    android:layout_marginVertical="@dimen/common_spacing"
+                    android:layout_weight="1"
+                    android:background="@drawable/home_card_bg"
+                    android:gravity="center_vertical"
+                    android:orientation="vertical">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/common_spacing"
+                            android:layout_weight="1"
+                            android:text="@string/point_info_title"
+                            android:textColor="@color/black"
+                            android:textSize="24sp" />
+
+                    </LinearLayout>
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/divider_line_space"
+                        android:background="@color/black" />
+
+                    <FrameLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent">
+
+                        <androidx.recyclerview.widget.RecyclerView
+                            android:id="@+id/point_rv"
+                            android:layout_width="match_parent"
+                            android:layout_height="240dp"
+                            android:paddingBottom="@dimen/common_spacing" />
+
+                        <LinearLayout
+                            android:id="@+id/no_selected_point_layout"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:background="@drawable/card_white_bg"
+                            android:gravity="center"
+                            android:orientation="vertical">
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:gravity="center"
+                                android:paddingHorizontal="@dimen/common_spacing_2x"
+                                android:paddingVertical="@dimen/common_spacing"
+                                android:text="@string/show_points_when_selected_sop"
+                                android:textColor="@color/black"
+                                android:textSize="@dimen/common_btn_text_size" />
+                        </LinearLayout>
+                    </FrameLayout>
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/member_info_layout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="@dimen/common_spacing"
+                    android:layout_marginVertical="@dimen/common_spacing"
+                    android:layout_weight="1"
+                    android:background="@drawable/home_card_bg"
+                    android:gravity="center_vertical"
+                    android:orientation="vertical">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/common_spacing"
+                            android:layout_weight="1"
+                            android:text="@string/member_info_title"
+                            android:textColor="@color/black"
+                            android:textSize="24sp" />
+
+                        <TextView
+                            android:id="@+id/select_member_tv"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/common_spacing"
+                            android:layout_marginRight="@dimen/common_spacing"
+                            android:background="@drawable/common_btn"
+                            android:paddingHorizontal="@dimen/common_spacing_2x"
+                            android:text="@string/select"
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/common_btn_text_size" />
+                    </LinearLayout>
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/divider_line_space"
+                        android:background="@color/black" />
+
+                    <FrameLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent">
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:gravity="center"
+                            android:orientation="horizontal">
+
+                            <LinearLayout
+                                android:layout_width="wrap_content"
+                                android:layout_height="match_parent"
+                                android:background="@drawable/home_card_bg"
+                                android:orientation="vertical">
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:gravity="center"
+                                    android:paddingHorizontal="@dimen/common_spacing_2x"
+                                    android:paddingVertical="@dimen/common_spacing"
+                                    android:text="@string/locker"
+                                    android:textColor="@color/black"
+                                    android:textSize="24sp" />
+
+                                <View
+                                    android:layout_width="match_parent"
+                                    android:layout_height="@dimen/divider_line_space"
+                                    android:background="@color/black" />
+
+                                <LinearLayout
+                                    android:layout_width="match_parent"
+                                    android:layout_height="match_parent"
+                                    android:gravity="center"
+                                    android:orientation="vertical"
+                                    android:paddingBottom="@dimen/common_spacing">
+
+                                    <ImageView
+                                        android:layout_width="50dp"
+                                        android:layout_height="50dp"
+                                        android:layout_marginTop="@dimen/common_spacing"
+                                        android:src="@mipmap/icon_data_manage_menu_user_manage"
+                                        android:tint="@color/black" />
+
+                                    <TextView
+                                        android:id="@+id/locker_name"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:gravity="center"
+                                        android:textColor="@color/black"
+                                        android:textSize="@dimen/common_btn_text_size" />
+                                </LinearLayout>
+                            </LinearLayout>
+
+                            <LinearLayout
+                                android:id="@+id/select_colocker_layout"
+                                android:layout_width="match_parent"
+                                android:layout_height="match_parent"
+                                android:layout_weight="1"
+                                android:background="@drawable/home_card_bg"
+                                android:orientation="vertical">
+
+                                <TextView
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:gravity="center"
+                                    android:paddingHorizontal="@dimen/common_spacing_2x"
+                                    android:paddingVertical="@dimen/common_spacing"
+                                    android:text="@string/colocker"
+                                    android:textColor="@color/black"
+                                    android:textSize="24sp" />
+
+                                <View
+                                    android:layout_width="match_parent"
+                                    android:layout_height="@dimen/divider_line_space"
+                                    android:background="@color/black" />
+
+                                <androidx.recyclerview.widget.RecyclerView
+                                    android:id="@+id/colocker_rv"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="match_parent" />
+                            </LinearLayout>
+
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:id="@+id/no_selected_member_layout"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:background="@drawable/card_white_bg"
+                            android:gravity="center"
+                            android:orientation="vertical">
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:gravity="center"
+                                android:paddingHorizontal="@dimen/common_spacing_2x"
+                                android:paddingVertical="@dimen/common_spacing"
+                                android:text="@string/show_member_when_selected_sop"
+                                android:textColor="@color/black"
+                                android:textSize="@dimen/common_btn_text_size" />
+                        </LinearLayout>
+                    </FrameLayout>
+                </LinearLayout>
+            </LinearLayout>
+        </LinearLayout>
+
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="right"
+            android:orientation="horizontal"
+            android:padding="@dimen/common_spacing">
+
+            <TextView
+                android:id="@+id/save_and_execute"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="@dimen/common_spacing"
+                android:background="@drawable/common_btn"
+                android:paddingHorizontal="@dimen/common_spacing_2x"
+                android:text="@string/save_and_execute"
+                android:textColor="@color/black"
+                android:textSize="@dimen/common_btn_text_size" />
+
+            <TextView
+                android:id="@+id/save"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@drawable/common_btn"
+                android:paddingHorizontal="@dimen/common_spacing_2x"
+                android:text="@string/save"
+                android:textColor="@color/black"
+                android:textSize="@dimen/common_btn_text_size" />
+
+            <TextView
+                android:id="@+id/cancel"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/common_spacing"
+                android:background="@drawable/common_btn"
+                android:paddingHorizontal="@dimen/common_spacing_2x"
+                android:text="@string/cancel"
+                android:textColor="@color/black"
+                android:textSize="@dimen/common_btn_text_size" />
+        </LinearLayout>
+    </LinearLayout>
+</layout>

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

@@ -0,0 +1,412 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_margin="@dimen/common_spacing_2x"
+        android:background="@drawable/home_card_bg"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:id="@+id/title_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:paddingHorizontal="@dimen/common_spacing"
+            android:paddingVertical="@dimen/common_spacing_small">
+
+            <ImageView
+                android:layout_width="@dimen/common_spacing_2x"
+                android:layout_height="@dimen/common_spacing_2x"
+                android:src="@mipmap/icon_data_manage_menu_user_manage" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/common_spacing"
+                android:layout_weight="1"
+                android:text="@string/edit_job_title"
+                android:textColor="@color/black"
+                android:textSize="24sp" />
+
+            <TextView
+                android:id="@+id/back"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/common_spacing"
+                android:background="@drawable/common_btn"
+                android:paddingHorizontal="@dimen/common_spacing_2x"
+                android:text="@string/back"
+                android:textColor="@color/black"
+                android:textSize="@dimen/common_btn_text_size" />
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/divider_line_space"
+            android:background="@color/black" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="horizontal">
+
+            <LinearLayout
+                android:id="@+id/base_info_layout"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_marginHorizontal="@dimen/common_spacing"
+                android:layout_marginTop="@dimen/common_spacing"
+                android:layout_marginBottom="@dimen/common_spacing"
+                android:layout_weight="1"
+                android:background="@drawable/home_card_bg"
+                android:gravity="center_vertical"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/common_spacing"
+                    android:text="@string/base_info_title"
+                    android:textColor="@color/black"
+                    android:textSize="24sp" />
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/divider_line_space"
+                    android:background="@color/black" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:orientation="vertical">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/common_spacing_2x"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal"
+                        android:paddingHorizontal="@dimen/dialog_content_normal_padding_horizontal">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/job_workstation"
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/common_text_size" />
+
+                        <TextView
+                            android:id="@+id/workstation_tv"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/common_spacing"
+                            android:background="@drawable/bg_common_input"
+                            android:drawableRight="@drawable/icon_drop_down"
+                            android:hint="@string/please_select_job_workstation"
+                            android:maxLines="1"
+                            android:paddingHorizontal="@dimen/common_spacing"
+                            android:paddingVertical="2dp"
+                            android:singleLine="true"
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/common_text_size" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/common_spacing_2x"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal"
+                        android:paddingHorizontal="@dimen/dialog_content_normal_padding_horizontal">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/lock_mode"
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/common_text_size" />
+
+                        <TextView
+                            android:id="@+id/lock_mode_tv"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/common_spacing"
+                            android:background="@drawable/bg_common_input"
+                            android:drawableRight="@drawable/icon_drop_down"
+                            android:hint="@string/please_select_lock_mode"
+                            android:maxLines="1"
+                            android:paddingHorizontal="@dimen/common_spacing"
+                            android:paddingVertical="2dp"
+                            android:singleLine="true"
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/common_text_size" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/common_spacing_2x"
+                        android:layout_marginBottom="@dimen/common_spacing_2x"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal"
+                        android:paddingHorizontal="@dimen/dialog_content_normal_padding_horizontal">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/create_job_name"
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/common_text_size" />
+
+                        <EditText
+                            android:id="@+id/job_name_et"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/common_spacing"
+                            android:background="@drawable/bg_common_input"
+                            android:hint="@string/please_input_job_name"
+                            android:maxLines="1"
+                            android:paddingHorizontal="@dimen/common_spacing"
+                            android:paddingVertical="2dp"
+                            android:singleLine="true"
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/common_text_size" />
+                    </LinearLayout>
+                </LinearLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:orientation="vertical">
+
+                <LinearLayout
+                    android:id="@+id/point_info_layout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="@dimen/common_spacing"
+                    android:layout_marginVertical="@dimen/common_spacing"
+                    android:layout_weight="1"
+                    android:background="@drawable/home_card_bg"
+                    android:gravity="center_vertical"
+                    android:orientation="vertical">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/common_spacing"
+                            android:layout_weight="1"
+                            android:text="@string/point_info_title"
+                            android:textColor="@color/black"
+                            android:textSize="24sp" />
+
+                        <TextView
+                            android:id="@+id/select_point_tv"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/common_spacing"
+                            android:layout_marginRight="@dimen/common_spacing"
+                            android:background="@drawable/common_btn"
+                            android:paddingHorizontal="@dimen/common_spacing_2x"
+                            android:text="@string/select"
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/common_btn_text_size" />
+                    </LinearLayout>
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/divider_line_space"
+                        android:background="@color/black" />
+
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/point_rv"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:paddingBottom="@dimen/common_spacing" />
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/member_info_layout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="@dimen/common_spacing"
+                    android:layout_marginVertical="@dimen/common_spacing"
+                    android:layout_weight="1"
+                    android:background="@drawable/home_card_bg"
+                    android:gravity="center_vertical"
+                    android:orientation="vertical">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/common_spacing"
+                            android:layout_weight="1"
+                            android:text="@string/member_info_title"
+                            android:textColor="@color/black"
+                            android:textSize="24sp" />
+
+                        <TextView
+                            android:id="@+id/select_member_tv"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/common_spacing"
+                            android:layout_marginRight="@dimen/common_spacing"
+                            android:background="@drawable/common_btn"
+                            android:paddingHorizontal="@dimen/common_spacing_2x"
+                            android:text="@string/select"
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/common_btn_text_size" />
+                    </LinearLayout>
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/divider_line_space"
+                        android:background="@color/black" />
+
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:gravity="center"
+                        android:orientation="horizontal">
+
+                        <LinearLayout
+                            android:layout_width="wrap_content"
+                            android:layout_height="match_parent"
+                            android:background="@drawable/home_card_bg"
+                            android:orientation="vertical">
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:gravity="center"
+                                android:paddingHorizontal="@dimen/common_spacing_2x"
+                                android:paddingVertical="@dimen/common_spacing"
+                                android:text="@string/locker"
+                                android:textColor="@color/black"
+                                android:textSize="24sp" />
+
+                            <View
+                                android:layout_width="match_parent"
+                                android:layout_height="@dimen/divider_line_space"
+                                android:background="@color/black" />
+
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="match_parent"
+                                android:gravity="center"
+                                android:orientation="vertical"
+                                android:paddingBottom="@dimen/common_spacing">
+
+                                <ImageView
+                                    android:layout_width="50dp"
+                                    android:layout_height="50dp"
+                                    android:layout_marginTop="@dimen/common_spacing"
+                                    android:src="@mipmap/icon_data_manage_menu_user_manage"
+                                    android:tint="@color/black" />
+
+                                <TextView
+                                    android:id="@+id/locker_name"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:gravity="center"
+                                    android:textColor="@color/black"
+                                    android:textSize="@dimen/common_btn_text_size" />
+                            </LinearLayout>
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:id="@+id/select_colocker_layout"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:layout_weight="1"
+                            android:background="@drawable/home_card_bg"
+                            android:orientation="vertical">
+
+                            <TextView
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:gravity="center"
+                                android:paddingHorizontal="@dimen/common_spacing_2x"
+                                android:paddingVertical="@dimen/common_spacing"
+                                android:text="@string/colocker"
+                                android:textColor="@color/black"
+                                android:textSize="24sp" />
+
+                            <View
+                                android:layout_width="match_parent"
+                                android:layout_height="@dimen/divider_line_space"
+                                android:background="@color/black" />
+
+                            <androidx.recyclerview.widget.RecyclerView
+                                android:id="@+id/colocker_rv"
+                                android:layout_width="wrap_content"
+                                android:layout_height="match_parent" />
+                        </LinearLayout>
+
+                    </LinearLayout>
+                </LinearLayout>
+            </LinearLayout>
+        </LinearLayout>
+
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:padding="@dimen/common_spacing">
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="@dimen/divider_line_space"
+                android:layout_weight="1" />
+
+            <TextView
+                android:id="@+id/save_and_execute"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="@dimen/common_spacing"
+                android:background="@drawable/common_btn"
+                android:paddingHorizontal="@dimen/common_spacing_2x"
+                android:text="@string/save_and_execute"
+                android:textColor="@color/black"
+                android:textSize="@dimen/common_btn_text_size" />
+
+            <TextView
+                android:id="@+id/save"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@drawable/common_btn"
+                android:paddingHorizontal="@dimen/common_spacing_2x"
+                android:text="@string/save"
+                android:textColor="@color/black"
+                android:textSize="@dimen/common_btn_text_size" />
+
+            <TextView
+                android:id="@+id/cancel"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/common_spacing"
+                android:background="@drawable/common_btn"
+                android:paddingHorizontal="@dimen/common_spacing_2x"
+                android:text="@string/cancel"
+                android:textColor="@color/black"
+                android:textSize="@dimen/common_btn_text_size" />
+        </LinearLayout>
+    </LinearLayout>
+</layout>

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

@@ -30,7 +30,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:layout_gravity="center_vertical"
-                android:layout_margin="@dimen/common_spacing_2x"
+                android:layout_margin="@dimen/common_spacing"
                 tools:listitem="@layout/item_home_quick_entrance" />
         </FrameLayout>
 

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

@@ -0,0 +1,235 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_margin="@dimen/common_spacing_2x"
+        android:background="@drawable/home_card_bg"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:id="@+id/title_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:paddingHorizontal="@dimen/common_spacing"
+            android:paddingVertical="@dimen/common_spacing_small">
+
+            <ImageView
+                android:id="@+id/preview_step_iv"
+                android:layout_width="@dimen/common_spacing_2x"
+                android:layout_height="@dimen/common_spacing_2x"
+                android:src="@mipmap/icon_data_manage_menu_user_manage" />
+
+            <TextView
+                android:id="@+id/preview_step_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/common_spacing"
+                android:text="@string/create_sop_title"
+                android:textColor="@color/black"
+                android:textSize="24sp" />
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:src="@drawable/icon_arrow_right" />
+
+            <ImageView
+                android:layout_width="@dimen/common_spacing_2x"
+                android:layout_height="@dimen/common_spacing_2x"
+                android:src="@mipmap/icon_data_manage_menu_role_manage" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/common_spacing"
+                android:text="@string/select_member_title"
+                android:textColor="@color/black"
+                android:textSize="24sp" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1" />
+
+            <TextView
+                android:id="@+id/back"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/common_spacing"
+                android:background="@drawable/common_btn"
+                android:paddingHorizontal="@dimen/common_spacing_2x"
+                android:text="@string/back"
+                android:textColor="@color/black"
+                android:textSize="@dimen/common_btn_text_size" />
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/divider_line_space"
+            android:background="@color/black" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="horizontal">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginHorizontal="@dimen/common_spacing_2x"
+                android:layout_marginVertical="@dimen/common_spacing_2x"
+                android:layout_weight="1"
+                android:background="@drawable/home_card_bg"
+                android:orientation="vertical">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:background="@drawable/home_card_bg"
+                    android:divider="@drawable/divider_table"
+                    android:orientation="horizontal"
+                    android:layout_weight="1"
+                    android:showDividers="middle">
+
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:gravity="center_horizontal"
+                        android:orientation="vertical">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:gravity="center"
+                            android:paddingHorizontal="@dimen/common_spacing_2x"
+                            android:paddingVertical="@dimen/common_spacing"
+                            android:text="@string/locker"
+                            android:textColor="@color/black"
+                            android:textSize="24sp" />
+
+                        <TextView
+                            android:id="@+id/select_locker_tv"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginBottom="@dimen/common_spacing"
+                            android:background="@drawable/bg_select_member_btn"
+                            android:paddingHorizontal="@dimen/common_spacing_2x"
+                            android:paddingVertical="@dimen/common_spacing_small"
+                            android:text="@string/select"
+                            android:textColor="@color/white" />
+                    </LinearLayout>
+
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/locker_rv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/select_colocker_layout"
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:background="@drawable/home_card_bg"
+                    android:divider="@drawable/divider_table"
+                    android:orientation="horizontal"
+                    android:layout_weight="1"
+                    android:showDividers="middle">
+
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:gravity="center_horizontal"
+                        android:orientation="vertical">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:gravity="center"
+                            android:paddingHorizontal="@dimen/common_spacing_2x"
+                            android:paddingVertical="@dimen/common_spacing"
+                            android:text="@string/colocker"
+                            android:textColor="@color/black"
+                            android:textSize="24sp" />
+
+                        <TextView
+                            android:id="@+id/select_colocker_tv"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginBottom="@dimen/common_spacing"
+                            android:background="@drawable/bg_select_member_btn"
+                            android:paddingHorizontal="@dimen/common_spacing_2x"
+                            android:paddingVertical="@dimen/common_spacing_small"
+                            android:text="@string/select"
+                            android:textColor="@color/white" />
+                    </LinearLayout>
+
+
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/colocker_rv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent" />
+                </LinearLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:layout_marginTop="@dimen/common_spacing_2x"
+                android:layout_marginHorizontal="@dimen/common_spacing_2x"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/select_member_tip"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/select_colocker_tip"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/normal_text_size" />
+
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/all_user_rv"
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_marginBottom="@dimen/common_spacing_2x"
+                    android:layout_weight="1"
+                    android:background="@drawable/home_card_bg" />
+            </LinearLayout>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="right"
+            android:orientation="horizontal"
+            android:padding="@dimen/common_spacing">
+
+            <TextView
+                android:id="@+id/confirm"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/common_spacing"
+                android:background="@drawable/common_btn"
+                android:paddingHorizontal="@dimen/common_spacing_2x"
+                android:text="@string/confirm"
+                android:textColor="@color/black"
+                android:textSize="@dimen/common_btn_text_size" />
+
+            <TextView
+                android:id="@+id/cancel"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/common_spacing"
+                android:background="@drawable/common_btn"
+                android:paddingHorizontal="@dimen/common_spacing_2x"
+                android:text="@string/cancel"
+                android:textColor="@color/black"
+                android:textSize="@dimen/common_btn_text_size" />
+        </LinearLayout>
+    </LinearLayout>
+</layout>

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

@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_margin="@dimen/common_spacing_2x"
+        android:background="@drawable/home_card_bg"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:id="@+id/title_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:paddingHorizontal="@dimen/common_spacing"
+            android:paddingVertical="@dimen/common_spacing_small">
+
+            <ImageView
+                android:id="@+id/preview_step_iv"
+                android:layout_width="@dimen/common_spacing_2x"
+                android:layout_height="@dimen/common_spacing_2x"
+                android:src="@mipmap/icon_data_manage_menu_user_manage" />
+
+            <TextView
+                android:id="@+id/preview_step_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/common_spacing"
+                android:text="@string/create_sop_title"
+                android:textColor="@color/black"
+                android:textSize="24sp" />
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:src="@drawable/icon_arrow_right" />
+
+            <ImageView
+                android:layout_width="@dimen/common_spacing_2x"
+                android:layout_height="@dimen/common_spacing_2x"
+                android:src="@mipmap/icon_data_manage_menu_point_manage" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/common_spacing"
+                android:text="@string/select_point_title"
+                android:textColor="@color/black"
+                android:textSize="24sp" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1" />
+
+            <TextView
+                android:id="@+id/back"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/common_spacing"
+                android:background="@drawable/common_btn"
+                android:paddingHorizontal="@dimen/common_spacing_2x"
+                android:text="@string/back"
+                android:textColor="@color/black"
+                android:textSize="@dimen/common_btn_text_size" />
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/divider_line_space"
+            android:background="@color/black" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:orientation="horizontal">
+
+            <LinearLayout
+                android:id="@+id/selected_point_info_layout"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_marginHorizontal="@dimen/common_spacing_2x"
+                android:layout_marginVertical="@dimen/common_spacing"
+                android:layout_weight="1"
+                android:background="@drawable/home_card_bg"
+                android:gravity="center_vertical"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/common_spacing"
+                    android:text="@string/selected_point_info_title"
+                    android:textColor="@color/black"
+                    android:textSize="24sp" />
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/divider_line_space"
+                    android:background="@color/black" />
+
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/selected_point_rv"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:paddingBottom="@dimen/common_spacing" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/unselected_point_info_layout"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_marginHorizontal="@dimen/common_spacing_2x"
+                android:layout_marginVertical="@dimen/common_spacing"
+                android:layout_weight="2"
+                android:background="@drawable/home_card_bg"
+                android:gravity="center_vertical"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/common_spacing"
+                    android:text="@string/unselected_point_info_title"
+                    android:textColor="@color/black"
+                    android:textSize="24sp" />
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/divider_line_space"
+                    android:background="@color/black" />
+
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/unselected_point_rv"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:paddingBottom="@dimen/common_spacing" />
+
+            </LinearLayout>
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="right"
+            android:orientation="horizontal"
+            android:padding="@dimen/common_spacing">
+
+            <TextView
+                android:id="@+id/confirm"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/common_spacing"
+                android:background="@drawable/common_btn"
+                android:paddingHorizontal="@dimen/common_spacing_2x"
+                android:text="@string/confirm"
+                android:textColor="@color/black"
+                android:textSize="@dimen/common_btn_text_size" />
+
+            <TextView
+                android:id="@+id/cancel"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/common_spacing"
+                android:background="@drawable/common_btn"
+                android:paddingHorizontal="@dimen/common_spacing_2x"
+                android:text="@string/cancel"
+                android:textColor="@color/black"
+                android:textSize="@dimen/common_btn_text_size" />
+        </LinearLayout>
+    </LinearLayout>
+</layout>

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

@@ -1,22 +1,23 @@
 <?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">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <LinearLayout
-        android:layout_width="140dp"
-        android:layout_height="140dp"
+        android:layout_width="@dimen/home_item_quick_entrance_layout"
+        android:layout_height="@dimen/home_item_quick_entrance_layout"
         android:gravity="center_horizontal"
         android:orientation="vertical">
 
         <FrameLayout
-            android:layout_width="100dp"
-            android:layout_height="100dp"
+            android:layout_width="@dimen/home_item_quick_entrance_iv_layout"
+            android:layout_height="@dimen/home_item_quick_entrance_iv_layout"
             android:background="@drawable/bg_home_menu_item">
 
             <ImageView
                 android:id="@+id/home_menu_iv"
-                android:layout_width="80dp"
-                android:layout_height="80dp"
+                android:layout_width="@dimen/home_item_quick_entrance_iv"
+                android:layout_height="@dimen/home_item_quick_entrance_iv"
                 android:layout_gravity="center"
                 app:tint="@color/black" />
         </FrameLayout>
@@ -27,6 +28,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/common_spacing_small"
             android:textColor="@color/black"
-            android:textSize="24sp" />
+            tools:text="创建作业"
+            android:textSize="@dimen/home_item_quick_entrace_text_size" />
     </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="201dp"
-            android:layout_height="226dp"
+            android:layout_width="@dimen/login_method_item_layout_width"
+            android:layout_height="@dimen/login_method_item_layout_height"
             android:layout_gravity="center"
             android:background="@drawable/bg_card_item_land">
 
@@ -23,8 +23,8 @@
 
             <ImageView
                 android:id="@+id/login_method_iv"
-                android:layout_width="121dp"
-                android:layout_height="121dp"
+                android:layout_width="@dimen/login_method_item_iv_size"
+                android:layout_height="@dimen/login_method_item_iv_size"
                 android:layout_centerHorizontal="true"
                 android:layout_marginTop="22.5dp"
                 android:adjustViewBounds="false"

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

@@ -20,9 +20,9 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="@string/user_manage_filter_title"
+                android:text="@string/role_manage_add_title"
                 android:textColor="@color/black"
-                android:textSize="@dimen/title_normal_text_size" />
+                android:textSize="@dimen/common_btn_text_size" />
 
             <ImageView
                 android:id="@+id/close_iv"
@@ -56,7 +56,7 @@
                     android:layout_height="wrap_content"
                     android:text="@string/role_manage_role_name"
                     android:textColor="@color/black"
-                    android:textSize="@dimen/normal_text_size" />
+                    android:textSize="@dimen/common_text_size" />
 
                 <EditText
                     android:id="@+id/role_name_et"
@@ -70,7 +70,7 @@
                     android:paddingVertical="@dimen/normal_input_padding_vertical"
                     android:singleLine="true"
                     android:textColor="@color/black"
-                    android:textSize="@dimen/normal_text_size" />
+                    android:textSize="@dimen/common_text_size" />
             </LinearLayout>
 
             <LinearLayout
@@ -86,7 +86,7 @@
                     android:layout_height="wrap_content"
                     android:text="@string/role_manage_permission_string"
                     android:textColor="@color/black"
-                    android:textSize="@dimen/normal_text_size" />
+                    android:textSize="@dimen/common_text_size" />
 
                 <EditText
                     android:id="@+id/role_key_et"
@@ -100,7 +100,7 @@
                     android:paddingVertical="@dimen/normal_input_padding_vertical"
                     android:singleLine="true"
                     android:textColor="@color/black"
-                    android:textSize="@dimen/normal_text_size" />
+                    android:textSize="@dimen/common_text_size" />
             </LinearLayout>
 
             <LinearLayout
@@ -116,7 +116,7 @@
                     android:layout_height="wrap_content"
                     android:text="@string/manage_filter_status"
                     android:textColor="@color/black"
-                    android:textSize="@dimen/normal_text_size" />
+                    android:textSize="@dimen/common_text_size" />
 
                 <RadioGroup
                     android:id="@+id/status_rg"
@@ -129,7 +129,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/normal_margin_left"
-                        android:textSize="@dimen/normal_text_size"
+                        android:textSize="@dimen/common_text_size"
                         android:text="@string/user_manage_filter_activate" />
 
                     <RadioButton
@@ -137,7 +137,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/normal_margin_left"
-                        android:textSize="@dimen/normal_text_size"
+                        android:textSize="@dimen/common_text_size"
                         android:text="@string/user_manage_filter_deactivate" />
                 </RadioGroup>
             </LinearLayout>

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

@@ -20,7 +20,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="@string/user_manage_filter_title"
+                android:text="@string/point_manage_add_title"
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
 

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

@@ -47,312 +47,317 @@
             android:layout_width="match_parent"
             android:layout_height="@dimen/divider_line_space"
             android:background="@color/black" />
-
         <LinearLayout
-            android:id="@+id/base_info_layout"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="@dimen/common_spacing_2x"
-            android:layout_marginTop="@dimen/common_spacing_2x"
-            android:layout_marginBottom="@dimen/common_spacing"
-            android:background="@drawable/home_card_bg"
-            android:gravity="center_vertical"
+            android:layout_height="match_parent"
             android:orientation="vertical">
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/common_spacing"
-                android:layout_weight="1"
-                android:text="@string/base_info_title"
-                android:textColor="@color/black"
-                android:textSize="24sp" />
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/divider_line_space"
-                android:background="@color/black" />
-
-
             <LinearLayout
+                android:id="@+id/base_info_layout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/common_spacing_2x"
                 android:layout_marginTop="@dimen/common_spacing_2x"
+                android:layout_marginBottom="@dimen/common_spacing"
+                android:background="@drawable/home_card_bg"
                 android:gravity="center_vertical"
-                android:orientation="horizontal"
-                android:paddingHorizontal="@dimen/dialog_content_normal_padding_horizontal">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/job_workstation"
-                    android:textColor="@color/black"
-                    android:textSize="@dimen/common_text_size" />
+                android:orientation="vertical">
 
                 <TextView
-                    android:id="@+id/workstation_tv"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/common_spacing"
-                    android:background="@drawable/bg_common_input"
-                    android:drawableRight="@drawable/icon_drop_down"
-                    android:hint="@string/please_select_job_workstation"
-                    android:maxLines="1"
-                    android:paddingHorizontal="@dimen/common_spacing"
-                    android:paddingVertical="2dp"
-                    android:singleLine="true"
-                    android:textColor="@color/black"
-                    android:textSize="@dimen/common_text_size" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/common_spacing_2x"
-                android:gravity="center_vertical"
-                android:orientation="horizontal"
-                android:paddingHorizontal="@dimen/dialog_content_normal_padding_horizontal">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/lock_mode"
+                    android:layout_weight="1"
+                    android:text="@string/base_info_title"
                     android:textColor="@color/black"
-                    android:textSize="@dimen/common_text_size" />
+                    android:textSize="24sp" />
 
-                <TextView
-                    android:id="@+id/lock_mode_tv"
+                <View
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="@dimen/common_spacing"
-                    android:background="@drawable/bg_common_input"
-                    android:drawableRight="@drawable/icon_drop_down"
-                    android:hint="@string/please_select_lock_mode"
-                    android:maxLines="1"
-                    android:paddingHorizontal="@dimen/common_spacing"
-                    android:paddingVertical="2dp"
-                    android:singleLine="true"
-                    android:textColor="@color/black"
-                    android:textSize="@dimen/common_text_size" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/common_spacing_2x"
-                android:layout_marginBottom="@dimen/common_spacing_2x"
-                android:gravity="center_vertical"
-                android:orientation="horizontal"
-                android:paddingHorizontal="@dimen/dialog_content_normal_padding_horizontal">
+                    android:layout_height="@dimen/divider_line_space"
+                    android:background="@color/black" />
 
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/create_job_name"
-                    android:textColor="@color/black"
-                    android:textSize="@dimen/common_text_size" />
 
-                <EditText
-                    android:id="@+id/job_name_et"
+                <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="@dimen/common_spacing"
-                    android:background="@drawable/bg_common_input"
-                    android:hint="@string/please_input_job_name"
-                    android:maxLines="1"
-                    android:paddingHorizontal="@dimen/common_spacing"
-                    android:paddingVertical="2dp"
-                    android:singleLine="true"
-                    android:textColor="@color/black"
-                    android:textSize="@dimen/common_text_size" />
-            </LinearLayout>
-        </LinearLayout>
+                    android:layout_marginTop="@dimen/common_spacing_2x"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:paddingHorizontal="@dimen/dialog_content_normal_padding_horizontal">
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1"
-            android:orientation="vertical">
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/job_workstation"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/common_text_size" />
 
-            <LinearLayout
-                android:id="@+id/point_info_layout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/common_spacing_2x"
-                android:layout_marginVertical="@dimen/common_spacing"
-                android:layout_weight="1"
-                android:background="@drawable/home_card_bg"
-                android:gravity="center_vertical"
-                android:orientation="vertical">
+                    <TextView
+                        android:id="@+id/workstation_tv"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/common_spacing"
+                        android:background="@drawable/bg_common_input"
+                        android:drawableRight="@drawable/icon_drop_down"
+                        android:hint="@string/please_select_job_workstation"
+                        android:maxLines="1"
+                        android:paddingHorizontal="@dimen/common_spacing"
+                        android:paddingVertical="2dp"
+                        android:singleLine="true"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/common_text_size" />
+                </LinearLayout>
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="horizontal">
+                    android:layout_marginTop="@dimen/common_spacing_2x"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:paddingHorizontal="@dimen/dialog_content_normal_padding_horizontal">
 
                     <TextView
-                        android:layout_width="match_parent"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="@dimen/common_spacing"
-                        android:layout_weight="1"
-                        android:text="@string/point_info_title"
+                        android:text="@string/lock_mode"
                         android:textColor="@color/black"
-                        android:textSize="24sp" />
+                        android:textSize="@dimen/common_text_size" />
 
                     <TextView
-                        android:id="@+id/select_point_tv"
-                        android:layout_width="wrap_content"
+                        android:id="@+id/lock_mode_tv"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/common_spacing"
-                        android:layout_marginRight="@dimen/common_spacing"
-                        android:background="@drawable/common_btn"
-                        android:paddingHorizontal="@dimen/common_spacing_2x"
-                        android:text="@string/select"
+                        android:background="@drawable/bg_common_input"
+                        android:drawableRight="@drawable/icon_drop_down"
+                        android:hint="@string/please_select_lock_mode"
+                        android:maxLines="1"
+                        android:paddingHorizontal="@dimen/common_spacing"
+                        android:paddingVertical="2dp"
+                        android:singleLine="true"
                         android:textColor="@color/black"
-                        android:textSize="@dimen/common_btn_text_size" />
+                        android:textSize="@dimen/common_text_size" />
                 </LinearLayout>
 
-                <View
+                <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/divider_line_space"
-                    android:background="@color/black" />
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/common_spacing_2x"
+                    android:layout_marginBottom="@dimen/common_spacing_2x"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:paddingHorizontal="@dimen/dialog_content_normal_padding_horizontal">
 
-                <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/point_rv"
-                    android:layout_width="match_parent"
-                    android:layout_height="240dp"
-                    android:paddingBottom="@dimen/common_spacing" />
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/create_job_name"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/common_text_size" />
 
+                    <EditText
+                        android:id="@+id/job_name_et"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/common_spacing"
+                        android:background="@drawable/bg_common_input"
+                        android:hint="@string/please_input_job_name"
+                        android:maxLines="1"
+                        android:paddingHorizontal="@dimen/common_spacing"
+                        android:paddingVertical="2dp"
+                        android:singleLine="true"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/common_text_size" />
+                </LinearLayout>
             </LinearLayout>
 
             <LinearLayout
-                android:id="@+id/member_info_layout"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/common_spacing_2x"
-                android:layout_marginVertical="@dimen/common_spacing"
+                android:layout_height="0dp"
                 android:layout_weight="1"
-                android:background="@drawable/home_card_bg"
-                android:gravity="center_vertical"
                 android:orientation="vertical">
 
                 <LinearLayout
+                    android:id="@+id/point_info_layout"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="horizontal">
+                    android:layout_marginHorizontal="@dimen/common_spacing_2x"
+                    android:layout_marginVertical="@dimen/common_spacing"
+                    android:layout_weight="1"
+                    android:background="@drawable/home_card_bg"
+                    android:gravity="center_vertical"
+                    android:orientation="vertical">
 
-                    <TextView
+                    <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="@dimen/common_spacing"
-                        android:layout_weight="1"
-                        android:text="@string/member_info_title"
-                        android:textColor="@color/black"
-                        android:textSize="24sp" />
+                        android:orientation="horizontal">
 
-                    <TextView
-                        android:id="@+id/select_member_tv"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="@dimen/common_spacing"
-                        android:layout_marginRight="@dimen/common_spacing"
-                        android:background="@drawable/common_btn"
-                        android:paddingHorizontal="@dimen/common_spacing_2x"
-                        android:text="@string/select"
-                        android:textColor="@color/black"
-                        android:textSize="@dimen/common_btn_text_size" />
-                </LinearLayout>
+                        <TextView
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/common_spacing"
+                            android:layout_weight="1"
+                            android:text="@string/point_info_title"
+                            android:textColor="@color/black"
+                            android:textSize="24sp" />
 
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/divider_line_space"
-                    android:background="@color/black" />
+                        <TextView
+                            android:id="@+id/select_point_tv"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/common_spacing"
+                            android:layout_marginRight="@dimen/common_spacing"
+                            android:background="@drawable/common_btn"
+                            android:paddingHorizontal="@dimen/common_spacing_2x"
+                            android:text="@string/select"
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/common_btn_text_size" />
+                    </LinearLayout>
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/divider_line_space"
+                        android:background="@color/black" />
 
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/point_rv"
+                        android:layout_width="match_parent"
+                        android:layout_height="240dp"
+                        android:paddingBottom="@dimen/common_spacing" />
+
+                </LinearLayout>
 
                 <LinearLayout
+                    android:id="@+id/member_info_layout"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:gravity="center"
-                    android:orientation="horizontal">
+                    android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="@dimen/common_spacing_2x"
+                    android:layout_marginVertical="@dimen/common_spacing"
+                    android:layout_weight="1"
+                    android:background="@drawable/home_card_bg"
+                    android:gravity="center_vertical"
+                    android:orientation="vertical">
 
                     <LinearLayout
-                        android:layout_width="wrap_content"
-                        android:layout_height="match_parent"
-                        android:background="@drawable/home_card_bg"
-                        android:orientation="vertical">
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
 
                         <TextView
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/common_spacing"
+                            android:layout_weight="1"
+                            android:text="@string/member_info_title"
+                            android:textColor="@color/black"
+                            android:textSize="24sp" />
+
+                        <TextView
+                            android:id="@+id/select_member_tv"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:gravity="center"
+                            android:layout_marginLeft="@dimen/common_spacing"
+                            android:layout_marginRight="@dimen/common_spacing"
+                            android:background="@drawable/common_btn"
                             android:paddingHorizontal="@dimen/common_spacing_2x"
-                            android:paddingVertical="@dimen/common_spacing"
-                            android:text="@string/locker"
+                            android:text="@string/select"
                             android:textColor="@color/black"
-                            android:textSize="24sp" />
+                            android:textSize="@dimen/common_btn_text_size" />
+                    </LinearLayout>
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/divider_line_space"
+                        android:background="@color/black" />
 
-                        <View
-                            android:layout_width="match_parent"
-                            android:layout_height="@dimen/divider_line_space"
-                            android:background="@color/black" />
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:gravity="center"
+                        android:orientation="horizontal">
 
                         <LinearLayout
-                            android:layout_width="match_parent"
+                            android:layout_width="wrap_content"
                             android:layout_height="match_parent"
-                            android:gravity="center"
-                            android:orientation="vertical"
-                            android:paddingBottom="@dimen/common_spacing">
-
-                            <ImageView
-                                android:layout_width="50dp"
-                                android:layout_height="50dp"
-                                android:layout_marginTop="@dimen/common_spacing"
-                                android:src="@mipmap/icon_data_manage_menu_user_manage"
-                                android:tint="@color/black" />
+                            android:background="@drawable/home_card_bg"
+                            android:orientation="vertical">
 
                             <TextView
-                                android:id="@+id/locker_name"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:gravity="center"
+                                android:paddingHorizontal="@dimen/common_spacing_2x"
+                                android:paddingVertical="@dimen/common_spacing"
+                                android:text="@string/locker"
                                 android:textColor="@color/black"
-                                android:textSize="@dimen/common_btn_text_size" />
-                        </LinearLayout>
-                    </LinearLayout>
+                                android:textSize="24sp" />
 
-                    <LinearLayout
-                        android:id="@+id/select_colocker_layout"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:layout_weight="1"
-                        android:background="@drawable/home_card_bg"
-                        android:orientation="vertical">
+                            <View
+                                android:layout_width="match_parent"
+                                android:layout_height="@dimen/divider_line_space"
+                                android:background="@color/black" />
 
-                        <TextView
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:gravity="center"
-                            android:paddingHorizontal="@dimen/common_spacing_2x"
-                            android:paddingVertical="@dimen/common_spacing"
-                            android:text="@string/colocker"
-                            android:textColor="@color/black"
-                            android:textSize="24sp" />
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="match_parent"
+                                android:gravity="center"
+                                android:orientation="vertical"
+                                android:paddingBottom="@dimen/common_spacing">
+
+                                <ImageView
+                                    android:layout_width="50dp"
+                                    android:layout_height="50dp"
+                                    android:layout_marginTop="@dimen/common_spacing"
+                                    android:src="@mipmap/icon_data_manage_menu_user_manage"
+                                    android:tint="@color/black" />
+
+                                <TextView
+                                    android:id="@+id/locker_name"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:gravity="center"
+                                    android:textColor="@color/black"
+                                    android:textSize="@dimen/common_btn_text_size" />
+                            </LinearLayout>
+                        </LinearLayout>
 
-                        <View
+                        <LinearLayout
+                            android:id="@+id/select_colocker_layout"
                             android:layout_width="match_parent"
-                            android:layout_height="@dimen/divider_line_space"
-                            android:background="@color/black" />
+                            android:layout_height="match_parent"
+                            android:layout_weight="1"
+                            android:background="@drawable/home_card_bg"
+                            android:orientation="vertical">
 
-                        <androidx.recyclerview.widget.RecyclerView
-                            android:id="@+id/colocker_rv"
-                            android:layout_width="wrap_content"
-                            android:layout_height="match_parent" />
-                    </LinearLayout>
+                            <TextView
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:gravity="center"
+                                android:paddingHorizontal="@dimen/common_spacing_2x"
+                                android:paddingVertical="@dimen/common_spacing"
+                                android:text="@string/colocker"
+                                android:textColor="@color/black"
+                                android:textSize="24sp" />
+
+                            <View
+                                android:layout_width="match_parent"
+                                android:layout_height="@dimen/divider_line_space"
+                                android:background="@color/black" />
 
+                            <androidx.recyclerview.widget.RecyclerView
+                                android:id="@+id/colocker_rv"
+                                android:layout_width="wrap_content"
+                                android:layout_height="match_parent" />
+                        </LinearLayout>
+
+                    </LinearLayout>
                 </LinearLayout>
             </LinearLayout>
         </LinearLayout>
 
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"

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

@@ -30,7 +30,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:layout_gravity="center_vertical"
-                android:layout_margin="@dimen/common_spacing_2x"
+                android:layout_margin="@dimen/common_spacing"
                 tools:listitem="@layout/item_home_quick_entrance" />
         </FrameLayout>
 

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

@@ -57,7 +57,7 @@
 
 
             <TextView
-                android:id="@+id/add_user"
+                android:id="@+id/add"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
@@ -69,7 +69,7 @@
 
 
             <TextView
-                android:id="@+id/delete_user"
+                android:id="@+id/delete"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
@@ -86,7 +86,7 @@
                 android:layout_weight="1" />
 
             <TextView
-                android:id="@+id/filter_user"
+                android:id="@+id/filter"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"

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

@@ -72,122 +72,127 @@
             android:layout_height="@dimen/divider_line_space"
             android:background="@color/black" />
 
-
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="@dimen/common_spacing_2x"
-            android:layout_marginTop="@dimen/common_spacing_2x"
-            android:background="@drawable/home_card_bg"
+            android:layout_height="match_parent"
             android:orientation="vertical">
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/common_spacing_2x"
+                android:layout_marginTop="@dimen/common_spacing_2x"
                 android:background="@drawable/home_card_bg"
-                android:divider="@drawable/divider_table"
-                android:orientation="horizontal"
-                android:showDividers="middle">
+                android:orientation="vertical">
 
                 <LinearLayout
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:gravity="center_horizontal"
-                    android:orientation="vertical">
+                    android:background="@drawable/home_card_bg"
+                    android:divider="@drawable/divider_table"
+                    android:orientation="horizontal"
+                    android:showDividers="middle">
 
-                    <TextView
+                    <LinearLayout
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:gravity="center"
-                        android:paddingHorizontal="@dimen/common_spacing_2x"
-                        android:paddingVertical="@dimen/common_spacing"
-                        android:text="@string/locker"
-                        android:textColor="@color/black"
-                        android:textSize="24sp" />
-
-                    <TextView
-                        android:id="@+id/select_locker_tv"
+                        android:gravity="center_horizontal"
+                        android:orientation="vertical">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:gravity="center"
+                            android:paddingHorizontal="@dimen/common_spacing_2x"
+                            android:paddingVertical="@dimen/common_spacing"
+                            android:text="@string/locker"
+                            android:textColor="@color/black"
+                            android:textSize="24sp" />
+
+                        <TextView
+                            android:id="@+id/select_locker_tv"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginBottom="@dimen/common_spacing"
+                            android:background="@drawable/bg_select_member_btn"
+                            android:paddingHorizontal="@dimen/common_spacing_2x"
+                            android:paddingVertical="@dimen/common_spacing_small"
+                            android:text="@string/select"
+                            android:textColor="@color/white" />
+                    </LinearLayout>
+
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/locker_rv"
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginBottom="@dimen/common_spacing"
-                        android:background="@drawable/bg_select_member_btn"
-                        android:paddingHorizontal="@dimen/common_spacing_2x"
-                        android:paddingVertical="@dimen/common_spacing_small"
-                        android:text="@string/select"
-                        android:textColor="@color/white" />
+                        android:layout_height="wrap_content" />
                 </LinearLayout>
 
-                <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/locker_rv"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
-            </LinearLayout>
-
-
-            <LinearLayout
-                android:id="@+id/select_colocker_layout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@drawable/home_card_bg"
-                android:divider="@drawable/divider_table"
-                android:orientation="horizontal"
-                android:showDividers="middle">
 
                 <LinearLayout
-                    android:layout_width="wrap_content"
+                    android:id="@+id/select_colocker_layout"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:gravity="center_horizontal"
-                    android:orientation="vertical">
+                    android:background="@drawable/home_card_bg"
+                    android:divider="@drawable/divider_table"
+                    android:orientation="horizontal"
+                    android:showDividers="middle">
 
-                    <TextView
+                    <LinearLayout
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:gravity="center"
-                        android:paddingHorizontal="@dimen/common_spacing_2x"
-                        android:paddingVertical="@dimen/common_spacing"
-                        android:text="@string/colocker"
-                        android:textColor="@color/black"
-                        android:textSize="24sp" />
-
-                    <TextView
-                        android:id="@+id/select_colocker_tv"
+                        android:gravity="center_horizontal"
+                        android:orientation="vertical">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:gravity="center"
+                            android:paddingHorizontal="@dimen/common_spacing_2x"
+                            android:paddingVertical="@dimen/common_spacing"
+                            android:text="@string/colocker"
+                            android:textColor="@color/black"
+                            android:textSize="24sp" />
+
+                        <TextView
+                            android:id="@+id/select_colocker_tv"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginBottom="@dimen/common_spacing"
+                            android:background="@drawable/bg_select_member_btn"
+                            android:paddingHorizontal="@dimen/common_spacing_2x"
+                            android:paddingVertical="@dimen/common_spacing_small"
+                            android:text="@string/select"
+                            android:textColor="@color/white" />
+                    </LinearLayout>
+
+
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/colocker_rv"
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginBottom="@dimen/common_spacing"
-                        android:background="@drawable/bg_select_member_btn"
-                        android:paddingHorizontal="@dimen/common_spacing_2x"
-                        android:paddingVertical="@dimen/common_spacing_small"
-                        android:text="@string/select"
-                        android:textColor="@color/white" />
+                        android:layout_height="match_parent" />
                 </LinearLayout>
+            </LinearLayout>
 
+            <TextView
+                android:id="@+id/select_member_tip"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/common_spacing_2x"
+                android:layout_marginTop="@dimen/common_spacing_2x"
+                android:text="@string/select_colocker_tip"
+                android:textColor="@color/black"
+                android:textSize="@dimen/common_text_size" />
 
-                <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/colocker_rv"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent" />
-            </LinearLayout>
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/all_user_rv"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_marginHorizontal="@dimen/common_spacing_2x"
+                android:layout_marginTop="@dimen/common_spacing"
+                android:layout_weight="1"
+                android:background="@drawable/home_card_bg" />
         </LinearLayout>
 
-        <TextView
-            android:id="@+id/select_member_tip"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="@dimen/common_spacing_2x"
-            android:layout_marginTop="@dimen/common_spacing_2x"
-            android:text="@string/select_colocker_tip"
-            android:textColor="@color/black"
-            android:textSize="@dimen/common_text_size" />
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/all_user_rv"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_marginHorizontal="@dimen/common_spacing_2x"
-            android:layout_marginTop="@dimen/common_spacing"
-            android:layout_weight="1"
-            android:background="@drawable/home_card_bg" />
-
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"

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

@@ -71,69 +71,75 @@
             android:layout_width="match_parent"
             android:layout_height="@dimen/divider_line_space"
             android:background="@color/black" />
-
         <LinearLayout
-            android:id="@+id/selected_point_info_layout"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="@dimen/common_spacing_2x"
-            android:layout_marginVertical="@dimen/common_spacing"
-            android:background="@drawable/home_card_bg"
-            android:gravity="center_vertical"
-            android:orientation="vertical">
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            android:layout_weight="1">
 
-            <TextView
+            <LinearLayout
+                android:id="@+id/selected_point_info_layout"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/common_spacing"
+                android:layout_height="0dp"
+                android:layout_marginHorizontal="@dimen/common_spacing_2x"
+                android:layout_marginVertical="@dimen/common_spacing"
                 android:layout_weight="1"
-                android:text="@string/selected_point_info_title"
-                android:textColor="@color/black"
-                android:textSize="24sp" />
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/divider_line_space"
-                android:background="@color/black" />
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/selected_point_rv"
+                android:background="@drawable/home_card_bg"
+                android:gravity="center_vertical"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/common_spacing"
+                    android:text="@string/selected_point_info_title"
+                    android:textColor="@color/black"
+                    android:textSize="24sp" />
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/divider_line_space"
+                    android:background="@color/black" />
+
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/selected_point_rv"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:paddingBottom="@dimen/common_spacing"/>
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/unselected_point_info_layout"
                 android:layout_width="match_parent"
-                android:layout_height="260dp"
-                android:paddingBottom="@dimen/common_spacing"/>
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/unselected_point_info_layout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="@dimen/common_spacing_2x"
-            android:layout_marginVertical="@dimen/common_spacing"
-            android:background="@drawable/home_card_bg"
-            android:gravity="center_vertical"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/common_spacing"
-                android:layout_weight="1"
-                android:text="@string/unselected_point_info_title"
-                android:textColor="@color/black"
-                android:textSize="24sp" />
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/divider_line_space"
-                android:background="@color/black" />
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/unselected_point_rv"
-                android:layout_width="match_parent"
-                android:layout_height="450dp"
-                android:paddingBottom="@dimen/common_spacing" />
-
+                android:layout_height="0dp"
+                android:layout_marginHorizontal="@dimen/common_spacing_2x"
+                android:layout_marginVertical="@dimen/common_spacing"
+                android:layout_weight="2"
+                android:background="@drawable/home_card_bg"
+                android:gravity="center_vertical"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/common_spacing"
+                    android:text="@string/unselected_point_info_title"
+                    android:textColor="@color/black"
+                    android:textSize="24sp" />
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/divider_line_space"
+                    android:background="@color/black" />
+
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/unselected_point_rv"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:paddingBottom="@dimen/common_spacing" />
+
+            </LinearLayout>
         </LinearLayout>
 
         <LinearLayout

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

@@ -1,22 +1,23 @@
 <?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">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <LinearLayout
-        android:layout_width="140dp"
-        android:layout_height="140dp"
+        android:layout_width="@dimen/home_item_quick_entrance_layout"
+        android:layout_height="@dimen/home_item_quick_entrance_layout"
         android:gravity="center_horizontal"
         android:orientation="vertical">
 
         <FrameLayout
-            android:layout_width="100dp"
-            android:layout_height="100dp"
+            android:layout_width="@dimen/home_item_quick_entrance_iv_layout"
+            android:layout_height="@dimen/home_item_quick_entrance_iv_layout"
             android:background="@drawable/bg_home_menu_item">
 
             <ImageView
                 android:id="@+id/home_menu_iv"
-                android:layout_width="80dp"
-                android:layout_height="80dp"
+                android:layout_width="@dimen/home_item_quick_entrance_iv"
+                android:layout_height="@dimen/home_item_quick_entrance_iv"
                 android:layout_gravity="center"
                 app:tint="@color/black" />
         </FrameLayout>
@@ -27,6 +28,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/common_spacing_small"
             android:textColor="@color/black"
-            android:textSize="24sp" />
+            tools:text="创建作业"
+            android:textSize="@dimen/home_item_quick_entrace_text_size" />
     </LinearLayout>
 </layout>

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

@@ -6,8 +6,8 @@
         android:layout_height="wrap_content">
 
         <RelativeLayout
-            android:layout_width="201dp"
-            android:layout_height="226dp"
+            android:layout_width="@dimen/login_method_item_layout_width"
+            android:layout_height="@dimen/login_method_item_layout_height"
             android:layout_gravity="center"
             android:background="@drawable/bg_card_item">
 
@@ -23,10 +23,10 @@
 
             <ImageView
                 android:id="@+id/login_method_iv"
-                android:layout_width="121dp"
-                android:layout_height="121dp"
+                android:layout_width="@dimen/login_method_item_iv_size"
+                android:layout_height="@dimen/login_method_item_iv_size"
                 android:layout_centerHorizontal="true"
-                android:layout_marginTop="22.5dp"
+                android:layout_marginTop="@dimen/login_method_item_iv_margin"
                 android:adjustViewBounds="false"
                 android:scaleType="center"/>
 
@@ -38,7 +38,7 @@
                 android:layout_marginTop="@dimen/common_spacing_2x"
                 android:gravity="center_horizontal"
                 android:textColor="@color/login_method_tv_color"
-                android:textSize="35sp" />
+                android:textSize="@dimen/login_method_item_tv_text_size" />
         </RelativeLayout>
     </FrameLayout>
 </layout>

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

@@ -316,5 +316,8 @@
     <string name="card_manage_title">Card Manage</string>
     <string name="device_in_detect">In device recognition</string>
     <string name="init_device_registration_key_and_lock_complete_step_hint">Scan complete</string>
+    <string name="role_in_preset_tip">The preset role cannot be deleted</string>
+    <string name="point_manage_add_title">Add point</string>
+    <string name="role_manage_add_title">Add role</string>
 
 </resources>

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

@@ -1,9 +1,65 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <dimen name="header_height">70dp</dimen>
+    <dimen name="header_padding">10dp</dimen>
+    <dimen name="header_logo_width">194dp</dimen>
+    <dimen name="header_logo_height">35dp</dimen>
+    <dimen name="header_time_text_size">20sp</dimen>
+    <dimen name="line_height">3dp</dimen>
+    <dimen name="login_version_margin">10dp</dimen>
+    <dimen name="login_version_text_size">14sp</dimen>
+    <dimen name="login_main_title_text_size">60sp</dimen>
+    <dimen name="login_main_title_margin_top">20dp</dimen>
+    <dimen name="login_sub_title_margin_top">20dp</dimen>
+    <dimen name="login_sub_title_text_size">25sp</dimen>
+    <dimen name="login_menu_margin">66dp</dimen>
+    <dimen name="login_circle_view_size">20dp</dimen>
+    <dimen name="login_tip_text_size">25sp</dimen>
+    <dimen name="login_tec_support_text_size">18sp</dimen>
+    <dimen name="login_tec_support_margin_bottom">10dp</dimen>
+    <dimen name="header_time_padding">5dp</dimen>
+    <dimen name="home_user_icon_size">25dp</dimen>
+    <dimen name="home_user_icon_margin">3dp</dimen>
+    <dimen name="home_nickname_margin">10dp</dimen>
+    <dimen name="home_nickname_text_size">20sp</dimen>
+    <dimen name="home_bottom_nav_height">90dp</dimen>
+    <dimen name="home_bottom_nav_text_size">34sp</dimen>
+    <dimen name="home_bottom_nav_icon_size">68dp</dimen>
+    <dimen name="home_bottom_nav_width">90dp</dimen>
+    <dimen name="dialog_common_root_width">680dp</dimen>
+    <dimen name="dialog_common_root_height_big">1020dp</dimen>
+    <dimen name="dialog_common_root_height_small">340dp</dimen>
+    <dimen name="dialog_common_root_height_normal">510dp</dimen>
+    <dimen name="title_normal_padding_horizontal">10dp</dimen>
+    <dimen name="title_normal_padding_vertical">5dp</dimen>
+    <dimen name="title_normal_text_size">20sp</dimen>
+    <dimen name="divider_line_space">1dp</dimen>
+    <dimen name="dialog_normal_margin_top">20dp</dimen>
+    <dimen name="dialog_content_normal_padding_horizontal">16dp</dimen>
+    <dimen name="normal_text_size">18sp</dimen>
+    <dimen name="normal_input_padding_horizontal">10dp</dimen>
+    <dimen name="normal_input_padding_vertical">2dp</dimen>
+    <dimen name="normal_radio_root_layout_padding">56dp</dimen>
+    <dimen name="normal_margin_left">10dp</dimen>
+    <dimen name="normal_layout_margin_top">20dp</dimen>
+    <dimen name="common_margin_spacing_big">40dp</dimen>
+    <dimen name="common_spacing_4x">40dp</dimen>
+    <dimen name="common_spacing_7x">70dp</dimen>
+    <dimen name="common_spacing_1_5x">15dp</dimen>
     <dimen name="init_margin_space">120dp</dimen>
-    <dimen name="init_set_admin_account_et_height">51dp</dimen>
-    <dimen name="init_key_iv_width">85dp</dimen>
-    <dimen name="init_key_iv_height">59.5dp</dimen>
-    <dimen name="init_lock_iv_width">34dp</dimen>
-    <dimen name="init_lock_iv_height">119dp</dimen>
+    <dimen name="init_set_admin_account_et_height">30dp</dimen>
+    <dimen name="init_key_iv_width">50dp</dimen>
+    <dimen name="init_key_iv_height">35dp</dimen>
+    <dimen name="init_lock_iv_width">20dp</dimen>
+    <dimen name="init_lock_iv_height">70dp</dimen>
+    <dimen name="login_method_item_layout_width">201dp</dimen>
+    <dimen name="login_method_item_layout_height">226dp</dimen>
+    <dimen name="login_method_item_iv_size">121dp</dimen>
+    <dimen name="login_method_item_iv_margin">22.5dp</dimen>
+    <dimen name="login_method_item_tv_text_size">35sp</dimen>
+    <dimen name="home_item_quick_entrance_layout">140dp</dimen>
+    <dimen name="home_item_quick_entrance_iv_layout">100dp</dimen>
+    <dimen name="home_item_quick_entrance_iv">80dp</dimen>
+    <dimen name="home_item_quick_entrace_text_size">24sp</dimen>
+    <dimen name="vector_icon_size">40.8dp</dimen>
 </resources>

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

@@ -316,5 +316,8 @@
     <string name="card_manage_title">卡片管理</string>
     <string name="device_in_detect">设备识别中</string>
     <string name="init_device_registration_key_and_lock_complete_step_hint">扫描完成</string>
+    <string name="role_in_preset_tip">预设角色不允许删除</string>
+    <string name="point_manage_add_title">添加点位</string>
+    <string name="role_manage_add_title">添加角色</string>
 
 </resources>

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

@@ -52,4 +52,14 @@
     <dimen name="init_key_iv_height">35dp</dimen>
     <dimen name="init_lock_iv_width">20dp</dimen>
     <dimen name="init_lock_iv_height">70dp</dimen>
+    <dimen name="login_method_item_layout_width">201dp</dimen>
+    <dimen name="login_method_item_layout_height">226dp</dimen>
+    <dimen name="login_method_item_iv_size">121dp</dimen>
+    <dimen name="login_method_item_iv_margin">22.5dp</dimen>
+    <dimen name="login_method_item_tv_text_size">35sp</dimen>
+    <dimen name="home_item_quick_entrance_layout">140dp</dimen>
+    <dimen name="home_item_quick_entrance_iv_layout">100dp</dimen>
+    <dimen name="home_item_quick_entrance_iv">80dp</dimen>
+    <dimen name="home_item_quick_entrace_text_size">24sp</dimen>
+    <dimen name="vector_icon_size">24dp</dimen>
 </resources>

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

@@ -319,5 +319,8 @@
     <string name="card_manage_title">卡片管理</string>
     <string name="device_in_detect">设备识别中</string>
     <string name="init_device_registration_key_and_lock_complete_step_hint">扫描完成</string>
+    <string name="role_in_preset_tip">预设角色不允许删除</string>
+    <string name="point_manage_add_title">添加点位</string>
+    <string name="role_manage_add_title">添加角色</string>
 
 </resources>

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

@@ -60,17 +60,6 @@ abstract class BaseFragment<V : ViewDataBinding> : Fragment(), CustomAdapt {
         }
     }
 
-    /** 请求权限，基于 PermissionUtils */
-    protected fun requestPermissionsIfNeeded(
-        vararg permissions: String,
-        callback: PermissionUtils.PermissionCallback
-    ) {
-        PermissionUtils.checkAndRequestPermissions(
-            permissions.toList().toTypedArray(),
-            callback
-        )
-    }
-
     /** EventBus 事件，子类可重写 */
     @Subscribe(threadMode = ThreadMode.MAIN)
     open fun onEvent(event: EventBean<Any>) {