From f53408654b959bc099716353836b6e5788e65b7f Mon Sep 17 00:00:00 2001
From: fengjignqi <15192412330@163.com>
Date: Mon, 29 Jun 2026 16:57:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ckkj/water/mine/AppThemActivity.java  |  5 +++++
 .../ckkj/water/mine/ChangePhoneActivity.java  |  5 +++++
 .../ckkj/water/mine/MineCenterFragment.java   |  5 +++++
 .../water/mine/MineInfomationActivity.java    | 21 +++++++++++++------
 .../ckkj/water/mine/PsdManageActivity.java    |  5 +++++
 .../com/ckkj/water/mine/ResetPsdActivity.java |  5 +++++
 .../com/ckkj/water/mine/SettingsActivity.java |  5 +++++
 .../water/mine/UserLogOffAccountActivity.java |  5 +++++
 .../com/ckkj/water/mine/mvp/MineContract.java |  5 +++++
 .../com/ckkj/water/mine/mvp/MineImpl.java     | 10 +++++++++
 .../ckkj/water/mine/mvp/MinePresenter.java    |  9 ++++++++
 .../java/com/ckkj/water/network/Request.java  |  8 +++++++
 .../ckkj/water/plan/WaterConfigFragment.java  |  2 +-
 13 files changed, 83 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/ckkj/water/mine/AppThemActivity.java b/app/src/main/java/com/ckkj/water/mine/AppThemActivity.java
index ea23917..4a58adb 100644
--- a/app/src/main/java/com/ckkj/water/mine/AppThemActivity.java
+++ b/app/src/main/java/com/ckkj/water/mine/AppThemActivity.java
@@ -122,4 +122,9 @@ public class AppThemActivity extends BaseActivity<AppThemeChangeLayoutBinding, M
     public void logOutSuccess(BaseBean bean) {
 
     }
+
+    @Override
+    public void uploadImageSuccess(BaseBean bean) {
+
+    }
 }
diff --git a/app/src/main/java/com/ckkj/water/mine/ChangePhoneActivity.java b/app/src/main/java/com/ckkj/water/mine/ChangePhoneActivity.java
index 847143d..09f588a 100644
--- a/app/src/main/java/com/ckkj/water/mine/ChangePhoneActivity.java
+++ b/app/src/main/java/com/ckkj/water/mine/ChangePhoneActivity.java
@@ -151,4 +151,9 @@ public class ChangePhoneActivity extends BaseActivity<ChangePhoneActivityBinding
     public void logOutSuccess(BaseBean bean) {
 
     }
+
+    @Override
+    public void uploadImageSuccess(BaseBean bean) {
+
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/ckkj/water/mine/MineCenterFragment.java b/app/src/main/java/com/ckkj/water/mine/MineCenterFragment.java
index b6a3d0d..d57d8ea 100644
--- a/app/src/main/java/com/ckkj/water/mine/MineCenterFragment.java
+++ b/app/src/main/java/com/ckkj/water/mine/MineCenterFragment.java
@@ -165,6 +165,11 @@ public class MineCenterFragment extends BaseFragment<MineFragmentLayoutBinding,
         goTo(mContext, LoginActivity.class,null);
     }
 
+    @Override
+    public void uploadImageSuccess(BaseBean bean) {
+
+    }
+
     @Override
     public void updateUserInfoSuccess(BaseBean bean) {
 
diff --git a/app/src/main/java/com/ckkj/water/mine/MineInfomationActivity.java b/app/src/main/java/com/ckkj/water/mine/MineInfomationActivity.java
index 39f2a0b..f25aece 100644
--- a/app/src/main/java/com/ckkj/water/mine/MineInfomationActivity.java
+++ b/app/src/main/java/com/ckkj/water/mine/MineInfomationActivity.java
@@ -197,6 +197,11 @@ public class MineInfomationActivity extends BaseActivity<MineInformationLayoutBi
 
     }
 
+    @Override
+    public void uploadImageSuccess(BaseBean bean) {
+
+    }
+
 
     private void getCompressFile(File file) {
         LubanCompressUtil.getInstance().getCompressFile(mContext, file, new LubanCompressUtil.CompressCallback() {
@@ -220,13 +225,17 @@ public class MineInfomationActivity extends BaseActivity<MineInformationLayoutBi
                             return;
                         }
 
-                        hideDialogLoading();
-                        ToastUtil.showShort(mContext,getString(R.string.avatar_update_success));
+                        //Todo 开始上传图片
+                        mPresenter.uploadImage(file);
 
-                        Glide.with(mContext)
-                                .load(file)
-                                .error(mContext.getDrawable(R.mipmap.icon_mine_user_head_defaul))
-                                .into(viewBinding.imgAvatar);
+
+//                        hideDialogLoading();
+//                        ToastUtil.showShort(mContext,getString(R.string.avatar_update_success));
+//
+//                        Glide.with(mContext)
+//                                .load(file)
+//                                .error(mContext.getDrawable(R.mipmap.icon_mine_user_head_defaul))
+//                                .into(viewBinding.imgAvatar);
                     } else {
                         ToastUtil.showShort(mContext, getString(R.string.file_not_exist));
                     }
diff --git a/app/src/main/java/com/ckkj/water/mine/PsdManageActivity.java b/app/src/main/java/com/ckkj/water/mine/PsdManageActivity.java
index 5a05cc1..67f6e53 100644
--- a/app/src/main/java/com/ckkj/water/mine/PsdManageActivity.java
+++ b/app/src/main/java/com/ckkj/water/mine/PsdManageActivity.java
@@ -101,4 +101,9 @@ public class PsdManageActivity extends BaseActivity<PasswordManLayoutBinding, Mi
     public void logOutSuccess(BaseBean bean) {
 
     }
+
+    @Override
+    public void uploadImageSuccess(BaseBean bean) {
+
+    }
 }
diff --git a/app/src/main/java/com/ckkj/water/mine/ResetPsdActivity.java b/app/src/main/java/com/ckkj/water/mine/ResetPsdActivity.java
index 59199ca..e6db814 100644
--- a/app/src/main/java/com/ckkj/water/mine/ResetPsdActivity.java
+++ b/app/src/main/java/com/ckkj/water/mine/ResetPsdActivity.java
@@ -96,6 +96,11 @@ public class ResetPsdActivity extends BaseActivity<ResetPsdLayoutBinding, MinePr
 
     }
 
+    @Override
+    public void uploadImageSuccess(BaseBean bean) {
+
+    }
+
     @Override
     public MinePresenter createPresenter() {
         return new MinePresenter(new MineImpl());
diff --git a/app/src/main/java/com/ckkj/water/mine/SettingsActivity.java b/app/src/main/java/com/ckkj/water/mine/SettingsActivity.java
index 7c34607..510043a 100644
--- a/app/src/main/java/com/ckkj/water/mine/SettingsActivity.java
+++ b/app/src/main/java/com/ckkj/water/mine/SettingsActivity.java
@@ -224,4 +224,9 @@ public class SettingsActivity extends BaseActivity<ActivitySettingsLayoutBinding
     public void logOutSuccess(BaseBean bean) {
 
     }
+
+    @Override
+    public void uploadImageSuccess(BaseBean bean) {
+
+    }
 }
diff --git a/app/src/main/java/com/ckkj/water/mine/UserLogOffAccountActivity.java b/app/src/main/java/com/ckkj/water/mine/UserLogOffAccountActivity.java
index de7a967..00e9caf 100644
--- a/app/src/main/java/com/ckkj/water/mine/UserLogOffAccountActivity.java
+++ b/app/src/main/java/com/ckkj/water/mine/UserLogOffAccountActivity.java
@@ -131,4 +131,9 @@ public class UserLogOffAccountActivity extends BaseActivity<UserLogOffActivityBi
     public void logOutSuccess(BaseBean bean) {
 
     }
+
+    @Override
+    public void uploadImageSuccess(BaseBean bean) {
+
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/ckkj/water/mine/mvp/MineContract.java b/app/src/main/java/com/ckkj/water/mine/mvp/MineContract.java
index b0a7962..44df4e5 100644
--- a/app/src/main/java/com/ckkj/water/mine/mvp/MineContract.java
+++ b/app/src/main/java/com/ckkj/water/mine/mvp/MineContract.java
@@ -33,6 +33,8 @@ public class MineContract {
         void updateUserInfo(JSONObject json, CallBack callBack);
         //通过旧密码，修改新密码
         void updateUserPwdByOld(JSONObject json, CallBack callBack);
+        //上传图片
+        void uploadImage(JSONObject json, CallBack callBack);
 
     }
 
@@ -47,6 +49,9 @@ public class MineContract {
         void updateUserPasswordSuccess(BaseBean bean);
         //退出登录
         void logOutSuccess(BaseBean bean);
+        //上传图片成功
+        void uploadImageSuccess(BaseBean bean);
+
     }
 
     public interface RecommendModel{
diff --git a/app/src/main/java/com/ckkj/water/mine/mvp/MineImpl.java b/app/src/main/java/com/ckkj/water/mine/mvp/MineImpl.java
index 05db19c..afebba8 100644
--- a/app/src/main/java/com/ckkj/water/mine/mvp/MineImpl.java
+++ b/app/src/main/java/com/ckkj/water/mine/mvp/MineImpl.java
@@ -140,4 +140,14 @@ public class MineImpl implements MineContract.DataModel {
             e.printStackTrace();
         }
     }
+
+    /**
+     * 上传图片
+     * @param json
+     * @param callBack
+     */
+    @Override
+    public void uploadImage(JSONObject json, MineContract.CallBack callBack) {
+
+    }
 }
diff --git a/app/src/main/java/com/ckkj/water/mine/mvp/MinePresenter.java b/app/src/main/java/com/ckkj/water/mine/mvp/MinePresenter.java
index d3379aa..cc1c01f 100644
--- a/app/src/main/java/com/ckkj/water/mine/mvp/MinePresenter.java
+++ b/app/src/main/java/com/ckkj/water/mine/mvp/MinePresenter.java
@@ -17,6 +17,7 @@ import com.google.gson.Gson;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.io.File;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -135,4 +136,12 @@ public class MinePresenter extends BasePresenter<MineContract.MineView> {
             }
         });
     }
+
+    /**
+     * 上传图片
+     * @param file
+     */
+    public void uploadImage(File file) {
+
+    }
 }
diff --git a/app/src/main/java/com/ckkj/water/network/Request.java b/app/src/main/java/com/ckkj/water/network/Request.java
index 73ec258..3016426 100644
--- a/app/src/main/java/com/ckkj/water/network/Request.java
+++ b/app/src/main/java/com/ckkj/water/network/Request.java
@@ -14,6 +14,7 @@ import java.util.List;
 import java.util.Map;
 
 import io.reactivex.Observable;
+import okhttp3.MultipartBody;
 import okhttp3.RequestBody;
 import retrofit2.http.Body;
 import retrofit2.http.DELETE;
@@ -21,6 +22,7 @@ import retrofit2.http.GET;
 import retrofit2.http.HeaderMap;
 import retrofit2.http.POST;
 import retrofit2.http.PUT;
+import retrofit2.http.Part;
 import retrofit2.http.Path;
 import retrofit2.http.QueryMap;
 
@@ -51,6 +53,12 @@ public interface Request {
     @PUT("app/v1/updataUser")
     Observable<BaseBean> updateUserInfo(@HeaderMap Map<String, String> headMap, @Body RequestBody requestBody);
 
+    //上传图片
+    @PUT("app/v1/uploadImage")
+    Observable<BaseBean> uploadImage(@HeaderMap Map<String, String> headMap,@Part MultipartBody.Part file);
+
+
+
     //首页设备列表
     @GET("app/v1/deviceList")
     Observable<BaseBean<List<WaterDeviceEntity>>> getIndexDeviceList(@HeaderMap Map<String, String> headMap);
diff --git a/app/src/main/java/com/ckkj/water/plan/WaterConfigFragment.java b/app/src/main/java/com/ckkj/water/plan/WaterConfigFragment.java
index e904c34..1e91178 100644
--- a/app/src/main/java/com/ckkj/water/plan/WaterConfigFragment.java
+++ b/app/src/main/java/com/ckkj/water/plan/WaterConfigFragment.java
@@ -75,7 +75,7 @@ public class WaterConfigFragment extends BaseFragment<WaterConfigFragmentLayoutC
             timeDataList.add(timeData);
             bean.setTimeData(timeDataList);
             bean.setWeekday(i + 1);
-            bean.setStatus("0");
+            bean.setStatus("1");
             bean.setWeekName(ZYTimeUtils.getWeekName(i,mContext));
             bean.setTriggerType("0");
             list.add(bean);