From 4598b51c90c695c9ccbe5350a84e4a46b9d8e587 Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期三, 22 五月 2024 20:19:02 +0800 Subject: [PATCH] 2024年05月22日20:18:54 --- app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java | 107 +++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 94 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java index 7717a37..9f08ae4 100644 --- a/app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java +++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java @@ -5,15 +5,12 @@ import com.google.gson.Gson; import com.google.gson.JsonObject; -import com.hdl.linkpm.sdk.core.callback.IResponseCallBack; import com.hdl.linkpm.sdk.core.exception.HDLException; import com.hdl.linkpm.sdk.user.HDLLinkPMUser; import com.hdl.linkpm.sdk.user.bean.HDLLoginBean; import com.hdl.linkpm.sdk.user.bean.HDLUserRegionBean; -import com.hdl.linkpm.sdk.user.bean.ImageSubmitInfo; import com.hdl.linkpm.sdk.user.callback.ILoginCallBack; import com.hdl.linkpm.sdk.user.callback.IRegionByAccountCallBack; -import com.hdl.linkpm.sdk.user.controller.HDLPMUserController; import com.hdl.photovoltaic.config.UserConfigManage; import com.hdl.photovoltaic.internet.HttpClient; import com.hdl.photovoltaic.internet.api.HttpApi; @@ -57,7 +54,8 @@ * @param i_account 璐﹀彿 */ public void regionByAccount(String i_account, CloudCallBeak<HDLUserRegionBean> cloudCallBeak) { - HDLLinkPMUser.getInstance().regionByAccount(i_account, new IRegionByAccountCallBack() { + boolean isBooleanB = UserConfigManage.getInstance().isBAccount(); + HDLLinkPMUser.getInstance().regionByAccount(isBooleanB, i_account, new IRegionByAccountCallBack() { @Override public void onSuccess(HDLUserRegionBean regionBean) { if (cloudCallBeak != null) { @@ -94,6 +92,7 @@ public void onSuccess(HDLLoginBean loginBean) { if (callBack != null) { + loginBean.setAccount(account); saveUserData(loginBean); callBack.onSuccess(loginBean); } @@ -258,7 +257,7 @@ */ public void uploadUserHeadImage_C(File file, CloudCallBeak<String> cloudCallBeak) { String requestUrl = HttpApi.C_POST_GET_IMAGE_URL; - HttpClient.getInstance().requestHttpFile(requestUrl, file, new CloudCallBeak<String>() { + HttpClient.getInstance().uploadingFile(requestUrl, file, new CloudCallBeak<String>() { @Override public void onSuccess(String jsonStr) { if (cloudCallBeak != null) { @@ -333,6 +332,27 @@ } + + /** + * 淇敼鐢ㄦ埛鍚嶇О + * + * @param memberName 鐢ㄦ埛鍚嶇О + * @param cloudCallBeak - + */ + public void updateMemberName_C(String memberName, CloudCallBeak<Boolean> cloudCallBeak) { + updateMemberInfo_C("", memberName, "", "", "", "", cloudCallBeak); + } + + /** + * 淇敼鐢ㄦ埛澶村儚 + * + * @param memberHeadIcon 澶村儚鍦板潃 + * @param cloudCallBeak - + */ + public void updateMemberHeadIcon_C(String memberHeadIcon, CloudCallBeak<Boolean> cloudCallBeak) { + updateMemberInfo_C("", "", "", memberHeadIcon, "", "", cloudCallBeak); + } + /** * 鏇存柊涓汉淇℃伅(C绔处鍙�) * @@ -344,13 +364,7 @@ * @param memberSex 鐢ㄦ埛鎬у埆 * @param cloudCallBeak - */ - public void updateMemberInfo_C(String languageType, - String memberName, - String memberBirthday, - String memberHeadIcon, - String loginName, - String memberSex, - CloudCallBeak<Boolean> cloudCallBeak) { + public void updateMemberInfo_C(String languageType, String memberName, String memberBirthday, String memberHeadIcon, String loginName, String memberSex, CloudCallBeak<Boolean> cloudCallBeak) { String requestUrl = HttpApi.C_POST_UPDATE_MEMBER_INFO; JsonObject json = new JsonObject(); if (!TextUtils.isEmpty(languageType)) { @@ -505,6 +519,71 @@ } + /** + * 缁戝畾璁よ瘉(鎵嬫満/閭)(C绔处鍙�) + * + * @param memberPhone 鎵嬫満鍙凤紙鏈粦瀹氭墜鏈哄彿鍙傛暟浼爊ull锛� + * @param memberEmail 閭锛堟湭缁戝畾閭鍙傛暟浼爊ull锛� + * @param verifyCode 楠岃瘉鐮� + */ + public void bindingAccount_C(String memberPhone, String memberEmail, String verifyCode, CloudCallBeak<Boolean> cloudCallBeak) { + String requestUrl = HttpApi.C_POST_MEMBERINFO_BINDWITHACCOUNT; + JsonObject json = new JsonObject(); + if (!TextUtils.isEmpty(memberPhone)) { + json.addProperty("memberPhone", memberPhone);//鎵嬫満鍙� + } + if (!TextUtils.isEmpty(memberEmail)) { + json.addProperty("memberEmail", memberEmail);//閭 + } + json.addProperty("verifyCode", verifyCode);//楠岃瘉鐮� + HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() { + @Override + public void onSuccess(String str) { + if (cloudCallBeak != null) { + cloudCallBeak.onSuccess(true); + } + } + + @Override + public void onFailure(HDLException e) { + if (cloudCallBeak != null) { + cloudCallBeak.onFailure(e); + } + } + }); + + + } + + + /** + * 瑙g粦璁よ瘉(鎵嬫満/閭)(C绔处鍙�) + * + * @param unBindLabel 瑙g粦鏍囪瘑锛圥HONE EMAIL锛� + */ + public void unBindingAccount_C(String unBindLabel, CloudCallBeak<Boolean> cloudCallBeak) { + String requestUrl = HttpApi.C_POST_MEMBERINFO_UNBINDWITHACCOUNT; + JsonObject json = new JsonObject(); + json.addProperty("unBindLabel", unBindLabel);//鎵嬫満鍙凤紙PHONE EMAIL锛� + HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() { + @Override + public void onSuccess(String str) { + if (cloudCallBeak != null) { + cloudCallBeak.onSuccess(true); + } + } + + @Override + public void onFailure(HDLException e) { + if (cloudCallBeak != null) { + cloudCallBeak.onFailure(e); + } + } + }); + + + } + // endregion @@ -554,9 +633,10 @@ /** * 閫�鍑虹櫥褰曟椂璋冪敤锛屾竻闄ゆ帹閫佹暟鎹� */ - public void SignOutClearData() { + public void signOutClearData() { String requestUrl = HttpApi.POST_GET_IMAGE_LOGOUT; //閫氱煡浜戠锛屽凡缁忛��鍑虹櫥闄� + HttpClient.getInstance().requestHttp(requestUrl, new JsonObject().toString(), null); } public boolean isPhone(String phone) { @@ -587,6 +667,7 @@ UserConfigManage.getInstance().setUserId(obj.getUserId());//鐢ㄦ埛id //b绔拰c绔畾涔夎处鍙峰瓧娈典笉涓�鏍� UserConfigManage.getInstance().setAccount(TextUtils.isEmpty(obj.getAccount()) ? obj.getUserPhone() : obj.getAccount());//璐﹀彿 + UserConfigManage.getInstance().setUserName(obj.getName()); UserConfigManage.getInstance().setToken(obj.getAccessToken());//Token UserConfigManage.getInstance().setHeaderPrefix(obj.getHeaderPrefix());//璁よ瘉璇锋眰澶村墠缂�(搴曞眰璇锋眰缁熶竴鍔�) UserConfigManage.getInstance().setRefreshToken(obj.getRefreshToken());//鍒锋柊Token鐢ㄧ殑鍒锋柊Token鐢ㄧ殑 -- Gitblit v1.8.0