From b2d2e6dcf6ec38a2f24721f2bc925d634a6eb78d Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 05 十二月 2023 18:31:01 +0800
Subject: [PATCH] 2023年12月05日18:30:40
---
app/src/main/java/com/hdl/photovoltaic/ui/me/TemperatureUnitActivity.java | 6 +
app/src/main/java/com/hdl/photovoltaic/ui/me/languageSelectionActivity.java | 6 ++
app/src/main/java/com/hdl/photovoltaic/utils/LocalManageUtil.java | 10 +++
app/src/main/java/com/hdl/photovoltaic/base/BaseDialog.java | 55 ++++++++++++++++++
app/src/main/res/values/strings.xml | 4
app/src/main/res/values/themes.xml | 1
app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationCancelDialog.java | 1
app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java | 61 +++++++-------------
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 12 ++--
app/src/main/res/layout/set_line.xml | 5 +
app/src/main/java/com/hdl/photovoltaic/other/HdlFileLogic.java | 2
app/src/main/res/layout/toolbar_top_view_52.xml | 4 -
app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java | 2
app/src/main/java/com/hdl/photovoltaic/ui/me/AccountAndSecurityActivity.java | 1
14 files changed, 113 insertions(+), 57 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/base/BaseDialog.java b/app/src/main/java/com/hdl/photovoltaic/base/BaseDialog.java
new file mode 100644
index 0000000..082298e
--- /dev/null
+++ b/app/src/main/java/com/hdl/photovoltaic/base/BaseDialog.java
@@ -0,0 +1,55 @@
+package com.hdl.photovoltaic.base;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.graphics.Color;
+import android.view.View;
+
+import androidx.annotation.NonNull;
+
+import com.hdl.photovoltaic.R;
+
+public class BaseDialog extends Dialog {
+
+ private Context mContext;
+
+ public BaseDialog(@NonNull Context context, int themeResId) {
+ super(context, themeResId);
+ this.mContext = context;
+ setStatusBarTextColor();
+ setNotificationBarBackgroundColor(CustomColor.white);
+ }
+
+ /**
+ * 淇敼鐘舵�佹爮瀛椾綋棰滆壊锛堥粦鑹诧級
+ */
+ public void setStatusBarTextColor() {
+ getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
+ }
+
+ /**
+ * 璁剧疆閫氱煡鏍忚儗鏅鑹�
+ *
+ * @param color 棰滆壊鍊�(0=钃濊壊;1=鐧借壊;)
+ */
+ public void setNotificationBarBackgroundColor(CustomColor color) {
+ switch (color) {
+ case blue: {
+ getWindow().setStatusBarColor(this.mContext.getColor(R.color.text_245EC3));
+ break;
+ }
+ case white: {
+ getWindow().setStatusBarColor(this.mContext.getColor(R.color.text_FFFFFFFF));
+ break;
+ }
+ }
+
+ }
+
+ public enum CustomColor {
+ blue,//钃濊壊
+ white,//鐧借壊
+
+
+ }
+}
diff --git a/app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java b/app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java
index 7babdf6..e72dbb6 100644
--- a/app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java
+++ b/app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java
@@ -85,7 +85,7 @@
private String bingEmail;
//娓╁害鍗曚綅(C鎽勬皬搴�;F=鍗庢皬搴�)
- private String temperature_unit = "C";
+ private String temperature_unit = "鈩�";
//app褰撳墠鐨勮瑷�
private String currentAppLanguage;
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlFileLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlFileLogic.java
index 5ba3a48..66a7cec 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlFileLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlFileLogic.java
@@ -126,7 +126,7 @@
/**
* 鑾峰彇鍥轰欢鍗囩骇鏂囦欢鍏ㄨ矾寰�
*
- * @param oid 鍥轰欢oid
+ * @param oid
* @param version 椹卞姩鐗堟湰
* @return 鍏ㄨ矾寰�
*/
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
index a274790..58ef4c6 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -439,7 +439,7 @@
*/
private void uniDeviceFirmwareDownload(Object data, DCUniMPJSCallback callback) {
String deviceOidId = getKeyValue("deviceOidId", getKeyValue("data", data));//浜戠涓婅澶噄d
- String oid = getKeyValue("oid", getKeyValue("data", data));//璁惧oid
+ String oid = getKeyValue("oid", getKeyValue("data", data));//鍥轰欢鐨刼id
String imageId = getKeyValue("imageId", getKeyValue("data", data));//鍥轰欢闀滃儚id
String version = getKeyValue("version", getKeyValue("data", data));//鍥轰欢鐗堟湰
String localUrl = getKeyValue("localUrl", getKeyValue("data", data));//鍌ㄥ瓨鍦ㄦ湰鍦板浐浠舵枃浠惰矾寰�
@@ -470,9 +470,9 @@
* 鍚戜簯绔彂璧枫�愯澶囧浐浠躲�戝崌绾TA鎸囦护
*/
private void uniUpgradeDeviceFirmware(Object data, DCUniMPJSCallback callback) {
- String deviceMac = getKeyValue("mac", getKeyValue("data", data));//缃戝叧璁惧mac锛堟煡鎵緎ocket锛�
+ String deviceMac = getKeyValue("mac", getKeyValue("data", data));//閫嗗彉鍣ㄨ澶噈ac锛堟煡鎵緎ocket锛�
String deviceOidId = getKeyValue("deviceOidId", getKeyValue("data", data));//浜戠涓婅澶噄d
- String oid = getKeyValue("oid", getKeyValue("data", data));//璁惧id
+ String oid = getKeyValue("oid", getKeyValue("data", data));//鍗囩骇鍥轰欢鐨刼id
String firmwareVersionId = getKeyValue("firmwareVersionId", getKeyValue("data", data));//鍥轰欢鐗堟湰id
String version = getKeyValue("version", getKeyValue("data", data));//鍥轰欢鐗堟湰
String hardwareModel = getKeyValue("hardwareModel", getKeyValue("data", data));//浜戠涓婃枃浠禡D5
@@ -629,7 +629,7 @@
* 鍚戜簯绔彂璧枫�愯澶囬┍鍔ㄤ笅杞姐�戞寚浠�
*/
private void uniGatewayDriverDownload(Object data, DCUniMPJSCallback callback) {
- String deviceOid = getKeyValue("oid", getKeyValue("data", data));//缃戝叧璁惧oid
+ String deviceOid = getKeyValue("oid", getKeyValue("data", data));//閫嗗彉鍣ㄨ澶噊id
String driverCode = getKeyValue("driverCode", getKeyValue("data", data));//椹卞姩缂栫爜
String imageId = getKeyValue("imageId", getKeyValue("data", data));//椹卞姩闀滃儚id
String version = getKeyValue("version", getKeyValue("data", data));//椹卞姩鐗堟湰
@@ -663,8 +663,8 @@
*/
private void uniUpgradeGatewayDriver(Object data, DCUniMPJSCallback callback) {
- String deviceMac = getKeyValue("mac", getKeyValue("data", data));//缃戝叧璁惧mac锛堟煡鎵緎ocket锛�
- String deviceOid = getKeyValue("oid", getKeyValue("data", data));//缃戝叧璁惧oid
+ String deviceMac = getKeyValue("mac", getKeyValue("data", data));//閫嗗彉鍣ㄨ澶噈ac锛堟煡鎵緎ocket锛�
+ String deviceOid = getKeyValue("oid", getKeyValue("data", data));//閫嗗彉鍣ㄨ澶噊id
String driverVersionId = getKeyValue("driverVersionId", getKeyValue("data", data));//椹卞姩鐗堟湰id
String module = getKeyValue("module", getKeyValue("data", data));//妯″潡淇℃伅
String version = getKeyValue("version", getKeyValue("data", data));//椹卞姩鐗堟湰鍙�
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/AccountAndSecurityActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/AccountAndSecurityActivity.java
index a7cdeab..e08f03a 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/AccountAndSecurityActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/AccountAndSecurityActivity.java
@@ -41,6 +41,7 @@
viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
+
finish();
}
});
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 0cb3ecc..f421a78 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
@@ -27,6 +27,7 @@
import com.hdl.photovoltaic.ui.StartActivity;
import com.hdl.photovoltaic.ui.adapter.LanguageAdapter;
import com.hdl.photovoltaic.utils.AppManagerUtils;
+import com.hdl.photovoltaic.utils.LocalManageUtil;
import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
import com.hdl.photovoltaic.widget.ConfirmationInputDialog;
@@ -67,7 +68,9 @@
viewBinding.setLanguageIl.getRoot().setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- startActivity(languageSelectionActivity.class);
+ Intent intent = new Intent();
+ intent.setClass(_mActivity, languageSelectionActivity.class);
+ startActivityForResult(intent, 30);
}
});
//璐﹀彿涓庡畨鍏�
@@ -83,7 +86,9 @@
viewBinding.setTemperatureUnitIl.getRoot().setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- startActivity(TemperatureUnitActivity.class);
+ Intent intent = new Intent();
+ intent.setClass(_mActivity, TemperatureUnitActivity.class);
+ startActivityForResult(intent, 40);
}
});
//閫�鍑虹櫥褰�
@@ -105,49 +110,25 @@
viewBinding.setLanguageIl.sllLlRlNameTv.setText(R.string.set_multilingual);
viewBinding.setAccountSecurityIl.sllLlRlNameTv.setText(R.string.set_account_security);
viewBinding.setTemperatureUnitIl.sllLlRlNameTv.setText(R.string.set_temperature_unit);
+ viewBinding.setLanguageIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);
+ String str = LocalManageUtil.getLanguage(UserConfigManage.getInstance().getCurrentAppLanguage()).getTitle();
+ viewBinding.setLanguageIl.sllLlRlRightContentTv.setText(str);
+ viewBinding.setTemperatureUnitIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);
+ viewBinding.setTemperatureUnitIl.sllLlRlRightContentTv.setText(UserConfigManage.getInstance().getTemperature_unit());
+
}
- /**
- * 淇敼鐢ㄦ埛鏄电О
- */
- 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().getUserName());
- confirmationInputDialog.show();
-
- confirmationInputDialog.setYesOnclickListener(new ConfirmationInputDialog.onYesOnclickListener() {
- @Override
- public void Confirm(String str) {
- HdlAccountLogic.getInstance().updateMemberInfo_C("", str, "", "", "", "", new CloudCallBeak<Boolean>() {
- @Override
- public void onSuccess(Boolean obj) {
- UserConfigManage.getInstance().setUserName(str);
- UserConfigManage.getInstance().Save();
- HdlThreadLogic.tipFlashingBox(_mActivity, true, getString(R.string.home_login_change_name_succeed), 0);
- }
-
- @Override
- public void onFailure(HDLException e) {
- HdlThreadLogic.tipFlashingBox(_mActivity, false, e.getMessage(), e.getCode());
- }
- });
-
- }
- });
- confirmationInputDialog.setNoOnclickListener(new ConfirmationInputDialog.onNoOnclickListener() {
- @Override
- public void Cancel() {
- confirmationInputDialog.dismiss();
- }
- });
+ @Override
+ protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+ super.onActivityResult(requestCode, resultCode, data);
+ if (requestCode == 30 && resultCode == 30) {
+ String str = LocalManageUtil.getLanguage(UserConfigManage.getInstance().getCurrentAppLanguage()).getTitle();
+ viewBinding.setLanguageIl.sllLlRlRightContentTv.setText(str);
+ } else if (requestCode == 40 && resultCode == 40) {
+ viewBinding.setTemperatureUnitIl.sllLlRlRightContentTv.setText(UserConfigManage.getInstance().getTemperature_unit());
}
}
-
/**
* 閫�鍑虹櫥褰曡姹傜殑鏂规硶
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/TemperatureUnitActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/TemperatureUnitActivity.java
index bf45236..a51d6ef 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/TemperatureUnitActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/TemperatureUnitActivity.java
@@ -52,12 +52,12 @@
LanguageAdapter.ItemData c = new LanguageAdapter.ItemData();
c.setState(false);
c.setTitle(getString(R.string.set_c));
- c.setUnit("C");
+ c.setUnit("鈩�");
list.add(c);
LanguageAdapter.ItemData f = new LanguageAdapter.ItemData();
f.setState(false);
f.setTitle(getString(R.string.set_f));
- f.setUnit("F");
+ f.setUnit("鈩�");
list.add(f);
for (int i = 0; i < list.size(); i++) {
@@ -82,6 +82,8 @@
languageAdapter.setNoOnclickListener(new LanguageAdapter.OnclickListener() {
@Override
public void onClick(int position, LanguageAdapter.ItemData itemData) {
+
+
for (int i = 0; i < list.size(); i++) {
LanguageAdapter.ItemData data = list.get(i);
data.setState(false);
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/languageSelectionActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/languageSelectionActivity.java
index 20a7089..046e511 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/languageSelectionActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/languageSelectionActivity.java
@@ -68,6 +68,7 @@
viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
+ setResult(30);
finish();
}
});
@@ -75,12 +76,17 @@
languageAdapter.setNoOnclickListener(new LanguageAdapter.OnclickListener() {
@Override
public void onClick(int position, LanguageAdapter.ItemData itemData) {
+
for (int i = 0; i < list.size(); i++) {
LanguageAdapter.ItemData data = list.get(i);
data.setState(false);
}
list.get(position).setState(true);
languageAdapter.notifyDataSetChanged();
+ if (UserConfigManage.getInstance().getCurrentAppLanguage().equals(itemData.getLanguage())) {
+ //鍚屼竴涓笉鎵ц寮圭獥
+ return;
+ }
languageSelectionDialog(itemData);
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/utils/LocalManageUtil.java b/app/src/main/java/com/hdl/photovoltaic/utils/LocalManageUtil.java
index 4afce4e..8e00e2f 100644
--- a/app/src/main/java/com/hdl/photovoltaic/utils/LocalManageUtil.java
+++ b/app/src/main/java/com/hdl/photovoltaic/utils/LocalManageUtil.java
@@ -143,6 +143,16 @@
}
+ public static LanguageAdapter.ItemData getLanguage(String languageStr) {
+ List<LanguageAdapter.ItemData> list = getLanguageList();
+ for (int i = 0; i < list.size(); i++) {
+ if (list.get(i).getLanguage().equals(languageStr)) {
+ return list.get(i);
+
+ }
+ }
+ return new LanguageAdapter.ItemData();
+ }
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationCancelDialog.java b/app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationCancelDialog.java
index 1e285a7..9ac7a2b 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationCancelDialog.java
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationCancelDialog.java
@@ -9,6 +9,7 @@
import androidx.annotation.NonNull;
import com.hdl.photovoltaic.R;
+import com.hdl.photovoltaic.base.BaseDialog;
import com.hdl.photovoltaic.databinding.DialogConfirmCancelBinding;
/**
diff --git a/app/src/main/res/layout/set_line.xml b/app/src/main/res/layout/set_line.xml
index 424c5cd..a974cf6 100644
--- a/app/src/main/res/layout/set_line.xml
+++ b/app/src/main/res/layout/set_line.xml
@@ -10,7 +10,9 @@
android:layout_height="@dimen/dp_57"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent">
+ app:layout_constraintTop_toTopOf="parent"
+ android:background="@color/text_FFFFFFFF"
+ >
<TextView
android:id="@+id/sll_ll_rl_name_tv"
@@ -56,7 +58,6 @@
android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/dp_9"
android:layout_toStartOf="@+id/sll_ll_rl_right_icon_ll"
- android:text="--"
android:textColor="@color/text_7C8590"
android:textSize="@dimen/text_15"
android:visibility="gone" />
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 0a9e22b..a198bc4 100644
--- a/app/src/main/res/layout/toolbar_top_view_52.xml
+++ b/app/src/main/res/layout/toolbar_top_view_52.xml
@@ -21,8 +21,7 @@
android:layout_gravity="center"
android:layout_marginStart="@dimen/dp_16"
android:scaleType="centerInside"
- android:src="@drawable/back"
- />
+ android:src="@drawable/back" />
</LinearLayout>
<!--2.鏍囬鏂囨湰-->
@@ -36,7 +35,6 @@
android:fontFamily="sans-serif-medium"
android:gravity="center"
android:maxLines="1"
- 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 8de60a7..9112140 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -122,8 +122,8 @@
<string name="set_email_address">鐢靛瓙閭</string>
<string name="set_not_bind">鏈粦瀹�</string>
<string name="set_language_choice">璇█閫夋嫨</string>
- <string name="set_c">C(鎽勬皬搴�)</string>
- <string name="set_f">F(鍗庢皬搴�)</string>
+ <string name="set_c">鈩�(鎽勬皬搴�)</string>
+ <string name="set_f">鈩�(鍗庢皬搴�)</string>
<string name="set_change_bind_phone_number">淇敼鎵嬫満鍙风爜</string>
<string name="set_change_bind_mail">淇敼閭鍦板潃</string>
<string name="set_bind_phone_succeed">缁戝畾鎵嬫満鍙锋垚鍔�.</string>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index f0138bd..f887031 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -45,6 +45,7 @@
<item name="android:windowIsFloating">false</item>
<!--鏄剧ず閫氱煡鏍�-->
<item name="android:windowActionBar">false</item>
+<!-- <item name="android:windowFullscreen">true</item>-->
<!-- <item name="android:windowIsTranslucent">false</item>:鏄惁鍗婇�忔槑-->
<!-- <item name="android:windowNoTitle">true</item>:鏄惁鏄剧ずtitle-->
--
Gitblit v1.8.0