From a8e0bddc9903d854808e9526600128e95560faa3 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期一, 30 十月 2023 18:21:25 +0800
Subject: [PATCH] 2023年10月30日18:21:12
---
app/src/main/res/layout/activity_test_main.xml | 53 ++++
app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java | 1
app/src/main/res/values/strings.xml | 7
app/src/main/res/layout/fragment_message.xml | 122 ++++++++++
app/src/main/AndroidManifest.xml | 3
app/src/main/res/layout/fragment_me_line.xml | 1
app/src/main/res/values/colors.xml | 1
app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java | 8
app/src/main/java/com/hdl/photovoltaic/ui/message/MessageFragment.java | 54 ++++
app/src/main/res/layout/activity_home_login.xml | 1
app/src/main/res/layout/test_item.xml | 26 ++
app/src/main/java/com/hdl/photovoltaic/other/HdlThreadLogic.java | 2
app/src/main/java/com/hdl/photovoltaic/ui/test/TestMainActivity.java | 224 ++++++++++++++++++++
app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java | 18
app/src/main/java/com/hdl/photovoltaic/ui/account/RegisterAccountActivity.java | 16
app/src/main/java/com/hdl/photovoltaic/utils/GlideUtils.java | 2
app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java | 20 +
app/src/main/java/com/hdl/photovoltaic/ui/test/TestTitleAdapter.java | 69 ++++++
18 files changed, 599 insertions(+), 29 deletions(-)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 11f782f..5cf8bd8 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -77,6 +77,9 @@
android:supportsRtl="true"
android:theme="@style/Theme.PhotovoltaicDebug">
<activity
+ android:name=".ui.test.TestMainActivity"
+ android:exported="false" />
+ <activity
android:name=".ui.me.MeChangePasswordActivity"
android:exported="false" />
<activity
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 17f3436..840aa9d 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
@@ -79,6 +79,26 @@
}
/**
+ * 鑾峰彇褰撳墠浣忓畢鐨勩�愪富銆戦�嗗彉鍣ㄥ垪琛�
+ */
+ public GatewayBean getCurrentHomeMainGateway() {
+ List<GatewayBean> list = HDLLinkLocalGateway.getInstance().getGatewayList();
+ if (list.size() > 0) {
+ for (int i = 0; i < list.size(); i++) {
+ GatewayBean gatewayBean = list.get(i);
+ if (TextUtils.isEmpty(gatewayBean.getDevice_mac())) {
+ continue;
+ }
+ if (gatewayBean.getMaster().equals(GatewayMasterType.MasterTrue) && gatewayBean.getHomeId().equals(UserConfigManage.getInstance().getHomeId())) {
+ //鎵惧埌杩斿洖
+ return gatewayBean;
+ }
+ }
+ }
+ return null;
+ }
+
+ /**
* 閫嗗彉鍣ㄤ笂浼犳暟鎹埌浜戠(鍖呮嫭:sid锛宱id)
*
* @param mac 璁惧mac
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 68f95f7..7b983fc 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlThreadLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlThreadLogic.java
@@ -51,7 +51,7 @@
* @param context 涓婁笅鏂�(涓嶉渶瑕佸脊妗嗗～null)
* @param showErrorMode 鏄惁鏄剧ず閿欒(涓嶉渶瑕佸～null)
*/
- public static void runThread(Runnable runnable, Context context, ShowErrorMode showErrorMode) {
+ public static void runSubThread(Runnable runnable, Context context, ShowErrorMode showErrorMode) {
new Thread(new Runnable() {
@Override
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 263a352..03ca70c 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
@@ -115,9 +115,9 @@
private void bottomViewChangeOfStyle() {
if (this.currentFragmentIndex == 1) {
- viewBinding.myPowerStationFcv1.setVisibility(View.VISIBLE);
- viewBinding.myMessageFcv2.setVisibility(View.GONE);
- viewBinding.myMeFcv3.setVisibility(View.GONE);
+ viewBinding.myPowerStationFcv1.setVisibility(View.VISIBLE);//鏄剧ず鐢电珯鐣岄潰
+ viewBinding.myMessageFcv2.setVisibility(View.GONE);//闅愯棌娑堟伅鐣岄潰
+ viewBinding.myMeFcv3.setVisibility(View.GONE);//闅愯棌鎴戠殑鐣岄潰
viewBinding.myPowerStationBottomIl1.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.selectedpowerstation));
viewBinding.myPowerStationBottomIl1.titleTv.setTextColor(getColor(R.color.text_90000000));
viewBinding.myMessageBottomIl2.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.message_unselected));
@@ -125,9 +125,9 @@
viewBinding.myMeBottomIl3.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.unselectedme));
viewBinding.myMeBottomIl3.titleTv.setTextColor(getColor(R.color.text_65000000));
} else if (this.currentFragmentIndex == 2) {
- viewBinding.myPowerStationFcv1.setVisibility(View.GONE);
- viewBinding.myMessageFcv2.setVisibility(View.VISIBLE);
- viewBinding.myMeFcv3.setVisibility(View.GONE);
+ viewBinding.myPowerStationFcv1.setVisibility(View.GONE);//闅愯棌鐢电珯鐣岄潰
+ viewBinding.myMessageFcv2.setVisibility(View.VISIBLE);//鏄剧ず娑堟伅鐣岄潰
+ viewBinding.myMeFcv3.setVisibility(View.GONE);//闅愯棌鎴戠殑鐣岄潰
viewBinding.myPowerStationBottomIl1.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.unselectedpowerstation));
viewBinding.myPowerStationBottomIl1.titleTv.setTextColor(getColor(R.color.text_65000000));
viewBinding.myMessageBottomIl2.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.message_select));
@@ -135,9 +135,9 @@
viewBinding.myMeBottomIl3.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.unselectedme));
viewBinding.myMeBottomIl3.titleTv.setTextColor(getColor(R.color.text_65000000));
} else if (this.currentFragmentIndex == 3) {
- viewBinding.myPowerStationFcv1.setVisibility(View.GONE);
- viewBinding.myMessageFcv2.setVisibility(View.GONE);
- viewBinding.myMeFcv3.setVisibility(View.VISIBLE);
+ viewBinding.myPowerStationFcv1.setVisibility(View.GONE);//闅愯棌鐢电珯鐣岄潰
+ viewBinding.myMessageFcv2.setVisibility(View.GONE);//闅愯棌娑堟伅鐣岄潰
+ viewBinding.myMeFcv3.setVisibility(View.VISIBLE);//鏄剧ず鎴戠殑鐣岄潰
viewBinding.myPowerStationBottomIl1.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.unselectedpowerstation));
viewBinding.myPowerStationBottomIl1.titleTv.setTextColor(getColor(R.color.text_65000000));
viewBinding.myMessageBottomIl2.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.message_unselected));
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 c2f9d04..7c37980 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java
@@ -24,6 +24,7 @@
@Override
public void onBindView(Bundle savedInstanceState) {
+ //7澶╁唴鍏嶇櫥褰�
if (UserConfigManage.getInstance().isAutoLogin()) {
// showLoading();
HdlResidenceLogic.getInstance().getResidenceIdList("", "", new CloudCallBeak<List<HouseIdBean>>() {
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 6e74153..5cc5a34 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
@@ -317,7 +317,7 @@
long time = (millisUntilFinished / 1000);
String str = time + "s" + getString(R.string.home_login_psw_verification_repeater);
viewBinding.registerPhoneVerificationTv.setText(str);
- viewBinding.registerPhoneVerificationTv.setTextColor(getResources().getColor(R.color.text_25000000));
+ viewBinding.registerPhoneVerificationTv.setTextColor(getResources().getColor(R.color.text_25000000,null));
viewBinding.registerPhoneVerificationTv.setEnabled(false);
}
@@ -325,7 +325,7 @@
@Override
public void onFinish() {
viewBinding.registerPhoneVerificationTv.setText(getString(R.string.home_login_verification_regain));
- viewBinding.registerPhoneVerificationTv.setTextColor(getResources().getColor(R.color.text_245EC3));
+ viewBinding.registerPhoneVerificationTv.setTextColor(getResources().getColor(R.color.text_245EC3,null));
viewBinding.registerPhoneVerificationTv.setEnabled(true);
@@ -341,7 +341,7 @@
String str = time + "s" + getString(R.string.home_login_psw_verification_repeater);
viewBinding.registerMailVerificationTv.setText(str);
- viewBinding.registerMailVerificationTv.setTextColor(getResources().getColor(R.color.text_25000000));
+ viewBinding.registerMailVerificationTv.setTextColor(getResources().getColor(R.color.text_25000000,null));
viewBinding.registerMailVerificationTv.setEnabled(false);
}
@@ -349,7 +349,7 @@
@Override
public void onFinish() {
viewBinding.registerMailVerificationTv.setText(getString(R.string.home_login_verification_regain));
- viewBinding.registerMailVerificationTv.setTextColor(getResources().getColor(R.color.text_245EC3));
+ viewBinding.registerMailVerificationTv.setTextColor(getResources().getColor(R.color.text_245EC3,null));
viewBinding.registerMailVerificationTv.setEnabled(true);
}
@@ -363,12 +363,12 @@
//鎵嬫満鍙�
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.accountTitleTv.setTextColor(getResources().getColor(R.color.text_90000000,null));
viewBinding.registerPhoneTitleIc.lineV.setVisibility(View.VISIBLE);
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.accountTitleTv.setTextColor(getResources().getColor(R.color.text_40000000,null));
viewBinding.registerMailTitleIc.lineV.setVisibility(View.GONE);
//杈撳叆鎵嬫満鍙�
@@ -393,12 +393,12 @@
//閭
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.accountTitleTv.setTextColor(getResources().getColor(R.color.text_40000000,null));
viewBinding.registerPhoneTitleIc.lineV.setVisibility(View.GONE);
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.accountTitleTv.setTextColor(getResources().getColor(R.color.text_90000000,null));
viewBinding.registerMailTitleIc.lineV.setVisibility(View.VISIBLE);
//杈撳叆閭
viewBinding.registerAccountEt.setInputType(InputType.TYPE_CLASS_TEXT);
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 c01bad5..ffc5902 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
@@ -16,6 +16,7 @@
import com.hdl.photovoltaic.other.HdlThreadLogic;
import com.hdl.photovoltaic.ui.bean.BUserInfo;
import com.hdl.photovoltaic.ui.bean.CUserInfo;
+import com.hdl.photovoltaic.ui.test.TestMainActivity;
import com.hdl.photovoltaic.utils.GlideUtils;
/**
@@ -126,6 +127,13 @@
startActivity(intent);
}
});
+ viewBinding.fragmentMeLineAsregardsIl.fragmentMeLineCl.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ startActivity(TestMainActivity.class);
+ }
+ });
+
}
/**
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/message/MessageFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/message/MessageFragment.java
index 515f330..24a9ef0 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/message/MessageFragment.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/message/MessageFragment.java
@@ -1,8 +1,10 @@
package com.hdl.photovoltaic.ui.message;
import android.os.Bundle;
-import android.view.LayoutInflater;
+import android.view.View;
+
+import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.CustomBaseFragment;
import com.hdl.photovoltaic.databinding.FragmentMessageBinding;
@@ -21,20 +23,66 @@
@Override
public void onBindView(Bundle savedInstanceState) {
- //鍒濆鍖栨暟鎹�
- initData();
+
//鍒濆鍖栫晫闈�
initView();
//鍒濆鍖栫洃鍚櫒
initEvent();
+ //鍒濆鍖栨暟鎹�
+ initData();
}
private void initEvent() {
+ viewBinding.messageTabDeviceAlertCl.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ viewBinding.messageTabDeviceAlertTitleTv.setTextColor(getResources().getColor(R.color.text_FFFFFFFF, null));
+ viewBinding.messageTabPlatformPushTitleTv.setTextColor(getResources().getColor(R.color.text80_FFFFFF, null));
+ viewBinding.messageTabDeviceLogTitleTv.setTextColor(getResources().getColor(R.color.text80_FFFFFF, null));
+ viewBinding.line1V.setVisibility(View.VISIBLE);
+ viewBinding.line2V.setVisibility(View.GONE);
+ viewBinding.line3V.setVisibility(View.GONE);
+
+ }
+ });
+
+ viewBinding.messageTabPlatformPushCl.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ viewBinding.messageTabDeviceAlertTitleTv.setTextColor(getResources().getColor(R.color.text80_FFFFFF, null));
+ viewBinding.messageTabPlatformPushTitleTv.setTextColor(getResources().getColor(R.color.text_FFFFFFFF, null));
+ viewBinding.messageTabDeviceLogTitleTv.setTextColor(getResources().getColor(R.color.text80_FFFFFF, null));
+ viewBinding.line1V.setVisibility(View.GONE);
+ viewBinding.line2V.setVisibility(View.VISIBLE);
+ viewBinding.line3V.setVisibility(View.GONE);
+ }
+ });
+
+ viewBinding.messageTabDeviceLogCl.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ viewBinding.messageTabDeviceAlertTitleTv.setTextColor(getResources().getColor(R.color.text80_FFFFFF, null));
+ viewBinding.messageTabPlatformPushTitleTv.setTextColor(getResources().getColor(R.color.text80_FFFFFF, null));
+ viewBinding.messageTabDeviceLogTitleTv.setTextColor(getResources().getColor(R.color.text_FFFFFFFF, null));
+ viewBinding.line1V.setVisibility(View.GONE);
+ viewBinding.line2V.setVisibility(View.GONE);
+ viewBinding.line3V.setVisibility(View.VISIBLE);
+ }
+ });
}
+
private void initView() {
+ viewBinding.messageTabDeviceAlertTitleTv.setTextColor(getResources().getColor(R.color.text_FFFFFFFF, null));
+ viewBinding.messageTabPlatformPushTitleTv.setTextColor(getResources().getColor(R.color.text80_FFFFFF, null));
+ viewBinding.messageTabDeviceLogTitleTv.setTextColor(getResources().getColor(R.color.text80_FFFFFF, null));
+ viewBinding.line1V.setVisibility(View.VISIBLE);
+ viewBinding.line2V.setVisibility(View.GONE);
+ viewBinding.line3V.setVisibility(View.GONE);
}
private void initData() {
}
+
+
}
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
new file mode 100644
index 0000000..40455f8
--- /dev/null
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/test/TestMainActivity.java
@@ -0,0 +1,224 @@
+package com.hdl.photovoltaic.ui.test;
+
+import androidx.recyclerview.widget.LinearLayoutManager;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.View;
+
+import com.google.gson.Gson;
+import com.hdl.photovoltaic.R;
+import com.hdl.photovoltaic.base.CustomBaseActivity;
+import com.hdl.photovoltaic.config.UserConfigManage;
+import com.hdl.photovoltaic.databinding.ActivityTestMainBinding;
+import com.hdl.photovoltaic.enums.ShowErrorMode;
+import com.hdl.photovoltaic.listener.LinkCallBack;
+import com.hdl.photovoltaic.other.HdlDeviceLogic;
+import com.hdl.photovoltaic.other.HdlThreadLogic;
+import com.hdl.photovoltaic.ui.bean.OidBean;
+import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
+import com.hdl.photovoltaic.widget.ConfirmationExceptionDialog;
+import com.hdl.sdk.link.common.exception.HDLLinkException;
+import com.hdl.sdk.link.core.bean.gateway.GatewayBean;
+import com.hdl.sdk.link.core.callback.GatewayCallBack;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 娴嬭瘯缃戝叧鏁版嵁涓诲叆鍙ｇ晫闈�
+ */
+public class TestMainActivity extends CustomBaseActivity implements View.OnClickListener {
+
+ private ActivityTestMainBinding viewBinding;
+ private TestTitleAdapter testTitleAdapter;
+
+ @Override
+ public Object getContentView() {
+ viewBinding = ActivityTestMainBinding.inflate(getLayoutInflater());
+ return viewBinding.getRoot();
+ }
+
+ @Override
+ public void onBindView(Bundle savedInstanceState) {
+
+ LinearLayoutManager linearLayoutManager = new LinearLayoutManager(this);
+ testTitleAdapter = new TestTitleAdapter(getTitleList());
+ viewBinding.listItemRl.setLayoutManager(linearLayoutManager);
+ viewBinding.listItemRl.setAdapter(testTitleAdapter);
+ initView();
+ initEvent();
+
+ }
+
+ /**
+ * 鍒濆鍖�
+ */
+ 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);
+
+
+ }
+
+ private void initEvent() {
+ viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setOnClickListener(this);
+ testTitleAdapter.setItemOnClickListener(new TestTitleAdapter.OnClickListener() {
+ @Override
+ public void OnClick(int position) {
+
+
+ if (TextUtils.isEmpty(UserConfigManage.getInstance().getHomeId())) {
+ // TODO: 10/30/23 璇峰厛閫夋嫨浣忓畢杩涜娴嬭瘯,鍚﹀垯鏃犳硶杩涜閫嗗彉鍣ㄦ寚浠ゆ祴璇�;
+ TipDialog("璇峰厛閫夋嫨浣忓畢杩涜娴嬭瘯,鍚﹀垯鏃犳硶杩涜閫嗗彉鍣ㄦ寚浠ゆ祴璇�.");
+ return;
+ }
+ GatewayBean gatewayBean = HdlDeviceLogic.getInstance().getCurrentHomeMainGateway();
+ if (gatewayBean == null) {
+ // TODO: 10/30/23 鎵句笉鍒颁綇瀹呯殑涓婚�嗗彉鍣�,璇峰厛纭鏄惁缁戝畾閫嗗彉鍣紝鍐嶈繘琛岄�嗗彉鍣ㄦ寚浠ゆ祴璇�;
+ TipDialog("鎵句笉鍒颁綇瀹呯殑涓婚�嗗彉鍣�,璇峰厛纭鏄惁缁戝畾杩囬�嗗彉鍣紝鍐嶈繘琛岄�嗗彉鍣ㄦ寚浠ゆ祴璇�.");
+ return;
+ }
+ showLoading();
+ startRequest(position, gatewayBean);
+ }
+ });
+ }
+
+
+ @Override
+ public void onClick(View v) {
+ int id = v.getId();
+ if (id == viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.getId()) {
+ finish();
+ }
+ }
+
+ /**
+ * 鑷畾涔夌殑鏍囬
+ *
+ * @return -
+ */
+ private List<String> getTitleList() {
+ List<String> s = new ArrayList<>();
+ s.add("鎼滅储閫嗗彉鍣ㄥ垪琛�");
+ s.add("鑾峰彇閫嗗彉鍣╫id鍒楄〃");
+ s.add("璇诲彇閫嗗彉鍣ㄨ鎯�");
+ return s;
+ }
+
+ /**
+ * 璇锋眰鎸囦护
+ *
+ * @param position 绱㈠紩鍊�
+ */
+ private void startRequest(int position, GatewayBean gatewayBean) {
+ String title = getTitleList().get(position);
+ switch (title) {
+ case "鎼滅储閫嗗彉鍣ㄥ垪琛�": {
+ HdlDeviceLogic.getInstance().searchGateway(new GatewayCallBack() {
+ @Override
+ public void onSuccess(List<GatewayBean> gatewayBeanList) {
+ gsonConvertJsonStr(gatewayBeanList);
+ }
+
+ @Override
+ public void onError(HDLLinkException e) {
+ setError(e);
+ }
+ });
+ }
+ break;
+
+ case "鑾峰彇閫嗗彉鍣╫id鍒楄〃": {
+ HdlDeviceLogic.getInstance().getInverterOidList(gatewayBean.getDevice_mac(), new LinkCallBack<List<OidBean>>() {
+ @Override
+ public void onSuccess(List<OidBean> obj) {
+ gsonConvertJsonStr(obj);
+ }
+
+ @Override
+ public void onError(HDLLinkException e) {
+ setError(e);
+ }
+ });
+ }
+ break;
+
+ case "璇诲彇閫嗗彉鍣ㄨ鎯�": {
+ HdlDeviceLogic.getInstance().getGatewayInfo(gatewayBean.getDevice_mac(), new LinkCallBack<GatewayBean>() {
+ @Override
+ public void onSuccess(GatewayBean obj) {
+ gsonConvertJsonStr(obj);
+ }
+
+ @Override
+ public void onError(HDLLinkException e) {
+ setError(e);
+ }
+ });
+ }
+ break;
+ }
+
+ }
+
+ private void setError(HDLLinkException hdlLinkException) {
+ String error = hdlLinkException.getMsg() + "(" + hdlLinkException.getCode() + ")";
+ showText(error);
+ }
+
+ private void gsonConvertJsonStr(Object src) {
+ Gson gson = new Gson();
+ String json = gson.toJson(src);
+ showText(json);
+ }
+
+ /**
+ * 鍥炲鐨勬暟鎹�
+ *
+ * @param s 鏁版嵁
+ */
+ private void showText(String s) {
+ HdlThreadLogic.runMainThread(new Runnable() {
+ @Override
+ public void run() {
+ hideLoading();
+ String s1 = "鏁版嵁鍥炲:\r\n" + s;
+ viewBinding.replyContentTv.setText(s1);
+ }
+ }, this, ShowErrorMode.YES);
+ }
+
+
+ /**
+ * @param s 閿欒淇℃伅
+ */
+ private void TipDialog(String s) {
+ ConfirmationCancelDialog confirmationCancelDialog = new ConfirmationCancelDialog(this);
+ confirmationCancelDialog.setTitle("鎻愮ず");
+ confirmationCancelDialog.setContent(s);
+ confirmationCancelDialog.setConfirmation("纭");
+ confirmationCancelDialog.setCancel("鍙栨秷");
+ confirmationCancelDialog.show();
+ confirmationCancelDialog.setNoOnclickListener(new ConfirmationCancelDialog.onNoOnclickListener() {
+ @Override
+ public void Cancel() {
+ confirmationCancelDialog.dismiss();
+ }
+ });
+ confirmationCancelDialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
+ @Override
+ public void Confirm() {
+ confirmationCancelDialog.dismiss();
+
+ }
+ });
+ }
+
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/test/TestTitleAdapter.java b/app/src/main/java/com/hdl/photovoltaic/ui/test/TestTitleAdapter.java
new file mode 100644
index 0000000..15e8982
--- /dev/null
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/test/TestTitleAdapter.java
@@ -0,0 +1,69 @@
+package com.hdl.photovoltaic.ui.test;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.hdl.photovoltaic.R;
+
+import java.util.List;
+
+public class TestTitleAdapter extends RecyclerView.Adapter<TestTitleAdapter.TestItem> {
+
+ private OnClickListener mOnClickListener;
+ private List<String> mList;
+
+ public TestTitleAdapter(List<String> list) {
+ this.mList = list;
+ }
+
+ public void setItemOnClickListener(OnClickListener onClickListener) {
+ mOnClickListener = onClickListener;
+ }
+
+ @NonNull
+ @Override
+ public TestItem onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+ View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.test_item, parent, false);
+ return new TestItem(view);
+ }
+
+ @Override
+ public void onBindViewHolder(@NonNull TestItem holder, int position) {
+ String item = mList.get(position);
+ holder.textView.setText(item);
+ holder.textView.setTag(position);//璁剧疆绱㈠紩鍊�
+ holder.textView.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ if (mOnClickListener != null) {
+ mOnClickListener.OnClick((int) holder.textView.getTag());
+ }
+ }
+ });
+ }
+
+ @Override
+ public int getItemCount() {
+ return mList.size();
+ }
+
+ static class TestItem extends RecyclerView.ViewHolder {
+
+ public TextView textView;
+
+ public TestItem(@NonNull View itemView) {
+ super(itemView);
+ textView = itemView.findViewById(R.id.test_title_tv);
+
+ }
+ }
+
+ public interface OnClickListener {
+ void OnClick(int position);
+ }
+}
diff --git a/app/src/main/java/com/hdl/photovoltaic/utils/GlideUtils.java b/app/src/main/java/com/hdl/photovoltaic/utils/GlideUtils.java
index 5faa058..92193b1 100644
--- a/app/src/main/java/com/hdl/photovoltaic/utils/GlideUtils.java
+++ b/app/src/main/java/com/hdl/photovoltaic/utils/GlideUtils.java
@@ -112,7 +112,7 @@
*/
public static void getImage(String path, ImageView imageView, int pixels) {
- HdlThreadLogic.runThread(new Runnable() {
+ HdlThreadLogic.runSubThread(new Runnable() {
@Override
public void run() {
try {
diff --git a/app/src/main/res/layout/activity_home_login.xml b/app/src/main/res/layout/activity_home_login.xml
index dd31786..860c937 100644
--- a/app/src/main/res/layout/activity_home_login.xml
+++ b/app/src/main/res/layout/activity_home_login.xml
@@ -5,6 +5,7 @@
android:id="@+id/home_login_parent_cl"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:background="@color/text_FFFFFFFF"
tools:context="com.hdl.photovoltaic.ui.HomeLoginActivity">
<ImageView
diff --git a/app/src/main/res/layout/activity_test_main.xml b/app/src/main/res/layout/activity_test_main.xml
new file mode 100644
index 0000000..4f8b80e
--- /dev/null
+++ b/app/src/main/res/layout/activity_test_main.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ tools:context=".ui.test.TestMainActivity">
+
+ <include
+ android:id="@+id/toolbar_top_fragment_house_list_rl"
+ layout="@layout/toolbar_top_view_52" />
+
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/list_item_rl"
+ android:layout_width="@dimen/dp_100"
+ android:layout_height="0dp"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/toolbar_top_fragment_house_list_rl" />
+
+ <View
+ android:id="@+id/lien"
+ android:layout_width="0.5dp"
+ android:layout_height="0dp"
+ android:background="@color/text_245EC3"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintStart_toEndOf="@+id/list_item_rl"
+ app:layout_constraintTop_toBottomOf="@+id/toolbar_top_fragment_house_list_rl" />
+
+ <ScrollView
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toEndOf="@+id/lien"
+ app:layout_constraintTop_toBottomOf="@+id/toolbar_top_fragment_house_list_rl">
+
+ <FrameLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+
+ <TextView
+ android:id="@+id/reply_content_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:padding="@dimen/dp_10"
+ android:textColor="@color/text_030D1C"
+ android:textSize="@dimen/text_15" />
+ </FrameLayout>
+ </ScrollView>
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_me_line.xml b/app/src/main/res/layout/fragment_me_line.xml
index 05d7668..975be60 100644
--- a/app/src/main/res/layout/fragment_me_line.xml
+++ b/app/src/main/res/layout/fragment_me_line.xml
@@ -6,6 +6,7 @@
android:background="@color/text_F9FAFB">
<androidx.constraintlayout.widget.ConstraintLayout
+ android:id="@+id/fragment_me_line_cl"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginStart="@dimen/dp_20"
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index fc3fa41..93cb1fd 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -1,9 +1,123 @@
<?xml version="1.0" encoding="utf-8"?>
<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">
-<!-- <include-->
-<!-- android:id="@+id/toolbar_top_fragment_me_rl"-->
-<!-- layout="@layout/toolbar_top_view_52" />-->
+ android:layout_height="match_parent"
+ android:background="@color/text_F5F7FA">
+ <RelativeLayout
+ android:id="@+id/message_rl"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_52"
+ android:background="@color/text_245EC3"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent">
+
+ <LinearLayout
+ android:id="@+id/message_tab_ll"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginStart="@dimen/dp_17"
+ android:layout_marginEnd="@dimen/dp_16"
+ android:orientation="horizontal">
+ <!--璁惧璀︽姤-->
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:id="@+id/message_tab_device_alert_cl"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1">
+
+ <TextView
+ android:id="@+id/message_tab_device_alert_title_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/dp_23"
+ android:layout_marginTop="@dimen/dp_16"
+ android:gravity="center"
+ android:text="@string/message_device_alert"
+ android:textColor="@color/text_FFFFFFFF"
+ android:textSize="@dimen/text_16"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <View
+ android:id="@+id/line1_v"
+ android:layout_width="0dp"
+ android:layout_height="3dp"
+ android:layout_marginTop="@dimen/dp_11"
+ android:background="@color/text_FFFFFFFF"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="@+id/message_tab_device_alert_title_tv"
+ app:layout_constraintStart_toStartOf="@+id/message_tab_device_alert_title_tv" />
+
+
+ </androidx.constraintlayout.widget.ConstraintLayout>
+ <!--骞冲彴鎺ㄩ��-->
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:id="@+id/message_tab_platform_push_cl"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1">
+
+ <TextView
+ android:id="@+id/message_tab_platform_push_title_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/dp_23"
+ android:layout_marginTop="@dimen/dp_16"
+ android:gravity="center"
+ android:text="@string/message_platform_push"
+ android:textColor="@color/text_FFFFFFFF"
+ android:textSize="@dimen/text_16"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <View
+ android:id="@+id/line2_v"
+ android:layout_width="0dp"
+ android:layout_height="3dp"
+ android:layout_marginTop="@dimen/dp_11"
+ android:background="@color/text_FFFFFFFF"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="@+id/message_tab_platform_push_title_tv"
+ app:layout_constraintStart_toStartOf="@+id/message_tab_platform_push_title_tv" />
+
+
+ </androidx.constraintlayout.widget.ConstraintLayout>
+ <!--璁惧鏃ュ織-->
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:id="@+id/message_tab_device_log_cl"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1">
+
+ <TextView
+ android:id="@+id/message_tab_device_log_title_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/dp_23"
+ android:layout_marginTop="@dimen/dp_16"
+ android:gravity="center"
+ android:text="@string/message_device_log"
+ android:textColor="@color/text_FFFFFFFF"
+ android:textSize="@dimen/text_16"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <View
+ android:id="@+id/line3_v"
+ android:layout_width="0dp"
+ android:layout_height="3dp"
+ android:layout_marginTop="@dimen/dp_11"
+ android:background="@color/text_FFFFFFFF"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="@+id/message_tab_device_log_title_tv"
+ app:layout_constraintStart_toStartOf="@+id/message_tab_device_log_title_tv" />
+
+
+ </androidx.constraintlayout.widget.ConstraintLayout>
+
+ </LinearLayout>
+ </RelativeLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/test_item.xml b/app/src/main/res/layout/test_item.xml
new file mode 100644
index 0000000..cc68ffb
--- /dev/null
+++ b/app/src/main/res/layout/test_item.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="@dimen/dp_60">
+
+ <TextView
+ android:id="@+id/test_title_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textColor="@color/text_030D1C"
+ android:textSize="@dimen/text_18"
+ android:gravity="center"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="0.5dp"
+ android:background="@color/text_245EC3"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 75abf42..fc01ac9 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -23,6 +23,7 @@
<color name="text_E1E1E1">#E1E1E1</color>
<color name="text_94B6E7">#94B6E7</color>
<color name="text_FFFFFFFF">#FFFFFFFF</color>
+ <color name="text80_FFFFFF">#80FFFFFF</color>
<color name="text_D34545">#D34545</color>
<color name="text_FFB300">#FFB300</color>
<color name="text_B9B9B9">#B9B9B9</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d0364f3..9530275 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
<resources>
-<!-- <string name="app_name">PhotovoltaicDebug</string>-->
+ <!-- <string name="app_name">PhotovoltaicDebug</string>-->
<string name="app_name">鏅烘収鑳芥簮</string>
<string name="title_activity_home_login">HomeLoginActivity</string>
<!-- Strings used for fragments for navigation -->
@@ -63,7 +63,6 @@
<string name="home_login_change_name_succeed">淇敼澶囨敞鎴愬姛.</string>
-
<!--鎴戠殑鐢电珯-->
<string name="power_station">鐢电珯</string>
<string name="power_station_me">鎴戠殑</string>
@@ -83,6 +82,9 @@
<!--娑堟伅-->
<string name="message">娑堟伅</string>
+ <string name="message_device_alert">璁惧璀︽姤</string>
+ <string name="message_platform_push">骞冲彴鎺ㄩ��</string>
+ <string name="message_device_log">璁惧鏃ュ織</string>
<!--鎴戠殑-->
<string name="me">鎴戠殑</string>
@@ -102,7 +104,6 @@
<string name="set_logout">閫�鍑虹櫥褰�</string>
<string name="set_privacy">闅愮璁剧疆</string>
<string name="set_nickname_modification">鏄电О淇敼</string>
-
<!--uin-->
--
Gitblit v1.8.0