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 a1aa150..7e18a72 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 @@ -40,7 +40,7 @@ val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, LocaleConstant.SERVER_BASE_URL ) as String - return "$defaultValue/static/${this.replace("\\", "/")}" + return "$defaultValue/api/static/${this.replace("\\", "/")}" } fun String.compressImage(context: Context, listener: OnImageCompressListener) { 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 a1aa150..7e18a72 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 @@ -40,7 +40,7 @@ val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, LocaleConstant.SERVER_BASE_URL ) as String - return "$defaultValue/static/${this.replace("\\", "/")}" + return "$defaultValue/api/static/${this.replace("\\", "/")}" } fun String.compressImage(context: Context, listener: OnImageCompressListener) { 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 f9b8d01..23ab6cc 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 @@ -8,7 +8,7 @@ /** * PublicKey校验 */ - @GET("/sys/config/baseConfig") + @GET("/api/sys/config/baseConfig") suspend fun authenticate(): String /** @@ -19,7 +19,7 @@ * @param secretKey 加密后的密码 */ @FormUrlEncoded - @POST("/sys/user/appLogin") + @POST("/api/sys/user/appLogin") suspend fun login( @Field("sid") sid: String, @Field("username") account: String, @@ -29,13 +29,13 @@ /** * 获取用户信息 */ - @GET("/sys/user/info") + @GET("/api/sys/user/info") suspend fun getUserDetail(@Header("token") token: String): String /** * 实施中列表 */ - @GET("/site/listPage") + @GET("/api/site/listPage") suspend fun getProjectListByPage( @Header("token") token: String, @Query("keywords") keywords: String, @@ -47,7 +47,7 @@ /** * 施工现场详情 */ - @GET("/site/detail") + @GET("/api/site/detail") suspend fun getProjectDetail( @Header("token") token: String, @Query("projectId") projectId: String @@ -56,7 +56,7 @@ /** * 获取工作区域 */ - @GET("/overview/deviceList") + @GET("/api/overview/deviceList") suspend fun getWorkSiteArea( @Header("token") token: String, @Query("projectId") projectId: String @@ -65,7 +65,7 @@ /** * 获取工作区域作业人员 */ - @GET("/overview/workerList") + @GET("/api/overview/workerList") suspend fun getWorkers( @Header("token") token: String, @Query("projectId") projectId: String @@ -74,7 +74,7 @@ /** * 设备分页列表 */ - @GET("/device/listPage") + @GET("/api/device/listPage") suspend fun getDeviceList( @Header("token") token: String, @Query("deviceCode") deviceCode: String, @@ -89,7 +89,7 @@ * 设置甲烷阈值 */ @FormUrlEncoded - @POST("/device/setThreshold") + @POST("/api/device/setThreshold") suspend fun setMethaneThreshold( @Header("token") token: String, @Field("gasIp") gasIp: String, @@ -100,7 +100,7 @@ /** * 查询甲烷阈值 */ - @GET("/device/getThreshold") + @GET("/api/device/getThreshold") suspend fun getMethaneThreshold( @Header("token") token: String, @Query("gasIp") gasIp: String, @@ -110,7 +110,7 @@ /** * 报警列表 */ - @GET("/alarm/listPage") + @GET("/api/alarm/listPage") suspend fun getAlarmListByPage( @Header("token") token: String, @Query("keywords") keywords: String, @@ -123,19 +123,19 @@ /** * 报警详情 */ - @GET("/alarm/detail") + @GET("/api/alarm/detail") suspend fun getAlarmDetail(@Header("token") token: String, @Query("id") id: String): String /** * 声光报警开关 */ - @POST("/changeAlarmState") + @POST("/api/changeAlarmState") suspend fun changeAlarmState(@Body requestBody: RequestBody): String /** * 声光报警开关状态 */ - @GET("/GetCurrentState") + @GET("/api/GetCurrentState") suspend fun getAlarmState(): String /** @@ -144,19 +144,19 @@ * http://xx.com/static/2019-10/8050891248624f2bbefedcb196ce89cb.jpeg */ @Multipart - @POST("/file/upload") + @POST("/api/file/upload") suspend fun uploadImage(@Header("token") token: String, @Part file: MultipartBody.Part): String /** * 新增事件 */ - @POST("/event/add") + @POST("/api/event/add") suspend fun addEvent(@Header("token") token: String, @Body requestBody: RequestBody): String /** * 人员申请入场 */ - @POST("/worker/add") + @POST("/api/worker/add") suspend fun enter( @Header("token") token: String, @Body requestBody: RequestBody, @@ -166,6 +166,6 @@ /** * 提交算法区域 */ - @POST("/set_position") + @POST("/api/set_position") suspend fun postRegion(@Body requestBody: RequestBody): String } \ 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 a1aa150..7e18a72 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 @@ -40,7 +40,7 @@ val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, LocaleConstant.SERVER_BASE_URL ) as String - return "$defaultValue/static/${this.replace("\\", "/")}" + return "$defaultValue/api/static/${this.replace("\\", "/")}" } fun String.compressImage(context: Context, listener: OnImageCompressListener) { 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 f9b8d01..23ab6cc 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 @@ -8,7 +8,7 @@ /** * PublicKey校验 */ - @GET("/sys/config/baseConfig") + @GET("/api/sys/config/baseConfig") suspend fun authenticate(): String /** @@ -19,7 +19,7 @@ * @param secretKey 加密后的密码 */ @FormUrlEncoded - @POST("/sys/user/appLogin") + @POST("/api/sys/user/appLogin") suspend fun login( @Field("sid") sid: String, @Field("username") account: String, @@ -29,13 +29,13 @@ /** * 获取用户信息 */ - @GET("/sys/user/info") + @GET("/api/sys/user/info") suspend fun getUserDetail(@Header("token") token: String): String /** * 实施中列表 */ - @GET("/site/listPage") + @GET("/api/site/listPage") suspend fun getProjectListByPage( @Header("token") token: String, @Query("keywords") keywords: String, @@ -47,7 +47,7 @@ /** * 施工现场详情 */ - @GET("/site/detail") + @GET("/api/site/detail") suspend fun getProjectDetail( @Header("token") token: String, @Query("projectId") projectId: String @@ -56,7 +56,7 @@ /** * 获取工作区域 */ - @GET("/overview/deviceList") + @GET("/api/overview/deviceList") suspend fun getWorkSiteArea( @Header("token") token: String, @Query("projectId") projectId: String @@ -65,7 +65,7 @@ /** * 获取工作区域作业人员 */ - @GET("/overview/workerList") + @GET("/api/overview/workerList") suspend fun getWorkers( @Header("token") token: String, @Query("projectId") projectId: String @@ -74,7 +74,7 @@ /** * 设备分页列表 */ - @GET("/device/listPage") + @GET("/api/device/listPage") suspend fun getDeviceList( @Header("token") token: String, @Query("deviceCode") deviceCode: String, @@ -89,7 +89,7 @@ * 设置甲烷阈值 */ @FormUrlEncoded - @POST("/device/setThreshold") + @POST("/api/device/setThreshold") suspend fun setMethaneThreshold( @Header("token") token: String, @Field("gasIp") gasIp: String, @@ -100,7 +100,7 @@ /** * 查询甲烷阈值 */ - @GET("/device/getThreshold") + @GET("/api/device/getThreshold") suspend fun getMethaneThreshold( @Header("token") token: String, @Query("gasIp") gasIp: String, @@ -110,7 +110,7 @@ /** * 报警列表 */ - @GET("/alarm/listPage") + @GET("/api/alarm/listPage") suspend fun getAlarmListByPage( @Header("token") token: String, @Query("keywords") keywords: String, @@ -123,19 +123,19 @@ /** * 报警详情 */ - @GET("/alarm/detail") + @GET("/api/alarm/detail") suspend fun getAlarmDetail(@Header("token") token: String, @Query("id") id: String): String /** * 声光报警开关 */ - @POST("/changeAlarmState") + @POST("/api/changeAlarmState") suspend fun changeAlarmState(@Body requestBody: RequestBody): String /** * 声光报警开关状态 */ - @GET("/GetCurrentState") + @GET("/api/GetCurrentState") suspend fun getAlarmState(): String /** @@ -144,19 +144,19 @@ * http://xx.com/static/2019-10/8050891248624f2bbefedcb196ce89cb.jpeg */ @Multipart - @POST("/file/upload") + @POST("/api/file/upload") suspend fun uploadImage(@Header("token") token: String, @Part file: MultipartBody.Part): String /** * 新增事件 */ - @POST("/event/add") + @POST("/api/event/add") suspend fun addEvent(@Header("token") token: String, @Body requestBody: RequestBody): String /** * 人员申请入场 */ - @POST("/worker/add") + @POST("/api/worker/add") suspend fun enter( @Header("token") token: String, @Body requestBody: RequestBody, @@ -166,6 +166,6 @@ /** * 提交算法区域 */ - @POST("/set_position") + @POST("/api/set_position") suspend fun postRegion(@Body requestBody: RequestBody): String } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt index 4c5a675..cda5360 100644 --- a/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt @@ -42,7 +42,7 @@ ) } - const val SERVER_BASE_URL = "http://111.198.10.15:21409" + const val SERVER_BASE_URL = "http://123.60.215.216:8065" const val DEVICE_CONTROLLER_URL = "https://gbs.ntvgbs.cn/login/" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" const val ACCOUNT = "account"