Эх сурвалжийг харах

添加测试开关仓页、系统设置页基础

Frankensteinly 9 сар өмнө
parent
commit
a667d58b4a

+ 27 - 0
app/src/main/java/com/grkj/iscs/util/SPUtils.kt

@@ -16,6 +16,9 @@ object SPUtils {
     private const val KEY_LOGIN_USER_USER_NAME = "user_name"
     private const val KEY_LOGIN_USER_ROLE_KEY = "role_key"
 
+    private const val KEY_DOCK_CONFIG = "dock_config"
+    private const val KEY_PORT_CONFIG = "port_config"
+
     fun getLoginUser(context: Context): CardInfoRespVO? {
         val sp = context.getSharedPreferences(SP_NAME, Context.MODE_PRIVATE)
         if (sp.getString(KEY_LOGIN_USER_CARD_NFC, null) == null) {
@@ -74,4 +77,28 @@ object SPUtils {
             false
         }
     }
+
+    fun saveDockConfig(context: Context, config: String) {
+        val sp = context.getSharedPreferences(SP_NAME, Context.MODE_PRIVATE)
+        val edit = sp.edit()
+        edit.putString(KEY_DOCK_CONFIG, config)
+        edit.apply()
+    }
+
+    fun getDockConfig(context: Context): String? {
+        val sp = context.getSharedPreferences(SP_NAME, Context.MODE_PRIVATE)
+        return sp.getString(KEY_DOCK_CONFIG, null)
+    }
+
+    fun savePortConfig(context: Context, config: String) {
+        val sp = context.getSharedPreferences(SP_NAME, Context.MODE_PRIVATE)
+        val edit = sp.edit()
+        edit.putString(KEY_PORT_CONFIG, config)
+        edit.apply()
+    }
+
+    fun getPortConfig(context: Context): String? {
+        val sp = context.getSharedPreferences(SP_NAME, Context.MODE_PRIVATE)
+        return sp.getString(KEY_PORT_CONFIG, null)
+    }
 }

+ 3 - 1
app/src/main/java/com/grkj/iscs/view/activity/test/BleActivity.kt

@@ -194,7 +194,9 @@ class BleActivity : BaseActivity<ActivityBleBinding>() {
                     holder.setOnClickListener(R.id.sendTicket) {
 //                        val testStr = "{\"cardNo\":\"ACB13E0B\",\"data\":[{\"taskCode\":\"87654321110\",\"taskId\":\"587aa6cfcce940778836e512a10c330e\",\"dataList\":[{\"dataId\":1,\"target\":0,\"status\":0,\"closed\":1,\"equipRfidNo\":\"1DA0C66D031080\",\"infoRfidNo\":\"206BD295\"},{\"dataId\":2,\"target\":0,\"status\":0,\"closed\":1,\"equipRfidNo\":\"1DCAD26D031080\",\"infoRfidNo\":\"D074D295\"}],\"closed\":1}]}"
 //                        val testStr = "{\"cardNo\":\"80A8C0F4EA\",\"password\":\"12345678\",\"effectiveTime\":24,\"data\":[{\"taskCode\":\"202401020001\",\"taskId\":\"71b49baa49b343bc84d7e6b829ac1bdc\",\"codeId\":1,\"dataList\":[{\"dataId\":1,\"equipRfidNo\":\"049648B2E31690\",\"infoRfidNo\":\"04E3BCCA201290\",\"target\":1},{\"dataId\":2,\"equipRfidNo\":\"0405982414C563\",\"target\":0,\"prevId\":1}]},{\"taskCode\":\"202401020002\",\"taskId\":\"145b5a4cc38c41e19943f4c8b48d12b0\",\"codeId\":2,\"dataList\":[{\"dataId\":1,\"equipRfidNo\":\"045460F7F4F438\",\"infoRfidNo\":\"04BC6584C65009\",\"target\":1},{\"dataId\":2,\"equipRfidNo\":\"042B99E449E795\",\"target\":0,\"prevId\":1},{\"dataId\":3,\"equipRfidNo\":\"04A312EE848B62\",\"infoRfidNo\":\"04220E86831289\",\"target\":1,\"prevId\":2}]}],\"lockList\":[{\"lockId\":\"1\",\"rfid\":\"040E21443010E9\"},{\"lockId\":\"2\",\"rfid\":\"0457505E5861C2\"}]}"
-                        val testStr = "{\"cardNo\":\"267747D5\",\"data\":[{\"codeId\":1,\"dataList\":[{\"dataId\":0,\"equipRfidNo\":\"1DA0C66D031080\",\"target\":0},{\"dataId\":1,\"equipRfidNo\":\"1DCAD26D031080\",\"prevId\":0,\"target\":0}],\"taskCode\":\"202410290918\",\"taskId\":\"123456\"}],\"effectiveTime\":24,\"lockList\":[{\"lockId\":\"1\",\"rfid\":\"706BD295\"},{\"lockId\":\"2\",\"rfid\":\"6CD295\"}]}"
+//                        val testStr = "{\"cardNo\":\"267747D5\",\"data\":[{\"codeId\":1,\"dataList\":[{\"dataId\":0,\"equipRfidNo\":\"1DA0C66D031080\",\"target\":0},{\"dataId\":1,\"equipRfidNo\":\"1DCAD26D031080\",\"prevId\":0,\"target\":0}],\"taskCode\":\"202410290918\",\"taskId\":\"123456\"}],\"effectiveTime\":24,\"lockList\":[{\"lockId\":\"1\",\"rfid\":\"706BD295\"},{\"lockId\":\"2\",\"rfid\":\"6CD295\"}]}"
+
+                        val testStr = "{\"cardNo\":\"267747D5\",\"data\":[{\"codeId\":1,\"dataList\":[{\"dataId\":11,\"equipName\":\"E-11\",\"equipRfidNo\":\"1DA0C66D031080\",\"target\":0},{\"dataId\":12,\"equipName\":\"E-12\",\"equipRfidNo\":\"1DCAD26D031080\",\"target\":0}],\"taskCode\":\"291\",\"taskId\":\"291\"}],\"effectiveTime\":24,\"lockList\":[{\"lockId\":1,\"rfid\":\"0089D495\"},{\"lockId\":2,\"rfid\":\"B05AD495\"}]}"
                         BleCmdManager.sendWorkTicket(testStr, bleDevice = item?.bleDevice!!, callback = object : CustomBleWriteCallback() {
                             override fun onWriteSuccess(current: Int, total: Int, justWrite: ByteArray?) {
                                 println("sendTicket success")

+ 17 - 0
app/src/main/java/com/grkj/iscs/view/fragment/DockTestFragment.kt

@@ -0,0 +1,17 @@
+package com.grkj.iscs.view.fragment
+
+import com.grkj.iscs.databinding.FragmentDockTestBinding
+import com.grkj.iscs.view.base.BaseFragment
+
+/**
+ * 底座测试页
+ */
+class DockTestFragment : BaseFragment<FragmentDockTestBinding>() {
+
+    override val viewBinding: FragmentDockTestBinding
+        get() = FragmentDockTestBinding.inflate(layoutInflater)
+
+    override fun initView() {
+
+    }
+}

+ 17 - 0
app/src/main/java/com/grkj/iscs/view/fragment/SystemSettingFragment.kt

@@ -0,0 +1,17 @@
+package com.grkj.iscs.view.fragment
+
+import com.grkj.iscs.databinding.FragmentSystemSettingBinding
+import com.grkj.iscs.view.base.BaseFragment
+
+/**
+ * 系统设置页
+ */
+class SystemSettingFragment : BaseFragment<FragmentSystemSettingBinding>() {
+
+    override val viewBinding: FragmentSystemSettingBinding
+        get() = FragmentSystemSettingBinding.inflate(layoutInflater)
+
+    override fun initView() {
+
+    }
+}

+ 37 - 0
app/src/main/res/layout/fragment_dock_test.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".view.fragment.DockTestFragment">
+
+    <com.grkj.iscs.view.widget.CommonBtn
+        android:id="@+id/cb_close"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentBottom="true"
+        app:btn_bg="@drawable/common_btn_blue_bg"
+        app:btn_name="@string/close_all_docks" />
+
+    <com.grkj.iscs.view.widget.CommonBtn
+        android:id="@+id/cb_open"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_marginRight="@dimen/common_spacing"
+        android:layout_toLeftOf="@id/cb_close"
+        app:btn_bg="@drawable/common_btn_red_bg"
+        app:btn_name="@string/open_all_docks" />
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@id/cb_close"
+        android:layout_marginBottom="@dimen/common_spacing"
+        android:background="@drawable/item_rv_technology_sop_bg_normal"
+        android:padding="5dp">
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</RelativeLayout>

+ 8 - 0
app/src/main/res/layout/fragment_system_setting.xml

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

+ 2 - 0
app/src/main/res/values/strings.xml

@@ -173,4 +173,6 @@
     <string name="confirm_to_uncolock">%s是否确认解除共锁?</string>
     <string name="not_involved_in_ticket">您不参与该工票</string>
     <string name="you_are_not_locker_tip">您不是上锁人,无法执行此操作</string>
+    <string name="open_all_docks">全仓开</string>
+    <string name="close_all_docks">全仓关</string>
 </resources>