Merge branch 'master' into 1.2.1_google

wjc

1 天以前 29e200b8db74d31f49d4d1ac64a41ad44e1b3a90

 app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java

@@ -499,6 +499,7 @@
     * @param account       账号 (手机或者邮箱)
     * @param loginPwd      密码
     * @param verifyCode    验证码
     * @param phonePrefix    手机号前缀
     * @param cloudCallBeak -
     */
    public void registerAccount_C(boolean isPhone, String account, String loginPwd, String verifyCode, String phonePrefix, CloudCallBeak<Boolean> cloudCallBeak) {
@@ -542,6 +543,7 @@
     * @param account       账号 (手机或者邮箱)
     * @param loginPwd      新密码
     * @param verifyCode    验证码
     * @param phonePrefix    手机号前缀
     * @param cloudCallBeak -
     */
    public void changePassword_C(boolean isPhone, String account, String loginPwd, String verifyCode, String phonePrefix, CloudCallBeak<Boolean> cloudCallBeak) {
@@ -612,6 +614,7 @@
     *
     * @param memberPhone 手机号（未绑定手机号参数传null）
     * @param memberEmail 邮箱（未绑定邮箱参数传null）
     * @param phonePrefix    手机号前缀
     * @param verifyCode  验证码
     */
    public void bindingAccount_C(String memberPhone, String memberEmail, String verifyCode, String phonePrefix, CloudCallBeak<Boolean> cloudCallBeak) {
@@ -820,7 +823,7 @@
            UserConfigManage.getInstance().setTheSameLoginAccount(isUserId);//与上一个账号是否同一个
            //UserConfigManage.getInstance().getUserId()表示第一次安装登录
            if (!TextUtils.isEmpty(UserConfigManage.getInstance().getUserId()) && !UserConfigManage.getInstance().isTheSameLoginAccount()) {
                //不同账号,删除之前的旧账号日志信息;
                //不同账号,删除之前的旧账号信息;
                HdlFileLogic.getInstance().deleteDirectory(HdlFileLogic.getInstance().getCurrentUserRootPath());
                HdlFileLogic.getInstance().deleteDirectory(HdlFileLogic.getInstance().getUserFilePath());
                UserConfigManage.getInstance().setHomeId("");
@@ -838,6 +841,7 @@
            UserConfigManage.getInstance().setToken(obj.getAccessToken());//Token
            UserConfigManage.getInstance().setHeaderPrefix(obj.getHeaderPrefix());//认证请求头前缀(底层请求统一加)
            UserConfigManage.getInstance().setRefreshToken(obj.getRefreshToken());//刷新Token用的
            UserConfigManage.getInstance().setNoNetworkFlag(false);
            UserConfigManage.getInstance().Save();
        }