refactor(更新) :

- 进入录入模式选择的时候就改变设备录入状态
- 修改名称

app/src/main/java/com/grkj/iscs/BusinessManager.kt

@@ -358,7 +358,7 @@ object BusinessManager {
                             ModBusController.readKeyRfid(
                                 dockBean.addr, if (keyBean.isLeft) 0 else 1
                             ) { isLeft, res ->
-                                if (!ISCSDomainData.isDeviceEnter) {
+                                if (!ISCSDomainData.isDeviceRegistration) {
                                     ModBusController.controlKeyCharge(
                                         true, keyBean.isLeft, dockBean.addr
                                     )
@@ -423,7 +423,7 @@ object BusinessManager {
                                                     )
                                                 } else {
                                                     LogUtil.e("Get key info fail : $rfid")
-                                                    if (!ISCSDomainData.isDeviceEnter) {
+                                                    if (!ISCSDomainData.isDeviceRegistration) {
                                                         ToastUtils.tip(R.string.get_key_info_fail)
                                                     }
                                                     ModBusController.controlKeyBuckle(
@@ -641,13 +641,13 @@ object BusinessManager {
                 }
             }
             Executor.delayOnMain(200) {
-                if (!ISCSDomainData.isDeviceEnter) {
+                if (!ISCSDomainData.isDeviceRegistration) {
                     listeners.forEach { it.callBack(dockBean) }
                 }
             }
         }
         Executor.delayOnMain(200) {
-            if (ISCSDomainData.isDeviceEnter) {
+            if (ISCSDomainData.isDeviceRegistration) {
                 initListener?.invoke()
             }
         }

app/src/main/java/com/grkj/iscs/model/ISCSDomainData.kt

@@ -14,5 +14,5 @@ object ISCSDomainData {
     /**
      * 是否是硬件录入
      */
-    var isDeviceEnter: Boolean = false
+    var isDeviceRegistration: Boolean = false
 }

app/src/main/java/com/grkj/iscs/view/activity/HomeActivity.kt

@@ -22,13 +22,12 @@ import com.grkj.iscs.model.eventmsg.DeviceExceptionMsg
 import com.grkj.iscs.model.eventmsg.MsgEvent
 import com.grkj.iscs.model.eventmsg.MsgEventConstants.MSG_EVENT_DEVICE_EXCEPTION
 import com.grkj.iscs.model.vo.user.UserInfoRespVO
-import com.grkj.iscs.util.SPUtils
 import com.grkj.iscs.util.ToastUtils
 import com.grkj.iscs.util.log.LogUtil
 import com.grkj.iscs.view.adapter.MenuAdapter
 import com.grkj.iscs.view.base.BaseFragment
 import com.grkj.iscs.view.base.BaseMvpActivity
-import com.grkj.iscs.view.fragment.DeviceInputHomeFragment
+import com.grkj.iscs.view.fragment.DeviceRegistrationHomeFragment
 import com.grkj.iscs.view.fragment.DeviceStatusFragment
 import com.grkj.iscs.view.fragment.DockTestFragment
 import com.grkj.iscs.view.fragment.ExceptionReportFragment
@@ -87,9 +86,9 @@ class HomeActivity : BaseMvpActivity<IHomeView, HomePresenter, ActivityHomeBindi
                 BusinessManager.isTestMode = true
                 mMenuList.add(
                     Menu(
-                        getString(R.string.device_input),
-                        R.mipmap.menu_icon_device_input,
-                        DeviceInputHomeFragment()
+                        getString(R.string.device_registration),
+                        R.mipmap.menu_icon_device_registration,
+                        DeviceRegistrationHomeFragment()
                     )
                 )
             }

app/src/main/java/com/grkj/iscs/view/fragment/DeviceInputHomeFragment.kt

@@ -1,21 +0,0 @@
-package com.grkj.iscs.view.fragment
-
-import com.grkj.iscs.databinding.FragmentDeviceInputHomeBinding
-import com.grkj.iscs.view.base.BaseMvpFragment
-import com.grkj.iscs.view.iview.IDeviceInputHomeView
-import com.grkj.iscs.view.presenter.DeviceInputHomePresenter
-
-class DeviceInputHomeFragment :
-    BaseMvpFragment<IDeviceInputHomeView, DeviceInputHomePresenter, FragmentDeviceInputHomeBinding>() {
-
-    override val viewBinding: FragmentDeviceInputHomeBinding
-        get() = FragmentDeviceInputHomeBinding.inflate(layoutInflater)
-
-    override fun initPresenter(): DeviceInputHomePresenter {
-        return DeviceInputHomePresenter()
-    }
-
-    override fun initView() {
-
-    }
-}

app/src/main/java/com/grkj/iscs/view/fragment/DeviceRegistrationHomeFragment.kt

@@ -0,0 +1,21 @@
+package com.grkj.iscs.view.fragment
+
+import com.grkj.iscs.databinding.FragmentDeviceRegistrationHomeBinding
+import com.grkj.iscs.view.base.BaseMvpFragment
+import com.grkj.iscs.view.iview.IDeviceRegistrationHomeView
+import com.grkj.iscs.view.presenter.DeviceRegistrationHomePresenter
+
+class DeviceRegistrationHomeFragment :
+    BaseMvpFragment<IDeviceRegistrationHomeView, DeviceRegistrationHomePresenter, FragmentDeviceRegistrationHomeBinding>() {
+
+    override val viewBinding: FragmentDeviceRegistrationHomeBinding
+        get() = FragmentDeviceRegistrationHomeBinding.inflate(layoutInflater)
+
+    override fun initPresenter(): DeviceRegistrationHomePresenter {
+        return DeviceRegistrationHomePresenter()
+    }
+
+    override fun initView() {
+
+    }
+}

app/src/main/java/com/grkj/iscs/view/fragment/DeviceInputKeyAndLockFragment.kt → app/src/main/java/com/grkj/iscs/view/fragment/DeviceRegistrationKeyAndLockFragment.kt

@@ -9,10 +9,9 @@ import androidx.core.view.isVisible
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.RecyclerView
 import com.grkj.iscs.R
-import com.grkj.iscs.databinding.FragmentDeviceInputKeyAndLockBinding
+import com.grkj.iscs.databinding.FragmentDeviceRegistrationKeyAndLockBinding
 import com.grkj.iscs.extentions.setSelected
 import com.grkj.iscs.extentions.setVisibleWithHolder
-import com.grkj.iscs.modbus.DockBean
 import com.grkj.iscs.modbus.ModBusController
 import com.grkj.iscs.model.DeviceConst.DOCK_TYPE_KEY
 import com.grkj.iscs.model.DeviceConst.DOCK_TYPE_LOCK
@@ -23,7 +22,7 @@ import com.grkj.iscs.util.SPUtils
 import com.grkj.iscs.util.log.LogUtil
 import com.grkj.iscs.view.base.BaseNavFragment
 import com.grkj.iscs.view.dialog.TipDialog
-import com.grkj.iscs.view.viewmodel.DeviceInputKeyAndLockViewModel
+import com.grkj.iscs.view.viewmodel.DeviceRegistrationKeyAndLockViewModel
 import com.sik.sikcore.extension.setDebouncedClickListener
 import com.sik.sikcore.thread.ThreadUtils
 import com.zhy.adapter.recyclerview.CommonAdapter
@@ -37,18 +36,17 @@ import kotlinx.coroutines.withContext
 /**
  * 新硬件录入页
  */
-class DeviceInputKeyAndLockFragment :
-    BaseNavFragment<FragmentDeviceInputKeyAndLockBinding>() {
-    private val viewModel: DeviceInputKeyAndLockViewModel by lazy { ViewModelProvider(this)[DeviceInputKeyAndLockViewModel::class] }
+class DeviceRegistrationKeyAndLockFragment :
+    BaseNavFragment<FragmentDeviceRegistrationKeyAndLockBinding>() {
+    private val viewModel: DeviceRegistrationKeyAndLockViewModel by lazy { ViewModelProvider(this)[DeviceRegistrationKeyAndLockViewModel::class] }
     private val tipDialog: TipDialog by lazy { TipDialog(requireContext()) }
     private var mRowList = mutableListOf<DockStatusBO>()
     private var isAlreadyInput: Boolean = false
     override fun getLayoutId(): Int {
-        return R.layout.fragment_device_input_key_and_lock
+        return R.layout.fragment_device_registration_key_and_lock
     }
 
     override fun initView() {
-        ISCSDomainData.isDeviceEnter = true
         viewModel.loginUser = SPUtils.getLoginUser(requireContext())
         //打开所有钥匙仓并关闭充电
         LogUtil.d("设备录入-打开所有钥匙仓并关闭充电")
@@ -64,7 +62,11 @@ class DeviceInputKeyAndLockFragment :
             binding.scanTip.isVisible = !it
             binding.rvDockLayout.isVisible = it
             binding.cbRescanOrInput.isVisible = it
-            binding.scanResultTip.text = requireContext().getString(R.string.device_input_scan_result_tip,viewModel.newHardwareKeySize,viewModel.newHardwareLockSize)
+            binding.scanResultTip.text = requireContext().getString(
+                R.string.device_registration_scan_result_tip,
+                viewModel.newHardwareKeySize,
+                viewModel.newHardwareLockSize
+            )
         }
         binding.cbRescanOrInput.setDebouncedClickListener {
             if (isAlreadyInput) {
@@ -75,7 +77,8 @@ class DeviceInputKeyAndLockFragment :
                 isAlreadyInput = false
                 binding.cbRescanOrInput.setText(
                     if (isAlreadyInput) CommonUtils.getStr(R.string.rescan)
-                        .toString() else CommonUtils.getStr(R.string.input_to_system).toString()
+                        .toString() else CommonUtils.getStr(R.string.registration_to_system)
+                        .toString()
                 )
             } else {
                 viewModel.deviceInputData(mRowList).observe(this) {
@@ -83,13 +86,13 @@ class DeviceInputKeyAndLockFragment :
                         isAlreadyInput = true
                         binding.cbRescanOrInput.setText(
                             if (isAlreadyInput) CommonUtils.getStr(R.string.rescan)
-                                .toString() else CommonUtils.getStr(R.string.input_to_system)
+                                .toString() else CommonUtils.getStr(R.string.registration_to_system)
                                 .toString()
                         )
                         tipDialog.setType(TipDialog.TYPE_CONFIRM)
                         tipDialog.setTip(
                             requireContext().getString(
-                                R.string.already_input_device_tip,
+                                R.string.already_registration_device_tip,
                                 it.second,
                                 it.third
                             )
@@ -98,7 +101,7 @@ class DeviceInputKeyAndLockFragment :
                     } else {
                         tipDialog.setType(TipDialog.TYPE_ALL)
                         tipDialog.setTip(
-                            requireContext().getString(R.string.input_device_error)
+                            requireContext().getString(R.string.registration_device_error)
                         )
                         tipDialog.showCancelCountdown(10)
                     }
@@ -124,7 +127,7 @@ class DeviceInputKeyAndLockFragment :
         fun refreshAdapter() {
             binding.cbRescanOrInput.setText(
                 if (isAlreadyInput) CommonUtils.getStr(R.string.rescan)
-                    .toString() else CommonUtils.getStr(R.string.input_to_system).toString()
+                    .toString() else CommonUtils.getStr(R.string.registration_to_system).toString()
             )
             ThreadUtils.runOnIO {
                 if (isResumed) {
@@ -143,7 +146,7 @@ class DeviceInputKeyAndLockFragment :
     }
 
     override fun onDestroyView() {
-        ISCSDomainData.isDeviceEnter = false
+        ISCSDomainData.isDeviceRegistration = false
         viewModel.unregisterInitListener()
         viewModel.isDestroy = true
         super.onDestroyView()
@@ -151,7 +154,7 @@ class DeviceInputKeyAndLockFragment :
 
     class KeyDockItemDelegate(
         var context: Context,
-        var presenter: DeviceInputKeyAndLockViewModel?
+        var presenter: DeviceRegistrationKeyAndLockViewModel?
     ) :
         ItemViewDelegate<DockStatusBO> {
         private val statusCloseTintColor =
@@ -275,7 +278,7 @@ class DeviceInputKeyAndLockFragment :
 
     class LockDockItemDelegate(
         var context: Context,
-        var presenter: DeviceInputKeyAndLockViewModel?,
+        var presenter: DeviceRegistrationKeyAndLockViewModel?,
         var ctx: Context
     ) : ItemViewDelegate<DockStatusBO> {
         private val statusCloseTintColor =

app/src/main/java/com/grkj/iscs/view/fragment/DeviceInputScanFragment.kt → app/src/main/java/com/grkj/iscs/view/fragment/DeviceRegistrationScanFragment.kt

@@ -2,23 +2,25 @@ package com.grkj.iscs.view.fragment
 
 import androidx.lifecycle.ViewModelProvider
 import com.grkj.iscs.R
-import com.grkj.iscs.databinding.FragmentDeviceInputScanBinding
-import com.grkj.iscs.enums.DeviceInputTypeEnum.*
+import com.grkj.iscs.databinding.FragmentDeviceRegistrationScanBinding
+import com.grkj.iscs.enums.DeviceInputTypeEnum.CARD
+import com.grkj.iscs.enums.DeviceInputTypeEnum.NONE
+import com.grkj.iscs.enums.DeviceInputTypeEnum.RFID
 import com.grkj.iscs.model.ISCSDomainData
 import com.grkj.iscs.util.CommonUtils
 import com.grkj.iscs.view.activity.HomeActivity
 import com.grkj.iscs.view.base.BaseNavFragment
 import com.grkj.iscs.view.dialog.TipDialog
-import com.grkj.iscs.view.viewmodel.DeviceInputViewModel
+import com.grkj.iscs.view.viewmodel.DeviceRegistrationViewModel
 import com.sik.sikcore.extension.setDebouncedClickListener
 
 /**
  * 设备录入扫描界面(卡片录入、RFID标签录入)
  */
-class DeviceInputScanFragment : BaseNavFragment<FragmentDeviceInputScanBinding>() {
-    private val viewModel: DeviceInputViewModel by lazy { ViewModelProvider(this)[DeviceInputViewModel::class] }
+class DeviceRegistrationScanFragment : BaseNavFragment<FragmentDeviceRegistrationScanBinding>() {
+    private val viewModel: DeviceRegistrationViewModel by lazy { ViewModelProvider(this)[DeviceRegistrationViewModel::class] }
     override fun getLayoutId(): Int {
-        return R.layout.fragment_device_input_scan
+        return R.layout.fragment_device_registration_scan
     }
 
     override fun initView() {
@@ -26,17 +28,21 @@ class DeviceInputScanFragment : BaseNavFragment<FragmentDeviceInputScanBinding>(
             navController.popBackStack()
         }
         when (ISCSDomainData.deviceInputType) {
-            CARD -> binding.inputTip.text = CommonUtils.getStr(R.string.device_input_scan_card_tip)
-            RFID -> binding.inputTip.text = CommonUtils.getStr(R.string.device_input_scan_rfid_tip)
+            CARD -> binding.inputTip.text =
+                CommonUtils.getStr(R.string.device_registration_scan_card_tip)
+
+            RFID -> binding.inputTip.text =
+                CommonUtils.getStr(R.string.device_registration_scan_rfid_tip)
+
             NONE -> binding.inputTip.text = ""
         }
 
-        (activity as HomeActivity).cardNoLiveData.observeForever {deviceNfc->
+        (activity as HomeActivity).cardNoLiveData.observeForever { deviceNfc ->
             if (isVisible && !deviceNfc.isNullOrEmpty()) {
                 val tipDialog = TipDialog(requireContext())
                 tipDialog.setTip(
                     requireContext().getString(
-                        R.string.device_input_recognize_tip,
+                        R.string.device_registration_recognize_tip,
                         getTipTypeStr(), deviceNfc ?: ""
                     )
                 )
@@ -45,21 +51,21 @@ class DeviceInputScanFragment : BaseNavFragment<FragmentDeviceInputScanBinding>(
                         if (it) {
                             tipDialog.setTip(
                                 requireContext().getString(
-                                    R.string.device_input_success_tip,
+                                    R.string.device_registration_success_tip,
                                     getTipTypeStr(), deviceNfc ?: ""
                                 )
                             )
-                            tipDialog.setConfirmListener{}
+                            tipDialog.setConfirmListener {}
                             tipDialog.setType(TipDialog.TYPE_CONFIRM)
                             tipDialog.show()
                         } else {
                             tipDialog.setTip(
                                 requireContext().getString(
-                                    R.string.device_input_fail_tip,
+                                    R.string.device_registration_fail_tip,
                                     getTipTypeStr()
                                 )
                             )
-                            tipDialog.setConfirmListener{}
+                            tipDialog.setConfirmListener {}
                             tipDialog.setType(TipDialog.TYPE_CONFIRM)
                             tipDialog.show()
                         }

app/src/main/java/com/grkj/iscs/view/fragment/DeviceInputTypeSelectFragment.kt → app/src/main/java/com/grkj/iscs/view/fragment/DeviceRegistrationTypeSelectFragment.kt

@@ -1,7 +1,7 @@
 package com.grkj.iscs.view.fragment
 
 import com.grkj.iscs.R
-import com.grkj.iscs.databinding.FragmentDeviceInputTypeSelectBinding
+import com.grkj.iscs.databinding.FragmentDeviceRegistrationTypeSelectBinding
 import com.grkj.iscs.enums.DeviceInputTypeEnum
 import com.grkj.iscs.model.ISCSDomainData
 import com.grkj.iscs.view.activity.HomeActivity
@@ -11,9 +11,10 @@ import com.sik.sikcore.extension.setDebouncedClickListener
 /**
  * 设备录入类型选择界面
  */
-class DeviceInputTypeSelectFragment : BaseNavFragment<FragmentDeviceInputTypeSelectBinding>() {
+class DeviceRegistrationTypeSelectFragment :
+    BaseNavFragment<FragmentDeviceRegistrationTypeSelectBinding>() {
     override fun getLayoutId(): Int {
-        return R.layout.fragment_device_input_type_select
+        return R.layout.fragment_device_registration_type_select
     }
 
     override fun initView() {
@@ -31,4 +32,9 @@ class DeviceInputTypeSelectFragment : BaseNavFragment<FragmentDeviceInputTypeSel
             navController.navigate(R.id.action_deviceInputTypeSelectFragment_to_deviceInputScanFragment)
         }
     }
+
+    override fun onResume() {
+        super.onResume()
+        ISCSDomainData.isDeviceRegistration = true
+    }
 }

app/src/main/java/com/grkj/iscs/view/iview/IDeviceInputHomeView.kt → app/src/main/java/com/grkj/iscs/view/iview/IDeviceRegistrationHomeView.kt

@@ -5,5 +5,5 @@ import com.grkj.iscs.view.base.IView
 /**
  * 设备录入界面接口
  */
-interface IDeviceInputHomeView : IView {
+interface IDeviceRegistrationHomeView : IView {
 }

app/src/main/java/com/grkj/iscs/view/presenter/DeviceInputHomePresenter.kt

@@ -1,7 +0,0 @@
-package com.grkj.iscs.view.presenter
-
-import com.grkj.iscs.view.base.BasePresenter
-import com.grkj.iscs.view.iview.IDeviceInputHomeView
-
-class DeviceInputHomePresenter : BasePresenter<IDeviceInputHomeView>() {
-}

app/src/main/java/com/grkj/iscs/view/presenter/DeviceRegistrationHomePresenter.kt

@@ -0,0 +1,7 @@
+package com.grkj.iscs.view.presenter
+
+import com.grkj.iscs.view.base.BasePresenter
+import com.grkj.iscs.view.iview.IDeviceRegistrationHomeView
+
+class DeviceRegistrationHomePresenter : BasePresenter<IDeviceRegistrationHomeView>() {
+}

app/src/main/java/com/grkj/iscs/view/presenter/HomePresenter.kt

@@ -24,7 +24,7 @@ class HomePresenter : BasePresenter<IHomeView>() {
 
     fun registerStatusListener() {
         BusinessManager.registerStatusListener(this) { dockBean ->
-            if (!BusinessManager.CAN_RETURN || ISCSDomainData.isDeviceEnter) {
+            if (!BusinessManager.CAN_RETURN || ISCSDomainData.isDeviceRegistration) {
                 return@registerStatusListener
             }
             when (dockBean.type) {

app/src/main/java/com/grkj/iscs/view/viewmodel/DeviceInputKeyAndLockViewModel.kt → app/src/main/java/com/grkj/iscs/view/viewmodel/DeviceRegistrationKeyAndLockViewModel.kt

@@ -27,7 +27,7 @@ import java.util.concurrent.atomic.AtomicInteger
 import kotlin.collections.iterator
 import kotlin.coroutines.resume
 
-class DeviceInputKeyAndLockViewModel : BaseViewModel() {
+class DeviceRegistrationKeyAndLockViewModel : BaseViewModel() {
     var loginUser: LoginUserBO? = null
     val isLoadComplete: MutableLiveData<Boolean> = MutableLiveData(false)
     var isStartCheckKey: Boolean = false

app/src/main/java/com/grkj/iscs/view/viewmodel/DeviceInputViewModel.kt → app/src/main/java/com/grkj/iscs/view/viewmodel/DeviceRegistrationViewModel.kt

@@ -13,7 +13,7 @@ import kotlin.coroutines.resume
 /**
  * 设备录入
  */
-class DeviceInputViewModel : BaseViewModel() {
+class DeviceRegistrationViewModel : BaseViewModel() {
     /**
      * 设备录入
      */

app/src/main/res/layout/fragment_device_input_key_and_lock.xml → app/src/main/res/layout/fragment_device_registration_key_and_lock.xml

@@ -24,13 +24,13 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:textColor="@color/color_d7d2d2"
-                android:textSize="18sp" />
+                android:textSize="@dimen/device_registration_text_size" />
 
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/rv_dock"
                 style="@style/CommonRecyclerView"
                 android:layout_above="@+id/cb_back"
-                android:layout_marginBottom="10dp" />
+                android:layout_marginBottom="@dimen/common_spacing" />
         </LinearLayout>
 
         <TextView
@@ -39,16 +39,16 @@
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
             android:gravity="center"
-            android:text="@string/device_input_scan_key_and_lock_tip"
+            android:text="@string/device_registration_scan_key_and_lock_tip"
             android:textColor="@color/color_d7d2d2"
-            android:textSize="18sp" />
+            android:textSize="@dimen/device_registration_text_size" />
 
         <com.grkj.iscs.view.widget.CommonBtn
             android:id="@+id/cb_rescan_or_input"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentBottom="true"
-            android:layout_marginRight="10dp"
+            android:layout_marginRight="@dimen/common_spacing"
             android:layout_toLeftOf="@+id/cb_back"
             android:visibility="gone"
             app:btn_bg="@drawable/common_btn_blue_bg"

app/src/main/res/layout/fragment_device_input_scan.xml → app/src/main/res/layout/fragment_device_registration_scan.xml

@@ -13,7 +13,7 @@
             android:layout_centerInParent="true"
             android:gravity="center"
             android:textColor="@color/color_d7d2d2"
-            android:textSize="18sp" />
+            android:textSize="@dimen/device_registration_text_size" />
 
         <com.grkj.iscs.view.widget.CommonBtn
             android:id="@+id/cb_back"

app/src/main/res/layout/fragment_device_input_type_select.xml → app/src/main/res/layout/fragment_device_registration_type_select.xml

@@ -7,7 +7,7 @@
         android:divider="@drawable/divider_horizontal"
         android:gravity="center_vertical"
         android:orientation="horizontal"
-        android:paddingHorizontal="28dp"
+        android:paddingHorizontal="@dimen/device_registration_padding_horizontal"
         android:showDividers="middle">
 
         <LinearLayout
@@ -15,23 +15,23 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:background="@drawable/bg_device_input_type_select"
+            android:background="@drawable/bg_device_registration_type_select"
             android:gravity="center"
             android:orientation="vertical"
-            android:padding="5dp">
+            android:padding="@dimen/device_registration_common_space">
 
             <ImageView
-                android:layout_width="111dp"
-                android:layout_height="49dp"
+                android:layout_width="@dimen/device_registration_common_icon_width"
+                android:layout_height="@dimen/device_registration_common_icon_height"
                 android:src="@mipmap/icon_key_lock_scan" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="5dp"
+                android:layout_marginTop="@dimen/device_registration_common_space"
                 android:text="@string/scan_key_and_lock"
                 android:textColor="@color/color_d7d2d2"
-                android:textSize="12sp" />
+                android:textSize="@dimen/device_registration_common_text_size" />
         </LinearLayout>
 
         <LinearLayout
@@ -39,23 +39,23 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:background="@drawable/bg_device_input_type_select"
+            android:background="@drawable/bg_device_registration_type_select"
             android:gravity="center"
             android:orientation="vertical"
-            android:padding="5dp">
+            android:padding="@dimen/device_registration_common_space">
 
             <ImageView
-                android:layout_width="111dp"
-                android:layout_height="49dp"
+                android:layout_width="@dimen/device_registration_common_icon_width"
+                android:layout_height="@dimen/device_registration_common_icon_height"
                 android:src="@mipmap/icon_card_input" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="5dp"
-                android:text="@string/card_input"
+                android:layout_marginTop="@dimen/device_registration_common_space"
+                android:text="@string/card_registration"
                 android:textColor="@color/color_d7d2d2"
-                android:textSize="12sp" />
+                android:textSize="@dimen/device_registration_common_text_size" />
         </LinearLayout>
 
         <LinearLayout
@@ -63,23 +63,23 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:background="@drawable/bg_device_input_type_select"
+            android:background="@drawable/bg_device_registration_type_select"
             android:gravity="center"
             android:orientation="vertical"
-            android:padding="5dp">
+            android:padding="@dimen/device_registration_common_space">
 
             <ImageView
-                android:layout_width="111dp"
-                android:layout_height="49dp"
+                android:layout_width="@dimen/device_registration_common_icon_width"
+                android:layout_height="@dimen/device_registration_common_icon_height"
                 android:src="@mipmap/icon_rfid_input" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="5dp"
-                android:text="@string/rfid_tag_input"
+                android:layout_marginTop="@dimen/device_registration_common_space"
+                android:text="@string/rfid_tag_registration"
                 android:textColor="@color/color_d7d2d2"
-                android:textSize="12sp" />
+                android:textSize="@dimen/device_registration_common_text_size" />
         </LinearLayout>
     </LinearLayout>
 </layout>

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

@@ -6,7 +6,7 @@
 
     <fragment
         android:id="@+id/deviceInputTypeSelectFragment"
-        android:name="com.grkj.iscs.view.fragment.DeviceInputTypeSelectFragment"
+        android:name="com.grkj.iscs.view.fragment.DeviceRegistrationTypeSelectFragment"
         android:label="DeviceInputTypeSelectFragment" >
         <action
             android:id="@+id/action_deviceInputTypeSelectFragment_to_deviceInputKeyAndLockFragment"
@@ -17,10 +17,10 @@
     </fragment>
     <fragment
         android:id="@+id/deviceInputKeyAndLockFragment"
-        android:name="com.grkj.iscs.view.fragment.DeviceInputKeyAndLockFragment"
+        android:name="com.grkj.iscs.view.fragment.DeviceRegistrationKeyAndLockFragment"
         android:label="DeviceInputKeyAndLockFragment" />
     <fragment
         android:id="@+id/deviceInputScanFragment"
-        android:name="com.grkj.iscs.view.fragment.DeviceInputScanFragment"
+        android:name="com.grkj.iscs.view.fragment.DeviceRegistrationScanFragment"
         android:label="DeviceInputScanFragment" />
 </navigation>

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

@@ -364,22 +364,22 @@
     <string name="lock_nfc_not_correct">该nfc无对应的挂锁信息</string>
     <string name="only_one_person_allowed">Only one person allowed</string>
     <string name="real_person_verification_required">Real-person verification required</string>
-    <string name="device_input">Device enter</string>
+    <string name="device_registration">Hardware registration</string>
     <string name="scan_key_and_lock">scan key and lock</string>
-    <string name="card_input">card enter</string>
-    <string name="rfid_tag_input">rfid tag enter</string>
-    <string name="device_input_scan_key_and_lock_tip">wait to scan new key and lock...</string>
-    <string name="device_input_scan_card_tip">please read card on card reader</string>
-    <string name="device_input_scan_rfid_tip">please read RFID on card reader</string>
-    <string name="device_input_recognize_tip">recognize %1$s\"%2$s\"，do you want to entered system？</string>
+    <string name="card_registration">card enter</string>
+    <string name="rfid_tag_registration">rfid tag enter</string>
+    <string name="device_registration_scan_key_and_lock_tip">wait to scan new key and lock...</string>
+    <string name="device_registration_scan_card_tip">please read card on card reader</string>
+    <string name="device_registration_scan_rfid_tip">please read RFID on card reader</string>
+    <string name="device_registration_recognize_tip">recognize %1$s\"%2$s\"，do you want to entered system？</string>
     <string name="card">Card</string>
     <string name="rfid">RFID</string>
-    <string name="device_input_success_tip">%1$s\"%2$s\"has been entered into the system.</string>
-    <string name="device_input_fail_tip">The %1$s is already in the system and does not need to be entered.</string>
+    <string name="device_registration_success_tip">%1$s\"%2$s\"has been entered into the system.</string>
+    <string name="device_registration_fail_tip">The %1$s is already in the system and does not need to be entered.</string>
     <string name="new_device">New</string>
     <string name="rescan">Rescan</string>
-    <string name="input_to_system">Enter to system</string>
-    <string name="already_input_device_tip">%1$d keys and %2$d padlocks have been entered</string>
-    <string name="input_device_error">entered error</string>
-    <string name="device_input_scan_result_tip">Identified unrecorded keys (%1$d) and padlocks (%2$d).</string>
+    <string name="registration_to_system">Enter to system</string>
+    <string name="already_registration_device_tip">%1$d keys and %2$d padlocks have been entered</string>
+    <string name="registration_device_error">entered error</string>
+    <string name="device_registration_scan_result_tip">Identified unrecorded keys (%1$d) and padlocks (%2$d).</string>
 </resources>

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

@@ -364,22 +364,22 @@
     <string name="lock_nfc_not_correct">该nfc无对应的挂锁信息</string>
     <string name="only_one_person_allowed">请保持单人入镜</string>
     <string name="real_person_verification_required">请保持真人操作</string>
-    <string name="device_input">设备录入</string>
+    <string name="device_registration">硬件录入</string>
     <string name="scan_key_and_lock">扫描钥匙挂锁</string>
-    <string name="card_input">录入卡片</string>
-    <string name="rfid_tag_input">录入RFID标签</string>
-    <string name="device_input_scan_key_and_lock_tip">等待扫描新的钥匙和挂锁...</string>
-    <string name="device_input_scan_card_tip">请在读卡器上刷卡</string>
-    <string name="device_input_scan_rfid_tip">请在读卡器上读取RFID</string>
-    <string name="device_input_recognize_tip">已识别%1$s\"%2$s\"，确定要录入系统吗？</string>
+    <string name="card_registration">录入卡片</string>
+    <string name="rfid_tag_registration">录入RFID标签</string>
+    <string name="device_registration_scan_key_and_lock_tip">等待扫描新的钥匙和挂锁...</string>
+    <string name="device_registration_scan_card_tip">请在读卡器上刷卡</string>
+    <string name="device_registration_scan_rfid_tip">请在读卡器上读取RFID</string>
+    <string name="device_registration_recognize_tip">已识别%1$s\"%2$s\"，确定要录入系统吗？</string>
     <string name="card">卡片</string>
     <string name="rfid">RFID</string>
-    <string name="device_input_success_tip">%1$s\"%2$s\"已录入系统。</string>
-    <string name="device_input_fail_tip">该%1$s已在系统中，无需录入。</string>
+    <string name="device_registration_success_tip">%1$s\"%2$s\"已录入系统。</string>
+    <string name="device_registration_fail_tip">该%1$s已在系统中，无需录入。</string>
     <string name="new_device">New</string>
     <string name="rescan">重新扫描</string>
-    <string name="input_to_system">录入系统</string>
-    <string name="already_input_device_tip">已录入%1$d把钥匙与%2$d把挂锁</string>
-    <string name="input_device_error">录入失败</string>
-    <string name="device_input_scan_result_tip">已识别未录入的钥匙 （%1$d把）与挂锁（%2$d把）。</string>
+    <string name="registration_to_system">录入系统</string>
+    <string name="already_registration_device_tip">已录入%1$d把钥匙与%2$d把挂锁</string>
+    <string name="registration_device_error">录入失败</string>
+    <string name="device_registration_scan_result_tip">已识别未录入的钥匙 （%1$d把）与挂锁（%2$d把）。</string>
 </resources>

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

@@ -85,4 +85,10 @@
     <dimen name="item_rv_login_height">130dp</dimen>
     <dimen name="item_rv_login_margin">7dp</dimen>
     <dimen name="item_rv_login_icon_size">40dp</dimen>
+    <dimen name="device_registration_text_size">18sp</dimen>
+    <dimen name="device_registration_padding_horizontal">28dp</dimen>
+    <dimen name="device_registration_common_space">5dp</dimen>
+    <dimen name="device_registration_common_icon_width">111dp</dimen>
+    <dimen name="device_registration_common_icon_height">49dp</dimen>
+    <dimen name="device_registration_common_text_size">12sp</dimen>
 </resources>

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

@@ -364,22 +364,22 @@
     <string name="lock_nfc_not_correct">该nfc无对应的挂锁信息</string>
     <string name="only_one_person_allowed">请保持单人入镜</string>
     <string name="real_person_verification_required">请保持真人操作</string>
-    <string name="device_input">设备录入</string>
+    <string name="device_registration">硬件录入</string>
     <string name="scan_key_and_lock">扫描钥匙挂锁</string>
-    <string name="card_input">录入卡片</string>
-    <string name="rfid_tag_input">录入RFID标签</string>
-    <string name="device_input_scan_key_and_lock_tip">等待扫描新的钥匙和挂锁...</string>
-    <string name="device_input_scan_card_tip">请在读卡器上刷卡</string>
-    <string name="device_input_scan_rfid_tip">请在读卡器上读取RFID</string>
-    <string name="device_input_recognize_tip">已识别%1$s\"%2$s\"，确定要录入系统吗？</string>
+    <string name="card_registration">录入卡片</string>
+    <string name="rfid_tag_registration">录入RFID标签</string>
+    <string name="device_registration_scan_key_and_lock_tip">等待扫描新的钥匙和挂锁...</string>
+    <string name="device_registration_scan_card_tip">请在读卡器上刷卡</string>
+    <string name="device_registration_scan_rfid_tip">请在读卡器上读取RFID</string>
+    <string name="device_registration_recognize_tip">已识别%1$s\"%2$s\"，确定要录入系统吗？</string>
     <string name="card">卡片</string>
     <string name="rfid">RFID</string>
-    <string name="device_input_success_tip">%1$s\"%2$s\"已录入系统。</string>
-    <string name="device_input_fail_tip">该%1$s已在系统中，无需录入。</string>
+    <string name="device_registration_success_tip">%1$s\"%2$s\"已录入系统。</string>
+    <string name="device_registration_fail_tip">该%1$s已在系统中，无需录入。</string>
     <string name="new_device">New</string>
     <string name="rescan">重新扫描</string>
-    <string name="input_to_system">录入系统</string>
-    <string name="already_input_device_tip">已录入%1$d把钥匙与%2$d把挂锁</string>
-    <string name="input_device_error">录入失败</string>
-    <string name="device_input_scan_result_tip">已识别未录入的钥匙 （%1$d把）与挂锁（%2$d把）。</string>
+    <string name="registration_to_system">录入系统</string>
+    <string name="already_registration_device_tip">已录入%1$d把钥匙与%2$d把挂锁</string>
+    <string name="registration_device_error">录入失败</string>
+    <string name="device_registration_scan_result_tip">已识别未录入的钥匙 （%1$d把）与挂锁（%2$d把）。</string>
 </resources>