From 773b9953ad645b39a9efa8ab6d71dfc9d9e4e22e Mon Sep 17 00:00:00 2001 From: hxb <hxb@hdlchina.com.cn> Date: 星期四, 24 十月 2024 11:51:57 +0800 Subject: [PATCH] 补全了所有日志 --- HDLLinkPMSdk/src/main/java/com/hdl/linkpm/sdk/user/HDLLinkPMUser.java | 89 ++++++++++++++++++++++++++++++++++++++------ 1 files changed, 76 insertions(+), 13 deletions(-) diff --git a/HDLLinkPMSdk/src/main/java/com/hdl/linkpm/sdk/user/HDLLinkPMUser.java b/HDLLinkPMSdk/src/main/java/com/hdl/linkpm/sdk/user/HDLLinkPMUser.java index 176c3fa..245754d 100644 --- a/HDLLinkPMSdk/src/main/java/com/hdl/linkpm/sdk/user/HDLLinkPMUser.java +++ b/HDLLinkPMSdk/src/main/java/com/hdl/linkpm/sdk/user/HDLLinkPMUser.java @@ -1,6 +1,7 @@ package com.hdl.linkpm.sdk.user; import android.text.TextUtils; +import android.util.Log; import com.google.gson.JsonObject; import com.google.gson.reflect.TypeToken; @@ -113,15 +114,15 @@ /** * 淇濆瓨鏋佸厜鎺ㄩ�佺粦瀹氫箣鍚庣殑id */ - public void saveHDLJpushId(String pushId) { + public void saveHDLJpushId(String pushId) { HDLSDKSPUtils.put(HDLLINK_PUSHID_KEY, pushId); } /** - * 鑾峰彇鏋佸厜鎺ㄩ�佺粦瀹氫箣鍚庣殑id + * 鑾峰彇鏋佸厜鎺ㄩ�佺粦瀹氫箣鍚庣殑id */ public String getHDLJpushId() { - return HDLSDKSPUtils.getString(HDLLINK_PUSHID_KEY); + return HDLSDKSPUtils.getString(HDLLINK_PUSHID_KEY); } /** @@ -130,6 +131,7 @@ * @param isLogin */ private void saveLogin(Boolean isLogin) { + HDLSDKLog.i(TAG, "鐧诲綍鐘舵�侊細"+isLogin); HDLSDKSPUtils.put(HDLLINK_ISLOGIN_KEY, isLogin); } @@ -151,11 +153,13 @@ } private void saveAccessToken(String accessToken) { + HDLSDKLog.i(TAG, "AccessToken锛�"+accessToken); this.accessToken = accessToken; HDLSDKSPUtils.put(HDLLINK_ACCESSTOKEN_KEY, this.accessToken); } private void saveRefreshToken(String refreshToken) { + HDLSDKLog.i(TAG, "RefreshToken锛�"+refreshToken); this.refreshToken = refreshToken; HDLSDKSPUtils.put(HDLLINK_REFRESHTOKEN_KEY, this.refreshToken); } @@ -190,25 +194,83 @@ /** * 閫氱煡閫�鍑洪噸鏂扮櫥褰� - * - * @param type: 0:姝e父閫�鍑� 1锛氭瀬鍏夋帹閫佸己鍒堕��鍑� + * @param type: 0:姝e父閫�鍑� 1锛氭瀬鍏夋帹閫佸己鍒堕��鍑� */ private void notificationRelogin(int type) { if (mOnReloginListener != null) { + HDLSDKLog.i(TAG, "閫氱煡閲嶆柊鐧诲綍锛岀櫥褰曠被鍨嬶細" + type); mOnReloginListener.onReLogin(type); } } /** * 閫�鍑虹櫥褰� - * - * @param type: 0:姝e父閫�鍑� 1锛氭瀬鍏夋帹閫佸己鍒堕��鍑� + * @param type: 0:姝e父閫�鍑� 1锛氭瀬鍏夋帹閫佸己鍒堕��鍑� */ public void logout(int type) { //1.娓呯┖鐧诲綍鐘舵�� removeAll(); //2.鍙戝嚭閲嶆柊鐧诲綍閫氱煡 notificationRelogin(type); + } + + /****************************璇锋眰鎺ュ彛****************************/ + /** + * 鑾峰彇璐﹀彿鎵�鍦ㄥ尯鍩� + * + * @param account 璐﹀彿 + * @param callBack 缁撴灉鍥炶皟 + */ + public void regionByAccount(String account, IRegionByAccountCallBack callBack) { + HDLPMUserController.getInstance().regionByAccount(account, new IRegionByAccountCallBack() { + @Override + public void onSuccess(HDLUserRegionBean regionBean) { + if (regionBean != null) { + //鏌ヨ鎴愬姛璁板綍涓�娆� + setUserRegionUrl(regionBean.getRegionUrl()); + if (callBack != null) { + callBack.onSuccess(regionBean); + } + } else { + if (callBack != null) { + callBack.onFailure(HDLException.getErrorWithCode(HDLErrorCode.HDL_DATA_PARSING_ERROR)); + } + } + } + + @Override + public void onFailure(HDLException error) { + if (callBack != null) { + callBack.onFailure(error); + } + } + }); + } + + /** + * 閫氳繃璐﹀彿鍜屽瘑鐮佺櫥褰� + * + * @param account 璐﹀彿 + * @param loginPwd 瀵嗙爜 + * @param callBack 缁撴灉鍥炶皟 + */ + public void loginByPassword(String account, String loginPwd, ILoginCallBack callBack) { + HDLPMUserController.getInstance().loginByPassword(account, loginPwd, new ILoginCallBack() { + @Override + public void onSuccess(HDLLoginBean loginBean) { + loginSuccess(loginBean); + if (callBack != null) { + callBack.onSuccess(loginBean); + } + } + + @Override + public void onFailure(HDLException error) { + if (callBack != null) { + callBack.onFailure(error); + } + } + }); } /****************************璇锋眰鎺ュ彛****************************/ @@ -244,6 +306,7 @@ } }); } + /** * 閫氳繃璐﹀彿鍜屽瘑鐮佺櫥褰� @@ -385,7 +448,7 @@ /** * 涓婁紶鐢ㄦ埛澶村儚 * - * @param file 鍥剧墖鏂囦欢 + * @param file 鍥剧墖鏂囦欢 * @param callBack * @return */ @@ -409,19 +472,19 @@ /** * 灏忕▼搴弚gt鐗堟湰妫�娴嬫洿鏂� * - * @param appCode app缂栫爜 - * @param wgtVersion 灏忕▼搴弚gt鐗堟湰鍙� - * @param callBack 濡傛灉onSuccess 鍥炶皟鐨刡ean涓虹┖锛屼唬琛ㄥ綋鍓嶇増鏈凡缁忔槸鏈�鏂扮増鏈紝娌℃湁鏂扮増鏈� + * @param appCode app缂栫爜 + * @param wgtVersion 灏忕▼搴弚gt鐗堟湰鍙� + * @param callBack 濡傛灉onSuccess 鍥炶皟鐨刡ean涓虹┖锛屼唬琛ㄥ綋鍓嶇増鏈凡缁忔槸鏈�鏂扮増鏈紝娌℃湁鏂扮増鏈� * @return */ public void checkWgtVersion(String appCode, String wgtVersion, IResponseCallBack<NewVersionBean> callBack) { - HDLPMUserController.getInstance().checkAppVersion(appCode, wgtVersion, "wgt", callBack); + HDLPMUserController.getInstance().checkAppVersion(appCode, wgtVersion,"wgt", callBack); } /** * 鑾峰彇mqtt */ - public void getMqttInfo(String attachClientId, String homeType, String deviceUuid, IResponseCallBack<MqttInfo> listener) { + public void getMqttInfo(String attachClientId, String homeType, String deviceUuid, IResponseCallBack<MqttInfo>listener) { HDLPMUserController.getInstance().getMqttInfo(attachClientId, homeType, deviceUuid, listener); } -- Gitblit v1.8.0