2023年10月23日17:39:07

mac

2023-10-23 8bfe046de7987990e1bff2755c2963e14ebc54c1

2023年10月23日17:39:07

备份一下

 .idea/misc.xml

@@ -1,3 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
  <component name="ExternalStorageConfigurationManager" enabled="true" />
  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="corretto-1.8" project-jdk-type="JavaSDK" />
</project>

 app/build.gradle

@@ -82,6 +82,10 @@
    //屏幕适配
    implementation 'com.github.JessYanCoding:AndroidAutoSize:v1.2.1'

    //图片加载库
    implementation 'com.github.bumptech.glide:glide:4.12.0'
    annotationProcessor 'com.github.bumptech.glide:compiler:4.12.0'


    //********UniSDK必须添加的依赖 start********
    implementation "androidx.recyclerview:recyclerview:1.0.0"

 app/src/main/java/com/hdl/photovoltaic/internet/api/HttpApi.java

@@ -50,10 +50,7 @@
    public static final String B_POST_UPDATE_PROGRAM_PASSWORD = "/smart-footstone/user/userInfo/updateProgramPassword";
    //获取员工列表
    public static final String POST_GET_USER_LIST = "/smart-footstone/user/userInfo/getUserList";
    //获取用户个人信息 C端
    public static final String POST_GET_MEMBER_INFO = "/smart-footstone/member/memberInfo/getMemberInfo";
    //更新个人信息 C端
    public static final String POST_UPDATE_MEMBER_INFO = "/smart-footstone/member/memberInfo/updateMemberInfo";

    //上传图片
    public static final String POST_UPLOAD_IMAGE = "/home-wisdom/app/images/upload_image";
    //上传图片（新）
@@ -74,14 +71,14 @@
    public static final String C_POST_GET_OAUTH_REGISTER = "/smart-footstone/member/oauth/register";
    //用户找回密码 忘记密码,通过邮箱和手机号找回
    public static final String C_POST_FORGET_PROGRAM_PWD = "/smart-footstone/member/oauth/forgetPwd";

    //更改个人密码
    public static final String C_POST_UPDATE_PROGRAM_PASSWORD = "/smart-footstone/member/memberInfo/updatePwd";
    //获取用户个人信息 C端
    public static final String C_POST_GET_MEMBER_INFO = "/smart-footstone/member/memberInfo/getMemberInfo";
    //更新个人信息 C端
    public static final String C_POST_UPDATE_MEMBER_INFO = "/smart-footstone/member/memberInfo/updateMemberInfo";
    //endregion
    //endregion





}

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

@@ -522,7 +522,7 @@

    /**
     * 获取逆变器列表
     * 注意:有外网以云端设备为准,本地存在，云端没有则删除；内网以本地为主,搜索多少个设备就显示多少个；
     * 注意:有外网以云端设备为准;本地存在，云端没有则删除；内网以本地为主,搜索多少个设备就显示多少个；
     *
     * @param cloudCallBeak 返回逆变器列表
     */
@@ -682,7 +682,6 @@
     * @param spk           spk
     * @param mac           设备mac
     * @param cloudCallBeak 回调
     * @return -
     */
    public void getDeviceRemoteInfo(String homeId, String spk, String mac, CloudCallBeak<DeviceRemoteInfo> cloudCallBeak) {
        String requestUrl = HttpApi.POST_Device_RemoteInfo;

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

@@ -115,7 +115,7 @@
                            public void onSuccess(HouseInfoBean houseInfoBean) {
                                atomicInteger.set(atomicInteger.get() + 1);
                                if (houseInfoBean != null) {
                                    houseInfoBean.setHomeImage(houseIdBean.getHomeImage());//电站图片
                                    houseInfoBean.setPowerStationImage(houseIdBean.getPowerStationImage());//电站图片
                                    houseInfoBean.setInstalledCapacity(houseIdBean.getInstalledCapacity());//装机容量
                                    houseInfoBean.setPower(houseIdBean.getPower());//发电功率
                                    houseInfoBean.setTodayElectricity(houseIdBean.getTodayElectricity());//今天发电量

 app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java

@@ -11,7 +11,6 @@
import android.text.method.HideReturnsTransformationMethod;
import android.text.method.PasswordTransformationMethod;
import android.text.style.ForegroundColorSpan;
import android.util.Log;
import android.view.View;
import android.widget.TextView;

@@ -174,7 +173,7 @@
//                    //隐私协议提示
//                    return;
//                }
                showLoading(getString(R.string.home_login_登录中));
                showLoading(getString(R.string.home_login_be_logging_in));
                HdlAccountLogic.getInstance().regionByAccount(account, new CloudCallBeak<HDLUserRegionBean>() {
                    @Override
                    public void onSuccess(HDLUserRegionBean obj) {
@@ -270,12 +269,12 @@
    private boolean isLocalCheckAccountAndPassword(String account, String password) {
        if (TextUtils.isEmpty(account)) {
            viewBinding.homeLoginLine1V.setBackgroundColor(getColor(R.color.text_D34545));
            viewBinding.homeLoginAccountTextErrorTv.setText(R.string.home_login_error_账号不能为空);
            viewBinding.homeLoginAccountTextErrorTv.setText(R.string.home_login_error_account_null);
            return false;
        }
        if (TextUtils.isEmpty(password)) {
            viewBinding.homeLoginLine2V.setBackgroundColor(getColor(R.color.text_D34545));
            viewBinding.homeLoginPasswordTextErrorTv.setText(R.string.home_login_error_密码不能为空);
            viewBinding.homeLoginPasswordTextErrorTv.setText(R.string.home_login_error_password_null);
            return false;
        }


 app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java

@@ -6,15 +6,10 @@
import android.Manifest;
import android.content.pm.PackageManager;
import android.os.Bundle;
import android.text.TextUtils;
import android.util.Log;
import android.view.View;

import com.google.gson.Gson;
import com.hdl.linkpm.sdk.core.callback.IResponseCallBack;
import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.linkpm.sdk.device.HDLLinkPMDevice;
import com.hdl.linkpm.sdk.device.bean.GatewayCloudBean;
import com.hdl.linkpm.sdk.home.type.HomeType;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.CustomBaseActivity;
@@ -26,7 +21,6 @@
import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.other.HdlMqttLogic;
import com.hdl.photovoltaic.other.HdlUniLogic;
import com.hdl.photovoltaic.ui.bean.CloudInverterDeviceBean;
import com.hdl.photovoltaic.ui.bean.DeviceRemoteInfo;
import com.hdl.photovoltaic.uni.HDLUniMP;
import com.hdl.photovoltaic.utils.PermissionUtils;
@@ -37,12 +31,10 @@
import com.hdl.sdk.link.core.bean.gateway.GatewayBean;
import com.hdl.sdk.link.core.config.HDLLinkConfig;
import com.hdl.sdk.link.core.utils.mqtt.MqttRecvClient;
import com.hdl.sdk.link.gateway.HDLLinkLocalGateway;

import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;

import java.util.ArrayList;
import java.util.List;


@@ -114,9 +106,9 @@
    }

    private void initView() {
        viewBinding.myPowerStationBottomIl1.titleTv.setText(R.string.my_power_station_title);
        viewBinding.myPowerStationBottomIl1.titleTv.setText(R.string.power_station);
        viewBinding.myMessageBottomIl2.titleTv.setText(R.string.message);
        viewBinding.myMeBottomIl3.titleTv.setText(R.string.my_power_station_me);
        viewBinding.myMeBottomIl3.titleTv.setText(R.string.power_station_me);
        this.bottomViewChangeOfStyle();

    }

 app/src/main/java/com/hdl/photovoltaic/ui/account/ChangePassword.java

@@ -333,19 +333,19 @@
    private void switchPhoneOrMailView() {
        if (isPhoneType) {
            //手机号
            viewBinding.changePhoneIc.accountTitleTv.setText(R.string.home_login_手机号);
            viewBinding.changePhoneIc.accountTitleTv.setText(R.string.home_login_phone);
            viewBinding.changePhoneIc.accountTitleTv.setTextSize(20);
            viewBinding.changePhoneIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_90000000));
            viewBinding.changePhoneIc.lineV.setVisibility(View.VISIBLE);

            viewBinding.changeMailRl.accountTitleTv.setText(R.string.home_login_邮箱);
            viewBinding.changeMailRl.accountTitleTv.setText(R.string.home_login_email);
            viewBinding.changeMailRl.accountTitleTv.setTextSize(16);
            viewBinding.changeMailRl.accountTitleTv.setTextColor(getResources().getColor(R.color.text_40000000));
            viewBinding.changeMailRl.lineV.setVisibility(View.GONE);

            //输入手机号
            viewBinding.changeAccountEt.setInputType(InputType.TYPE_CLASS_NUMBER);
            viewBinding.changeAccountEt.setHint(R.string.home_login_请输入手机号);
            viewBinding.changeAccountEt.setHint(R.string.home_login_input_phone);
            //显示手机号验证码，隐藏邮箱验证码,
            viewBinding.changePhoneVerificationCodeRl.setVisibility(View.VISIBLE);
            viewBinding.changeMailVerificationCodeRl.setVisibility(View.GONE);
@@ -363,12 +363,12 @@

        } else {
            //邮箱
            viewBinding.changePhoneIc.accountTitleTv.setText(R.string.home_login_手机号);
            viewBinding.changePhoneIc.accountTitleTv.setText(R.string.home_login_phone);
            viewBinding.changePhoneIc.accountTitleTv.setTextSize(16);
            viewBinding.changePhoneIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_40000000));
            viewBinding.changePhoneIc.lineV.setVisibility(View.GONE);

            viewBinding.changeMailRl.accountTitleTv.setText(R.string.home_login_邮箱);
            viewBinding.changeMailRl.accountTitleTv.setText(R.string.home_login_email);
            viewBinding.changeMailRl.accountTitleTv.setTextSize(20);
            viewBinding.changeMailRl.accountTitleTv.setTextColor(getResources().getColor(R.color.text_90000000));
            viewBinding.changeMailRl.lineV.setVisibility(View.VISIBLE);

 app/src/main/java/com/hdl/photovoltaic/ui/account/RegisterAccountActivity.java

@@ -29,7 +29,6 @@
import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
import com.hdl.photovoltaic.widget.ConfirmationTipDialog;
import com.hdl.photovoltaic.widget.ListDialog;
import com.hdl.sdk.link.common.utils.ThreadToolUtils;

/**
 * 注册账号界面
@@ -362,19 +361,19 @@
    private void switchPhoneOrMailView() {
        if (isPhoneType) {
            //手机号
            viewBinding.registerPhoneTitleIc.accountTitleTv.setText(R.string.home_login_手机号);
            viewBinding.registerPhoneTitleIc.accountTitleTv.setText(R.string.home_login_phone);
            viewBinding.registerPhoneTitleIc.accountTitleTv.setTextSize(20);
            viewBinding.registerPhoneTitleIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_90000000));
            viewBinding.registerPhoneTitleIc.lineV.setVisibility(View.VISIBLE);

            viewBinding.registerMailTitleIc.accountTitleTv.setText(R.string.home_login_邮箱);
            viewBinding.registerMailTitleIc.accountTitleTv.setText(R.string.home_login_email);
            viewBinding.registerMailTitleIc.accountTitleTv.setTextSize(16);
            viewBinding.registerMailTitleIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_40000000));
            viewBinding.registerMailTitleIc.lineV.setVisibility(View.GONE);

            //输入手机号
            viewBinding.registerAccountEt.setInputType(InputType.TYPE_CLASS_NUMBER);
            viewBinding.registerAccountEt.setHint(R.string.home_login_请输入手机号);
            viewBinding.registerAccountEt.setHint(R.string.home_login_input_phone);
            //显示手机号验证码，隐藏邮箱验证码,
            viewBinding.registerPhoneVerificationCodeRl.setVisibility(View.VISIBLE);
            viewBinding.registerMailVerificationCodeRl.setVisibility(View.GONE);
@@ -392,12 +391,12 @@

        } else {
            //邮箱
            viewBinding.registerPhoneTitleIc.accountTitleTv.setText(R.string.home_login_手机号);
            viewBinding.registerPhoneTitleIc.accountTitleTv.setText(R.string.home_login_phone);
            viewBinding.registerPhoneTitleIc.accountTitleTv.setTextSize(16);
            viewBinding.registerPhoneTitleIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_40000000));
            viewBinding.registerPhoneTitleIc.lineV.setVisibility(View.GONE);

            viewBinding.registerMailTitleIc.accountTitleTv.setText(R.string.home_login_邮箱);
            viewBinding.registerMailTitleIc.accountTitleTv.setText(R.string.home_login_email);
            viewBinding.registerMailTitleIc.accountTitleTv.setTextSize(20);
            viewBinding.registerMailTitleIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_90000000));
            viewBinding.registerMailTitleIc.lineV.setVisibility(View.VISIBLE);

 app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java

@@ -1,5 +1,7 @@
package com.hdl.photovoltaic.ui.adapter;

import android.content.Context;
import android.graphics.Bitmap;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -9,18 +11,23 @@
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;

import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.ui.bean.HouseIdBean;
import com.hdl.photovoltaic.utils.GlideUtils;

import java.util.List;

public class HouseInfoAdapter extends RecyclerView.Adapter<HouseInfoAdapter.MyViewHolder> {

    private List<HouseIdBean> mList;
    private Context mContext;
    private OnclickListener noOnclickListener;//点击了的监听器

    public HouseInfoAdapter(List<HouseIdBean> list) {
    public HouseInfoAdapter(List<HouseIdBean> list, Context context) {

        this.mList = list;
        this.mContext = context;
    }

    @NonNull
@@ -34,6 +41,7 @@
    public void onBindViewHolder(@NonNull MyViewHolder holder, int position) {
        HouseIdBean houseIdBean = this.mList.get(position);
        holder.homeNameTv.setText(houseIdBean.getHomeName());
        GlideUtils.getRoundedCornersImage(mContext, houseIdBean.getPowerStationImage(), holder.homeIconIv, new RoundedCorners(4));
        holder.itemView.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {

 app/src/main/java/com/hdl/photovoltaic/ui/bean/HouseIdBean.java

@@ -4,7 +4,7 @@

public class HouseIdBean implements Serializable {
    private String homeId;//电站id
    private String homeImage;//电站图片
    private String powerStationImage;//电站图片
    private String homeName;//电站名称
    private String installedCapacity;//装机容量
    private String power;//发电功率
@@ -20,12 +20,12 @@
        this.homeId = homeId;
    }

    public String getHomeImage() {
        return homeImage == null ? "" : homeImage;
    public String getPowerStationImage() {
        return powerStationImage == null ? "" : powerStationImage;
    }

    public void setHomeImage(String homeImage) {
        this.homeImage = homeImage;
    public void setPowerStationImage(String homeImage) {
        this.powerStationImage = homeImage;
    }

    public String getHomeName() {

 app/src/main/java/com/hdl/photovoltaic/ui/me/MeChangePasswordActivity.java

@@ -5,13 +5,10 @@
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.text.Editable;
import android.text.Spannable;
import android.text.SpannableStringBuilder;
import android.text.TextUtils;
import android.text.TextWatcher;
import android.text.method.HideReturnsTransformationMethod;
import android.text.method.PasswordTransformationMethod;
import android.text.style.ForegroundColorSpan;
import android.view.View;
import android.widget.EditText;
import android.widget.ImageView;
@@ -26,7 +23,9 @@
import com.hdl.photovoltaic.other.HdlThreadLogic;
import com.hdl.photovoltaic.widget.FlashingBoxDialog;


/**
 * 我的-修改密码-界面
 */
public class MeChangePasswordActivity extends BaseActivity {

    private ActivityMeChangePasswordBinding viewBinding;
@@ -43,6 +42,7 @@
        initView();
        //初始化界面监听器
        initEvent();

    }

    /**

 app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java

@@ -9,7 +9,7 @@
import com.hdl.photovoltaic.databinding.FragmentMeBinding;

/**
 * 个人中心界面
 * 我的-界面
 */
public class MeFragment extends CustomBaseFragment {
    private FragmentMeBinding viewBinding;
@@ -50,7 +50,7 @@
    }

    private void initView() {
        viewBinding.toolbarTopFragmentMeRl.topTitleTv.setText(R.string.my_power_station_me);
        viewBinding.toolbarTopFragmentMeRl.topTitleTv.setText(R.string.power_station_me);
        viewBinding.toolbarTopFragmentMeRl.topMoreIv.setVisibility(View.VISIBLE);
        viewBinding.toolbarTopFragmentMeRl.topMoreIv.setImageResource(R.drawable.message);

@@ -60,7 +60,7 @@
        viewBinding.fragmentMeLineSetIl.fragmentMeLineV.setVisibility(View.VISIBLE);

        viewBinding.fragmentMeLineAsregardsIl.fragmentMeLineLeftIconIv.setImageResource(R.drawable.asregards);
        viewBinding.fragmentMeLineAsregardsIl.fragmentMeLineTitleIv.setText(R.string.me_关于);
        viewBinding.fragmentMeLineAsregardsIl.fragmentMeLineTitleIv.setText(R.string.me_regard);
    }



 app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java

@@ -3,18 +3,18 @@

import android.os.Bundle;
import android.view.View;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;

import com.hdl.linkpm.sdk.user.HDLLinkPMUser;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.CustomBaseActivity;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.ActivitySetBinding;
import com.hdl.photovoltaic.widget.ConfirmationInputDialog;

/**
 * 设置界面
 * 我的-设置-界面
 */
public class SetActivity extends CustomBaseActivity implements View.OnClickListener {
public class SetActivity extends CustomBaseActivity {

    private ActivitySetBinding viewBinding;

@@ -34,10 +34,38 @@
    }

    private void initEvent() {
        viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setOnClickListener(this);
        viewBinding.setChangePasswordIl.sllLlNameRl.setOnClickListener(this);
        viewBinding.outTv.setOnClickListener(this);
        viewBinding.setPushMsgIl.sllLlRlRightSwitchIv.setOnClickListener(this);
        viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                finish();
            }
        });
        viewBinding.setNicknameIl.sllLlNameRl.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                changedNickname();
            }
        });
        viewBinding.setChangePasswordIl.sllLlNameRl.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                startActivity(MeChangePasswordActivity.class);
            }
        });
        viewBinding.setPushMsgIl.sllLlRlRightSwitchIv.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                v.setSelected(!v.isSelected());
            }
        });
        viewBinding.outTv.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                logoutRequest();
            }
        });


    }

    private void initView() {
@@ -47,32 +75,54 @@
        viewBinding.toolbarTopFragmentHouseListRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF));
        viewBinding.setNicknameIl.sllLlRlNameTv.setText(R.string.set_nickname);
        viewBinding.setChangePasswordIl.sllLlRlNameTv.setText(R.string.home_login_change_password);
        viewBinding.setCloseAccountIl.sllLlRlNameTv.setText(R.string.set_注销账号);
        viewBinding.setMesIl.sllLlRlTitleTv.setText(R.string.set_消息设置);
        viewBinding.setPushMsgIl.sllLlRlNameTv.setText(R.string.set_推送消息);
        viewBinding.setCloseAccountIl.sllLlRlNameTv.setText(R.string.set_close_account);
        viewBinding.setMesIl.sllLlRlTitleTv.setText(R.string.set_message_setting);
        viewBinding.setPushMsgIl.sllLlRlNameTv.setText(R.string.set_push_notification);
        viewBinding.setPushMsgIl.sllLlRlRightNextIv.setVisibility(View.GONE);
        viewBinding.setPushMsgIl.sllLlRlRightSwitchIv.setVisibility(View.VISIBLE);
        viewBinding.setCallMsgIl.sllLlRlNameTv.setText(R.string.set_报警消息);
        viewBinding.setGeneralMsgIl.sllLlRlTitleTv.setText(R.string.set_通用设置);
        viewBinding.setMultiLanguageIl.sllLlRlNameTv.setText(R.string.set_多语言);
        viewBinding.setDataCenterIl.sllLlRlNameTv.setText(R.string.set_数据中心);
        viewBinding.setCallMsgIl.sllLlRlNameTv.setText(R.string.set_alarm_message);
        viewBinding.setGeneralMsgIl.sllLlRlTitleTv.setText(R.string.set_general_setting);
        viewBinding.setMultiLanguageIl.sllLlRlNameTv.setText(R.string.set_multilingual);
        viewBinding.setDataCenterIl.sllLlRlNameTv.setText(R.string.set_data_centre);
        viewBinding.setPrivacyIl.sllLlRlTitleTv.setText(R.string.set_privacy);
        viewBinding.setSystemAuthorizationIl.sllLlRlNameTv.setText(R.string.set_系统权限管理);
        viewBinding.setShareIl.sllLlRlNameTv.setText(R.string.set_第三方信息共享清单);
    }
        viewBinding.setSystemAuthorizationIl.sllLlRlNameTv.setText(R.string.set_system_rights_managemen);
        viewBinding.setShareIl.sllLlRlNameTv.setText(R.string.set_3_msg_sharing);

    @Override
    public void onClick(View v) {
        if (v.getId() == viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.getId()) {
            finish();
        } else if (v.getId() == viewBinding.setPushMsgIl.sllLlRlRightSwitchIv.getId()) {
            v.setSelected(!v.isSelected());
        } else if (v.getId() == viewBinding.setChangePasswordIl.sllLlNameRl.getId()) {
            startActivity(MeChangePasswordActivity.class);
        } else if (v.getId() == viewBinding.outTv.getId()) {
            logoutRequest();
        if (UserConfigManage.getInstance().isBAccount()) {
            //B端
            viewBinding.setNicknameIl.sllLlNameRl.setVisibility(View.GONE);
        } else {
            //C端
            viewBinding.setNicknameIl.sllLlNameRl.setVisibility(View.VISIBLE);
        }

    }

    /**
     * 修改用户昵称
     */
    private void changedNickname() {
        if (UserConfigManage.getInstance().isBAccount()) {
            //todo B端不支持更改昵称
        } else {
            ConfirmationInputDialog confirmationInputDialog = new ConfirmationInputDialog(_mActivity);
            confirmationInputDialog.setTitle(getString(R.string.set_nickname_modification));
            confirmationInputDialog.setEditContent(UserConfigManage.getInstance().getAccount());
            confirmationInputDialog.show();

            confirmationInputDialog.setYesOnclickListener(new ConfirmationInputDialog.onYesOnclickListener() {
                @Override
                public void Confirm(String str) {

                }
            });
            confirmationInputDialog.setNoOnclickListener(new ConfirmationInputDialog.onNoOnclickListener() {
                @Override
                public void Cancel() {
                    confirmationInputDialog.dismiss();
                }
            });
        }

    }


 app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java

@@ -5,7 +5,6 @@
import android.content.pm.PackageManager;
import android.hardware.camera2.CameraManager;
import android.os.Bundle;
import android.util.Log;
import android.view.View;

import androidx.annotation.NonNull;
@@ -35,7 +34,7 @@
import java.util.List;

/**
 * 电站列表界面
 * (住宅)电站列表-界面
 */
public class HouseListFragment extends CustomBaseFragment {

@@ -100,7 +99,7 @@
            @Override
            public void onRefresh() {
                updateUIData(true);
                Log.d("HouseListFragment", "下拉刷新");
                HdlLogLogic.print("HouseListFragment", "下拉刷新");
            }
        });
        houseInfoAdapter.setNoOnclickListener(new HouseInfoAdapter.OnclickListener() {
@@ -116,11 +115,11 @@
    }

    private void initView() {
        viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.my_power_station_我的电站);
        viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.my_power_station);
        viewBinding.toolbarTopFragmentHouseListRl.topMoreIv.setVisibility(View.VISIBLE);
        viewBinding.toolbarTopFragmentHouseListRl.topMoreIv.setImageResource(R.drawable.add);
        LinearLayoutManager linearLayout = new LinearLayoutManager(_mActivity);
        houseInfoAdapter = new HouseInfoAdapter(this.houseListBeanIDList);
        houseInfoAdapter = new HouseInfoAdapter(this.houseListBeanIDList,_mActivity);
        viewBinding.fragmentHouseSrlListRc.setLayoutManager(linearLayout);
        viewBinding.fragmentHouseSrlListRc.setAdapter(houseInfoAdapter);


 app/src/main/java/com/hdl/photovoltaic/utils/GlideUtils.java

New file
@@ -0,0 +1,163 @@
package com.hdl.photovoltaic.utils;

import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Canvas;
import android.graphics.Paint;
import android.graphics.PorterDuff;
import android.graphics.PorterDuffXfermode;
import android.graphics.Rect;
import android.graphics.RectF;
import android.widget.ImageView;

import androidx.core.graphics.drawable.RoundedBitmapDrawable;
import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory;

import com.bumptech.glide.Glide;
import com.bumptech.glide.load.resource.bitmap.CenterCrop;
import com.bumptech.glide.load.resource.bitmap.CircleCrop;
import com.bumptech.glide.load.resource.bitmap.GranularRoundedCorners;
import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
import com.bumptech.glide.request.RequestOptions;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.other.HdlThreadLogic;

import java.io.InputStream;
import java.net.HttpURLConnection;
import java.net.URL;

/**
 * [Android]图片加载库Glide
 */
public class GlideUtils {
    /**
     * 标准图片
     *
     * @param context   上下文
     * @param url       图片地址
     * @param imageview 显示图片组件
     */
    public static void getGeneralImage(Context context, String url, ImageView imageview) {
        Glide.with(context)
                .load(url)
                .apply(getRequestOptions())
                .into(imageview);
    }

    /**
     * 图片四个角度单独指定
     *
     * @param context                上下文
     * @param url                    图片地址
     * @param imageview              显示图片组件
     * @param granularRoundedCorners 设置图片角度
     */
    public static void getGranularRoundedCornersImage(Context context, String url, ImageView imageview, GranularRoundedCorners granularRoundedCorners) {
        Glide.with(context)
                .load(url)
                .apply(getRequestOptions())
                .transform(granularRoundedCorners)//new GranularRoundedCorners(30f,80f,80f,30f)
                .into(imageview);
    }

    /**
     * 图片四个角统一指定
     *
     * @param context        上下文
     * @param url            图片地址
     * @param imageview      显示图片组件
     * @param roundedCorners 设置图片角度值
     */
    public static void getRoundedCornersImage(Context context, String url, ImageView imageview, RoundedCorners roundedCorners) {
        Glide.with(context)
                .load(url)
                .apply(getRequestOptions())
                .transform(new CenterCrop(), roundedCorners)//Glide加载图片圆角效果与ImageView的ScaleType冲突问题
//                .transform(roundedCorners)
                .into(imageview);
    }

    /**
     * 圆角
     *
     * @param context   上下文
     * @param url       图片地址
     * @param imageview 显示图片组件
     */
    public static void getCircleCropImage(Context context, String url, ImageView imageview) {
        Glide.with(context)
                .load(url)
                .apply(getRequestOptions())
                .transform(new CircleCrop())
                .into(imageview);
    }


    private static RequestOptions getRequestOptions() {
        return new RequestOptions()
                .placeholder(R.mipmap.ic_launcher)
                .error(R.mipmap.ic_launcher)
                .fallback(R.mipmap.ic_launcher);
//                .override(113, 130);

    }

    /**
     * 设置图片
     *
     * @param path      图片地址
     * @param imageView 显示图片组件
     * @param pixels    设置圆角值
     */
    public static void getImage(String path, ImageView imageView, int pixels) {

        HdlThreadLogic.runThread(new Runnable() {
            @Override
            public void run() {
                try {
                    URL url = new URL(path);
                    HttpURLConnection conn = (HttpURLConnection) url.openConnection();
                    conn.setConnectTimeout(3000);
                    conn.setRequestMethod("GET");
                    if (conn.getResponseCode() == 200) {
                        InputStream inStream = conn.getInputStream();
                        Bitmap bitmap = BitmapFactory.decodeStream(inStream);
                        imageView.setImageBitmap(getRoundedCornerBitmap(bitmap,pixels));
                    }
                } catch (Exception e) {
                }
            }
        }, null, null);

    }

    /**
     * @param bitmap 需要修改的图片
     * @param pixels 圆角的弧度
     * @return 圆角图片
     */
    public static Bitmap getRoundedCornerBitmap(Bitmap bitmap, int pixels) {


        Bitmap output = Bitmap.createBitmap(bitmap.getWidth(),
                bitmap.getHeight(), Bitmap.Config.ARGB_8888);
        Canvas canvas = new Canvas(output);
        final int color = 0xff424242;
        final Paint paint = new Paint();
        final Rect rect = new Rect(0, 0, bitmap.getWidth(), bitmap.getHeight());
        final RectF rectF = new RectF(rect);
        final float roundPx = pixels;
        //防止锯齿
        paint.setAntiAlias(true);
        //相当于清屏
        canvas.drawARGB(0, 0, 0, 0);
        paint.setColor(color);
        //先画了一个带圆角的矩形
        canvas.drawRoundRect(rectF, roundPx, roundPx, paint);
        paint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_IN));
        //再把原来的bitmap画到现在的bitmap
        canvas.drawBitmap(bitmap, rect, rect, paint);
        return output;
    }
}

 app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationInputDialog.java

@@ -31,7 +31,7 @@
    private onNoOnclickListener noOnclickListener;//取消按钮被点击了的监听器
    private onYesOnclickListener yesOnclickListener;//确定按钮被点击了的监听器
    private DialogConfirmInputBinding viewBinding;
    private String titleStr, yesStr, noStr;
    private String titleStr, yesStr, noStr,edit_content;

    @Override
    protected void onCreate(Bundle savedInstanceState) {
@@ -99,6 +99,22 @@
    }

    /**
     * 输入框内容
     *
     * @param edit_content 输入框内容
     */
    public void setEditContent(String edit_content) {
        if (TextUtils.isEmpty(edit_content)) {
            return;
        }
        this.edit_content = edit_content;
        if (viewBinding != null) {
            viewBinding.loadingConfirmationInputEt.setText(edit_content);
        }

    }

    /**
     * 自定义"确认"文本
     *
     * @param confirm 内容
@@ -151,21 +167,11 @@
            }
        });


        viewBinding.loadingConfirmationClickTv.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                v.setSelected(!v.isSelected());
                if (v.isSelected()) {
                    viewBinding.loadingConfirmationInputEt.setTransformationMethod(HideReturnsTransformationMethod.getInstance());
                    viewBinding.loadingConfirmationHideIv.setImageDrawable(AppCompatResources.getDrawable(mContext, R.drawable.show));
                } else {
                    viewBinding.loadingConfirmationInputEt.setTransformationMethod(PasswordTransformationMethod.getInstance());
                    viewBinding.loadingConfirmationHideIv.setImageDrawable(AppCompatResources.getDrawable(mContext, R.drawable.hide));
                }
                //设置光标位置
                viewBinding.loadingConfirmationInputEt.setSelection(viewBinding.loadingConfirmationInputEt.getText().length());

                //一键清空文本
                viewBinding.loadingConfirmationInputEt.setText("");
            }
        });
    }
@@ -189,6 +195,9 @@
        if (!TextUtils.isEmpty(noStr)) {
            viewBinding.dialogCancelTv.setText(noStr);
        }
        if (!TextUtils.isEmpty(edit_content)) {
            viewBinding.loadingConfirmationInputEt.setText(edit_content);
        }
    }

    private void initView() {

 app/src/main/res/layout/activity_change_password.xml

@@ -65,7 +65,7 @@
            android:layout_marginStart="@dimen/dp_20"
            android:layout_marginEnd="@dimen/dp_60"
            android:background="@null"
            android:hint="@string/home_login_请输入手机号"
            android:hint="@string/home_login_input_phone"
            android:inputType="text"
            android:lines="1"
            android:maxLines="1"
@@ -100,7 +100,7 @@
            android:layout_marginEnd="@dimen/dp_20"
            android:gravity="center"
            android:padding="@dimen/dp_16"
            android:text="@string/home_login_验证码"
            android:text="@string/home_login_verification_code"
            android:textColor="@color/text_245EC3"
            android:textSize="@dimen/text_14" />

@@ -120,7 +120,7 @@
            android:layout_alignParentStart="true"
            android:layout_marginStart="@dimen/dp_20"
            android:background="@null"
            android:hint="@string/home_login_input_验证码"
            android:hint="@string/home_login_input_verification_code"
            android:inputType="text"
            android:lines="1"
            android:maxLines="1"
@@ -178,7 +178,7 @@
            android:layout_alignParentStart="true"
            android:layout_marginStart="@dimen/dp_20"
            android:background="@null"
            android:hint="@string/home_login_input_验证码"
            android:hint="@string/home_login_input_verification_code"
            android:inputType="text"
            android:lines="1"
            android:maxLines="1"
@@ -305,7 +305,7 @@
        android:background="@drawable/yesandnocheck"
        android:enabled="false"
        android:gravity="center"
        android:text="@string/home_login_确认重置"
        android:text="@string/home_login_confirm_reset"
        android:textColor="@color/text_FFFFFFFF"
        android:textSize="18sp"
        app:layout_constraintEnd_toEndOf="parent"

 app/src/main/res/layout/activity_fast_scan.xml

@@ -58,7 +58,7 @@
                android:layout_width="wrap_content"
                android:layout_height="20dp"
                android:layout_marginEnd="20dp"
                android:text="@string/device_手动连接"
                android:text="@string/device_manual_connection"
                android:textColor="@color/text_FFFFFFFF"
                android:textSize="@dimen/text_14" />


 app/src/main/res/layout/activity_home_login.xml

@@ -22,7 +22,7 @@
        android:layout_width="wrap_content"
        android:layout_height="@dimen/dp_20"
        android:layout_marginStart="@dimen/dp_6"
        android:text="@string/home_login_中文"
        android:text="@string/home_login_chinese"
        android:textColor="@color/text_FF000000"
        android:textSize="@dimen/text_14"
        app:layout_constraintBottom_toBottomOf="@+id/home_login_server_iv"
@@ -54,7 +54,7 @@
        android:layout_width="wrap_content"
        android:layout_height="@dimen/dp_39"
        android:layout_marginTop="@dimen/dp_40"
        android:text="@string/home_login_HDL光伏储能"
        android:text="@string/home_login_hdl_stored_energy"
        android:textColor="@color/text_90000000"
        android:textSize="@dimen/text_28"
        android:textStyle="bold"
@@ -75,7 +75,7 @@
        android:layout_width="wrap_content"
        android:layout_height="@dimen/dp_20"
        android:layout_marginStart="@dimen/dp_16"
        android:text="@string/home_login_我是安装商"
        android:text="@string/home_login_an_installer"
        android:textColor="@color/text_FF000000"
        android:textSize="@dimen/text_14"
        app:layout_constraintBottom_toBottomOf="@+id/home_login_check_iv"
@@ -91,7 +91,7 @@
        android:layout_marginEnd="@dimen/dp_60"
        android:background="@null"
        android:gravity="center_vertical"
        android:hint="@string/home_login_请输入手机号_邮箱号"
        android:hint="@string/home_login__input_phone_email"
        android:inputType="text"
        android:lines="1"
        android:maxLines="1"
@@ -146,7 +146,7 @@
        android:layout_marginEnd="@dimen/dp_60"
        android:background="@null"
        android:gravity="center_vertical"
        android:hint="@string/home_login_请输入密码"
        android:hint="@string/home_login_input_psw"
        android:inputType="textPassword"
        android:lines="1"
        android:maxLines="1"
@@ -191,7 +191,7 @@
        android:layout_width="32dp"
        android:layout_height="17dp"
        android:layout_marginTop="@dimen/dp_24"
        android:text="@string/home_login_注册"
        android:text="@string/home_login_register"
        android:textColor="@color/text_245EC3"
        android:textSize="@dimen/text_14"
        app:layout_constraintStart_toStartOf="@+id/home_login_line2_v"
@@ -202,7 +202,7 @@
        android:layout_width="wrap_content"
        android:layout_height="@dimen/dp_20"
        android:layout_marginTop="@dimen/dp_24"
        android:text="@string/home_login_忘记密码"
        android:text="@string/home_login_forget_password"
        android:textColor="@color/text_245EC3"
        android:textSize="@dimen/text_14"
        app:layout_constraintEnd_toEndOf="@+id/home_login_line2_v"
@@ -217,7 +217,7 @@
        android:background="@drawable/yesandnocheck"
        android:enabled="false"
        android:gravity="center"
        android:text="@string/home_login_登录"
        android:text="@string/home_login_logoin"
        android:textColor="@color/text_FFFFFFFF"
        android:textSize="18sp"
        app:layout_constraintEnd_toEndOf="@+id/home_login_line2_v"
@@ -230,7 +230,7 @@
        android:layout_width="wrap_content"
        android:layout_height="@dimen/dp_25"
        android:layout_marginTop="@dimen/text_28"
        android:text="@string/home_login_体验电站"
        android:text="@string/home_login_power_station"
        android:textColor="@color/text_245EC3"
        android:textSize="18sp"
        app:layout_constraintEnd_toEndOf="parent"
@@ -252,7 +252,7 @@
        android:layout_width="wrap_content"
        android:layout_height="@dimen/dp_20"
        android:layout_marginStart="@dimen/dp_16"
        android:text="@string/home_login_同意_服务协议"
        android:text="@string/home_login_consent_service_agreement"
        android:textColor="@color/text_FF000000"
        android:textSize="@dimen/text_14"
        app:layout_constraintBottom_toBottomOf="@+id/home_login_privacy_check_iv"

 app/src/main/res/layout/activity_register_account.xml

@@ -23,7 +23,7 @@
        android:layout_height="@dimen/dp_39"
        android:layout_marginStart="@dimen/dp_20"
        android:layout_marginTop="@dimen/dp_42"
        android:text="@string/home_login_注册"
        android:text="@string/home_login_register"
        android:textAlignment="center"
        android:textColor="@color/text_90000000"
        android:textSize="@dimen/text_28"
@@ -166,7 +166,7 @@
            android:layout_marginStart="@dimen/dp_20"
            android:layout_marginEnd="@dimen/dp_60"
            android:background="@null"
            android:hint="@string/home_login_请输入手机号"
            android:hint="@string/home_login_input_phone"
            android:inputType="text"
            android:lines="1"
            android:maxLines="1"
@@ -286,7 +286,7 @@
            android:layout_marginEnd="@dimen/dp_20"
            android:gravity="center"
            android:padding="@dimen/dp_16"
            android:text="@string/home_login_验证码"
            android:text="@string/home_login_verification_code"
            android:textColor="@color/text_245EC3"
            android:textSize="@dimen/text_14" />

@@ -306,7 +306,7 @@
            android:layout_alignParentStart="true"
            android:layout_marginStart="@dimen/dp_20"
            android:background="@null"
            android:hint="@string/home_login_input_验证码"
            android:hint="@string/home_login_input_verification_code"
            android:inputType="text"
            android:lines="1"
            android:maxLines="1"
@@ -366,7 +366,7 @@
            android:layout_alignParentStart="true"
            android:layout_marginStart="@dimen/dp_20"
            android:background="@null"
            android:hint="@string/home_login_input_验证码"
            android:hint="@string/home_login_input_verification_code"
            android:inputType="text"
            android:lines="1"
            android:maxLines="1"
@@ -408,7 +408,7 @@
        android:background="@drawable/yesandnocheck"
        android:enabled="false"
        android:gravity="center"
        android:text="@string/home_login_注册"
        android:text="@string/home_login_register"
        android:textColor="@color/text_FFFFFFFF"
        android:textSize="18sp"
        app:layout_constraintEnd_toEndOf="parent"

 app/src/main/res/layout/activity_set.xml

@@ -91,7 +91,7 @@
                    android:layout_marginEnd="@dimen/dp_86"
                    android:background="@drawable/out_login"
                    android:gravity="center"
                    android:text="@string/set_退出登录"
                    android:text="@string/set_logout"
                    android:textColor="@color/text_FF5757"
                    android:textSize="@dimen/text_16" />
            </RelativeLayout>

 app/src/main/res/layout/dialog_confirm_cancel.xml

@@ -70,7 +70,7 @@
                    android:id="@+id/dialog_cancel_tv"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:text="@string/loading_取消"
                    android:text="@string/loading_cancel"
                    android:textColor="@color/text_7C8590"
                    android:textSize="@dimen/text_18" />

@@ -94,7 +94,7 @@
                    android:id="@+id/dialog_confirm_tv"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:text="@string/loading_确认"
                    android:text="@string/loading_affirm"
                    android:textColor="@color/text_FF245EC3"
                    android:textSize="@dimen/text_18" />
            </LinearLayout>

 app/src/main/res/layout/dialog_confirm_input.xml

@@ -49,13 +49,12 @@
                android:layout_marginEnd="@dimen/dp_40"
                android:background="@null"
                android:gravity="center_vertical|start"
                android:hint="@string/home_login_请输入密码"
                android:inputType="textPassword"
                android:inputType="text"
                android:lines="1"
                android:maxLines="1"
                android:paddingStart="@dimen/dp_16"
                android:paddingEnd="@dimen/dp_16"
                android:textColor="@color/text_FF000000"
                android:textColor="@color/text_030D1C"
                android:textColorHint="@color/text_25000000"
                app:layout_constraintBottom_toBottomOf="parent"
                app:layout_constraintEnd_toEndOf="parent"
@@ -65,11 +64,11 @@
                />

            <ImageView
                android:id="@+id/loading_confirmation_hide_iv"
                android:layout_width="23dp"
                android:layout_height="18dp"
                android:id="@+id/loading_confirmation_clear_iv"
                android:layout_width="@dimen/dp_20"
                android:layout_height="@dimen/dp_20"
                android:layout_marginEnd="@dimen/dp_16"
                android:src="@drawable/hide"
                android:src="@drawable/clear"
                app:layout_constraintBottom_toBottomOf="@+id/loading_confirmation_input_et"
                app:layout_constraintEnd_toEndOf="parent"
                app:layout_constraintTop_toTopOf="@+id/loading_confirmation_input_et" />
@@ -103,7 +102,7 @@
                    android:id="@+id/dialog_cancel_tv"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:text="@string/loading_取消"
                    android:text="@string/loading_cancel"
                    android:textColor="@color/text_7C8590"
                    android:textSize="@dimen/text_18" />

@@ -127,7 +126,7 @@
                    android:id="@+id/dialog_confirm_tv"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:text="@string/loading_确认"
                    android:text="@string/loading_affirm"
                    android:textColor="@color/text_FF245EC3"
                    android:textSize="@dimen/text_18" />
            </LinearLayout>

 app/src/main/res/layout/dialog_list.xml

@@ -83,7 +83,7 @@
                android:id="@+id/hdl_cancel_tv"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:text="@string/loading_取消"
                android:text="@string/loading_cancel"
                android:textColor="@color/text_90000000"
                android:textSize="@dimen/text_18"


 app/src/main/res/layout/fragment_house_list.xml

@@ -39,7 +39,7 @@
                    android:id="@+id/fragment_house_list_content_title1_tv"
                    android:layout_width="wrap_content"
                    android:layout_height="@dimen/dp_20"
                    android:text="@string/my_power_station_发电功率"
                    android:text="@string/power_station_generated_power"
                    android:textColor="@color/text_90000000"
                    android:textSize="@dimen/text_14" />

@@ -66,7 +66,7 @@
                    android:id="@+id/fragment_house_list_content_title2_tv"
                    android:layout_width="wrap_content"
                    android:layout_height="@dimen/dp_20"
                    android:text="@string/my_power_station_今日发电"
                    android:text="@string/power_station_Power_generation_today"
                    android:textColor="@color/text_90000000"
                    android:textSize="@dimen/text_14" />

@@ -93,7 +93,7 @@
                    android:id="@+id/fragment_house_list_content_title3_tv"
                    android:layout_width="wrap_content"
                    android:layout_height="@dimen/dp_20"
                    android:text="@string/my_power_station_创建时间"
                    android:text="@string/power_station_creation_time"
                    android:textColor="@color/text_90000000"
                    android:textSize="@dimen/text_14" />


 app/src/main/res/layout/frgment_house_list_line.xml

@@ -20,7 +20,8 @@
            android:id="@+id/fragment_house_list_line_left_iv"
            android:layout_width="113dp"
            android:layout_height="130dp"
            android:background="@color/text_245EC3" />
            android:scaleType="centerCrop"
            />

        <TextView
            android:id="@+id/fragment_house_list_line_name_tv"
@@ -30,7 +31,7 @@
            android:layout_marginTop="@dimen/dp_28"
            android:layout_toEndOf="@+id/fragment_house_list_line_left_iv"
            android:gravity="center_vertical"
            android:text="@string/my_power_station_title"
            android:text="@string/power_station"
            android:textColor="@color/text_90000000"
            android:textSize="@dimen/text_16" />

@@ -42,7 +43,7 @@
            android:layout_alignStart="@+id/fragment_house_list_line_name_tv"
            android:layout_marginTop="@dimen/dp_13"
            android:gravity="center_vertical"
            android:text="@string/my_power_station_装机容量"
            android:text="@string/my_power_station_installed_capacity"
            android:textColor="@color/text_40000000"
            android:textSize="@dimen/text_12" />

@@ -54,7 +55,7 @@
            android:layout_alignStart="@+id/fragment_house_list_line_capacity_tv"
            android:layout_marginTop="@dimen/dp_13"
            android:gravity="center_vertical"
            android:text="@string/my_power_station_发电功率"
            android:text="@string/power_station_generated_power"
            android:textColor="@color/text_40000000"
            android:textSize="@dimen/text_12" />

@@ -66,7 +67,7 @@
            android:layout_alignParentEnd="true"
            android:background="@drawable/state_ffb300"
            android:gravity="center"
            android:text="@string/my_power_station_连接中"
            android:text="@string/my_power_station_connecting"
            android:textColor="@color/text_FFFFFFFF"
            android:textSize="@dimen/text_12" />


 app/src/main/res/layout/loading_alert.xml

@@ -29,7 +29,7 @@
        android:layout_marginRight="@dimen/dp_10"
        android:layout_marginBottom="@dimen/dp_10"
        android:maxLines="1"
        android:text="@string/device_加载中"
        android:text="@string/device_loading"
        android:textColor="@color/text_FFFFFFFF"
        android:textSize="@dimen/text_12"
        app:layout_constraintEnd_toEndOf="@+id/load_pb"

 app/src/main/res/layout/text_underline.xml

@@ -9,7 +9,7 @@
        android:layout_width="wrap_content"
        android:layout_height="@dimen/dp_28"
        android:gravity="center"
        android:text="@string/home_login_手机号"
        android:text="@string/home_login_phone"
        android:textColor="@color/text_40000000"

        android:textSize="@dimen/text_16" />

 app/src/main/res/layout/toolbar_top_view_52.xml

@@ -36,7 +36,7 @@
        android:fontFamily="sans-serif-medium"
        android:gravity="center"
        android:maxLines="1"
        android:text="@string/my_power_station_我的电站"
        android:text="@string/my_power_station"
        android:textColor="@color/text_FFFFFFFF"
        android:textSize="@dimen/text_18" />


 app/src/main/res/values/strings.xml

@@ -11,36 +11,36 @@
    <string name="hello_second_fragment">Hello second fragment. Arg: %1$s</string>

    <!--登录模块-->
    <string name="home_login_中文">中文（简体）</string>
    <string name="home_login_HDL光伏储能">HDL光伏储能</string>
    <string name="home_login_我是安装商">我是安装商</string>
    <string name="home_login_请输入手机号_邮箱号">请输入手机号/邮箱号</string>
    <string name="home_login_请输入手机号">请输入手机号</string>
    <string name="home_login_邮箱号">邮箱号</string>
    <string name="home_login_请输入密码">请输入密码</string>
    <string name="home_login_注册">注册</string>
    <string name="home_login_忘记密码">忘记密码</string>
    <string name="home_login_chinese">中文（简体）</string>
    <string name="home_login_hdl_stored_energy">HDL光伏储能</string>
    <string name="home_login_an_installer">我是安装商</string>
    <string name="home_login__input_phone_email">请输入手机号/邮箱号</string>
    <string name="home_login_input_phone">请输入手机号</string>
    <string name="home_login_email_address">邮箱号</string>
    <string name="home_login_input_psw">请输入密码</string>
    <string name="home_login_register">注册</string>
    <string name="home_login_forget_password">忘记密码</string>
    <string name="home_login_change_password">修改密码</string>
    <string name="home_login_登录">登录</string>
    <string name="home_login_登录中">登录中…</string>
    <string name="home_login_体验电站">体验电站</string>
    <string name="home_login_同意_服务协议">同意《服务协议》和《用户信息保护规定》</string>
    <string name="home_login_error_账号不能为空">账号不能为空.</string>
    <string name="home_login_error_密码不能为空">密码不能为空.</string>
    <string name="home_login_error_账号或者密码不对">账号或者密码不对,请重新输入.</string>
    <string name="home_login_logoin">登录</string>
    <string name="home_login_be_logging_in">登录中…</string>
    <string name="home_login_power_station">体验电站</string>
    <string name="home_login_consent_service_agreement">同意《服务协议》和《用户信息保护规定》</string>
    <string name="home_login_error_account_null">账号不能为空.</string>
    <string name="home_login_error_password_null">密码不能为空.</string>
    <string name="home_login_error_account_or_password">账号或者密码不对,请重新输入.</string>
    <string name="home_login_error_6_16_str">密码不符合最低安全要求,最少6–16个字符.</string>
    <string name="home_login_error_密码不能小于6个字符">密码不能小于6个字符.</string>
    <string name="home_login_error_密码不能大于16个字符">密码不能大于16个字符.</string>
    <string name="home_login_error_password_6">密码不能小于6个字符.</string>
    <string name="home_login_error_password_16">密码不能大于16个字符.</string>
    <string name="home_login_input_6_16">请输入6–16位的密码</string>
    <string name="home_login_confirm_psw">请再次确认密码</string>
    <string name="home_login_手机号">手机号</string>
    <string name="home_login_邮箱">邮箱</string>
    <string name="home_login_phone">手机号</string>
    <string name="home_login_email">邮箱</string>
    <string name="home_login_input_mail">请输入邮箱</string>
    <string name="home_login_国家_区域">请选择国家/区域</string>
    <string name="home_login_验证码">获取验证码</string>
    <string name="home_login_input_验证码">请输入验证码</string>
    <string name="home_login_确认重置">确认重置</string>
    <string name="home_login_null_验证码">验证码不能为空.</string>
    <string name="home_login_national_region">请选择国家/区域</string>
    <string name="home_login_verification_code">获取验证码</string>
    <string name="home_login_input_verification_code">请输入验证码</string>
    <string name="home_login_confirm_reset">确认重置</string>
    <string name="home_login_null_verification_code">验证码不能为空.</string>
    <string name="home_login_phone_null">手机号不能为空.</string>
    <string name="home_login_mail_null">邮箱不能为空.</string>
    <string name="home_login_psw_unlikeliness">两次输入密码不一样.</string>
@@ -63,21 +63,21 @@


    <!--我的电站-->
    <string name="my_power_station_title">电站</string>
    <string name="my_power_station_me">我的</string>
    <string name="my_power_station_我的电站">我的电站</string>
    <string name="my_power_station_发电功率">发电功率</string>
    <string name="my_power_station_今日发电">今日发电</string>
    <string name="my_power_station_创建时间">创建时间</string>
    <string name="my_power_station_装机容量">装机容量</string>
    <string name="my_power_station_连接中">连接中</string>
    <string name="my_power_station_离线">离线</string>
    <string name="my_power_station_故障">故障</string>
    <string name="my_power_station_运行">运行</string>
    <string name="power_station">电站</string>
    <string name="power_station_me">我的</string>
    <string name="my_power_station">我的电站</string>
    <string name="power_station_generated_power">发电功率</string>
    <string name="power_station_Power_generation_today">今日发电</string>
    <string name="power_station_creation_time">创建时间</string>
    <string name="my_power_station_installed_capacity">装机容量</string>
    <string name="my_power_station_connecting">连接中</string>
    <string name="my_power_station_off_line">离线</string>
    <string name="my_power_station_malfunction">故障</string>
    <string name="my_power_station_operation">运行</string>

    <!--设备-->
    <string name="device_手动连接">手动连接</string>
    <string name="device_加载中">加载中…</string>
    <string name="device_manual_connection">手动连接</string>
    <string name="device_loading">加载中…</string>

    <!--消息-->
    <string name="message">消息</string>
@@ -85,20 +85,21 @@
    <!--我的-->
    <string name="me">我的</string>
    <string name="me_set">设置</string>
    <string name="me_关于">关于</string>
    <string name="me_regard">关于</string>
    <string name="set_account">账号安全</string>
    <string name="set_nickname">昵称</string>
    <string name="set_注销账号">注销账号</string>
    <string name="set_消息设置">消息设置</string>
    <string name="set_推送消息">推送消息</string>
    <string name="set_报警消息">报警消息</string>
    <string name="set_通用设置">通用设置</string>
    <string name="set_多语言">多语言</string>
    <string name="set_数据中心">数据中心</string>
    <string name="set_系统权限管理">系统权限管理</string>
    <string name="set_第三方信息共享清单">第三方信息共享清单</string>
    <string name="set_退出登录">退出登录</string>
    <string name="set_close_account">注销账号</string>
    <string name="set_message_setting">消息设置</string>
    <string name="set_push_notification">推送消息</string>
    <string name="set_alarm_message">报警消息</string>
    <string name="set_general_setting">通用设置</string>
    <string name="set_multilingual">多语言</string>
    <string name="set_data_centre">数据中心</string>
    <string name="set_system_rights_managemen">系统权限管理</string>
    <string name="set_3_msg_sharing">第三方信息共享清单</string>
    <string name="set_logout">退出登录</string>
    <string name="set_privacy">隐私设置</string>
    <string name="set_nickname_modification">昵称修改</string>



@@ -106,8 +107,8 @@
    <string name="uni_open_error">页面初始化中 请等待5秒再点击</string>

    <!--弹框-->
    <string name="loading_取消">取消</string>
    <string name="loading_确认">确认</string>
    <string name="loading_cancel">取消</string>
    <string name="loading_affirm">确认</string>


</resources>

 app/src/main/res/values/themes.xml

@@ -11,6 +11,7 @@
        <item name="colorOnSecondary">@color/black</item>
        <!-- Status bar color. -->
        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>

        <!-- Customize your theme here. -->
    </style>