diff --git a/app/src/main/java/com/casic/br/operationsite/extensions/String.kt b/app/src/main/java/com/casic/br/operationsite/extensions/String.kt index 0ba91ea..9f7962e 100644 --- a/app/src/main/java/com/casic/br/operationsite/extensions/String.kt +++ b/app/src/main/java/com/casic/br/operationsite/extensions/String.kt @@ -70,24 +70,4 @@ val p = Pattern.compile(regEx) val m = p.matcher(this) return m.replaceAll("").trim { it <= ' ' } -} - -fun String.isIdCard(): Boolean { - val regExp_15 = - "^[1-9][0-9]{5}[0-9]{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)[0-9]{2}[0-9]" - - val regExp_18 = - "^[1-9][0-9]{5}(18|19|20)[0-9]{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)[0-9]{3}([0-9]|(X|x))" - - return if (this.length != 15 || this.length != 18) { - false - } else { - if (this.length == 15) { - val pattern = Pattern.compile(regExp_15) - pattern.matcher(this).matches() - } else { - val pattern = Pattern.compile(regExp_18) - pattern.matcher(this).matches() - } - } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/extensions/String.kt b/app/src/main/java/com/casic/br/operationsite/extensions/String.kt index 0ba91ea..9f7962e 100644 --- a/app/src/main/java/com/casic/br/operationsite/extensions/String.kt +++ b/app/src/main/java/com/casic/br/operationsite/extensions/String.kt @@ -70,24 +70,4 @@ val p = Pattern.compile(regEx) val m = p.matcher(this) return m.replaceAll("").trim { it <= ' ' } -} - -fun String.isIdCard(): Boolean { - val regExp_15 = - "^[1-9][0-9]{5}[0-9]{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)[0-9]{2}[0-9]" - - val regExp_18 = - "^[1-9][0-9]{5}(18|19|20)[0-9]{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)[0-9]{3}([0-9]|(X|x))" - - return if (this.length != 15 || this.length != 18) { - false - } else { - if (this.length == 15) { - val pattern = Pattern.compile(regExp_15) - pattern.matcher(this).matches() - } else { - val pattern = Pattern.compile(regExp_18) - pattern.matcher(this).matches() - } - } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt index 54093a7..7bb0ef6 100644 --- a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt @@ -89,7 +89,11 @@ * 人员申请入场 */ @POST("/worker/add") - suspend fun enter(@Header("token") token: String, @Body requestBody: RequestBody): String + suspend fun enter( + @Header("token") token: String, + @Body requestBody: RequestBody, + @QueryMap projectId: Map + ): String /** * 提交算法区域 diff --git a/app/src/main/java/com/casic/br/operationsite/extensions/String.kt b/app/src/main/java/com/casic/br/operationsite/extensions/String.kt index 0ba91ea..9f7962e 100644 --- a/app/src/main/java/com/casic/br/operationsite/extensions/String.kt +++ b/app/src/main/java/com/casic/br/operationsite/extensions/String.kt @@ -70,24 +70,4 @@ val p = Pattern.compile(regEx) val m = p.matcher(this) return m.replaceAll("").trim { it <= ' ' } -} - -fun String.isIdCard(): Boolean { - val regExp_15 = - "^[1-9][0-9]{5}[0-9]{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)[0-9]{2}[0-9]" - - val regExp_18 = - "^[1-9][0-9]{5}(18|19|20)[0-9]{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)[0-9]{3}([0-9]|(X|x))" - - return if (this.length != 15 || this.length != 18) { - false - } else { - if (this.length == 15) { - val pattern = Pattern.compile(regExp_15) - pattern.matcher(this).matches() - } else { - val pattern = Pattern.compile(regExp_18) - pattern.matcher(this).matches() - } - } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt index 54093a7..7bb0ef6 100644 --- a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt @@ -89,7 +89,11 @@ * 人员申请入场 */ @POST("/worker/add") - suspend fun enter(@Header("token") token: String, @Body requestBody: RequestBody): String + suspend fun enter( + @Header("token") token: String, + @Body requestBody: RequestBody, + @QueryMap projectId: Map + ): String /** * 提交算法区域 diff --git a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt index eb6a592..d9d0218 100644 --- a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt @@ -149,33 +149,31 @@ status: String ): String { val param = JsonObject() - param.addProperty("projectId", projectId) - - val workerParam = JsonObject() - workerParam.addProperty("workerType", workerType) - workerParam.addProperty("deptName", deptName) - workerParam.addProperty("ownerShip", ownerShip) - workerParam.addProperty("gender", gender) - workerParam.addProperty("registerTime", registerTime) - workerParam.addProperty("deptId", deptId) - workerParam.addProperty("genderName", genderName) - workerParam.addProperty("enterReason", enterReason) - workerParam.addProperty("phoneNumber", phoneNumber) - workerParam.addProperty("createTime", createTime) - workerParam.addProperty("workerAvatar", workerAvatar) - workerParam.addProperty("idCardNumber", idCardNumber) - workerParam.addProperty("statusName", statusName) - workerParam.addProperty("id", id) - workerParam.addProperty("workerName", workerName) - workerParam.addProperty("isRegister", isRegister) - workerParam.addProperty("status", status) - - param.add("worker", workerParam) + param.addProperty("workerType", workerType) + param.addProperty("deptName", deptName) + param.addProperty("ownerShip", ownerShip) + param.addProperty("gender", gender) + param.addProperty("registerTime", registerTime) + param.addProperty("deptId", deptId) + param.addProperty("genderName", genderName) + param.addProperty("enterReason", enterReason) + param.addProperty("phoneNumber", phoneNumber) + param.addProperty("createTime", createTime) + param.addProperty("workerAvatar", workerAvatar) + param.addProperty("idCardNumber", idCardNumber) + param.addProperty("statusName", statusName) + param.addProperty("id", id) + param.addProperty("workerName", workerName) + param.addProperty("isRegister", isRegister) + param.addProperty("status", status) val requestBody = param.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) - return api.enter(AuthenticationHelper.token!!, requestBody) + + val projectIdMap = HashMap() + projectIdMap["projectId"] = projectId + return api.enter(AuthenticationHelper.token!!, requestBody, projectIdMap) } suspend fun postRegion(code: String, color: String, position: String): String { diff --git a/app/src/main/java/com/casic/br/operationsite/extensions/String.kt b/app/src/main/java/com/casic/br/operationsite/extensions/String.kt index 0ba91ea..9f7962e 100644 --- a/app/src/main/java/com/casic/br/operationsite/extensions/String.kt +++ b/app/src/main/java/com/casic/br/operationsite/extensions/String.kt @@ -70,24 +70,4 @@ val p = Pattern.compile(regEx) val m = p.matcher(this) return m.replaceAll("").trim { it <= ' ' } -} - -fun String.isIdCard(): Boolean { - val regExp_15 = - "^[1-9][0-9]{5}[0-9]{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)[0-9]{2}[0-9]" - - val regExp_18 = - "^[1-9][0-9]{5}(18|19|20)[0-9]{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)[0-9]{3}([0-9]|(X|x))" - - return if (this.length != 15 || this.length != 18) { - false - } else { - if (this.length == 15) { - val pattern = Pattern.compile(regExp_15) - pattern.matcher(this).matches() - } else { - val pattern = Pattern.compile(regExp_18) - pattern.matcher(this).matches() - } - } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt index 54093a7..7bb0ef6 100644 --- a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt @@ -89,7 +89,11 @@ * 人员申请入场 */ @POST("/worker/add") - suspend fun enter(@Header("token") token: String, @Body requestBody: RequestBody): String + suspend fun enter( + @Header("token") token: String, + @Body requestBody: RequestBody, + @QueryMap projectId: Map + ): String /** * 提交算法区域 diff --git a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt index eb6a592..d9d0218 100644 --- a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt @@ -149,33 +149,31 @@ status: String ): String { val param = JsonObject() - param.addProperty("projectId", projectId) - - val workerParam = JsonObject() - workerParam.addProperty("workerType", workerType) - workerParam.addProperty("deptName", deptName) - workerParam.addProperty("ownerShip", ownerShip) - workerParam.addProperty("gender", gender) - workerParam.addProperty("registerTime", registerTime) - workerParam.addProperty("deptId", deptId) - workerParam.addProperty("genderName", genderName) - workerParam.addProperty("enterReason", enterReason) - workerParam.addProperty("phoneNumber", phoneNumber) - workerParam.addProperty("createTime", createTime) - workerParam.addProperty("workerAvatar", workerAvatar) - workerParam.addProperty("idCardNumber", idCardNumber) - workerParam.addProperty("statusName", statusName) - workerParam.addProperty("id", id) - workerParam.addProperty("workerName", workerName) - workerParam.addProperty("isRegister", isRegister) - workerParam.addProperty("status", status) - - param.add("worker", workerParam) + param.addProperty("workerType", workerType) + param.addProperty("deptName", deptName) + param.addProperty("ownerShip", ownerShip) + param.addProperty("gender", gender) + param.addProperty("registerTime", registerTime) + param.addProperty("deptId", deptId) + param.addProperty("genderName", genderName) + param.addProperty("enterReason", enterReason) + param.addProperty("phoneNumber", phoneNumber) + param.addProperty("createTime", createTime) + param.addProperty("workerAvatar", workerAvatar) + param.addProperty("idCardNumber", idCardNumber) + param.addProperty("statusName", statusName) + param.addProperty("id", id) + param.addProperty("workerName", workerName) + param.addProperty("isRegister", isRegister) + param.addProperty("status", status) val requestBody = param.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) - return api.enter(AuthenticationHelper.token!!, requestBody) + + val projectIdMap = HashMap() + projectIdMap["projectId"] = projectId + return api.enter(AuthenticationHelper.token!!, requestBody, projectIdMap) } suspend fun postRegion(code: String, color: String, position: String): String { diff --git a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt index d7c5fac..1e78dd3 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt @@ -14,7 +14,6 @@ import com.casic.br.operationsite.extensions.combineImagePath import com.casic.br.operationsite.extensions.compressImage import com.casic.br.operationsite.extensions.initLayoutImmersionBar -import com.casic.br.operationsite.extensions.isIdCard import com.casic.br.operationsite.utils.LoadingDialogHub import com.casic.br.operationsite.utils.LocaleConstant import com.casic.br.operationsite.vm.ApplyViewModel @@ -213,11 +212,6 @@ return@setOnClickListener } - if (!idCardView.text.toString().isIdCard()) { - "请输入正确的身份证号".show(this) - return@setOnClickListener - } - val currentTime = System.currentTimeMillis().timestampToCompleteDate() applyViewModel.enter( projectId,