From f18d22b5ab7f0c5a7e1aa917c551a541b019b812 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期日, 25 六月 2023 18:30:20 +0800
Subject: [PATCH] Merge branch 'wjc'
---
app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationDialog.java | 2
app/src/main/java/com/hdl/photovoltaic/other/HdlThreadLogic.java | 51 +++++++++++++++++++------
app/src/main/java/com/hdl/photovoltaic/config/AppConfigManage.java | 2
app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java | 4 +-
app/src/main/res/layout/loading_exception_log.xml | 6 +++
app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java | 27 +++++++++----
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java | 13 +++---
.idea/misc.xml | 1
8 files changed, 74 insertions(+), 32 deletions(-)
diff --git a/.idea/misc.xml b/.idea/misc.xml
index fd5a617..ee5e019 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -9,6 +9,7 @@
<entry key="app/src/main/res/layout/fragment_house_list.xml" value="0.10030395136778116" />
<entry key="app/src/main/res/layout/fragment_me.xml" value="0.10030395136778116" />
<entry key="app/src/main/res/layout/loading_confirm_input.xml" value="0.1" />
+ <entry key="app/src/main/res/layout/loading_exception_log.xml" value="0.1921875" />
<entry key="app/src/main/res/layout/toolbar_top_view_52.xml" value="0.10030395136778116" />
</map>
</option>
diff --git a/app/src/main/java/com/hdl/photovoltaic/config/AppConfigManage.java b/app/src/main/java/com/hdl/photovoltaic/config/AppConfigManage.java
index 4ff9ec2..e081196 100644
--- a/app/src/main/java/com/hdl/photovoltaic/config/AppConfigManage.java
+++ b/app/src/main/java/com/hdl/photovoltaic/config/AppConfigManage.java
@@ -6,7 +6,7 @@
/*********鏄惁姝ｅ紡鏈嶅姟鍣�*********/
- private static final boolean isOnlineServer = true;
+ private static final boolean isOnlineServer = false;
/*********姝ｅ紡鐜*********/
private static final String APP_KEY_ONLINE = "CSZEMDJL";
private static final String APP_SECRET_ONLINE = "CSZEMDKBCSZEMDKR";
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 0a4314e..af96ffb 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java
@@ -89,7 +89,7 @@
public void onSuccess(HttpResponsePack httpResponsePack) {
if (httpResponsePack != null && httpResponsePack.getData() != null) {
Gson gson = new Gson();
- String jsonStr = gson.toJson(httpResponsePack.getData().toString());
+ String jsonStr = gson.toJson(httpResponsePack.getData());
HouseInfoBeanClass houseInfoBeanClass = gson.fromJson(jsonStr, HouseInfoBeanClass.class);
houseList.addAll(houseInfoBeanClass.getList());
//鎬诲叡鏈夊灏戦〉
@@ -132,7 +132,7 @@
public void onSuccess(HttpResponsePack httpResponsePack) {
if (httpResponsePack != null && httpResponsePack.getData() != null) {
Gson gson = new Gson();
- String jsonStr = gson.toJson(httpResponsePack.getData().toString());
+ String jsonStr = gson.toJson(httpResponsePack.getData());
HouseInfoBean houseInfoBean = gson.fromJson(jsonStr, HouseInfoBean.class);
if (cloudCallBeak != null) {
cloudCallBeak.onSuccess(houseInfoBean);
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlThreadLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlThreadLogic.java
index 0922c13..13d7ea1 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlThreadLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlThreadLogic.java
@@ -9,6 +9,7 @@
import androidx.appcompat.app.AlertDialog;
import com.hdl.photovoltaic.enums.ShowErrorMode;
+import com.hdl.photovoltaic.widget.ConfirmationDialog;
/**
* 绾跨▼閫昏緫
@@ -86,12 +87,12 @@
/**
- * @param e 寮傚父淇℃伅绫�
+ * @param ex 寮傚父淇℃伅绫�
* @param context 涓婁笅鏂�(涓嶉渶瑕佸脊妗嗗～null)
* @param showErrorMode 鏄惁鏄剧ず閿欒(涓嶉渶瑕佸～null)
*/
- private static void exception(Exception e, ShowErrorMode showErrorMode, Context context) {
- if (showErrorMode == null || context == null || e == null) {
+ private static void exception(Exception ex, ShowErrorMode showErrorMode, Context context) {
+ if (showErrorMode == null || context == null || ex == null) {
return;
}
if (showErrorMode == ShowErrorMode.NO) {
@@ -101,18 +102,42 @@
handler.post(new Runnable() {
@Override
public void run() {
- Dialog alertDialog = new AlertDialog.Builder(context).
- setTitle("鎶辨瓑绋嬪簭鍑虹幇閿欒浜�,鐐瑰嚮\"纭\"鑾峰彇鏇村璇︾粏淇℃伅.").
- setMessage(e.getMessage()).
- create();
- alertDialog.show();
- //鎻愮ず
-// AlertDialog alertDialog = new AlertDialog(context, androidx.fragment.R.style.TextAppearance_Compat_Notification);
-// alertDialog.setTitle("鎶辨瓑绋嬪簭鍑虹幇閿欒浜�");
-// alertDialog.show();
-// Toast.makeText(context, "鎶辨瓑绋嬪簭鍑虹幇閿欒浜�", Toast.LENGTH_SHORT).show();
+
+ ConfirmationDialog confirmationDialog = new ConfirmationDialog(context);
+ confirmationDialog.setTitle("鎻愮ず");
+ confirmationDialog.setContent("寰堟姳姝�,绋嬪簭鍑虹幇閿欒浜�,鐐瑰嚮\"纭\"鑾峰彇鏇村璇︾粏閿欒淇℃伅.");
+ confirmationDialog.setConfirmation("纭");
+ confirmationDialog.setCancel("鍙栨秷");
+ confirmationDialog.show();
+ confirmationDialog.setNoOnclickListener(new ConfirmationDialog.onNoOnclickListener() {
+ @Override
+ public void Cancel() {
+ confirmationDialog.dismiss();
+ }
+ });
+ confirmationDialog.setYesOnclickListener(new ConfirmationDialog.onYesOnclickListener() {
+ @Override
+ public void Confirm() {
+ confirmationDialog.dismiss();
+ String s = getStackTrace(ex);
+
+ }
+ });
}
});
}
+
+ /**
+ * @return 璋冪敤鏍�
+ */
+ private static String getStackTrace(Exception ex) {
+ StringBuilder sb = new StringBuilder("");
+ StackTraceElement[] trace = ex.getStackTrace();
+ for (StackTraceElement stackTraceElement : trace) {
+ sb.append(stackTraceElement).append("\n");
+ }
+ return sb.toString();
+ }
+
}
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 60e7531..4af46c0 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java
@@ -19,6 +19,7 @@
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.CustomBaseActivity;
+import com.hdl.photovoltaic.enums.ShowErrorMode;
import com.hdl.photovoltaic.other.HdlResidenceLogic;
import com.hdl.photovoltaic.ui.bean.LoginUserBean;
import com.hdl.photovoltaic.ui.bean.LoginUserRegionBean;
@@ -76,7 +77,7 @@
private void initView() {
setStringDifferentColors(viewBinding.homeLoginPrivacyTv);
//娴嬭瘯鐢�
- viewBinding.homeLoginAccountEt.setText("18402017839");
+ viewBinding.homeLoginAccountEt.setText("13375012441");
viewBinding.homeLoginPasswordEt.setText("123456");
isLoginTextViewEnabled();
}
@@ -186,7 +187,7 @@
HdlAccountLogic.getInstance().regionByAccount(account, new CloudCallBeak<LoginUserRegionBean>() {
@Override
public void onSuccess(LoginUserRegionBean obj) {
- AppConfigManage.setUserRegionUrl(obj.getRegionUrl());
+ AppConfigManage.setUserRegionUrl("http://59.41.255.150:7777");//obj.getRegionUrl()
HdlAccountLogic.getInstance().loginByPassword(account, password, new CloudCallBeak<LoginUserBean>() {
@Override
public void onSuccess(LoginUserBean obj) {
@@ -196,18 +197,18 @@
HdlResidenceLogic.getInstance().getResidenceList(1, 100, new CloudCallBeak<Boolean>() {
@Override
public void onSuccess(Boolean obj) {
-
+ hideLoading();
+ restoreButtonStyleToInitializeState();
+ startActivity(MyPowerStationActivity.class);
}
@Override
public void onFailure(Exception exception) {
-
+ hideLoading();
+ restoreButtonStyleToInitializeState();
+ startActivity(MyPowerStationActivity.class);
}
});
- hideLoading();
- restoreButtonStyleToInitializeState();
- startActivity(MyPowerStationActivity.class);
-
}
}, null, null);
@@ -233,7 +234,15 @@
viewBinding.homeLoginExperienceTv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- startActivity(MyPowerStationActivity.class);
+
+// startActivity(MyPowerStationActivity.class);
+
+ HdlThreadLogic.runMainThread(new Runnable() {
+ @Override
+ public void run() {
+//
+ }
+ }, _mActivity, ShowErrorMode.YES);
}
});
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 fdff614..781bb8a 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
@@ -21,6 +21,7 @@
import com.hdl.photovoltaic.base.CustomBaseFragment;
import com.hdl.photovoltaic.databinding.LoadingConfirmInputBinding;
import com.hdl.photovoltaic.other.HdlLogLogic;
+import com.hdl.photovoltaic.other.HdlResidenceLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
import com.hdl.photovoltaic.other.HdlUniLogic;
import com.hdl.photovoltaic.ui.adapter.HouseInfoAdapter;
@@ -114,11 +115,12 @@
private void initData() {
this.houseListBeanList = new ArrayList<>();
- for (int i = 0; i < 11; i++) {
- HouseListBean houseListBean = new HouseListBean();
- houseListBean.setHomeName("鐢电珯" + i);
- this.houseListBeanList.add(houseListBean);
- }
+// for (int i = 0; i < 11; i++) {
+// HouseListBean houseListBean = new HouseListBean();
+// houseListBean.setHomeName("鐢电珯" + i);
+// this.houseListBeanList.add(houseListBean);
+// }
+ this.houseListBeanList.addAll(HdlResidenceLogic.getInstance().getHouseInfoBeanList());
}
@@ -148,6 +150,5 @@
}
}
-
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationDialog.java b/app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationDialog.java
index 8eca038..60e194e 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationDialog.java
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationDialog.java
@@ -100,7 +100,7 @@
*
* @param content 鍐呭
*/
- public void setContentText(String content) {
+ public void setContent(String content) {
if (TextUtils.isEmpty(content)) {
return;
}
diff --git a/app/src/main/res/layout/loading_exception_log.xml b/app/src/main/res/layout/loading_exception_log.xml
new file mode 100644
index 0000000..77d9ef6
--- /dev/null
+++ b/app/src/main/res/layout/loading_exception_log.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
--
Gitblit v1.8.0