diff --git a/app/build.gradle b/app/build.gradle index d944f80..67af4b0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,8 +22,6 @@ targetSdkVersion 31 versionCode 1 versionName "1.0.0" - - manifestPlaceholders = [GETUI_APPID: "A9V4DvwLcdAqkFCQuFyhq6"] } buildTypes { diff --git a/app/build.gradle b/app/build.gradle index d944f80..67af4b0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,8 +22,6 @@ targetSdkVersion 31 versionCode 1 versionName "1.0.0" - - manifestPlaceholders = [GETUI_APPID: "A9V4DvwLcdAqkFCQuFyhq6"] } buildTypes { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/util/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/smart/town/sanxi/util/retrofit/RetrofitService.kt index 5352979..2c38ce7 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/util/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/util/retrofit/RetrofitService.kt @@ -40,16 +40,11 @@ /** * 修改密码 - * - * @param oldPwd 旧密码 - * @param newPwd 新密码 */ - @FormUrlEncoded - @POST("/mgr/changePwd") + @POST("/sys/mgr/changePwd") suspend fun changePassword( @Header("token") token: String, - @Field("oldPwd") oldPwd: String, - @Field("newPwd") newPwd: String + @Body requestBody: RequestBody ): String /** diff --git a/app/build.gradle b/app/build.gradle index d944f80..67af4b0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,8 +22,6 @@ targetSdkVersion 31 versionCode 1 versionName "1.0.0" - - manifestPlaceholders = [GETUI_APPID: "A9V4DvwLcdAqkFCQuFyhq6"] } buildTypes { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/util/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/smart/town/sanxi/util/retrofit/RetrofitService.kt index 5352979..2c38ce7 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/util/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/util/retrofit/RetrofitService.kt @@ -40,16 +40,11 @@ /** * 修改密码 - * - * @param oldPwd 旧密码 - * @param newPwd 新密码 */ - @FormUrlEncoded - @POST("/mgr/changePwd") + @POST("/sys/mgr/changePwd") suspend fun changePassword( @Header("token") token: String, - @Field("oldPwd") oldPwd: String, - @Field("newPwd") newPwd: String + @Body requestBody: RequestBody ): String /** diff --git a/app/src/main/java/com/casic/smart/town/sanxi/util/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/smart/town/sanxi/util/retrofit/RetrofitServiceManager.kt index 4bd0e79..7fcad83 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/util/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/util/retrofit/RetrofitServiceManager.kt @@ -62,7 +62,13 @@ * 修改密码 */ suspend fun changePassword(oldPwd: String, newPwd: String): String { - return api.changePassword(AuthenticationHelper.token!!, oldPwd, newPwd) + val paramObject = JSONObject() + paramObject.put("oldPwd", oldPwd) + paramObject.put("newPwd", newPwd) + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.changePassword(AuthenticationHelper.token!!, requestBody) } /** diff --git a/app/build.gradle b/app/build.gradle index d944f80..67af4b0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,8 +22,6 @@ targetSdkVersion 31 versionCode 1 versionName "1.0.0" - - manifestPlaceholders = [GETUI_APPID: "A9V4DvwLcdAqkFCQuFyhq6"] } buildTypes { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/util/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/smart/town/sanxi/util/retrofit/RetrofitService.kt index 5352979..2c38ce7 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/util/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/util/retrofit/RetrofitService.kt @@ -40,16 +40,11 @@ /** * 修改密码 - * - * @param oldPwd 旧密码 - * @param newPwd 新密码 */ - @FormUrlEncoded - @POST("/mgr/changePwd") + @POST("/sys/mgr/changePwd") suspend fun changePassword( @Header("token") token: String, - @Field("oldPwd") oldPwd: String, - @Field("newPwd") newPwd: String + @Body requestBody: RequestBody ): String /** diff --git a/app/src/main/java/com/casic/smart/town/sanxi/util/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/smart/town/sanxi/util/retrofit/RetrofitServiceManager.kt index 4bd0e79..7fcad83 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/util/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/util/retrofit/RetrofitServiceManager.kt @@ -62,7 +62,13 @@ * 修改密码 */ suspend fun changePassword(oldPwd: String, newPwd: String): String { - return api.changePassword(AuthenticationHelper.token!!, oldPwd, newPwd) + val paramObject = JSONObject() + paramObject.put("oldPwd", oldPwd) + paramObject.put("newPwd", newPwd) + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.changePassword(AuthenticationHelper.token!!, requestBody) } /** diff --git a/app/src/main/res/layout/fragment_statistics.xml b/app/src/main/res/layout/fragment_statistics.xml index 9bf9304..01983a8 100644 --- a/app/src/main/res/layout/fragment_statistics.xml +++ b/app/src/main/res/layout/fragment_statistics.xml @@ -172,7 +172,7 @@ android:layout_height="wrap_content" android:gravity="center" android:paddingVertical="@dimen/dp_5" - android:text="闸井统计" + android:text="窨井统计" android:textColor="@color/mainTextColor" android:textSize="@dimen/sp_18" />