diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e36bd39..c54bf2a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -47,6 +47,7 @@
+
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e36bd39..c54bf2a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -47,6 +47,7 @@
+
diff --git a/app/src/main/java/com/casic/detector/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/detector/retrofit/RetrofitService.kt
index 89d85a1..a5c3bc6 100644
--- a/app/src/main/java/com/casic/detector/retrofit/RetrofitService.kt
+++ b/app/src/main/java/com/casic/detector/retrofit/RetrofitService.kt
@@ -75,4 +75,13 @@
@Part fileBuffer2: MultipartBody.Part?,
@Part fileBuffer3: MultipartBody.Part?
): String
+
+ /**
+ * 上传工单中标识器信息
+ */
+ @GET("/ems/rs/task/update-task-mark")
+ suspend fun uploadMarker(
+ @Query("userName") userId: String,
+ @Query("taskDetailId") taskId: String,
+ ): String
}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e36bd39..c54bf2a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -47,6 +47,7 @@
+
diff --git a/app/src/main/java/com/casic/detector/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/detector/retrofit/RetrofitService.kt
index 89d85a1..a5c3bc6 100644
--- a/app/src/main/java/com/casic/detector/retrofit/RetrofitService.kt
+++ b/app/src/main/java/com/casic/detector/retrofit/RetrofitService.kt
@@ -75,4 +75,13 @@
@Part fileBuffer2: MultipartBody.Part?,
@Part fileBuffer3: MultipartBody.Part?
): String
+
+ /**
+ * 上传工单中标识器信息
+ */
+ @GET("/ems/rs/task/update-task-mark")
+ suspend fun uploadMarker(
+ @Query("userName") userId: String,
+ @Query("taskDetailId") taskId: String,
+ ): String
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/detector/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/detector/retrofit/RetrofitServiceManager.kt
index ab92452..f00577c 100644
--- a/app/src/main/java/com/casic/detector/retrofit/RetrofitServiceManager.kt
+++ b/app/src/main/java/com/casic/detector/retrofit/RetrofitServiceManager.kt
@@ -200,4 +200,11 @@
}
}
}
+
+ /**
+ * 上传工单中标识器信息
+ */
+ suspend fun uploadMarker(userName: String, taskDetailId: String): String {
+ return api.uploadMarker(userName, taskDetailId)
+ }
}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e36bd39..c54bf2a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -47,6 +47,7 @@
+
diff --git a/app/src/main/java/com/casic/detector/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/detector/retrofit/RetrofitService.kt
index 89d85a1..a5c3bc6 100644
--- a/app/src/main/java/com/casic/detector/retrofit/RetrofitService.kt
+++ b/app/src/main/java/com/casic/detector/retrofit/RetrofitService.kt
@@ -75,4 +75,13 @@
@Part fileBuffer2: MultipartBody.Part?,
@Part fileBuffer3: MultipartBody.Part?
): String
+
+ /**
+ * 上传工单中标识器信息
+ */
+ @GET("/ems/rs/task/update-task-mark")
+ suspend fun uploadMarker(
+ @Query("userName") userId: String,
+ @Query("taskDetailId") taskId: String,
+ ): String
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/detector/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/detector/retrofit/RetrofitServiceManager.kt
index ab92452..f00577c 100644
--- a/app/src/main/java/com/casic/detector/retrofit/RetrofitServiceManager.kt
+++ b/app/src/main/java/com/casic/detector/retrofit/RetrofitServiceManager.kt
@@ -200,4 +200,11 @@
}
}
}
+
+ /**
+ * 上传工单中标识器信息
+ */
+ suspend fun uploadMarker(userName: String, taskDetailId: String): String {
+ return api.uploadMarker(userName, taskDetailId)
+ }
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/detector/view/MainActivity.kt b/app/src/main/java/com/casic/detector/view/MainActivity.kt
index 8516e0c..aa8bb9f 100644
--- a/app/src/main/java/com/casic/detector/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/detector/view/MainActivity.kt
@@ -469,7 +469,7 @@
//探测
detectionButton.setOnClickListener {
-
+ navigatePageTo()
}
}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e36bd39..c54bf2a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -47,6 +47,7 @@
+
diff --git a/app/src/main/java/com/casic/detector/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/detector/retrofit/RetrofitService.kt
index 89d85a1..a5c3bc6 100644
--- a/app/src/main/java/com/casic/detector/retrofit/RetrofitService.kt
+++ b/app/src/main/java/com/casic/detector/retrofit/RetrofitService.kt
@@ -75,4 +75,13 @@
@Part fileBuffer2: MultipartBody.Part?,
@Part fileBuffer3: MultipartBody.Part?
): String
+
+ /**
+ * 上传工单中标识器信息
+ */
+ @GET("/ems/rs/task/update-task-mark")
+ suspend fun uploadMarker(
+ @Query("userName") userId: String,
+ @Query("taskDetailId") taskId: String,
+ ): String
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/detector/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/detector/retrofit/RetrofitServiceManager.kt
index ab92452..f00577c 100644
--- a/app/src/main/java/com/casic/detector/retrofit/RetrofitServiceManager.kt
+++ b/app/src/main/java/com/casic/detector/retrofit/RetrofitServiceManager.kt
@@ -200,4 +200,11 @@
}
}
}
+
+ /**
+ * 上传工单中标识器信息
+ */
+ suspend fun uploadMarker(userName: String, taskDetailId: String): String {
+ return api.uploadMarker(userName, taskDetailId)
+ }
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/detector/view/MainActivity.kt b/app/src/main/java/com/casic/detector/view/MainActivity.kt
index 8516e0c..aa8bb9f 100644
--- a/app/src/main/java/com/casic/detector/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/detector/view/MainActivity.kt
@@ -469,7 +469,7 @@
//探测
detectionButton.setOnClickListener {
-
+ navigatePageTo()
}
}
diff --git a/app/src/main/java/com/casic/detector/view/SearchLabelActivity.kt b/app/src/main/java/com/casic/detector/view/SearchLabelActivity.kt
new file mode 100644
index 0000000..8bca233
--- /dev/null
+++ b/app/src/main/java/com/casic/detector/view/SearchLabelActivity.kt
@@ -0,0 +1,29 @@
+package com.casic.detector.view
+
+import com.casic.detector.R
+import com.casic.detector.extensions.initLayoutImmersionBar
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+import kotlinx.android.synthetic.main.activity_search_label.*
+
+class SearchLabelActivity : KotlinBaseActivity() {
+
+ override fun initData() {
+
+ }
+
+ override fun initEvent() {
+ leftBackView.setOnClickListener { finish() }
+ }
+
+ override fun initLayoutView(): Int = R.layout.activity_search_label
+
+ override fun observeRequestState() {
+
+ }
+
+ override fun setupTopBarLayout() {
+ ImmersionBar.with(this).statusBarDarkFont(true).init()
+ initLayoutImmersionBar(rootView)
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e36bd39..c54bf2a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -47,6 +47,7 @@
+
diff --git a/app/src/main/java/com/casic/detector/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/detector/retrofit/RetrofitService.kt
index 89d85a1..a5c3bc6 100644
--- a/app/src/main/java/com/casic/detector/retrofit/RetrofitService.kt
+++ b/app/src/main/java/com/casic/detector/retrofit/RetrofitService.kt
@@ -75,4 +75,13 @@
@Part fileBuffer2: MultipartBody.Part?,
@Part fileBuffer3: MultipartBody.Part?
): String
+
+ /**
+ * 上传工单中标识器信息
+ */
+ @GET("/ems/rs/task/update-task-mark")
+ suspend fun uploadMarker(
+ @Query("userName") userId: String,
+ @Query("taskDetailId") taskId: String,
+ ): String
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/detector/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/detector/retrofit/RetrofitServiceManager.kt
index ab92452..f00577c 100644
--- a/app/src/main/java/com/casic/detector/retrofit/RetrofitServiceManager.kt
+++ b/app/src/main/java/com/casic/detector/retrofit/RetrofitServiceManager.kt
@@ -200,4 +200,11 @@
}
}
}
+
+ /**
+ * 上传工单中标识器信息
+ */
+ suspend fun uploadMarker(userName: String, taskDetailId: String): String {
+ return api.uploadMarker(userName, taskDetailId)
+ }
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/detector/view/MainActivity.kt b/app/src/main/java/com/casic/detector/view/MainActivity.kt
index 8516e0c..aa8bb9f 100644
--- a/app/src/main/java/com/casic/detector/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/detector/view/MainActivity.kt
@@ -469,7 +469,7 @@
//探测
detectionButton.setOnClickListener {
-
+ navigatePageTo()
}
}
diff --git a/app/src/main/java/com/casic/detector/view/SearchLabelActivity.kt b/app/src/main/java/com/casic/detector/view/SearchLabelActivity.kt
new file mode 100644
index 0000000..8bca233
--- /dev/null
+++ b/app/src/main/java/com/casic/detector/view/SearchLabelActivity.kt
@@ -0,0 +1,29 @@
+package com.casic.detector.view
+
+import com.casic.detector.R
+import com.casic.detector.extensions.initLayoutImmersionBar
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+import kotlinx.android.synthetic.main.activity_search_label.*
+
+class SearchLabelActivity : KotlinBaseActivity() {
+
+ override fun initData() {
+
+ }
+
+ override fun initEvent() {
+ leftBackView.setOnClickListener { finish() }
+ }
+
+ override fun initLayoutView(): Int = R.layout.activity_search_label
+
+ override fun observeRequestState() {
+
+ }
+
+ override fun setupTopBarLayout() {
+ ImmersionBar.with(this).statusBarDarkFont(true).init()
+ initLayoutImmersionBar(rootView)
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/detector/vm/TaskViewModel.kt b/app/src/main/java/com/casic/detector/vm/TaskViewModel.kt
index 0ff8bf4..a81ad98 100644
--- a/app/src/main/java/com/casic/detector/vm/TaskViewModel.kt
+++ b/app/src/main/java/com/casic/detector/vm/TaskViewModel.kt
@@ -168,4 +168,15 @@
loadState.value = LoadState.Fail
it.convertChinese().show(BaseApplication.get())
})
+
+ fun uploadMarker(userName: String, taskDetailId: String) = launch({
+ val response = RetrofitServiceManager.uploadMarker(userName, taskDetailId)
+ if (response.separateResponseState()) {
+
+ } else {
+ response.toErrorMessage().show(BaseApplication.get())
+ }
+ }, {
+ it.convertChinese().show(BaseApplication.get())
+ })
}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e36bd39..c54bf2a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -47,6 +47,7 @@
+
diff --git a/app/src/main/java/com/casic/detector/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/detector/retrofit/RetrofitService.kt
index 89d85a1..a5c3bc6 100644
--- a/app/src/main/java/com/casic/detector/retrofit/RetrofitService.kt
+++ b/app/src/main/java/com/casic/detector/retrofit/RetrofitService.kt
@@ -75,4 +75,13 @@
@Part fileBuffer2: MultipartBody.Part?,
@Part fileBuffer3: MultipartBody.Part?
): String
+
+ /**
+ * 上传工单中标识器信息
+ */
+ @GET("/ems/rs/task/update-task-mark")
+ suspend fun uploadMarker(
+ @Query("userName") userId: String,
+ @Query("taskDetailId") taskId: String,
+ ): String
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/detector/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/detector/retrofit/RetrofitServiceManager.kt
index ab92452..f00577c 100644
--- a/app/src/main/java/com/casic/detector/retrofit/RetrofitServiceManager.kt
+++ b/app/src/main/java/com/casic/detector/retrofit/RetrofitServiceManager.kt
@@ -200,4 +200,11 @@
}
}
}
+
+ /**
+ * 上传工单中标识器信息
+ */
+ suspend fun uploadMarker(userName: String, taskDetailId: String): String {
+ return api.uploadMarker(userName, taskDetailId)
+ }
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/detector/view/MainActivity.kt b/app/src/main/java/com/casic/detector/view/MainActivity.kt
index 8516e0c..aa8bb9f 100644
--- a/app/src/main/java/com/casic/detector/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/detector/view/MainActivity.kt
@@ -469,7 +469,7 @@
//探测
detectionButton.setOnClickListener {
-
+ navigatePageTo()
}
}
diff --git a/app/src/main/java/com/casic/detector/view/SearchLabelActivity.kt b/app/src/main/java/com/casic/detector/view/SearchLabelActivity.kt
new file mode 100644
index 0000000..8bca233
--- /dev/null
+++ b/app/src/main/java/com/casic/detector/view/SearchLabelActivity.kt
@@ -0,0 +1,29 @@
+package com.casic.detector.view
+
+import com.casic.detector.R
+import com.casic.detector.extensions.initLayoutImmersionBar
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+import kotlinx.android.synthetic.main.activity_search_label.*
+
+class SearchLabelActivity : KotlinBaseActivity() {
+
+ override fun initData() {
+
+ }
+
+ override fun initEvent() {
+ leftBackView.setOnClickListener { finish() }
+ }
+
+ override fun initLayoutView(): Int = R.layout.activity_search_label
+
+ override fun observeRequestState() {
+
+ }
+
+ override fun setupTopBarLayout() {
+ ImmersionBar.with(this).statusBarDarkFont(true).init()
+ initLayoutImmersionBar(rootView)
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/detector/vm/TaskViewModel.kt b/app/src/main/java/com/casic/detector/vm/TaskViewModel.kt
index 0ff8bf4..a81ad98 100644
--- a/app/src/main/java/com/casic/detector/vm/TaskViewModel.kt
+++ b/app/src/main/java/com/casic/detector/vm/TaskViewModel.kt
@@ -168,4 +168,15 @@
loadState.value = LoadState.Fail
it.convertChinese().show(BaseApplication.get())
})
+
+ fun uploadMarker(userName: String, taskDetailId: String) = launch({
+ val response = RetrofitServiceManager.uploadMarker(userName, taskDetailId)
+ if (response.separateResponseState()) {
+
+ } else {
+ response.toErrorMessage().show(BaseApplication.get())
+ }
+ }, {
+ it.convertChinese().show(BaseApplication.get())
+ })
}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_search_label.xml b/app/src/main/res/layout/activity_search_label.xml
index bef1ccf..4c3538f 100644
--- a/app/src/main/res/layout/activity_search_label.xml
+++ b/app/src/main/res/layout/activity_search_label.xml
@@ -27,6 +27,7 @@
android:src="@mipmap/needle" />
@@ -43,7 +44,7 @@
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_gravity="center"
- android:text="10"
+ android:text="0"
android:textSize="80sp" />