From 8bfe046de7987990e1bff2755c2963e14ebc54c1 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期一, 23 十月 2023 17:39:19 +0800
Subject: [PATCH] 2023年10月23日17:39:07
---
app/src/main/res/layout/activity_change_password.xml | 10
app/src/main/res/layout/activity_set.xml | 2
app/src/main/java/com/hdl/photovoltaic/ui/account/ChangePassword.java | 10
app/src/main/res/layout/text_underline.xml | 2
app/src/main/res/values/themes.xml | 1
app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationInputDialog.java | 35 ++-
app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java | 2
.idea/misc.xml | 2
app/src/main/res/layout/frgment_house_list_line.xml | 11
app/src/main/java/com/hdl/photovoltaic/ui/me/MeChangePasswordActivity.java | 8
app/src/main/res/layout/dialog_confirm_input.xml | 17
app/src/main/res/layout/activity_home_login.xml | 20
app/src/main/res/layout/toolbar_top_view_52.xml | 2
app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java | 10
app/src/main/java/com/hdl/photovoltaic/utils/GlideUtils.java | 163 ++++++++++++++
app/build.gradle | 4
app/src/main/res/layout/activity_fast_scan.xml | 2
app/src/main/res/values/strings.xml | 103 ++++----
app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java | 106 +++++++--
app/src/main/res/layout/activity_register_account.xml | 12
app/src/main/res/layout/dialog_list.xml | 2
app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java | 6
app/src/main/res/layout/fragment_house_list.xml | 6
app/src/main/java/com/hdl/photovoltaic/ui/bean/HouseIdBean.java | 10
app/src/main/res/layout/dialog_confirm_cancel.xml | 4
app/src/main/java/com/hdl/photovoltaic/internet/api/HttpApi.java | 13
app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java | 12
app/src/main/java/com/hdl/photovoltaic/ui/account/RegisterAccountActivity.java | 11
app/src/main/res/layout/loading_alert.xml | 2
app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java | 7
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java | 9
app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java | 3
32 files changed, 415 insertions(+), 192 deletions(-)
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 03e5a1a..614f292 100644
--- a/.idea/misc.xml
+++ b/.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>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 9d6d5c1..0d6c420 100644
--- a/app/build.gradle
+++ b/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"
diff --git a/app/src/main/java/com/hdl/photovoltaic/internet/api/HttpApi.java b/app/src/main/java/com/hdl/photovoltaic/internet/api/HttpApi.java
index 7742d91..cc27e33 100644
--- a/app/src/main/java/com/hdl/photovoltaic/internet/api/HttpApi.java
+++ b/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
-
-
-
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
index 9cd92de..17f3436 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
+++ b/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;
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java
index 4ac7e43..5d4d945 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java
+++ b/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());//浠婂ぉ鍙戠數閲�
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java
index 9a3d4ce..f9ca155 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java
+++ b/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;
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
index 65c5431..2b7bca6 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
+++ b/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();
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/account/ChangePassword.java b/app/src/main/java/com/hdl/photovoltaic/ui/account/ChangePassword.java
index 9861ff8..6bd0e5b 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/account/ChangePassword.java
+++ b/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);
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/account/RegisterAccountActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/account/RegisterAccountActivity.java
index 6da6dac..6e74153 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/account/RegisterAccountActivity.java
+++ b/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);
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java b/app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java
index 6d28e1e..f9c1020 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java
+++ b/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) {
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/bean/HouseIdBean.java b/app/src/main/java/com/hdl/photovoltaic/ui/bean/HouseIdBean.java
index 829674b..b2c912a 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/bean/HouseIdBean.java
+++ b/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() {
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/MeChangePasswordActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/MeChangePasswordActivity.java
index 54be3de..7a7a26d 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/MeChangePasswordActivity.java
+++ b/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();
+
}
/**
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java
index e5dda5f..5a0af33 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java
+++ b/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);
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java
index 9597aea..764d7d7 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java
+++ b/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();
+ }
+ });
+ }
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java
index 4308d08..15c910f 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java
+++ b/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);
diff --git a/app/src/main/java/com/hdl/photovoltaic/utils/GlideUtils.java b/app/src/main/java/com/hdl/photovoltaic/utils/GlideUtils.java
new file mode 100644
index 0000000..5faa058
--- /dev/null
+++ b/app/src/main/java/com/hdl/photovoltaic/utils/GlideUtils.java
@@ -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]鍥剧墖鍔犺浇搴揋lide
+ */
+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鍔犺浇鍥剧墖鍦嗚鏁堟灉涓嶪mageView鐨凷caleType鍐茬獊闂
+// .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));
+ //鍐嶆妸鍘熸潵鐨刡itmap鐢诲埌鐜板湪鐨刡itmap
+ canvas.drawBitmap(bitmap, rect, rect, paint);
+ return output;
+ }
+}
diff --git a/app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationInputDialog.java b/app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationInputDialog.java
index ff1bcd3..af5dc82 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationInputDialog.java
+++ b/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() {
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index bb2d6ca..519ff3b 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/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"
diff --git a/app/src/main/res/layout/activity_fast_scan.xml b/app/src/main/res/layout/activity_fast_scan.xml
index 66cbe7f..27f462d 100644
--- a/app/src/main/res/layout/activity_fast_scan.xml
+++ b/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" />
diff --git a/app/src/main/res/layout/activity_home_login.xml b/app/src/main/res/layout/activity_home_login.xml
index 8971ce2..dd31786 100644
--- a/app/src/main/res/layout/activity_home_login.xml
+++ b/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"
diff --git a/app/src/main/res/layout/activity_register_account.xml b/app/src/main/res/layout/activity_register_account.xml
index 46b70a3..1cf2ab7 100644
--- a/app/src/main/res/layout/activity_register_account.xml
+++ b/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"
diff --git a/app/src/main/res/layout/activity_set.xml b/app/src/main/res/layout/activity_set.xml
index 2d6d07f..ec388a1 100644
--- a/app/src/main/res/layout/activity_set.xml
+++ b/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>
diff --git a/app/src/main/res/layout/dialog_confirm_cancel.xml b/app/src/main/res/layout/dialog_confirm_cancel.xml
index 16fe379..88651cf 100644
--- a/app/src/main/res/layout/dialog_confirm_cancel.xml
+++ b/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>
diff --git a/app/src/main/res/layout/dialog_confirm_input.xml b/app/src/main/res/layout/dialog_confirm_input.xml
index 07653df..47562c2 100644
--- a/app/src/main/res/layout/dialog_confirm_input.xml
+++ b/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>
diff --git a/app/src/main/res/layout/dialog_list.xml b/app/src/main/res/layout/dialog_list.xml
index 637f883..445be45 100644
--- a/app/src/main/res/layout/dialog_list.xml
+++ b/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"
diff --git a/app/src/main/res/layout/fragment_house_list.xml b/app/src/main/res/layout/fragment_house_list.xml
index 60365ea..de32d99 100644
--- a/app/src/main/res/layout/fragment_house_list.xml
+++ b/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" />
diff --git a/app/src/main/res/layout/frgment_house_list_line.xml b/app/src/main/res/layout/frgment_house_list_line.xml
index 6b87c59..5bcadf3 100644
--- a/app/src/main/res/layout/frgment_house_list_line.xml
+++ b/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" />
diff --git a/app/src/main/res/layout/loading_alert.xml b/app/src/main/res/layout/loading_alert.xml
index d1dec40..08238da 100644
--- a/app/src/main/res/layout/loading_alert.xml
+++ b/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"
diff --git a/app/src/main/res/layout/text_underline.xml b/app/src/main/res/layout/text_underline.xml
index 8fe495e..a11b3ca 100644
--- a/app/src/main/res/layout/text_underline.xml
+++ b/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" />
diff --git a/app/src/main/res/layout/toolbar_top_view_52.xml b/app/src/main/res/layout/toolbar_top_view_52.xml
index 0cb2a32..0a9e22b 100644
--- a/app/src/main/res/layout/toolbar_top_view_52.xml
+++ b/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" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index dd15713..2ecbdbe 100644
--- a/app/src/main/res/values/strings.xml
+++ b/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>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index d3b65b6..15fa0e9 100644
--- a/app/src/main/res/values/themes.xml
+++ b/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>
--
Gitblit v1.8.0