From 8231d2af7893e221d90c71bd5dec4cf3f2f1f0ce Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 30 十一月 2023 19:07:59 +0800
Subject: [PATCH] 2023年11月30日19:07:47
---
app/src/main/java/com/hdl/photovoltaic/ui/test/TestMainActivity.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 46 insertions(+), 11 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/test/TestMainActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/test/TestMainActivity.java
index 40455f8..0911e5b 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/test/TestMainActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/test/TestMainActivity.java
@@ -57,30 +57,32 @@
* 鍒濆鍖�
*/
private void initView() {
- viewBinding.toolbarTopFragmentHouseListRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF, null));
- viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText("閫嗗彉鍣ㄦ寚浠ゆ祴璇�");
- viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
- viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setVisibility(View.VISIBLE);
+
+ String homeId = "娴嬭瘯浣忓畢ID=" + UserConfigManage.getInstance().getHomeId();
+ String homeName = "娴嬭瘯浣忓畢鍚嶇О=" + UserConfigManage.getInstance().getHomeName();
+ viewBinding.homeIdTv.setText(homeId);
+ viewBinding.homeNameTv.setText(homeName);
}
private void initEvent() {
- viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setOnClickListener(this);
+ viewBinding.topBackBtn.setOnClickListener(this);
+ viewBinding.topLogBtn.setOnClickListener(this);
testTitleAdapter.setItemOnClickListener(new TestTitleAdapter.OnClickListener() {
@Override
- public void OnClick(int position) {
+ public void OnClick(int position, String title) {
if (TextUtils.isEmpty(UserConfigManage.getInstance().getHomeId())) {
// TODO: 10/30/23 璇峰厛閫夋嫨浣忓畢杩涜娴嬭瘯,鍚﹀垯鏃犳硶杩涜閫嗗彉鍣ㄦ寚浠ゆ祴璇�;
- TipDialog("璇峰厛閫夋嫨浣忓畢杩涜娴嬭瘯,鍚﹀垯鏃犳硶杩涜閫嗗彉鍣ㄦ寚浠ゆ祴璇�.");
+ TipDialog("璇峰厛閫夋嫨浣忓畢杩涜娴嬭瘯,鍚﹀垯鏃犳硶杩涜閫嗗彉鍣ㄦ寚浠ゆ祴璇�.", null);
return;
}
GatewayBean gatewayBean = HdlDeviceLogic.getInstance().getCurrentHomeMainGateway();
- if (gatewayBean == null) {
+ if (gatewayBean == null && !title.equals("鎼滅储閫嗗彉鍣ㄥ垪琛�")) {
// TODO: 10/30/23 鎵句笉鍒颁綇瀹呯殑涓婚�嗗彉鍣�,璇峰厛纭鏄惁缁戝畾閫嗗彉鍣紝鍐嶈繘琛岄�嗗彉鍣ㄦ寚浠ゆ祴璇�;
- TipDialog("鎵句笉鍒颁綇瀹呯殑涓婚�嗗彉鍣�,璇峰厛纭鏄惁缁戝畾杩囬�嗗彉鍣紝鍐嶈繘琛岄�嗗彉鍣ㄦ寚浠ゆ祴璇�.");
+ TipDialog("鎵句笉鍒颁綇瀹呯殑銆愪富閫嗗彉鍣ㄣ��,璇峰厛纭鏄惁缁戝畾杩囬�嗗彉鍣紝鍐嶈繘琛岄�嗗彉鍣ㄦ寚浠ゆ祴璇�.", null);
return;
}
showLoading();
@@ -93,8 +95,11 @@
@Override
public void onClick(View v) {
int id = v.getId();
- if (id == viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.getId()) {
+ if (id == viewBinding.topBackBtn.getId()) {
finish();
+ } else if (id == viewBinding.topLogBtn.getId()) {
+ startActivity(TestLogActivity.class);
+
}
}
@@ -108,6 +113,7 @@
s.add("鎼滅储閫嗗彉鍣ㄥ垪琛�");
s.add("鑾峰彇閫嗗彉鍣╫id鍒楄〃");
s.add("璇诲彇閫嗗彉鍣ㄨ鎯�");
+ s.add("娓呴櫎閫嗗彉鍣ㄤ綇瀹匢d");
return s;
}
@@ -163,6 +169,25 @@
});
}
break;
+ case "娓呴櫎閫嗗彉鍣ㄤ綇瀹匢d": {
+ TipDialog("涓�鏃︽竻闄ゆ帀閫嗗彉鍣ㄤ綇瀹卛d,閫嗗彉鍣ㄩ渶瑕侀噸鏂扮粦瀹氫綇瀹咃紝鍚﹀垯鏃犳硶娴嬭瘯閫嗗彉鍣ㄦ寚浠�;", new Listener() {
+ @Override
+ public void Confirmation() {
+ HdlDeviceLogic.getInstance().clearInverterHomeId(gatewayBean.getDevice_mac(), new LinkCallBack<Boolean>() {
+ @Override
+ public void onSuccess(Boolean obj) {
+ gsonConvertJsonStr(obj);
+ }
+
+ @Override
+ public void onError(HDLLinkException e) {
+ setError(e);
+ }
+ });
+ }
+ });
+ }
+ break;
}
}
@@ -198,7 +223,7 @@
/**
* @param s 閿欒淇℃伅
*/
- private void TipDialog(String s) {
+ private void TipDialog(String s, Listener listener) {
ConfirmationCancelDialog confirmationCancelDialog = new ConfirmationCancelDialog(this);
confirmationCancelDialog.setTitle("鎻愮ず");
confirmationCancelDialog.setContent(s);
@@ -209,16 +234,26 @@
@Override
public void Cancel() {
confirmationCancelDialog.dismiss();
+ hideLoading();
+
}
});
confirmationCancelDialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
@Override
public void Confirm() {
+ hideLoading();
confirmationCancelDialog.dismiss();
+ if (listener != null) {
+ listener.Confirmation();
+ }
}
});
}
+ public interface Listener {
+ void Confirmation();
+ }
+
}
\ No newline at end of file
--
Gitblit v1.8.0