From 94be043705cf5d8050e4424524a254befd4790aa Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 06 十二月 2023 13:32:00 +0800
Subject: [PATCH] 2023年12月06日13:31:45
---
app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationCancelDialog1.java | 3 +
app/src/main/java/com/hdl/photovoltaic/widget/FlashingBoxDialog.java | 3 +
app/src/main/java/com/hdl/photovoltaic/ui/me/TemperatureUnitActivity.java | 1
app/src/main/java/com/hdl/photovoltaic/widget/UpdateConfirmationCancelDialog.java | 3 +
app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java | 6 +++
app/src/main/java/com/hdl/photovoltaic/widget/ChangeAvatarDialog.java | 3 +
app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationCancelDialog.java | 2
app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationInputDialog.java | 3 +
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 9 ++++
app/src/main/java/com/hdl/photovoltaic/widget/LoadingDialog.java | 8 +---
app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationTipDialog.java | 3 +
app/src/main/res/layout/dialog_confirm_cancel.xml | 5 +-
app/src/main/java/com/hdl/photovoltaic/widget/ListDialog.java | 7 +++
app/src/main/java/com/hdl/photovoltaic/widget/ListStaticDialog.java | 3 +
app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationExceptionDialog.java | 3 +
app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java | 4 +
app/build.gradle | 2
app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java | 27 +++++++++----
18 files changed, 65 insertions(+), 30 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index 2da1182..032745b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -28,7 +28,7 @@
minSdk 23
targetSdk 30
versionCode 1
- versionName "1.1.1"//鐗堟湰瑙勫垯1.1鏄骇鍝佸姛鑳借凯浠ｇ敤鐨�,鏈�鍚庝竴浣�1鏄垜浠慨澶峛ug鐢ㄧ殑
+ versionName "1.1.2"//鐗堟湰瑙勫垯1.1鏄骇鍝佸姛鑳借凯浠ｇ敤鐨�,鏈�鍚庝竴浣�1鏄垜浠慨澶峛ug鐢ㄧ殑
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
multiDexEnabled true
manifestPlaceholders = mfph
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 b6834cd..91a8140 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
@@ -103,17 +103,26 @@
* 鑾峰彇褰撳墠浣忓畢鐨勩�愪富銆戦�嗗彉鍣ㄥ垪琛�
*/
public GatewayBean getCurrentHomeMainGateway() {
- List<GatewayBean> list = this.getCurrentHomeGatewayList();
- if (list.size() > 0) {
- for (int i = 0; i < list.size(); i++) {
- GatewayBean gatewayBean = list.get(i);
- if (gatewayBean.getMaster().equals(GatewayMasterType.MasterTrue)) {
- //鎵惧埌杩斿洖
- return gatewayBean;
- }
+ return queryCurrentHomeMainGateway(this.getCurrentHomeGatewayList());
+ }
+
+ /**
+ * 鏌ヨ褰撳墠浣忓畢鐨勩�愪富銆戦�嗗彉鍣ㄥ垪琛�
+ */
+ public GatewayBean queryCurrentHomeMainGateway(List<GatewayBean> list) {
+ if (list == null || list.size() == 0) {
+ return null;
+ }
+ GatewayBean findGatewayBean = null;
+ for (int i = 0; i < list.size(); i++) {
+ GatewayBean gatewayBean = list.get(i);
+ if (gatewayBean.getMaster().equals(GatewayMasterType.MasterTrue) && gatewayBean.getHomeId().equals(UserConfigManage.getInstance().getHomeId())) {
+ //鎵惧埌杩斿洖
+ findGatewayBean = gatewayBean;
+ break;
}
}
- return null;
+ return findGatewayBean;
}
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 58ef4c6..71cff85 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -996,11 +996,18 @@
public void onSuccess(List<GatewayBean> list) {
if (callback != null) {
uniCallbackData(list, callback);
- //EventBus浜嬩欢鍒嗗彂
+ //EventBus浜嬩欢鍒嗗彂,杩涘叆浣忓畢寮�濮嬭闃呬富棰�
BaseEventBus baseEventBus = new BaseEventBus();
baseEventBus.setType(HDLUniMP.UNI_EVENT_REPLY_DEVICE_LIST);
baseEventBus.setData(list);
EventBus.getDefault().post(baseEventBus);
+ GatewayBean gatewayBean = HdlDeviceLogic.getInstance().queryCurrentHomeMainGateway(list);
+ if (gatewayBean != null) {
+ //杩涙潵浣忓畢璇︽儏閮借涓婁紶涓�娆id鍒楄〃鍒颁簯绔�;
+ HdlDeviceLogic.getInstance().uploadDataToCloud(gatewayBean.getDevice_mac(), null);
+ }
+
+
}
}
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 a961fc1..8e713f9 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java
@@ -65,7 +65,8 @@
@Override
public void onBindView(Bundle savedInstanceState) {
-
+ setNotificationBarBackgroundColor(CustomColor.white);
+ setStatusBarTextColor();
//鍒濆鍖�
initView();
//鍒濆鍖栫晫闈㈢洃鍚櫒
@@ -226,6 +227,7 @@
HdlAccountLogic.getInstance().regionByAccount(account, new CloudCallBeak<HDLUserRegionBean>() {
@Override
public void onSuccess(HDLUserRegionBean obj) {
+ //鍒濆鍖栨湇鍔″煙鍚�
AppConfigManage.setUserRegionUrl(obj.getRegionUrl());
HDLLinkPMUser.getInstance().setUserRegionUrl(AppConfigManage.getUserRegionUrl());
HdlAccountLogic.getInstance().loginByPassword(account, password, new ILoginCallBack() {
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java
index 3b8f630..e4cd14c 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java
@@ -9,9 +9,11 @@
import android.os.IBinder;
import com.hdl.linkpm.sdk.core.exception.HDLException;
+import com.hdl.linkpm.sdk.user.HDLLinkPMUser;
import com.hdl.photovoltaic.HDLApp;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.CustomBaseActivity;
+import com.hdl.photovoltaic.config.AppConfigManage;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.internet.HttpServer.MyNanoHttpServer;
import com.hdl.photovoltaic.internet.HttpServer.MyNanoHttpService;
@@ -33,6 +35,10 @@
@Override
public void onBindView(Bundle savedInstanceState) {
+ setNotificationBarBackgroundColor(CustomColor.white);
+ setStatusBarTextColor();
+ //鍒濆鍖栨湇鍔″櫒鍩熷悕锛堢敤鎴锋敞鍐屾墍鍦ㄦ湇鍔″櫒鍩熷悕鍦板潃锛�
+ AppConfigManage.setUserRegionUrl(HDLLinkPMUser.getInstance().getUserRegionUrl());
//7澶╁唴鍏嶇櫥褰�
if (UserConfigManage.getInstance().isAutoLogin()) {
// showLoading();
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 a51d6ef..f95255c 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
@@ -75,6 +75,7 @@
viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
+ setResult(40);
finish();
}
});
diff --git a/app/src/main/java/com/hdl/photovoltaic/widget/ChangeAvatarDialog.java b/app/src/main/java/com/hdl/photovoltaic/widget/ChangeAvatarDialog.java
index 5faddaf..1966a93 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/ChangeAvatarDialog.java
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/ChangeAvatarDialog.java
@@ -9,12 +9,13 @@
import androidx.annotation.NonNull;
import com.hdl.photovoltaic.R;
+import com.hdl.photovoltaic.base.BaseDialog;
import com.hdl.photovoltaic.databinding.DialogChangeAvatarBinding;
/**
* 淇敼澶村儚涓撶敤寮圭獥
*/
-public class ChangeAvatarDialog extends Dialog {
+public class ChangeAvatarDialog extends BaseDialog {
private final Context mContext;
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 9ac7a2b..71f093d 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationCancelDialog.java
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationCancelDialog.java
@@ -15,7 +15,7 @@
/**
* 纭鍙栨秷妗�
*/
-public class ConfirmationCancelDialog extends Dialog {
+public class ConfirmationCancelDialog extends BaseDialog {
public ConfirmationCancelDialog(@NonNull Context context) {
super(context, R.style.Custom_Dialog);
this.mContext = context;
diff --git a/app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationCancelDialog1.java b/app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationCancelDialog1.java
index fa12b1f..1e14e34 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationCancelDialog1.java
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationCancelDialog1.java
@@ -10,10 +10,11 @@
import androidx.annotation.NonNull;
import com.hdl.photovoltaic.R;
+import com.hdl.photovoltaic.base.BaseDialog;
import com.hdl.photovoltaic.databinding.DialogAgreeOnagreeBinding;
-public class ConfirmationCancelDialog1 extends Dialog {
+public class ConfirmationCancelDialog1 extends BaseDialog {
public ConfirmationCancelDialog1(@NonNull Context context) {
super(context, R.style.Custom_Dialog);
this.mContext = context;
diff --git a/app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationExceptionDialog.java b/app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationExceptionDialog.java
index d6e813d..ae198d6 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationExceptionDialog.java
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationExceptionDialog.java
@@ -12,12 +12,13 @@
import androidx.appcompat.content.res.AppCompatResources;
import com.hdl.photovoltaic.R;
+import com.hdl.photovoltaic.base.BaseDialog;
import com.hdl.photovoltaic.databinding.DialogExceptionLogBinding;
/**
* 寮傚父寮圭獥
*/
-public class ConfirmationExceptionDialog extends Dialog {
+public class ConfirmationExceptionDialog extends BaseDialog {
private DialogExceptionLogBinding viewBinding;
private final Context mContext;
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 af5dc82..b4834a7 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationInputDialog.java
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationInputDialog.java
@@ -14,13 +14,14 @@
import androidx.constraintlayout.widget.ConstraintSet;
import com.hdl.photovoltaic.R;
+import com.hdl.photovoltaic.base.BaseDialog;
import com.hdl.photovoltaic.databinding.DialogConfirmInputBinding;
import com.hdl.photovoltaic.utils.KeyboardStateObserverUtils;
/**
* 杈撳叆纭妗�
*/
-public class ConfirmationInputDialog extends Dialog {
+public class ConfirmationInputDialog extends BaseDialog {
public ConfirmationInputDialog(@NonNull Context context) {
super(context, R.style.Custom_Dialog);
diff --git a/app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationTipDialog.java b/app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationTipDialog.java
index 33ed2b6..cb7e1fd 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationTipDialog.java
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationTipDialog.java
@@ -9,12 +9,13 @@
import androidx.annotation.NonNull;
import com.hdl.photovoltaic.R;
+import com.hdl.photovoltaic.base.BaseDialog;
import com.hdl.photovoltaic.databinding.DialogConfirmationTipBinding;
/**
* 鎻愮ず纭妗�
*/
-public class ConfirmationTipDialog extends Dialog {
+public class ConfirmationTipDialog extends BaseDialog {
private final Context mContext;
diff --git a/app/src/main/java/com/hdl/photovoltaic/widget/FlashingBoxDialog.java b/app/src/main/java/com/hdl/photovoltaic/widget/FlashingBoxDialog.java
index c0f974d..d01e795 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/FlashingBoxDialog.java
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/FlashingBoxDialog.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.DialogFlashingBoxBinding;
import java.util.Timer;
@@ -17,7 +18,7 @@
/**
* 鑷畾涔夎嚜鍔ㄥ叧闂璬ialog
*/
-public class FlashingBoxDialog extends Dialog {
+public class FlashingBoxDialog extends BaseDialog {
private DialogFlashingBoxBinding viewBinding;
diff --git a/app/src/main/java/com/hdl/photovoltaic/widget/ListDialog.java b/app/src/main/java/com/hdl/photovoltaic/widget/ListDialog.java
index 0443c67..7353664 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/ListDialog.java
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/ListDialog.java
@@ -19,6 +19,7 @@
import com.hdl.photovoltaic.HDLApp;
import com.hdl.photovoltaic.R;
+import com.hdl.photovoltaic.base.BaseDialog;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.DialogListBinding;
import com.hdl.photovoltaic.ui.StartActivity;
@@ -33,7 +34,7 @@
/**
* 鍔ㄦ�佸垪琛ㄥ脊绐�
*/
-public class ListDialog extends Dialog {
+public class ListDialog extends BaseDialog {
private DialogListBinding viewBinding;
private ListDialogAdapter listDialogAdapter;
@@ -84,6 +85,10 @@
}
list.get(position).setState(true);
listDialogAdapter.notifyDataSetChanged();
+ if (UserConfigManage.getInstance().getCurrentAppLanguage().equals(itemData.getLanguage())) {
+ //鍚屼竴涓笉鎵ц寮圭獥
+ return;
+ }
languageSelectionDialog(position, itemData);
}
});
diff --git a/app/src/main/java/com/hdl/photovoltaic/widget/ListStaticDialog.java b/app/src/main/java/com/hdl/photovoltaic/widget/ListStaticDialog.java
index 1187a3d..a93bfa6 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/ListStaticDialog.java
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/ListStaticDialog.java
@@ -9,12 +9,13 @@
import androidx.annotation.NonNull;
import com.hdl.photovoltaic.R;
+import com.hdl.photovoltaic.base.BaseDialog;
import com.hdl.photovoltaic.databinding.DialogStaticListBinding;
/**
* 闈欐�佸垪琛ㄥ脊绐�
*/
-public class ListStaticDialog extends Dialog {
+public class ListStaticDialog extends BaseDialog {
private onNoListener onNoOnclickListener;
private onHDLChinaListener onHDLChinaListener;
private onHDLBahrainListener onHDLBahrainListener;
diff --git a/app/src/main/java/com/hdl/photovoltaic/widget/LoadingDialog.java b/app/src/main/java/com/hdl/photovoltaic/widget/LoadingDialog.java
index 2b43bf0..99e354e 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/LoadingDialog.java
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/LoadingDialog.java
@@ -10,14 +10,10 @@
import com.hdl.photovoltaic.R;
+import com.hdl.photovoltaic.base.BaseDialog;
-public class LoadingDialog extends Dialog {
+public class LoadingDialog extends BaseDialog {
private TextView content;
-
- public LoadingDialog(Context context) {
- super(context);
- init(context);
- }
public LoadingDialog(Context context, int theme) {
super(context, theme);
diff --git a/app/src/main/java/com/hdl/photovoltaic/widget/UpdateConfirmationCancelDialog.java b/app/src/main/java/com/hdl/photovoltaic/widget/UpdateConfirmationCancelDialog.java
index c7e830f..b078049 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/UpdateConfirmationCancelDialog.java
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/UpdateConfirmationCancelDialog.java
@@ -9,9 +9,10 @@
import androidx.annotation.NonNull;
import com.hdl.photovoltaic.R;
+import com.hdl.photovoltaic.base.BaseDialog;
import com.hdl.photovoltaic.databinding.DialogUpdateConfirmCancelBinding;
-public class UpdateConfirmationCancelDialog extends Dialog {
+public class UpdateConfirmationCancelDialog extends BaseDialog {
public UpdateConfirmationCancelDialog(@NonNull Context context) {
super(context, R.style.Custom_Dialog);
this.mContext = context;
diff --git a/app/src/main/res/layout/dialog_confirm_cancel.xml b/app/src/main/res/layout/dialog_confirm_cancel.xml
index a479bbd..f1fef1a 100644
--- a/app/src/main/res/layout/dialog_confirm_cancel.xml
+++ b/app/src/main/res/layout/dialog_confirm_cancel.xml
@@ -2,11 +2,12 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ >
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/loading_confirmation_cl"
- android:layout_width="0dp"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_48"
android:layout_marginTop="@dimen/dp_20"
--
Gitblit v1.8.0