补充点位名称的赋值和传输；修改打包配置

app/build.gradle

@@ -35,22 +35,26 @@ android {
     }
 
     buildTypes {
+        debug {
+
+        }
         release {
-            release {
-                minifyEnabled true  // 混淆
-                zipAlignEnabled true // 进行压缩优化
-                shrinkResources true    // 移除无用的resource文件
-                proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-                signingConfig signingConfigs.release
-
-                android.applicationVariants.all { variant ->
-                    variant.outputs.all {
-                        outputFileName = "ISCS_v${versionName}_${versionCode}.apk"
-                    }
-                }
-            }
+            minifyEnabled true  // 混淆
+            zipAlignEnabled true // 进行压缩优化
+            shrinkResources true    // 移除无用的resource文件
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            signingConfig signingConfigs.release
         }
     }
+
+    android.applicationVariants.all { variant ->
+        variant.outputs.all {
+            def buildType = variant.buildType.name
+            outputFileName = "ISCS_${buildType.capitalize()}_v${variant.versionName}_${variant.versionCode}.apk"
+        }
+    }
+
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
@@ -88,7 +92,7 @@ dependencies {
 
     implementation 'androidx.multidex:multidex:2.0.1'
 
-    //https://github.com/googlesamples/easypermissions
+    // https://github.com/googlesamples/easypermissions
     implementation 'pub.devrel:easypermissions:3.0.0'
 
 

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

@@ -610,6 +610,7 @@ object BusinessManager {
                 val task = WorkTicketSendBO.DataBO.DataListBO(
                     dataId = pointVO.pointId?.toInt(),
                     equipRfidNo = pointVO.pointNfc,
+                    equipName = pointVO.pointName,
                     infoRfidNo = pointVO.pointName,
                     target = if (isLock) 0 else 1
                 )

app/src/main/java/com/grkj/iscs/model/bo/WorkTicketSendBO.kt

@@ -57,6 +57,10 @@ data class WorkTicketSendBO(
              * 工作点位RFID号
              */
             var equipRfidNo: String? = null,
+            /**
+             * 工作点位名称
+             */
+            var equipName: String? = null,
             /**
              * 锁RFID号（只在创建的时候有）
              */