From da8d00e706afcff506848331ec0e58ea1ee58969 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 30 七月 2025 16:24:52 +0800
Subject: [PATCH] 2025年07月30日16:24:47
---
app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java | 83 ++++--
app/src/main/res/layout/activity_message_info.xml | 70 +----
app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java | 4
app/src/main/java/com/hdl/photovoltaic/ui/message/MessageInfoActivity.java | 68 +++++
app/src/main/res/values/strings.xml | 8
app/src/main/res/layout/line_message_info.xml | 61 +++-
app/src/main/java/com/hdl/photovoltaic/HDLApp.java | 33 ++
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 7
app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java | 12
app/src/main/res/drawable-xhdpi/roll_back.png | 0
app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java | 50 +++
app/src/main/res/values-zh/strings.xml | 6
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java | 50 +++
app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java | 13 +
app/src/main/res/values-en/strings.xml | 6
app/src/main/java/com/hdl/photovoltaic/ui/bean/MessageBean.java | 30 ++
app/src/main/java/com/hdl/photovoltaic/widget/AddPowerStationDialog.java | 77 ++++++
app/src/main/java/com/hdl/photovoltaic/widget/adapter/PowerStationDialogAdapter.java | 94 +++++++
app/build.gradle | 2
19 files changed, 528 insertions(+), 146 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index fec5047..f35619d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -90,7 +90,7 @@
*/
android.applicationVariants.configureEach { variant ->
variant.outputs.configureEach {
- outputFileName = "photovoltaic_v${versionName}_${generateTime()}_${getEnvironmentVersion(4)}.apk"
+ outputFileName = "photovoltaic_v${versionName}_${generateTime()}_${getEnvironmentVersion(1)}.apk"
}
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
index 1af3a6a..db24c47 100644
--- a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
+++ b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
@@ -259,6 +259,39 @@
restartApp(mHDLApp);
}
}, 500);
+ } else if (type == LogoutType.UniLogout.getValue()) {
+ AppManagerUtils.getAppManager().finishAllActivity();
+ //娓呯┖浣忓畢id
+ UserConfigManage.getInstance().setHomeId("");
+ UserConfigManage.getInstance().setAutomaticSkipNoNetworkFlag(true);
+ //閲嶆柊璁惧畾涓�涓椂闂�
+ UserConfigManage.getInstance().setLoginDateTime(0);
+ UserConfigManage.getInstance().Save();
+ //娓呯┖娑堟伅缂撳瓨鏁版嵁
+ HdlMessageLogic.getInstance().clearListMessage();
+ //娓呯┖鐢电珯缂撳瓨鏁版嵁
+ HdlResidenceLogic.getInstance().clearHouseList();
+ //娓呯┖璁惧缂撳瓨鏁版嵁
+ HdlDeviceLogic.getInstance().clearDeviceList();
+ //娓呯┖缂撳瓨鏁版嵁
+ if (mInfoMap != null) {
+ mInfoMap.clear();
+ }
+ //鏂紑mqtt杩炴帴
+ if (MqttRecvClient.getInstance() != null) {
+ MqttRecvClient.getInstance().disConnect();
+ }
+ //鏂紑鎵�鏈塼cp杩炴帴涓旀竻绌鸿繛鎺ョ紦瀛�
+ // TODO: 10/10/23
+// TcpSocketBoot.stopAllConnectLinkGateway();
+ if (null != HDLUniMPSDKManager.getInstance().getUniMP()) {
+ HDLUniMPSDKManager.getInstance().getUniMP().closeUniMP();
+ }
+ SystemClock.sleep(200);
+ initDCUniMPSDK();
+ Intent intent = new Intent(getInstance(), LoginActivity.class);
+ intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
+ startActivity(intent);
} else {
HdlLogLogic.print("鐩戝惉鍒扮櫥褰曢��鍑�---" + type, true);
//鍒犻櫎鎺ㄩ�乀oken
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 81c9c0b..8ddb2c1 100644
--- a/app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java
+++ b/app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java
@@ -122,6 +122,19 @@
*/
private boolean noNetworkFlag = false;
+ public boolean isAutomaticSkipNoNetworkFlag() {
+ return automaticSkipNoNetworkFlag;
+ }
+
+ public void setAutomaticSkipNoNetworkFlag(boolean automaticSkipNoNetworkFlag) {
+ this.automaticSkipNoNetworkFlag = automaticSkipNoNetworkFlag;
+ }
+
+ /**
+ * 鑷姩璺宠浆鍒版棤缃戞ā寮�(true=鍚屾剰璺宠浆,false=涓嶅悓鎰忚烦杞�)
+ */
+ private boolean automaticSkipNoNetworkFlag = false;
+
/**
* 鏃犵綉妯″紡璁惧mac
*/
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 417e4ef..8c468ae 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -824,6 +824,7 @@
case HDLUniMP.UNI_EVENT_REPLY_NO_WORK_MODEL_EXIT: {
//閫�鍑烘棤缃戞ā寮忔爣璇�
UserConfigManage.getInstance().setNoNetworkFlag(false);
+ UserConfigManage.getInstance().setAutomaticSkipNoNetworkFlag(false);
UserConfigManage.getInstance().Save();
uniSuccessCallback(mode_type, true, callback);
if (null != HDLUniMPSDKManager.getInstance().getUniMP()) {
@@ -834,6 +835,12 @@
HDLApp.getInstance().startActivity(intent);
}
break;
+ case HDLUniMP.UNI_EVENT_REPLY_NO_WORK_MODEL_FROM_OFFLINE: {
+ //璁惧绂荤綉鏃舵湁鍏ュ彛杩涘叆鏃犵綉妯″紡
+ uniSuccessCallback(mode_type, true, callback);
+ HdlAccountLogic.getInstance().logout(LogoutType.UniLogout);
+ }
+ break;
case HDLUniMP.UNI_EVENT_REPLY_NO_WORK_MODEL_DEVICE_INFO: {
try {
//杩涘叆鏃犵綉妯″紡閫嗗彉鍣ㄨ鎯呴〉锛岀紦瀛榤ac鍜屽瘑鐮�
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java
index 888a2ef..54d21b3 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java
@@ -481,12 +481,12 @@
this.notificationSet();
//ACCESS_FINE_LOCATION 鍏佽浣跨敤GPS瀹氫綅
//ACCESS_COARSE_LOCATION 鍏佽浣跨敤WIFI鐑偣鎴栧熀绔欐潵鑾峰彇绮楃暐鐨勫畾浣�
-// String[] ary = PermissionUtils.checkPermission(_mActivity, new String[]{Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION});
-// if (ary.length > 0) {
-// this.requestPermissions(ary, PermissionUtils.STATUS_SUCCESS);
-// } else {
-// locationUpdates();
-// }
+ String[] ary = PermissionUtils.checkPermission(_mActivity, new String[]{Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION});
+ if (ary.length > 0) {
+ this.requestPermissions(ary, PermissionUtils.STATUS_SUCCESS);
+ } else {
+ locationUpdates();
+ }
}
@Override
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
index 0450dd8..cfb88e9 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
@@ -101,7 +101,6 @@
//
// });
-
}
/**
@@ -176,6 +175,13 @@
// viewBinding.homeLoginPasswordEt.setText(pws);
checkClearIconShowOrNot(viewBinding.homeLoginAccountEt.getText().toString());
isLoginTextViewEnabled();
+ if (UserConfigManage.getInstance().isAutomaticSkipNoNetworkFlag()) {
+ SharedPreUtils.putBoolean("no_network_mode", true);
+ UserConfigManage.getInstance().setNoNetworkFlag(true);
+ UserConfigManage.getInstance().Save();
+ String path = HDLUniMP.UNI_EVENT_OPEN_NONETWORKDEVICELIST + "?mac=" + UserConfigManage.getInstance().getNoNetworkDeviceMac() + "&password=" + UserConfigManage.getInstance().getNoNetworkPassword() + "&autoVerify=false";
+ HdlUniLogic.getInstance().openUniMP(path, null);
+ }
} catch (Exception ignored) {
}
}
@@ -319,40 +325,7 @@
viewBinding.homeNoNetworkModeLoginTv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- boolean isNoNetworkModeLogin = SharedPreUtils.getBoolean("no_network_mode");
- if (!isNoNetworkModeLogin) {
- //绗竴娆℃墦寮�瑕佹彁绀�
- ConfirmationCancelDialog confirmationCancelDialog = new ConfirmationCancelDialog(_mActivity);
- confirmationCancelDialog.setTitle(getString(R.string.loading_title_tip));
- confirmationCancelDialog.setContent(getString(R.string.no_network_mode_tip));
- confirmationCancelDialog.setConfirmation(getString(R.string.home_login_affirm));
- confirmationCancelDialog.setCancel(getString(R.string.scan_cancel));
- confirmationCancelDialog.show();
- confirmationCancelDialog.getContentTextView().setGravity(Gravity.START);
- confirmationCancelDialog.setNoOnclickListener(new ConfirmationCancelDialog.onNoOnclickListener() {
- @Override
- public void Cancel() {
- confirmationCancelDialog.dismiss();
- SharedPreUtils.putBoolean("no_network_mode", false);
- }
- });
- confirmationCancelDialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
- @Override
- public void Confirm() {
- confirmationCancelDialog.dismiss();
- SharedPreUtils.putBoolean("no_network_mode", true);
- UserConfigManage.getInstance().setNoNetworkFlag(true);
- UserConfigManage.getInstance().Save();
- String path = HDLUniMP.UNI_EVENT_OPEN_NONETWORKDEVICELIST + "?mac=" + UserConfigManage.getInstance().getNoNetworkDeviceMac() + "&password=" + UserConfigManage.getInstance().getNoNetworkPassword() + "&autoVerify=false";
- HdlUniLogic.getInstance().openUniMP(path, null);
- }
- });
- } else {
- UserConfigManage.getInstance().setNoNetworkFlag(true);
- UserConfigManage.getInstance().Save();
- String path = HDLUniMP.UNI_EVENT_OPEN_NONETWORKDEVICELIST + "?mac=" + UserConfigManage.getInstance().getNoNetworkDeviceMac() + "&password=" + UserConfigManage.getInstance().getNoNetworkPassword() + "&autoVerify=false";
- HdlUniLogic.getInstance().openUniMP(path, null);
- }
+ noNetworkMode();
}
});
@@ -479,6 +452,46 @@
}
/**
+ * 杩涘叆鏃犵綉妯″紡
+ */
+ private void noNetworkMode() {
+ boolean isNoNetworkModeLogin = SharedPreUtils.getBoolean("no_network_mode");
+ if (!isNoNetworkModeLogin) {
+ //绗竴娆℃墦寮�瑕佹彁绀�
+ ConfirmationCancelDialog confirmationCancelDialog = new ConfirmationCancelDialog(_mActivity);
+ confirmationCancelDialog.setTitle(getString(R.string.loading_title_tip));
+ confirmationCancelDialog.setContent(getString(R.string.no_network_mode_tip));
+ confirmationCancelDialog.setConfirmation(getString(R.string.home_login_affirm));
+ confirmationCancelDialog.setCancel(getString(R.string.scan_cancel));
+ confirmationCancelDialog.show();
+ confirmationCancelDialog.getContentTextView().setGravity(Gravity.START);
+ confirmationCancelDialog.setNoOnclickListener(new ConfirmationCancelDialog.onNoOnclickListener() {
+ @Override
+ public void Cancel() {
+ confirmationCancelDialog.dismiss();
+ SharedPreUtils.putBoolean("no_network_mode", false);
+ }
+ });
+ confirmationCancelDialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
+ @Override
+ public void Confirm() {
+ confirmationCancelDialog.dismiss();
+ SharedPreUtils.putBoolean("no_network_mode", true);
+ UserConfigManage.getInstance().setNoNetworkFlag(true);
+ UserConfigManage.getInstance().Save();
+ String path = HDLUniMP.UNI_EVENT_OPEN_NONETWORKDEVICELIST + "?mac=" + UserConfigManage.getInstance().getNoNetworkDeviceMac() + "&password=" + UserConfigManage.getInstance().getNoNetworkPassword() + "&autoVerify=false";
+ HdlUniLogic.getInstance().openUniMP(path, null);
+ }
+ });
+ } else {
+ UserConfigManage.getInstance().setNoNetworkFlag(true);
+ UserConfigManage.getInstance().Save();
+ String path = HDLUniMP.UNI_EVENT_OPEN_NONETWORKDEVICELIST + "?mac=" + UserConfigManage.getInstance().getNoNetworkDeviceMac() + "&password=" + UserConfigManage.getInstance().getNoNetworkPassword() + "&autoVerify=false";
+ HdlUniLogic.getInstance().openUniMP(path, null);
+ }
+ }
+
+ /**
* 鏍￠獙鐧诲綍鎸夐挳鏄惁鍚敤
*/
private void isLoginTextViewEnabled() {
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/bean/MessageBean.java b/app/src/main/java/com/hdl/photovoltaic/ui/bean/MessageBean.java
index d21c488..972a8e5 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/bean/MessageBean.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/bean/MessageBean.java
@@ -19,6 +19,34 @@
private String deviceOid;//璁惧oid
private String deviceDesc;//璁惧澶囨敞
+ public String getDescription() {
+ return description == null ? "" : description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public String getRemark() {
+ return remark == null ? "" : remark;
+ }
+
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
+
+ public String getPlan() {
+ return plan == null ? "" : plan;
+ }
+
+ public void setPlan(String plan) {
+ this.plan = plan;
+ }
+
+ private String description;//浜嬩欢鍐呭
+ private String remark;//澶囨敞
+ private String plan;//澶勭悊鏂规
+
private String deviceType;//璁惧绫诲瀷(INV 锛� 閫嗗彉鍣�, BMS 锛� BMS鎺у埗鐩�, BATTERY 锛� 鐢垫睜鍗曞厓)
private String deviceTypeDesc;//璁惧绫诲瀷鎻忚堪
@@ -188,9 +216,7 @@
* @return -
*/
public String getLocationAddress() {
-
return location.getNationName() + ">" + location.getProvinceName() + ">" + location.getCityName() + ">" + address;
-
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java
index bc6ea8d..20cbb37 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java
@@ -24,6 +24,7 @@
import com.github.AAChartModel.AAChartCore.AAChartCreator.AAChartModel;
import com.github.AAChartModel.AAChartCore.AAChartCreator.AAChartView;
import com.github.AAChartModel.AAChartCore.AAChartCreator.AAMoveOverEventMessageModel;
+import com.hdl.linkpm.sdk.HDLLinkPMSdk;
import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.photovoltaic.HDLApp;
import com.hdl.photovoltaic.R;
@@ -44,17 +45,23 @@
import com.hdl.photovoltaic.other.HdlResidenceLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
import com.hdl.photovoltaic.other.HdlUniLogic;
+import com.hdl.photovoltaic.ui.StartActivity;
+import com.hdl.photovoltaic.ui.adapter.LanguageAdapter;
import com.hdl.photovoltaic.ui.bean.DataOverBean;
import com.hdl.photovoltaic.ui.bean.SocialContributionBean;
import com.hdl.photovoltaic.ui.bean.StatisticsBean;
import com.hdl.photovoltaic.ui.bean.StatusOverviewBean;
import com.hdl.photovoltaic.ui.home.aachart.BasicChartComposer;
import com.hdl.photovoltaic.uni.HDLUniMP;
+import com.hdl.photovoltaic.utils.AppManagerUtils;
import com.hdl.photovoltaic.utils.GPSManagerUtils;
import com.hdl.photovoltaic.utils.PermissionUtils;
import com.hdl.photovoltaic.utils.TimeUtils;
+import com.hdl.photovoltaic.widget.AddPowerStationDialog;
import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
import com.hdl.photovoltaic.widget.FlashingBoxDialog;
+import com.hdl.photovoltaic.widget.adapter.ListDialogAdapter;
+import com.hdl.photovoltaic.widget.adapter.PowerStationDialogAdapter;
import com.hdl.photovoltaic.widget.refreshlayout.BGARefreshLayout;
import com.hdl.photovoltaic.widget.refreshlayout.HDLRefreshViewHolder;
import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
@@ -86,6 +93,7 @@
private String timeType = TimeType.day;//鏃堕棿绫诲瀷(榛樿锛氬ぉ)
+ private String debugging_str = "";//鏃堕棿绫诲瀷(榛樿锛氬ぉ)
@Override
@@ -126,13 +134,31 @@
viewBinding.homePageStationAddIv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- requestPermissions(new OnCallBeak() {
+ AddPowerStationDialog addPowerStationDialog = new AddPowerStationDialog(_mActivity);
+ addPowerStationDialog.show();
+ addPowerStationDialog.setCanceledOnTouchOutside(true);
+ addPowerStationDialog.setItemOnclickListener(new PowerStationDialogAdapter.OnclickListener() {
@Override
- public void onClickCallBeak() {
-// UserConfigManage.getInstance().setUniBottomSafeDistanceBackgroundColor(1);
-// HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION, null);
+ public void onClick(int position, String str) {
+// debugging_str = str;
+ addPowerStationDialog.dismiss();
+ UserConfigManage.getInstance().setUniBottomSafeDistanceBackgroundColor(1);
+ if (_mActivity.getString(R.string.simple_debugging).equals(str)) {
+ HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION_SIMPLE, null);
+ } else {
+ HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION, null);
+ }
+// requestPermissions(new OnCallBeak() {
+// @Override
+// public void onClickCallBeak() {
+//// UserConfigManage.getInstance().setUniBottomSafeDistanceBackgroundColor(1);
+//// HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION, null);
+// }
+// });
}
});
+
+
}
});
@@ -683,7 +709,11 @@
switch (permissions[i]) {
case Manifest.permission.ACCESS_FINE_LOCATION: {
UserConfigManage.getInstance().setUniBottomSafeDistanceBackgroundColor(1);
- HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION, null);
+ if (_mActivity.getString(R.string.simple_debugging).equals(debugging_str)) {
+ HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION_SIMPLE, null);
+ } else {
+ HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION, null);
+ }
locationUpdates();
}
break;
@@ -706,10 +736,16 @@
if (ary.length > 0) {
this.requestPermissions(ary, PermissionUtils.STATUS_SUCCESS);
} else {
-
+ //UserConfigManage.getInstance().setCurrentAppLanguage(itemData.getLanguage());
+ //UserConfigManage.getInstance().Save();
UserConfigManage.getInstance().setUniBottomSafeDistanceBackgroundColor(1);
- HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION, null);
+ if (_mActivity.getString(R.string.simple_debugging).equals(debugging_str)) {
+ HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION_SIMPLE, null);
+ } else {
+ HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION, null);
+ }
locationUpdates();
+
}
// if (onCallBeak != null) {
// onCallBeak.onClickCallBeak();
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/message/MessageInfoActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/message/MessageInfoActivity.java
index c4c25a6..e3807de 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/message/MessageInfoActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/message/MessageInfoActivity.java
@@ -3,6 +3,7 @@
import android.graphics.drawable.Drawable;
import android.os.Bundle;
+import android.text.TextUtils;
import android.view.View;
import android.widget.TextView;
@@ -46,7 +47,7 @@
@Override
public void onBindView(Bundle savedInstanceState) {
- setStatusBarTranslucent();
+ setStatusBarTranslucent();
getWindow().setNavigationBarColor(getColor(R.color.text_FF000000));
try {
String json = getIntent().getStringExtra("messageBean");
@@ -81,13 +82,35 @@
mMessageBean = msg;
viewBinding.messageInfoHomeNameTv.setText(mMessageBean.getHomeName());
- viewBinding.messageInfoAlarmContentIn.rightContentTv.setText(mMessageBean.getTitle());
+ viewBinding.messageInfoEventTitleIn.rightContentTv.setText(mMessageBean.getTitle());
+ viewBinding.messageInfoEventContentIn.rightContentTv.setText(mMessageBean.getDescription());
+ viewBinding.messageInfoRemarkIn.rightContentTv.setText(mMessageBean.getRemark());
viewBinding.messageInfoAlarmDeviceIn.rightContentTv.setText(mMessageBean.getDeviceDesc());
- viewBinding.messageInfoAlarmRangeIn.rightContentTv.setText(mMessageBean.getEffectScopeDesc());
viewBinding.messageInfoPowerStationLocationIn.rightContentTv.setText(mMessageBean.getLocationAddress());
String date = TimeUtils.getTimeFromTimestamp(mMessageBean.getCreateTime());
viewBinding.messageInfoAlarmTimeIn.rightContentTv.setText(date);
+ viewBinding.messageInfoAlarmTreatmentOptionsIn.rightContentTv.setText(mMessageBean.getPlan());
+
stateStyle(viewBinding.messageInfoAlarmStateTv);
+
+ if (TextUtils.isEmpty(mMessageBean.getTitle())) {
+ viewBinding.messageInfoEventTitleIn.getRoot().setVisibility(View.GONE);
+ }
+ if (TextUtils.isEmpty(mMessageBean.getDescription())) {
+ viewBinding.messageInfoEventContentIn.getRoot().setVisibility(View.GONE);
+ }
+ if (TextUtils.isEmpty(mMessageBean.getRemark())) {
+ viewBinding.messageInfoRemarkIn.getRoot().setVisibility(View.GONE);
+ }
+ if (TextUtils.isEmpty(mMessageBean.getDeviceDesc())) {
+ viewBinding.messageInfoAlarmDeviceIn.getRoot().setVisibility(View.GONE);
+ }
+ if (TextUtils.isEmpty(mMessageBean.getLocationAddress())) {
+ viewBinding.messageInfoPowerStationLocationIn.getRoot().setVisibility(View.GONE);
+ }
+ if (TextUtils.isEmpty(mMessageBean.getPlan())) {
+ viewBinding.messageInfoAlarmTreatmentOptionsIn.getRoot().setVisibility(View.GONE);
+ }
if (mMessageBean.getStatus().equals(MessageStateType.processed)) {
//宸茬粡瑙ｅ喅鎺夌殑闅愯棌
@@ -209,19 +232,24 @@
viewBinding.toolbarTopRl.topTitleTv.setText(R.string.message_alarm_info);
viewBinding.toolbarTopRl.topBackLl.setVisibility(View.VISIBLE);
- viewBinding.messageInfoAlarmContentIn.leftTitleTv.setText(R.string.messagealarm_details_content);
+
+ viewBinding.messageInfoEventTitleIn.leftTitleTv.setText(R.string.event_title);
+ viewBinding.messageInfoEventContentIn.leftTitleTv.setText(R.string.event_content);
+ viewBinding.messageInfoRemarkIn.leftTitleTv.setText(R.string.remark);
viewBinding.messageInfoAlarmDeviceIn.leftTitleTv.setText(R.string.messagealarm_details_device);
- viewBinding.messageInfoAlarmRangeIn.leftTitleTv.setText(R.string.message_alarm_detailsaffect_region);
viewBinding.messageInfoPowerStationLocationIn.leftTitleTv.setText(R.string.message_alarm_detailspower_station_location);
viewBinding.messageInfoAlarmTimeIn.leftTitleTv.setText(R.string.message_alarm_details_time);
+ viewBinding.messageInfoAlarmTreatmentOptionsIn.leftTitleTv.setText(R.string.treatment_options);
viewBinding.messageInfoHomeNameTv.setText(mMessageBean.getHomeName());
- viewBinding.messageInfoAlarmContentIn.rightContentTv.setText(mMessageBean.getTitle());
+ viewBinding.messageInfoEventTitleIn.rightContentTv.setText(mMessageBean.getTitle());
+ viewBinding.messageInfoEventContentIn.rightContentTv.setText(mMessageBean.getDescription());
+ viewBinding.messageInfoRemarkIn.rightContentTv.setText(mMessageBean.getRemark());
viewBinding.messageInfoAlarmDeviceIn.rightContentTv.setText(mMessageBean.getDeviceDesc());
- viewBinding.messageInfoAlarmRangeIn.rightContentTv.setText(mMessageBean.getEffectScopeDesc());
viewBinding.messageInfoPowerStationLocationIn.rightContentTv.setText(mMessageBean.getLocationAddress());
String date = TimeUtils.getTimeFromTimestamp(mMessageBean.getCreateTime());
viewBinding.messageInfoAlarmTimeIn.rightContentTv.setText(date);
+ viewBinding.messageInfoAlarmTreatmentOptionsIn.rightContentTv.setText(mMessageBean.getPlan());
stateStyle(viewBinding.messageInfoAlarmStateTv);
@@ -229,6 +257,32 @@
//鍙戠敓涓殑娑堟伅涓旀槸鏁呴殰鎵嶈鏄剧ず
viewBinding.messageInfoWorkOut.setVisibility(View.VISIBLE);
}
+
+ if (UserConfigManage.getInstance().isBAccount()) {
+ viewBinding.messageInfoAlarmTreatmentOptionsIn.getRoot().setVisibility(View.VISIBLE);
+// viewBinding.messageInfoAlarmTreatmentOptionsIn.lineV.setVisibility(View.GONE);
+ } else {
+// viewBinding.messageInfoAlarmTimeIn.lineV.setVisibility(View.GONE);
+ }
+
+ if (TextUtils.isEmpty(mMessageBean.getTitle())) {
+ viewBinding.messageInfoEventTitleIn.getRoot().setVisibility(View.GONE);
+ }
+ if (TextUtils.isEmpty(mMessageBean.getDescription())) {
+ viewBinding.messageInfoEventContentIn.getRoot().setVisibility(View.GONE);
+ }
+ if (TextUtils.isEmpty(mMessageBean.getRemark())) {
+ viewBinding.messageInfoRemarkIn.getRoot().setVisibility(View.GONE);
+ }
+ if (TextUtils.isEmpty(mMessageBean.getDeviceDesc())) {
+ viewBinding.messageInfoAlarmDeviceIn.getRoot().setVisibility(View.GONE);
+ }
+ if (TextUtils.isEmpty(mMessageBean.getLocationAddress())) {
+ viewBinding.messageInfoPowerStationLocationIn.getRoot().setVisibility(View.GONE);
+ }
+ if (TextUtils.isEmpty(mMessageBean.getPlan())) {
+ viewBinding.messageInfoAlarmTreatmentOptionsIn.getRoot().setVisibility(View.GONE);
+ }
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java
index c3f00bd..de58c0a 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java
@@ -54,9 +54,11 @@
import com.hdl.photovoltaic.utils.GPSManagerUtils;
import com.hdl.photovoltaic.utils.PermissionUtils;
import com.hdl.photovoltaic.utils.URLEncodingUtils;
+import com.hdl.photovoltaic.widget.AddPowerStationDialog;
import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
import com.hdl.photovoltaic.widget.DefaultFilteringDialog;
import com.hdl.photovoltaic.widget.DelayedConfirmationCancelDialog;
+import com.hdl.photovoltaic.widget.adapter.PowerStationDialogAdapter;
import com.hdl.photovoltaic.widget.refreshlayout.BGARefreshLayout;
import com.hdl.photovoltaic.widget.refreshlayout.HDLRefreshViewHolder;
import com.hdl.sdk.link.common.exception.HDLLinkException;
@@ -219,12 +221,26 @@
viewBinding.addIv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
-
- requestPermissions(new OnCallBeak() {
+ AddPowerStationDialog addPowerStationDialog = new AddPowerStationDialog(_mActivity);
+ addPowerStationDialog.show();
+ addPowerStationDialog.setCanceledOnTouchOutside(true);
+ addPowerStationDialog.setItemOnclickListener(new PowerStationDialogAdapter.OnclickListener() {
@Override
- public void onClickCallBeak() {
-// UserConfigManage.getInstance().setUniBottomSafeDistanceBackgroundColor(1);
-// HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION, null);
+ public void onClick(int position, String str) {
+ addPowerStationDialog.dismiss();
+ UserConfigManage.getInstance().setUniBottomSafeDistanceBackgroundColor(1);
+ if (_mActivity.getString(R.string.simple_debugging).equals(str)) {
+ HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION_SIMPLE, null);
+ } else {
+ HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION, null);
+ }
+// requestPermissions(new OnCallBeak() {
+// @Override
+// public void onClickCallBeak() {
+//// UserConfigManage.getInstance().setUniBottomSafeDistanceBackgroundColor(1);
+//// HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION, null);
+// }
+// });
}
});
@@ -1019,12 +1035,24 @@
if (ary.length > 0) {
this.requestPermissions(ary, PermissionUtils.STATUS_SUCCESS);
} else {
-
- UserConfigManage.getInstance().setUniBottomSafeDistanceBackgroundColor(1);
- HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION, null);
- locationUpdates();
-
-
+ AddPowerStationDialog addPowerStationDialog = new AddPowerStationDialog(_mActivity);
+ addPowerStationDialog.show();
+ addPowerStationDialog.setCanceledOnTouchOutside(true);
+ addPowerStationDialog.setItemOnclickListener(new PowerStationDialogAdapter.OnclickListener() {
+ @Override
+ public void onClick(int position, String str) {
+ addPowerStationDialog.dismiss();
+// UserConfigManage.getInstance().setCurrentAppLanguage(itemData.getLanguage());
+// UserConfigManage.getInstance().Save();
+ UserConfigManage.getInstance().setUniBottomSafeDistanceBackgroundColor(1);
+ if (_mActivity.getString(R.string.simple_debugging).equals(str)) {
+ HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION_SIMPLE, null);
+ } else {
+ HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION, null);
+ }
+ locationUpdates();
+ }
+ });
}
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java b/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java
index 58ae65a..7a89d9c 100644
--- a/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java
+++ b/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java
@@ -143,6 +143,7 @@
public final static String UNI_EVENT_REPLY_NO_WORK_MODEL_EXIT = "exit_no_work_model";//閫�鍑烘棤缃戞ā寮忔爣璇�
public final static String UNI_EVENT_REPLY_NO_WORK_MODEL_DEVICE_INFO = "no_work_device_info";//杩涘叆鏃犵綉妯″紡閫嗗彉鍣ㄨ鎯呴〉锛岀紦瀛榤ac鍜屽瘑鐮�
public final static String UNI_EVENT_REPLY_NO_WORK_MODEL_CLEAR_DEVICE_INFO = "clear_no_work_device_info";//鏃犵綉妯″紡閫嗗彉鍣ㄨ鎯呴〉锛屾竻闄ょ紦瀛榤ac鍜屽瘑鐮�
+ public final static String UNI_EVENT_REPLY_NO_WORK_MODEL_FROM_OFFLINE = "no_work_from_offline";//璁惧绂荤綉鏃舵湁鍏ュ彛杩涘叆鏃犵綉妯″紡
/*********缃戠粶璇锋眰妯″潡*********/
public final static String UNI_EVENT_REPLY_UNI_SEND_TO_CLOUD = "uni_send_to_cloud";//uni缃戠粶璇锋眰
@@ -170,7 +171,8 @@
//region --------銆愬師鐢熴�戞墦寮�銆愬皬绋嬪簭銆�--------
/*********浣忓畢妯″潡*********/
//椤甸潰璺緞甯﹀弬鏁拌鍒�->(UNI_EVENT_OPEN_HOME_CREATION+?key=value&key=鍙傛暟涓�)
- public final static String UNI_EVENT_OPEN_HOME_CREATION = "pages/powerStation/powerStationQuickConfig";//"pages/powerStation/powerStationCreate";//浣忓畢銆愮數绔欍�戝垱寤�
+ public final static String UNI_EVENT_OPEN_HOME_CREATION = "pages/powerStation/powerStationQuickConfig";//甯歌璋冭瘯浣忓畢銆愮數绔欍�戝垱寤�
+ public final static String UNI_EVENT_OPEN_HOME_CREATION_SIMPLE = "pages/powerStation/powerStationSimpleDebugging";//绠�鏄撹皟璇曚綇瀹呫�愮數绔欍�戝垱寤�
public final static String UNI_EVENT_OPEN_HOME_EDIT = "pages/powerStation/powerStationEdit";//浣忓畢銆愮數绔欍�戠紪杈�
public final static String UNI_EVENT_OPEN_HOME_DETAILS = "pages/powerStationDetail/index";//浣忓畢銆愮數绔欍�戣鎯�
diff --git a/app/src/main/java/com/hdl/photovoltaic/widget/AddPowerStationDialog.java b/app/src/main/java/com/hdl/photovoltaic/widget/AddPowerStationDialog.java
new file mode 100644
index 0000000..6676c74
--- /dev/null
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/AddPowerStationDialog.java
@@ -0,0 +1,77 @@
+package com.hdl.photovoltaic.widget;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.view.Gravity;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.view.WindowManager;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.LinearLayoutManager;
+
+import com.hdl.photovoltaic.R;
+import com.hdl.photovoltaic.base.BaseDialog;
+import com.hdl.photovoltaic.databinding.DialogListBinding;
+import com.hdl.photovoltaic.utils.UnitConversionUtils;
+import com.hdl.photovoltaic.widget.adapter.PowerStationDialogAdapter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+public class AddPowerStationDialog extends BaseDialog {
+ private final Context mContext;
+ private DialogListBinding viewBinding;
+
+ private List<String> list = new ArrayList<>();
+
+ private PowerStationDialogAdapter powerStationDialogAdapter;
+
+ private PowerStationDialogAdapter.OnclickListener itemOnclickListener;//鐐瑰嚮浜嗙殑鐩戝惉鍣�
+
+ public AddPowerStationDialog(@NonNull Context context) {
+ super(context, R.style.Custom_Dialog);
+ this.mContext = context;
+ this.list.add(this.mContext.getString(R.string.simple_debugging));
+ this.list.add(this.mContext.getString(R.string.general_debugging));
+ }
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ Window window = getWindow();
+ if (window != null) {
+ window.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+ WindowManager.LayoutParams layoutParams = window.getAttributes();
+ layoutParams.gravity = Gravity.START | Gravity.TOP;
+ layoutParams.width = (int) UnitConversionUtils.dpToPx(mContext, 140);
+ layoutParams.x = (int) UnitConversionUtils.dpToPx(mContext, 219);
+ layoutParams.y = (int) UnitConversionUtils.dpToPx(mContext, 89);
+ window.setAttributes(layoutParams);
+ }
+
+ viewBinding = DialogListBinding.inflate(getLayoutInflater());
+ setContentView(viewBinding.getRoot());
+ LinearLayoutManager linearLayout = new LinearLayoutManager(mContext);
+ powerStationDialogAdapter = new PowerStationDialogAdapter(this.list, mContext);
+ viewBinding.logicRcv.setLayoutManager(linearLayout);
+ viewBinding.logicRcv.setAdapter(powerStationDialogAdapter);
+ powerStationDialogAdapter.setItemOnclickListener(new PowerStationDialogAdapter.OnclickListener() {
+ @Override
+ public void onClick(int position, String title) {
+ if (itemOnclickListener != null) {
+ itemOnclickListener.onClick(position, title);
+ }
+ }
+ });
+
+ }
+
+ public void setItemOnclickListener(PowerStationDialogAdapter.OnclickListener onclickListener) {
+ if (onclickListener != null) {
+ this.itemOnclickListener = onclickListener;
+ }
+ }
+}
diff --git a/app/src/main/java/com/hdl/photovoltaic/widget/adapter/PowerStationDialogAdapter.java b/app/src/main/java/com/hdl/photovoltaic/widget/adapter/PowerStationDialogAdapter.java
new file mode 100644
index 0000000..3dba870
--- /dev/null
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/adapter/PowerStationDialogAdapter.java
@@ -0,0 +1,94 @@
+package com.hdl.photovoltaic.widget.adapter;
+
+import android.content.Context;
+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 com.hdl.photovoltaic.ui.adapter.LanguageAdapter;
+
+import java.util.List;
+
+public class PowerStationDialogAdapter extends RecyclerView.Adapter<ListDialogAdapter.MyViewHolder> {
+
+
+ private List<String> mList;
+ private final Context mContext;
+ private PowerStationDialogAdapter.OnclickListener itemOnclickListener;//鐐瑰嚮浜嗙殑鐩戝惉鍣�
+
+ public PowerStationDialogAdapter(List<String> list, Context context) {
+
+ this.mList = list;
+ this.mContext = context;
+ }
+
+ @NonNull
+ @Override
+ public ListDialogAdapter.MyViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+
+ View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.diaog_list_line, parent, false);
+ return new ListDialogAdapter.MyViewHolder(view);
+ }
+
+ @Override
+ public void onBindViewHolder(@NonNull ListDialogAdapter.MyViewHolder holder, int position) {
+ String itemDataStr = this.mList.get(position);
+ holder.list_item_title_tv.setText(itemDataStr);
+ holder.list_item_title_tv.setTextColor(mContext.getColor(R.color.text_FF5B5B5B));
+ if (position == this.mList.size() - 1) {
+ holder.list_item_line_v.setVisibility(View.GONE);
+ }
+ holder.itemView.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ if (itemOnclickListener != null) {
+ itemOnclickListener.onClick(holder.getAdapterPosition(), itemDataStr);
+ }
+ }
+ });
+
+ }
+
+ @Override
+ public int getItemCount() {
+ return this.mList == null ? 0 : this.mList.size();
+ }
+
+
+ public void setList(List<String> list) {
+ this.mList = list;
+ }
+
+ public void setItemOnclickListener(PowerStationDialogAdapter.OnclickListener onclickListener) {
+ this.itemOnclickListener = onclickListener;
+ }
+
+ /**
+ * 涓�琛屽竷灞�瀹瑰櫒
+ */
+ static class MyViewHolder extends RecyclerView.ViewHolder {
+
+
+ public TextView list_item_title_tv;
+
+ public View list_item_line_v;
+
+ public MyViewHolder(@NonNull View itemView) {
+ super(itemView);
+ list_item_title_tv = itemView.findViewById(R.id.list_item_title_tv);
+ list_item_line_v = itemView.findViewById(R.id.list_item_line_v);
+ }
+ }
+
+ public interface OnclickListener {
+ void onClick(int position, String str);
+ }
+
+
+}
+
diff --git a/app/src/main/res/drawable-xhdpi/roll_back.png b/app/src/main/res/drawable-xhdpi/roll_back.png
new file mode 100644
index 0000000..060483b
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/roll_back.png
Binary files differ
diff --git a/app/src/main/res/layout/activity_message_info.xml b/app/src/main/res/layout/activity_message_info.xml
index 7d2f933..a5321bf 100644
--- a/app/src/main/res/layout/activity_message_info.xml
+++ b/app/src/main/res/layout/activity_message_info.xml
@@ -66,70 +66,36 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ll">
-
+ <!--浜嬩欢鏍囬-->
<include
- android:id="@+id/message_info_alarm_content_in"
+ android:id="@+id/message_info_event_title_in"
layout="@layout/line_message_info" />
- <!--闅旈棿+闂撮殧绾柯�-->
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_32"
- android:gravity="center">
-
- <View
- android:layout_width="match_parent"
- android:layout_height="0.5dp"
- android:background="@color/text_1AFFFFFF" />
- </LinearLayout>
-
+ <!--浜嬩欢鍐呭-->
+ <include
+ android:id="@+id/message_info_event_content_in"
+ layout="@layout/line_message_info" />
+ <!--澶囨敞-->
+ <include
+ android:id="@+id/message_info_remark_in"
+ layout="@layout/line_message_info" />
+ <!--鎶ヨ璁惧-->
<include
android:id="@+id/message_info_alarm_device_in"
layout="@layout/line_message_info" />
-
- <!--闅旈棿+闂撮殧绾柯�-->
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_32"
- android:gravity="center">
-
- <View
- android:layout_width="match_parent"
- android:layout_height="0.5dp"
- android:background="@color/text_1AFFFFFF" />
- </LinearLayout>
- <!--浜у搧璇寸‖浠舵病鍋� 闅愯棌鎺� 2024骞�05鏈�28鏃�13:46:53-->
- <include
- android:id="@+id/message_info_alarm_range_in"
- layout="@layout/line_message_info"
- android:visibility="gone" />
-
- <View
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_33"
- android:visibility="gone" />
-
+ <!--鐢电珯浣嶇疆-->
<include
android:id="@+id/message_info_power_station_location_in"
layout="@layout/line_message_info" />
- <!--闅旈棿+闂撮殧绾柯�-->
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_32"
- android:gravity="center">
- <View
- android:layout_width="match_parent"
- android:layout_height="0.5dp"
- android:background="@color/text_1AFFFFFF" />
- </LinearLayout>
-
+ <!--鎶ヨ鏃堕棿-->
<include
android:id="@+id/message_info_alarm_time_in"
layout="@layout/line_message_info" />
-
- <View
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_16" />
+ <!--澶勭悊鏂规-->
+ <include
+ android:id="@+id/message_info_alarm_treatment_options_in"
+ layout="@layout/line_message_info"
+ android:visibility="gone" />
</LinearLayout>
diff --git a/app/src/main/res/layout/line_message_info.xml b/app/src/main/res/layout/line_message_info.xml
index a7854ef..6daa003 100644
--- a/app/src/main/res/layout/line_message_info.xml
+++ b/app/src/main/res/layout/line_message_info.xml
@@ -1,29 +1,46 @@
<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginStart="@dimen/dp_16"
- android:layout_marginEnd="@dimen/dp_16">
+ android:orientation="vertical">
- <TextView
- android:id="@+id/left_title_tv"
- android:layout_width="wrap_content"
- android:layout_height="20dp"
- android:layout_alignParentStart="true"
- android:layout_centerInParent="true"
- android:gravity="center"
- android:textColor="@color/text_FFACACAC"
- android:textSize="@dimen/text_12" />
-
- <TextView
- android:id="@+id/right_content_tv"
- android:layout_width="240dp"
+ <LinearLayout
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_alignParentEnd="true"
- android:layout_centerVertical="true"
- android:gravity="end"
- android:textColor="@color/text_FFACACAC"
- android:textSize="@dimen/text_12" />
+ android:gravity="center_vertical"
+ android:minHeight="50dp"
+ android:orientation="horizontal">
+ <TextView
+ android:id="@+id/left_title_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:paddingStart="@dimen/dp_16"
+ android:paddingEnd="@dimen/dp_0"
+ android:paddingTop="@dimen/dp_6"
+ android:paddingBottom="@dimen/dp_6"
+ android:textColor="@color/text_FFACACAC"
+ android:textSize="@dimen/text_12" />
-</RelativeLayout>
\ No newline at end of file
+ <TextView
+ android:id="@+id/right_content_tv"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:gravity="end"
+ android:paddingStart="@dimen/dp_30"
+ android:paddingEnd="@dimen/dp_16"
+ android:paddingTop="@dimen/dp_6"
+ android:paddingBottom="@dimen/dp_6"
+ android:textColor="@color/text_FFACACAC"
+ android:textSize="@dimen/text_12" />
+ </LinearLayout>
+
+ <View
+ android:id="@+id/line_v"
+ android:layout_width="match_parent"
+ android:layout_height="0.5dp"
+ android:background="@color/text_1AFFFFFF" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index e9f8d0a..d601908 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -367,4 +367,10 @@
<string name="confirm_deletion">Delete confirmation required</string>
<string name="no_network_mode_tip">Before using Offline Mode, ensure your phone and device are in the same local network. If unavailable, try belows:\n\n1. Connecting your phone to the device\'s hotspot.\n\n2. Connecting both to the same router (phone via Wi-Fi, device via LAN port with erthernet cable).</string>
<string name="no_permission_delete_home">No permission to delete, please contact the administrator for operation</string>
+ <string name="simple_debugging">Simple debugging</string>
+ <string name="general_debugging">General debugging</string>
+ <string name="event_title">Event title</string>
+ <string name="event_content">Event content</string>
+ <string name="remark">remark</string>
+ <string name="treatment_options">Treatment options</string>
</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 59e3a93..7824de2 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -363,4 +363,10 @@
<string name="confirm_deletion">纭畾闇�瑕佸垹闄�</string>
<string name="no_network_mode_tip">浣跨敤鏃犵綉妯″紡鍓嶏紝璇风‘淇濇墜鏈轰笌璁惧澶勪簬鍚屼竴灞�鍩熺綉鍐咃紝鍚﹀垯灏嗘棤娉曟甯镐娇鐢紝浣犲彲浠ュ皾璇曚互涓嬩袱绉嶆柟寮忥細\n\n1.鎵嬫満杩炴帴璁惧鐑偣銆俓n\n2.鎵嬫満杩炴帴璺敱鍣╓i-Fi锛岃澶囬�氳繃缃戠嚎鎺ュ叆璺敱鍣↙AN鍙ｃ��</string>
<string name="no_permission_delete_home">鏃犳潈闄愬垹闄わ紝璇疯仈绯荤鐞嗗憳杩涜鎿嶄綔</string>
+ <string name="simple_debugging">绠�鏄撹皟璇�</string>
+ <string name="general_debugging">甯歌璋冭瘯</string>
+ <string name="event_title">浜嬩欢鏍囬</string>
+ <string name="event_content">浜嬩欢鍐呭</string>
+ <string name="remark">澶囨敞</string>
+ <string name="treatment_options">澶勭悊鏂规</string>
</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index afe40ca..73aa1ac 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -369,8 +369,12 @@
<string name="confirm_deletion">Delete confirmation required</string>
<string name="no_network_mode_tip">Before using Offline Mode, ensure your phone and device are in the same local network. If unavailable, try belows:\n\n1. Connecting your phone to the device\'s hotspot.\n\n2. Connecting both to the same router (phone via Wi-Fi, device via LAN port with erthernet cable).</string>
<string name="no_permission_delete_home">No permission to delete, please contact the administrator for operation</string>
-
-
+ <string name="simple_debugging">Simple debugging</string>
+ <string name="general_debugging">General debugging</string>
+ <string name="event_title">Event title</string>
+ <string name="event_content">Event content</string>
+ <string name="remark">remark</string>
+ <string name="treatment_options">Treatment options</string>
</resources>
\ No newline at end of file
--
Gitblit v1.8.0