diff --git a/.gitignore b/.gitignore index dc53c76..73276f3 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,6 @@ .cxx local.properties /sdk/build/ +*.apk +*.json +*.zip diff --git a/.gitignore b/.gitignore index dc53c76..73276f3 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,6 @@ .cxx local.properties /sdk/build/ +*.apk +*.json +*.zip diff --git a/app/src/main/java/com/casic/br/app/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/app/retrofit/RetrofitService.kt index 34bf9b7..ac35be5 100644 --- a/app/src/main/java/com/casic/br/app/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/app/retrofit/RetrofitService.kt @@ -33,7 +33,7 @@ suspend fun loginOut(@Header("token") token: String): String /** - * 获取巡查记录 + * 获取检查记录 */ @GET("/inspection-record/listPage") suspend fun getCheckHistoryByPage( @@ -43,7 +43,7 @@ ): String /** - * 根据巡查ID获取此次记录的详情 + * 根据检查ID获取此次记录的详情 */ @GET("/inspection-record/listAlarmByInspection") suspend fun getCheckHistoryDetailById( diff --git a/.gitignore b/.gitignore index dc53c76..73276f3 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,6 @@ .cxx local.properties /sdk/build/ +*.apk +*.json +*.zip diff --git a/app/src/main/java/com/casic/br/app/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/app/retrofit/RetrofitService.kt index 34bf9b7..ac35be5 100644 --- a/app/src/main/java/com/casic/br/app/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/app/retrofit/RetrofitService.kt @@ -33,7 +33,7 @@ suspend fun loginOut(@Header("token") token: String): String /** - * 获取巡查记录 + * 获取检查记录 */ @GET("/inspection-record/listPage") suspend fun getCheckHistoryByPage( @@ -43,7 +43,7 @@ ): String /** - * 根据巡查ID获取此次记录的详情 + * 根据检查ID获取此次记录的详情 */ @GET("/inspection-record/listAlarmByInspection") suspend fun getCheckHistoryDetailById( diff --git a/app/src/main/java/com/casic/br/app/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/app/retrofit/RetrofitServiceManager.kt index ec93acb..4cc587a 100644 --- a/app/src/main/java/com/casic/br/app/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/app/retrofit/RetrofitServiceManager.kt @@ -64,7 +64,7 @@ } /** - * 获取巡查记录 + * 获取检查记录 */ suspend fun getCheckHistoryByPage(offset: Int): String { return api.getCheckHistoryByPage( @@ -73,7 +73,7 @@ } /** - * 根据巡查ID获取此次记录的详情 + * 根据检查ID获取此次记录的详情 */ suspend fun getCheckHistoryDetailById(inspectionId: String): String { return api.getCheckHistoryDetailById(AuthenticationHelper.token, inspectionId) diff --git a/.gitignore b/.gitignore index dc53c76..73276f3 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,6 @@ .cxx local.properties /sdk/build/ +*.apk +*.json +*.zip diff --git a/app/src/main/java/com/casic/br/app/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/app/retrofit/RetrofitService.kt index 34bf9b7..ac35be5 100644 --- a/app/src/main/java/com/casic/br/app/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/app/retrofit/RetrofitService.kt @@ -33,7 +33,7 @@ suspend fun loginOut(@Header("token") token: String): String /** - * 获取巡查记录 + * 获取检查记录 */ @GET("/inspection-record/listPage") suspend fun getCheckHistoryByPage( @@ -43,7 +43,7 @@ ): String /** - * 根据巡查ID获取此次记录的详情 + * 根据检查ID获取此次记录的详情 */ @GET("/inspection-record/listAlarmByInspection") suspend fun getCheckHistoryDetailById( diff --git a/app/src/main/java/com/casic/br/app/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/app/retrofit/RetrofitServiceManager.kt index ec93acb..4cc587a 100644 --- a/app/src/main/java/com/casic/br/app/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/app/retrofit/RetrofitServiceManager.kt @@ -64,7 +64,7 @@ } /** - * 获取巡查记录 + * 获取检查记录 */ suspend fun getCheckHistoryByPage(offset: Int): String { return api.getCheckHistoryByPage( @@ -73,7 +73,7 @@ } /** - * 根据巡查ID获取此次记录的详情 + * 根据检查ID获取此次记录的详情 */ suspend fun getCheckHistoryDetailById(inspectionId: String): String { return api.getCheckHistoryDetailById(AuthenticationHelper.token, inspectionId) diff --git a/app/src/main/res/layout/activity_check_history.xml b/app/src/main/res/layout/activity_check_history.xml index b54c408..b28cce1 100644 --- a/app/src/main/res/layout/activity_check_history.xml +++ b/app/src/main/res/layout/activity_check_history.xml @@ -16,7 +16,7 @@ app:tbv_only_show_title="false" app:tbv_show_left_image="true" app:tbv_show_right_image="false" - app:tbv_text="巡查记录" + app:tbv_text="检查记录" app:tbv_text_color="@color/white" app:tbv_text_size="@dimen/sp_18" /> diff --git a/.gitignore b/.gitignore index dc53c76..73276f3 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,6 @@ .cxx local.properties /sdk/build/ +*.apk +*.json +*.zip diff --git a/app/src/main/java/com/casic/br/app/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/app/retrofit/RetrofitService.kt index 34bf9b7..ac35be5 100644 --- a/app/src/main/java/com/casic/br/app/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/app/retrofit/RetrofitService.kt @@ -33,7 +33,7 @@ suspend fun loginOut(@Header("token") token: String): String /** - * 获取巡查记录 + * 获取检查记录 */ @GET("/inspection-record/listPage") suspend fun getCheckHistoryByPage( @@ -43,7 +43,7 @@ ): String /** - * 根据巡查ID获取此次记录的详情 + * 根据检查ID获取此次记录的详情 */ @GET("/inspection-record/listAlarmByInspection") suspend fun getCheckHistoryDetailById( diff --git a/app/src/main/java/com/casic/br/app/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/app/retrofit/RetrofitServiceManager.kt index ec93acb..4cc587a 100644 --- a/app/src/main/java/com/casic/br/app/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/app/retrofit/RetrofitServiceManager.kt @@ -64,7 +64,7 @@ } /** - * 获取巡查记录 + * 获取检查记录 */ suspend fun getCheckHistoryByPage(offset: Int): String { return api.getCheckHistoryByPage( @@ -73,7 +73,7 @@ } /** - * 根据巡查ID获取此次记录的详情 + * 根据检查ID获取此次记录的详情 */ suspend fun getCheckHistoryDetailById(inspectionId: String): String { return api.getCheckHistoryDetailById(AuthenticationHelper.token, inspectionId) diff --git a/app/src/main/res/layout/activity_check_history.xml b/app/src/main/res/layout/activity_check_history.xml index b54c408..b28cce1 100644 --- a/app/src/main/res/layout/activity_check_history.xml +++ b/app/src/main/res/layout/activity_check_history.xml @@ -16,7 +16,7 @@ app:tbv_only_show_title="false" app:tbv_show_left_image="true" app:tbv_show_right_image="false" - app:tbv_text="巡查记录" + app:tbv_text="检查记录" app:tbv_text_color="@color/white" app:tbv_text_size="@dimen/sp_18" /> diff --git a/app/src/main/res/layout/activity_check_history_detail.xml b/app/src/main/res/layout/activity_check_history_detail.xml index 93dbc5c..1323a98 100644 --- a/app/src/main/res/layout/activity_check_history_detail.xml +++ b/app/src/main/res/layout/activity_check_history_detail.xml @@ -16,7 +16,7 @@ app:tbv_only_show_title="false" app:tbv_show_left_image="true" app:tbv_show_right_image="false" - app:tbv_text="巡查记录" + app:tbv_text="检查记录" app:tbv_text_color="@color/white" app:tbv_text_size="@dimen/sp_18" /> @@ -38,7 +38,7 @@ @@ -64,7 +64,7 @@ diff --git a/.gitignore b/.gitignore index dc53c76..73276f3 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,6 @@ .cxx local.properties /sdk/build/ +*.apk +*.json +*.zip diff --git a/app/src/main/java/com/casic/br/app/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/app/retrofit/RetrofitService.kt index 34bf9b7..ac35be5 100644 --- a/app/src/main/java/com/casic/br/app/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/app/retrofit/RetrofitService.kt @@ -33,7 +33,7 @@ suspend fun loginOut(@Header("token") token: String): String /** - * 获取巡查记录 + * 获取检查记录 */ @GET("/inspection-record/listPage") suspend fun getCheckHistoryByPage( @@ -43,7 +43,7 @@ ): String /** - * 根据巡查ID获取此次记录的详情 + * 根据检查ID获取此次记录的详情 */ @GET("/inspection-record/listAlarmByInspection") suspend fun getCheckHistoryDetailById( diff --git a/app/src/main/java/com/casic/br/app/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/app/retrofit/RetrofitServiceManager.kt index ec93acb..4cc587a 100644 --- a/app/src/main/java/com/casic/br/app/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/app/retrofit/RetrofitServiceManager.kt @@ -64,7 +64,7 @@ } /** - * 获取巡查记录 + * 获取检查记录 */ suspend fun getCheckHistoryByPage(offset: Int): String { return api.getCheckHistoryByPage( @@ -73,7 +73,7 @@ } /** - * 根据巡查ID获取此次记录的详情 + * 根据检查ID获取此次记录的详情 */ suspend fun getCheckHistoryDetailById(inspectionId: String): String { return api.getCheckHistoryDetailById(AuthenticationHelper.token, inspectionId) diff --git a/app/src/main/res/layout/activity_check_history.xml b/app/src/main/res/layout/activity_check_history.xml index b54c408..b28cce1 100644 --- a/app/src/main/res/layout/activity_check_history.xml +++ b/app/src/main/res/layout/activity_check_history.xml @@ -16,7 +16,7 @@ app:tbv_only_show_title="false" app:tbv_show_left_image="true" app:tbv_show_right_image="false" - app:tbv_text="巡查记录" + app:tbv_text="检查记录" app:tbv_text_color="@color/white" app:tbv_text_size="@dimen/sp_18" /> diff --git a/app/src/main/res/layout/activity_check_history_detail.xml b/app/src/main/res/layout/activity_check_history_detail.xml index 93dbc5c..1323a98 100644 --- a/app/src/main/res/layout/activity_check_history_detail.xml +++ b/app/src/main/res/layout/activity_check_history_detail.xml @@ -16,7 +16,7 @@ app:tbv_only_show_title="false" app:tbv_show_left_image="true" app:tbv_show_right_image="false" - app:tbv_text="巡查记录" + app:tbv_text="检查记录" app:tbv_text_color="@color/white" app:tbv_text_size="@dimen/sp_18" /> @@ -38,7 +38,7 @@ @@ -64,7 +64,7 @@ diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 255def5..50e2bf6 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -57,7 +57,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/dp_20" android:fontFamily="sans-serif-black" - android:text="开始巡查" + android:text="开始检查" android:textColor="@color/black" android:textSize="@dimen/sp_20" /> @@ -81,7 +81,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/dp_20" android:fontFamily="sans-serif-black" - android:text="巡查记录" + android:text="检查记录" android:textColor="@color/black" android:textSize="@dimen/sp_20" /> diff --git a/.gitignore b/.gitignore index dc53c76..73276f3 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,6 @@ .cxx local.properties /sdk/build/ +*.apk +*.json +*.zip diff --git a/app/src/main/java/com/casic/br/app/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/app/retrofit/RetrofitService.kt index 34bf9b7..ac35be5 100644 --- a/app/src/main/java/com/casic/br/app/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/app/retrofit/RetrofitService.kt @@ -33,7 +33,7 @@ suspend fun loginOut(@Header("token") token: String): String /** - * 获取巡查记录 + * 获取检查记录 */ @GET("/inspection-record/listPage") suspend fun getCheckHistoryByPage( @@ -43,7 +43,7 @@ ): String /** - * 根据巡查ID获取此次记录的详情 + * 根据检查ID获取此次记录的详情 */ @GET("/inspection-record/listAlarmByInspection") suspend fun getCheckHistoryDetailById( diff --git a/app/src/main/java/com/casic/br/app/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/app/retrofit/RetrofitServiceManager.kt index ec93acb..4cc587a 100644 --- a/app/src/main/java/com/casic/br/app/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/app/retrofit/RetrofitServiceManager.kt @@ -64,7 +64,7 @@ } /** - * 获取巡查记录 + * 获取检查记录 */ suspend fun getCheckHistoryByPage(offset: Int): String { return api.getCheckHistoryByPage( @@ -73,7 +73,7 @@ } /** - * 根据巡查ID获取此次记录的详情 + * 根据检查ID获取此次记录的详情 */ suspend fun getCheckHistoryDetailById(inspectionId: String): String { return api.getCheckHistoryDetailById(AuthenticationHelper.token, inspectionId) diff --git a/app/src/main/res/layout/activity_check_history.xml b/app/src/main/res/layout/activity_check_history.xml index b54c408..b28cce1 100644 --- a/app/src/main/res/layout/activity_check_history.xml +++ b/app/src/main/res/layout/activity_check_history.xml @@ -16,7 +16,7 @@ app:tbv_only_show_title="false" app:tbv_show_left_image="true" app:tbv_show_right_image="false" - app:tbv_text="巡查记录" + app:tbv_text="检查记录" app:tbv_text_color="@color/white" app:tbv_text_size="@dimen/sp_18" /> diff --git a/app/src/main/res/layout/activity_check_history_detail.xml b/app/src/main/res/layout/activity_check_history_detail.xml index 93dbc5c..1323a98 100644 --- a/app/src/main/res/layout/activity_check_history_detail.xml +++ b/app/src/main/res/layout/activity_check_history_detail.xml @@ -16,7 +16,7 @@ app:tbv_only_show_title="false" app:tbv_show_left_image="true" app:tbv_show_right_image="false" - app:tbv_text="巡查记录" + app:tbv_text="检查记录" app:tbv_text_color="@color/white" app:tbv_text_size="@dimen/sp_18" /> @@ -38,7 +38,7 @@ @@ -64,7 +64,7 @@ diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 255def5..50e2bf6 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -57,7 +57,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/dp_20" android:fontFamily="sans-serif-black" - android:text="开始巡查" + android:text="开始检查" android:textColor="@color/black" android:textSize="@dimen/sp_20" /> @@ -81,7 +81,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/dp_20" android:fontFamily="sans-serif-black" - android:text="巡查记录" + android:text="检查记录" android:textColor="@color/black" android:textSize="@dimen/sp_20" /> diff --git a/app/src/main/res/layout/item_check_history_l.xml b/app/src/main/res/layout/item_check_history_l.xml index f6e16ca..4f4aadc 100644 --- a/app/src/main/res/layout/item_check_history_l.xml +++ b/app/src/main/res/layout/item_check_history_l.xml @@ -16,7 +16,7 @@ @@ -42,7 +42,7 @@