From c78db812030cdcf545c400b43825d7b2c5b076e1 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 28 十一月 2024 12:27:05 +0800
Subject: [PATCH] 2024年11月28日12:27:03
---
app/src/main/java/com/hdl/photovoltaic/internet/api/HttpApi.java | 2
app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java | 1
app/src/main/java/com/hdl/photovoltaic/ui/adapter/SearchDeviceAdapter.java | 8 +-
app/src/main/res/layout/item_search_device.xml | 61 ++++++++++----------
app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java | 33 +++++++++++
app/src/main/res/drawable/default_image.png | 0
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 25 ++++++++
app/src/main/res/layout/fragment_me_line.xml | 2
8 files changed, 96 insertions(+), 36 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/internet/api/HttpApi.java b/app/src/main/java/com/hdl/photovoltaic/internet/api/HttpApi.java
index 369f28a..5540907 100644
--- a/app/src/main/java/com/hdl/photovoltaic/internet/api/HttpApi.java
+++ b/app/src/main/java/com/hdl/photovoltaic/internet/api/HttpApi.java
@@ -154,6 +154,8 @@
public static final String POST_statusOverview = "/home-wisdom/app/powerStation/statusOverview";
//鑾峰彇鐢电珯浜や粯浜岀淮鐮�(瀹夎鍟�)
public static final String POST_getDeliveryUrlQrcode = "/home-wisdom/app/powerStation/getDeliveryUrlQrcode";
+ //鑾峰彇鐢电珯浜や粯URl(瀹夎鍟�)
+ public static final String POST_getDeliveryUrl = "/home-wisdom/app/powerStation/getDeliveryUrl";
//鐢电珯鎵嬪姩浜や粯(瀹夎鍟�)
public static final String POST_deliverToAccount = "/home-wisdom/app/powerStation/deliverToAccount";
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java
index f8a14fd..67f887a 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java
@@ -987,6 +987,39 @@
}
+
+ /**
+ * 鑾峰彇鐢电珯浜や粯URl锛圔绔級
+ * 鎻忚堪锛氬畨瑁呭晢鐢电珯鐨勪氦浠楿Rl
+ *
+ * @param homeId 鐢电珯id
+ * @param cloudCallBeak -
+ */
+ public void getDeliveryUrl(String homeId, CloudCallBeak<String> cloudCallBeak) {
+ String requestUrl = HttpApi.POST_getDeliveryUrl;
+ JsonObject json = new JsonObject();
+ json.addProperty("homeId", homeId);
+// json.addProperty("zoneType", memberBean.getId());//鍖哄煙
+
+ HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
+ @Override
+ public void onSuccess(String jsonStr) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(jsonStr);
+ }
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onFailure(e);
+ }
+ }
+ });
+
+ }
+
+
/**
* 鐢电珯鎵嬪姩浜や粯(B绔�)
* 鎻忚堪锛氬畨瑁呭晢鎵嬪姩浜や粯鐢电珯缁欐寚瀹氱殑C绔处鍙�
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 fa5cce0..9316532 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -249,6 +249,12 @@
uniGetDeliveryUrlQrcode(type, data, callback);
}
break;
+ //鐢电珯鐨勪氦浠楿RL(瀹夎鍟�)
+ case HDLUniMP.UNI_EVENT_REPLY_HOME_DELIVERYURL: {
+ uniGetDeliveryUrl(type, data, callback);
+ }
+
+ break;
//鐢电珯鎵嬪姩浜や粯(瀹夎鍟�)
case HDLUniMP.UNI_EVENT_REPLY_HOME_DELIVERTOACCOUNT: {
uniGetDeliverToAccount(type, data, callback);
@@ -983,6 +989,25 @@
}
/**
+ * 鐢电珯鐨勪氦浠楿Rl(瀹夎鍟�)
+ */
+ private void uniGetDeliveryUrl(String type, Object data, DCUniMPJSCallback callback) {
+ String homeId = getKeyValue("homeId", getKeyValue("data", data));
+ HdlResidenceLogic.getInstance().getDeliveryUrl(homeId, new CloudCallBeak<String>() {
+ @Override
+ public void onSuccess(String obj) {
+ uniSuccessCallback(type, obj, callback);
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ uniExceptionCallback(type, e, callback);
+ }
+ });
+
+ }
+
+ /**
* 鑾峰彇褰撳墠璐﹀彿鍦ㄥ叕鍙哥殑韬唤
*/
private void uniGetUserRightType(String type, Object data, DCUniMPJSCallback callback) {
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/adapter/SearchDeviceAdapter.java b/app/src/main/java/com/hdl/photovoltaic/ui/adapter/SearchDeviceAdapter.java
index 7552f2d..a88aef7 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/adapter/SearchDeviceAdapter.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/adapter/SearchDeviceAdapter.java
@@ -91,16 +91,16 @@
*/
private void setTextViewStyle(TextView textView, int state_value) {
String text = mContext.getString(R.string.my_power_station_operation);
- Drawable drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_06b92a);
+ Drawable drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_state_ff38c494);
switch (state_value) {
case 1: {
text = mContext.getString(R.string.my_power_station_connecting);
- drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_ffb300);
+ drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_satte_ffb300);
}
break;
case 2: {
text = mContext.getString(R.string.my_power_station_malfunction);
- drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_e34343);
+ drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_state_fff55252);
}
break;
case 3: {
@@ -110,7 +110,7 @@
break;
case 4: {
text = mContext.getString(R.string.my_power_station_off_line);
- drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_b9b9b9);
+ drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_state_ffb9b9b9);
}
break;
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 a315bb0..5c3c27d 100644
--- a/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java
+++ b/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java
@@ -33,6 +33,7 @@
public final static String UNI_EVENT_REPLY_HOME_DETAILS = "details";//浣忓畢銆愮數绔欍�戣鎯�
public final static String UNI_EVENT_REPLY_HOME_DEl = "del";//浣忓畢銆愮數绔欍�戝垹闄�
public final static String UNI_EVENT_REPLY_HOME_DELIVERYURLQRCODE = "delivery_url_qrcode";//鐢电珯鐨勪氦浠樹簩缁寸爜(瀹夎鍟�)
+ public final static String UNI_EVENT_REPLY_HOME_DELIVERYURL = "delivery_url";//鐢电珯鐨勪氦浠楿Rl(瀹夎鍟�)
public final static String UNI_EVENT_REPLY_HOME_DELIVERTOACCOUNT = "deliver_to_account";//鐢电珯鎵嬪姩浜や粯(瀹夎鍟�)
public final static String UNI_EVENT_REPLY_HOME_UPDATEDEBUGPERM = "update_debug_perm";//鐢电珯鎺堟潈瀹夎鍟�(C绔�)
public final static String UNI_EVENT_REPLY_HOME_ADD = "scan_add_home";//鎵爜娣诲姞鐢电珯(C绔�)
diff --git a/app/src/main/res/drawable/default_image.png b/app/src/main/res/drawable/default_image.png
index 22b4efb..ee42313 100644
--- a/app/src/main/res/drawable/default_image.png
+++ b/app/src/main/res/drawable/default_image.png
Binary files differ
diff --git a/app/src/main/res/layout/fragment_me_line.xml b/app/src/main/res/layout/fragment_me_line.xml
index 082face..a4db41d 100644
--- a/app/src/main/res/layout/fragment_me_line.xml
+++ b/app/src/main/res/layout/fragment_me_line.xml
@@ -18,7 +18,7 @@
<TextView
android:id="@+id/fragment_me_line_title_iv"
android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_23"
+ android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_7"
android:text="@string/me_set"
android:textColor="@color/text_E6FFFFFF"
diff --git a/app/src/main/res/layout/item_search_device.xml b/app/src/main/res/layout/item_search_device.xml
index 546a585..b37c11e 100644
--- a/app/src/main/res/layout/item_search_device.xml
+++ b/app/src/main/res/layout/item_search_device.xml
@@ -2,7 +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="@dimen/dp_127">
+ android:layout_height="@dimen/dp_117">
<!-- <ImageView-->
<!-- android:id="@+id/power_station_search_iv"-->
@@ -20,36 +20,48 @@
android:layout_height="@dimen/dp_99"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginEnd="@dimen/dp_21"
- android:background="@drawable/ffffff_13"
+ android:background="@drawable/bj_ff333738"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
+
+ <TextView
+ android:id="@+id/device_search_state_tv"
+ android:layout_width="7dp"
+ android:layout_height="7dp"
+ android:layout_marginStart="@dimen/dp_16"
+ android:layout_marginTop="22.5dp"
+ android:background="@drawable/device_state_ffb9b9b9"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
<TextView
android:id="@+id/device_search_name_tv"
- android:layout_width="0dp"
- android:layout_height="@dimen/dp_23"
- android:layout_alignParentStart="true"
- android:layout_marginStart="@dimen/dp_16"
- android:layout_marginTop="@dimen/dp_15"
- android:layout_marginEnd="@dimen/dp_6"
- android:layout_toStartOf="@+id/device_search_state_tv"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_20"
+ android:layout_marginStart="6dp"
+ android:layout_marginTop="16dp"
+ android:layout_marginEnd="@dimen/dp_5"
android:ellipsize="end"
- android:gravity="center_vertical|start"
+ android:gravity="center_vertical"
android:singleLine="true"
- android:textColor="@color/text_E6000000"
- android:textSize="@dimen/text_16"
- android:textStyle="bold" />
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_14"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toEndOf="@+id/device_search_state_tv"
+ app:layout_constraintTop_toTopOf="parent" />
+
<TextView
android:id="@+id/device_search_sn_tv"
android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_17"
+ android:layout_height="14.5dp"
android:layout_below="@+id/device_search_name_tv"
- android:layout_alignStart="@+id/device_search_name_tv"
+ android:layout_alignStart="@+id/device_search_state_tv"
android:layout_marginTop="@dimen/dp_6"
android:gravity="center_vertical"
- android:textColor="@color/text_66000000"
+ android:textColor="@color/text_66FFFFFF"
android:textSize="@dimen/text_12" />
<TextView
@@ -57,24 +69,11 @@
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_17"
android:layout_below="@+id/device_search_sn_tv"
- android:layout_alignStart="@+id/device_search_sn_tv"
+ android:layout_alignStart="@+id/device_search_state_tv"
android:layout_marginTop="@dimen/dp_6"
android:gravity="center_vertical"
- android:textColor="@color/text_66000000"
+ android:textColor="@color/text_66FFFFFF"
android:textSize="@dimen/text_12" />
-
- <TextView
- android:id="@+id/device_search_state_tv"
- android:layout_width="69dp"
- android:layout_height="@dimen/dp_33"
- android:layout_alignParentTop="true"
- android:layout_alignParentEnd="true"
- android:background="@drawable/state_ffb300"
- android:gravity="center"
- android:text="@string/my_power_station_connecting"
- android:textColor="@color/text_FFFFFFFF"
- android:textSize="@dimen/text_12" />
-
</RelativeLayout>
--
Gitblit v1.8.0