浏览代码

控制设备切换到录入指纹状态

bfzgs 2 年之前
父节点
当前提交
480395c8cb

+ 15 - 0
.idea/statistic.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Statistic">
+    <option name="excludedDirectories">
+      <list>
+        <option value="$PROJECT_DIR$/app/src/main/res/raw" />
+        <option value="$PROJECT_DIR$/app/src/main/res/values" />
+        <option value="$PROJECT_DIR$/app/src/main/res/values-land" />
+        <option value="$PROJECT_DIR$/app/src/main/res/values-night" />
+        <option value="$PROJECT_DIR$/app/src/main/res/values-w600dp" />
+        <option value="$PROJECT_DIR$/app/src/main/res/values-w1240dp" />
+      </list>
+    </option>
+  </component>
+</project>

+ 37 - 1
app/src/main/java/org/brynhild/graduation/activity/admin/DeviceDetailInfoActivity.kt

@@ -22,6 +22,7 @@ import org.brynhild.graduation.common.utils.JsonUtils
 import org.brynhild.graduation.common.utils.MultipleSelectHandler
 import org.brynhild.graduation.databinding.ActivityDeviceDetailInfoBinding
 import org.brynhild.graduation.databinding.AdminCreateDeviceDialogBinding
+import org.brynhild.graduation.databinding.AdminEnrollFingerPrintDialogBinding
 import org.brynhild.graduation.databinding.AdminModifyAreaDialogBinding
 import org.brynhild.graduation.databinding.AdminModifyDeviceDialogBinding
 import org.brynhild.graduation.network.adapter.DeviceAdapter
@@ -169,7 +170,7 @@ class DeviceDetailInfoActivity : BaseActivity() {
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
             R.id.admin_device_modify->{
-                    val dialogLayout= AdminModifyDeviceDialogBinding.inflate(LayoutInflater.from(this))
+                val dialogLayout= AdminModifyDeviceDialogBinding.inflate(LayoutInflater.from(this))
                 dialogLayout.owner.setText(device.owner.toString())
                 dialogLayout.area.setText(device.area.toString())
                 dialogLayout.active.setText(device.active.toString())
@@ -242,6 +243,41 @@ class DeviceDetailInfoActivity : BaseActivity() {
                     .build()
                     .show()
             }
+            R.id.admin_finger_enroll->{
+                val dialogLayout= AdminEnrollFingerPrintDialogBinding.inflate(LayoutInflater.from(this))
+
+                AlertDialog.Builder(this)
+                    .setTitle("修改信息")
+                    .setView(dialogLayout.root)
+                    .setPositiveButton("确认修改"){_,_->
+                        val service= ServiceCreator.create(AdminService::class.java)
+                        val data= EnrollFingerPrint(
+                            dialogLayout.userId.text.toString().toLongOrNull(),
+                            device.mac
+                        )
+                        service.enrollFingerPrint(LoginConfiguration.userInfo!!.token,data).enqueue(object :
+                            Callback<Result> {
+                            override fun onResponse(
+                                call: Call<Result>,
+                                response: Response<Result>
+                            ) {
+                                ResponseHandler.handle(response,{
+                                    ResponseHandler.showMessage(it)
+                                },{
+                                    ResponseHandler.showMessage(it)
+                                })
+                            }
+
+                            override fun onFailure(call: Call<Result>, t: Throwable) {
+                                t.printStackTrace()
+                            }
+                        })
+                    }
+                    .setNegativeButton("取消修改"){_,_->
+
+                    }
+                    .show()
+            }
         }
         return true
     }

+ 6 - 0
app/src/main/java/org/brynhild/graduation/common/transfer/vo/device/EnrollFingerPrint.kt

@@ -0,0 +1,6 @@
+package org.brynhild.graduation.common.transfer.vo.device
+
+data class EnrollFingerPrint(
+    val userId:Long?,
+    val mac:String
+)

+ 3 - 0
app/src/main/java/org/brynhild/graduation/service/http/AdminService.kt

@@ -79,6 +79,9 @@ interface AdminService {
     @POST("device/admin/device/bind")
     fun addDevice(@Header(AccountConstant.ACCOUNT_HEADER)token:String,@Body info: BindDevice):Call<Result>
 
+    @POST("device/admin/device/enroll")
+    fun enrollFingerPrint(@Header(AccountConstant.ACCOUNT_HEADER)token:String,@Body info: EnrollFingerPrint):Call<Result>
+
     @PUT("device/admin/device")
     fun modifyDevice(@Header(AccountConstant.ACCOUNT_HEADER)token: String,@Body info: AdminModifyDevice):Call<Result>
 

+ 27 - 0
app/src/main/res/layout/admin_enroll_finger_print_dialog.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:id="@+id/layout_category_add">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:orientation="horizontal"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:text="人员编号"
+            android:textAlignment="center" />
+
+        <EditText
+            android:id="@+id/userId"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="3" />
+    </LinearLayout>
+
+</LinearLayout>

+ 7 - 0
app/src/main/res/menu/admin_device_detail_info_options.xml

@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/admin_finger_enroll"
+        android:icon="@drawable/nav_device"
+        android:title="Delete"
+        app:showAsAction="always" />
     <item
         android:id="@+id/admin_device_modify"
         android:icon="@drawable/ic_modify"
@@ -11,4 +16,6 @@
         android:icon="@drawable/ic_delete"
         android:title="Delete"
         app:showAsAction="always" />
+
+
 </menu>