From 50101e1b1c152c5346a6f4e63a7c6db98809e4d9 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 22 五月 2024 15:02:42 +0800
Subject: [PATCH] 2024年05月22日15:02:36
---
app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationCancelDialog1.java | 13 ++++
app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java | 5 +
app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java | 2
app/src/main/res/values/strings.xml | 1
app/src/main/res/layout/fragment_message.xml | 2
app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationCancelDialog.java | 13 ++++
app/src/main/res/layout/activity_start.xml | 12 ++++
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/DeviceSearchActivity.java | 25 +++++++-
app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java | 4
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 6 +
app/src/main/res/layout/dialog_agree_onagree.xml | 6 +-
app/src/main/res/layout/dialog_confirm_cancel.xml | 8 +-
app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java | 1
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java | 19 ++++++
app/src/main/res/layout/activity_home_login.xml | 1
app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java | 2
app/src/main/java/com/hdl/photovoltaic/utils/URLEncodingUtils.java | 20 ++++++
app/src/main/res/layout/item_device_details.xml | 2
app/build.gradle | 2
app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java | 2
20 files changed, 123 insertions(+), 23 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index cd070c5..fddfe1e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -131,7 +131,7 @@
implementation project(path: ':third-zxing')
//Link鏈湴搴擄紙鍦ㄧ嚎渚濊禆缃戠粶搴擄級
implementation 'com.hdl.android:pmsdk:1.0.2'
- implementation 'com.hdl.android:debugsdk:1.0.22'
+ implementation 'com.hdl.android:debugsdk:1.0.23'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
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 ceb0a5f..5d4748c 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
@@ -1391,7 +1391,7 @@
gatewayBean.setSystemStatusDesc(cloudInverterDeviceBean.getSystemStatusDesc());//璁惧鐘舵��
gatewayBean.setHwVersion(cloudInverterDeviceBean.getHwVersion());//杞欢鐗堟湰鍙�
gatewayBean.setCategorySecondName(cloudInverterDeviceBean.getCategorySecondName());//璁惧绫诲瀷(浜у搧浜岀骇鍒嗙被鍚嶇О
- gatewayBean.setGateway_type(cloudInverterDeviceBean.getDeviceType());//璁惧绫诲瀷(INV:閫嗗彉鍣�;BMS:BMS鎺у埗鐩�;BATTERY:鐢垫睜鍗曞厓)
+ gatewayBean.setDeviceType(cloudInverterDeviceBean.getDeviceType());//璁惧绫诲瀷(INV:閫嗗彉鍣�;BMS:BMS鎺у埗鐩�;BATTERY:鐢垫睜鍗曞厓)
gatewayBean.setAddresses(cloudInverterDeviceBean.getAddresses());//瀛愮綉鍙�/璁惧鍙�,閫嗗彉鍣ㄥ湴鍧�
gatewayBean.setPowerPvNow(cloudInverterDeviceBean.getPowerPvNow());//鍙戠數鍔熺巼
gatewayBean.setTotalElectricityPvToday(cloudInverterDeviceBean.getTotalElectricityPvToday());//浠婃棩鍙戠數閲�
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 f764262..6b3d883 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -93,7 +93,7 @@
public class HdlUniLogic implements HDLUniMPSDKManager.IOnOtherUniMPEventCallBack {
private static volatile HdlUniLogic sHdlUniLogic;
- public final static String separator="---";
+ public final static String separator = "---";
/**
* 鑾峰彇褰撳墠瀵硅薄
@@ -563,6 +563,7 @@
*/
private void uniGetAndSetNetwork(String type, Object data, String TopicApi, DCUniMPJSCallback callback) {
String mac = getKeyValue("mac", getKeyValue("data", data));
+ JsonArray jsonArray = new JsonArray();
JsonObject jObject = null;
String attribute_data = getKeyValue("attribute_data", getKeyValue("data", data));
if (!TextUtils.isEmpty(attribute_data)) {
@@ -572,8 +573,9 @@
jObject = new JsonObject();
}
}
+ jsonArray.add(jObject);
//瑙ｅ瘑璐熻浇鏁版嵁(鍐欏瘑閽ョ粰缃戝叧涓�瀹氭槸鏄庢枃锛屽洜涓洪偅鏃剁綉鍏宠繕娌℃湁瀵嗛挜)
- TcpClient.getInstance().sendDataToLinkGateway(mac, false, TopicApi, jObject, "", new HDLLinkCallBack() {
+ TcpClient.getInstance().sendDataToLinkGateway(mac, false, TopicApi, jsonArray, "", new HDLLinkCallBack() {
@Override
public void onSuccess(String msg) {
if (callback != null) {
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 f1d023e..3a927fa 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
@@ -486,9 +486,10 @@
*/
private void getDialog() {
ConfirmationCancelDialog1 dialog = new ConfirmationCancelDialog1(_mActivity);
- dialog.setTitle(getString(R.string.loading_privacy));
- dialog.setContent(getString(R.string.loading_privacy_server));
dialog.show();
+// dialog.setTitle(getString(R.string.loading_privacy));
+ dialog.isHideTitle(true);
+ dialog.setContent(getString(R.string.loading_privacy_server));
setStringDifferentColors(dialog.getContentTextView());
dialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
@Override
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 ed03410..ac13b6a 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
@@ -286,6 +286,7 @@
String timeDateFormat = TimeUtils.getTimeDateFormat(timeType);
Calendar calendar = TimeUtils.stringToCalendar(currDate, timeDateFormat);
String time = TimeUtils.subtractDayMonthYearFromDate(calendar, 1, timeDateFormat, timeType);
+ //涓嶉渶瑕侀檺鍒舵渶灏忔棩鏈燂紝鍥犱负鏄煡璇㈣处鍙蜂笅鎵�鏈夌數绔欙紝鏃犳硶鐭ラ亾鏈�灏忓缓绔欐棩鏈�
viewBinding.yearMonthDayTv.setText(time);
getStatistics();
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java
index 39447e3..3dba84b 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java
@@ -120,9 +120,9 @@
private void logoutRequest() {
// 浜屾纭鎻愮ず妗�
ConfirmationCancelDialog dialog = new ConfirmationCancelDialog(this);
- dialog.setTitle(getString(R.string.loading_title_tip));
- dialog.setContent(getString(R.string.loading_log_out));
dialog.show();
+ dialog.setContent(getString(R.string.loading_log_out));
+ dialog.isHideTitle(true);
dialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
@Override
public void Confirm() {
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java b/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java
index 329a7f4..91c8d1f 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java
@@ -261,7 +261,7 @@
JsonObject jsonObject = new JsonObject();
jsonObject.addProperty("homeId", houseIdBean.getHomeId());
jsonObject.addProperty("homeName", houseIdBean.getHomeName());
- jsonObject.addProperty("powerStationStatus", houseIdBean.getPowerStationStatus()+"");
+ jsonObject.addProperty("powerStationStatus", houseIdBean.getPowerStationStatus() + "");
HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
uniCallBackBaseBean.setType(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_REFRESH_DETAILS);
uniCallBackBaseBean.setData(jsonObject);
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/DeviceSearchActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/DeviceSearchActivity.java
index 105dbf9..59b4c90 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/DeviceSearchActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/DeviceSearchActivity.java
@@ -24,10 +24,14 @@
import com.hdl.photovoltaic.other.HdlFileLogic;
import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
+import com.hdl.photovoltaic.other.HdlUniLogic;
import com.hdl.photovoltaic.ui.adapter.DeviceInfoAdapter;
import com.hdl.photovoltaic.ui.adapter.SearchDeviceAdapter;
import com.hdl.photovoltaic.ui.adapter.SearchHistoryAdapter;
import com.hdl.photovoltaic.ui.bean.DeviceBean;
+import com.hdl.photovoltaic.uni.HDLUniMP;
+import com.hdl.photovoltaic.utils.URLEncodingUtils;
+import com.hdl.sdk.link.core.bean.gateway.GatewayBean;
import java.util.ArrayList;
import java.util.Collections;
@@ -174,11 +178,26 @@
viewBinding.powerStationSearchEt.setText(title);
}
});
- //鐢电珯鐐瑰嚮鏄簨浠�
+ //璁惧鐐瑰嚮鏄簨浠�
searchDeviceAdapter.setOnclickListener(new DeviceInfoAdapter.OnClickListener() {
@Override
public void onClick(int position, DeviceBean deviceBean) {
-
+ GatewayBean gatewayBean = new GatewayBean();
+ gatewayBean.setCategorySecondName(deviceBean.getCategorySecondName());
+ gatewayBean.setDevice_mac(deviceBean.getOsn());
+ gatewayBean.setDevice_model(deviceBean.getOmodel());
+ gatewayBean.setOid(deviceBean.getOid());
+ gatewayBean.setGatewayId(deviceBean.getGatewayId());
+ gatewayBean.setAddresses(deviceBean.getAddresses());
+ gatewayBean.setSid(deviceBean.getSid());
+ gatewayBean.setDeviceId(deviceBean.getDeviceId());
+ gatewayBean.setDevice_name(deviceBean.getName());
+ gatewayBean.setDeviceStatus(deviceBean.getDeviceStatus());
+ gatewayBean.setHomeId(deviceBean.getHomeId());
+ gatewayBean.setDeviceType(deviceBean.getDeviceType());
+ String jsonEncryption = URLEncodingUtils.encodeURIComponent(new Gson().toJson(gatewayBean));
+ String path = HDLUniMP.UNI_EVENT_OPEN_DEVICE_DETAILS + "?inverterInfo=" + jsonEncryption;
+ HdlUniLogic.getInstance().openUniMP(path, null);
}
});
@@ -346,7 +365,7 @@
}
boolean if_boolean = false;
for (int i = 0; i < deviceList.size(); i++) {
- if (deviceList.get(i).getHomeId().equals(deviceBean.getHomeId())) {
+ if (deviceList.get(i).getOsn().equals(deviceBean.getOsn())) {
//瀛樺湪鏇挎崲
deviceList.remove(i);
deviceList.add(i, deviceBean);
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 d42a62e..507e362 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
@@ -1,5 +1,6 @@
package com.hdl.photovoltaic.ui.powerstation;
+import android.app.job.JobInfo;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.os.Bundle;
@@ -41,6 +42,7 @@
import com.hdl.photovoltaic.ui.bean.StatusOverviewBean;
import com.hdl.photovoltaic.uni.HDLUniMP;
import com.hdl.photovoltaic.utils.PermissionUtils;
+import com.hdl.photovoltaic.utils.URLEncodingUtils;
import com.hdl.photovoltaic.widget.DefaultFilteringDialog;
import com.hdl.photovoltaic.widget.DelayedConfirmationCancelDialog;
import com.hdl.sdk.link.common.exception.HDLLinkException;
@@ -408,7 +410,22 @@
deviceInfoAdapter.setOnclickListener(new DeviceInfoAdapter.OnClickListener() {
@Override
public void onClick(int position, DeviceBean deviceBean) {
-
+ GatewayBean gatewayBean = new GatewayBean();
+ gatewayBean.setCategorySecondName(deviceBean.getCategorySecondName());
+ gatewayBean.setDevice_mac(deviceBean.getOsn());
+ gatewayBean.setDevice_model(deviceBean.getOmodel());
+ gatewayBean.setOid(deviceBean.getOid());
+ gatewayBean.setGatewayId(deviceBean.getGatewayId());
+ gatewayBean.setAddresses(deviceBean.getAddresses());
+ gatewayBean.setSid(deviceBean.getSid());
+ gatewayBean.setDeviceId(deviceBean.getDeviceId());
+ gatewayBean.setDevice_name(deviceBean.getName());
+ gatewayBean.setDeviceStatus(deviceBean.getDeviceStatus());
+ gatewayBean.setHomeId(deviceBean.getHomeId());
+ gatewayBean.setDeviceType(deviceBean.getDeviceType());
+ String jsonEncryption = URLEncodingUtils.encodeURIComponent(new Gson().toJson(gatewayBean));
+ String path = HDLUniMP.UNI_EVENT_OPEN_DEVICE_DETAILS + "?inverterInfo=" + jsonEncryption;
+ HdlUniLogic.getInstance().openUniMP(path, null);
}
});
//璁惧璁剧疆涓嬫媺绠ご棰滆壊
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 dfe7121..3c122ce 100644
--- a/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java
+++ b/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java
@@ -130,8 +130,10 @@
public final static String UNI_EVENT_OPEN_HOME_EDIT = "pages/powerStation/powerStationEdit";//浣忓畢銆愮數绔欍�戠紪杈�
public final static String UNI_EVENT_OPEN_HOME_DETAILS = "pages/powerStationDetail/index";//浣忓畢銆愮數绔欍�戣鎯�
+
public final static String UNI_EVENT_OPEN_HOME_DETAILS_C = "pages/powerStationDetail/tabbarPage";//C绔墦寮�銆愮數绔欍�戣鎯�
public final static String UNI_EVENT_OPEN_HOME_Null_C = "pages/powerStationDetail/tabbarPage";//鏃犵數绔欐椂锛堜笉闇�瑕佷紶鍙傛暟锛�
+ public final static String UNI_EVENT_OPEN_DEVICE_DETAILS = "pages/powerStationDetail/childPage/device/detail";//璁惧璇︽儏
public final static String UNI_EVENT_OPEN_HOME_DEl = "del";//浣忓畢銆愮數绔欍�戝垹闄�
/*********璁惧妯″潡*********/
//璁惧妯″潡鎵撳紑椤甸潰鍏ㄨ矾寰�
diff --git a/app/src/main/java/com/hdl/photovoltaic/utils/URLEncodingUtils.java b/app/src/main/java/com/hdl/photovoltaic/utils/URLEncodingUtils.java
new file mode 100644
index 0000000..b8fc262
--- /dev/null
+++ b/app/src/main/java/com/hdl/photovoltaic/utils/URLEncodingUtils.java
@@ -0,0 +1,20 @@
+package com.hdl.photovoltaic.utils;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+
+/**
+ * 缂栫爜鍔犵爜
+ */
+public class URLEncodingUtils {
+ public static String encodeURIComponent(String value) {
+ try {
+ return URLEncoder.encode(value, "UTF-8")
+ .replace("+", "%20")
+ .replace("*", "%2A")
+ .replace("%7E", "~");
+ } catch (Exception e) {
+ return "";
+ }
+ }
+}
diff --git a/app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationCancelDialog.java b/app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationCancelDialog.java
index 71f093d..7a3bb9f 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationCancelDialog.java
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationCancelDialog.java
@@ -62,6 +62,19 @@
}
/**
+ * 闅愯棌鑷畾涔�"鏍囬"缁勪欢
+ *
+ * @param isHideTitle true 闅愯棌
+ */
+ public void isHideTitle(boolean isHideTitle) {
+ if (isHideTitle) {
+ if (viewBinding != null) {
+ viewBinding.loadingConfirmationTitleTv.setVisibility(View.GONE);
+ }
+ }
+ }
+
+ /**
* 鑷畾涔�"纭"鏂囨湰
*
* @param confirm 鍐呭
diff --git a/app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationCancelDialog1.java b/app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationCancelDialog1.java
index 1e14e34..b91acc5 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationCancelDialog1.java
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationCancelDialog1.java
@@ -61,6 +61,19 @@
}
/**
+ * 闅愯棌鑷畾涔�"鏍囬"缁勪欢
+ *
+ * @param isHideTitle true 闅愯棌
+ */
+ public void isHideTitle(boolean isHideTitle) {
+ if (isHideTitle) {
+ if (viewBinding != null) {
+ viewBinding.loadingConfirmationTitleTv.setVisibility(View.GONE);
+ }
+ }
+ }
+
+ /**
* 鑷畾涔�"纭"鏂囨湰
*
* @param confirm 鍐呭
diff --git a/app/src/main/res/layout/activity_home_login.xml b/app/src/main/res/layout/activity_home_login.xml
index 840dbe9..0d5d93b 100644
--- a/app/src/main/res/layout/activity_home_login.xml
+++ b/app/src/main/res/layout/activity_home_login.xml
@@ -122,7 +122,6 @@
android:layout_height="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_32"
android:src="@drawable/clear"
- android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@+id/home_login_account_et"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/home_login_account_et" />
diff --git a/app/src/main/res/layout/activity_start.xml b/app/src/main/res/layout/activity_start.xml
index 9a23842..58b31b6 100644
--- a/app/src/main/res/layout/activity_start.xml
+++ b/app/src/main/res/layout/activity_start.xml
@@ -8,6 +8,7 @@
tools:context="com.hdl.photovoltaic.ui.StartActivity">
<TextView
+ android:id="@+id/start_tv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_5"
@@ -23,4 +24,15 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.093" />
+ <ImageView
+ android:id="@+id/as_regards_icon_iv"
+ android:layout_width="53.5dp"
+ android:layout_height="53.5dp"
+ android:layout_marginTop="@dimen/dp_29"
+ android:src="@drawable/logo"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/start_tv" />
+
+
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_agree_onagree.xml b/app/src/main/res/layout/dialog_agree_onagree.xml
index 627b4de..9d853d9 100644
--- a/app/src/main/res/layout/dialog_agree_onagree.xml
+++ b/app/src/main/res/layout/dialog_agree_onagree.xml
@@ -21,11 +21,11 @@
<TextView
android:id="@+id/loading_confirmation_title_tv"
android:layout_width="0dp"
- android:gravity="center"
android:layout_height="@dimen/dp_25"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_24"
android:layout_marginEnd="@dimen/dp_20"
+ android:gravity="center"
android:textColor="@color/text_030D1C"
android:textSize="@dimen/text_18"
app:layout_constraintEnd_toEndOf="parent"
@@ -37,12 +37,12 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_16"
- android:layout_marginTop="@dimen/dp_16"
+ android:layout_marginTop="@dimen/dp_43"
android:layout_marginEnd="@dimen/dp_20"
android:layout_marginBottom="@dimen/dp_34"
android:singleLine="false"
- android:textColor="@color/text_030D1C"
android:tag="click"
+ android:textColor="@color/text_030D1C"
app:layout_constraintBottom_toTopOf="@+id/dialog_confirm_bottom_line_ly"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/dialog_confirm_cancel.xml b/app/src/main/res/layout/dialog_confirm_cancel.xml
index f1fef1a..0ad29dd 100644
--- a/app/src/main/res/layout/dialog_confirm_cancel.xml
+++ b/app/src/main/res/layout/dialog_confirm_cancel.xml
@@ -2,8 +2,7 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- >
+ android:layout_height="match_parent">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/loading_confirmation_cl"
@@ -37,12 +36,13 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_20"
- android:layout_marginTop="@dimen/dp_34"
+ android:layout_marginTop="@dimen/dp_43"
android:layout_marginEnd="@dimen/dp_20"
android:layout_marginBottom="@dimen/dp_34"
android:gravity="center"
android:singleLine="false"
- android:textColor="@color/text_030D1C"
+ android:textColor="@color/text_222222"
+ android:textSize="@dimen/text_18"
app:layout_constraintBottom_toTopOf="@+id/dialog_confirm_bottom_line_ly"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index 98d847f..08226f9 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -8,7 +8,7 @@
<RelativeLayout
android:id="@+id/message_rl"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_31"
+ android:layout_height="@dimen/dp_36"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_44"
android:layout_marginEnd="@dimen/dp_16"
diff --git a/app/src/main/res/layout/item_device_details.xml b/app/src/main/res/layout/item_device_details.xml
index 7ee0a76..2ab825c 100644
--- a/app/src/main/res/layout/item_device_details.xml
+++ b/app/src/main/res/layout/item_device_details.xml
@@ -116,7 +116,7 @@
android:layout_height="@dimen/dp_17"
android:layout_marginTop="3dp"
android:gravity="center"
- android:text="@string/generated_power"
+ android:text="@string/active_power"
android:textColor="@color/text_66000000"
android:textSize="@dimen/text_12" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index db6b61a..a9443b1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -303,5 +303,6 @@
<string name="enter_alarm_name">杈撳叆鎶ヨ鍚嶇О</string>
<string name="device">璁惧</string>
<string name="Offline_fault">绂荤嚎鏈夋晠闅�</string>
+ <string name="active_power">鏈夊姛鍔熺巼</string>
</resources>
\ No newline at end of file
--
Gitblit v1.8.0