From fa09b7224961617b69fa4e5c169b0b48fce18517 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 02 四月 2025 20:40:00 +0800
Subject: [PATCH] 2025年04月02日20:39:56
---
/dev/null | 0
app/src/main/res/layout/fragment_house_list.xml | 2
app/src/main/res/drawable-xhdpi/add.png | 0
app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java | 3 -
app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java | 6 ++-
app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java | 85 ++++++++++++++++++------------------------
app/src/main/res/drawable-xhdpi/search_path.png | 0
app/src/main/res/layout/item_plant_details.xml | 4 -
app/src/main/res/drawable-xhdpi/condition_screening.png | 0
app/src/main/java/com/hdl/photovoltaic/enums/DebugStatus.java | 2
app/src/main/res/drawable-xhdpi/authorization_debugging.png | 0
11 files changed, 44 insertions(+), 58 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/enums/DebugStatus.java b/app/src/main/java/com/hdl/photovoltaic/enums/DebugStatus.java
index 383ea2e..cf85359 100644
--- a/app/src/main/java/com/hdl/photovoltaic/enums/DebugStatus.java
+++ b/app/src/main/java/com/hdl/photovoltaic/enums/DebugStatus.java
@@ -1,7 +1,7 @@
package com.hdl.photovoltaic.enums;
/**
- * 鐢电珯鐨勮皟璇曠姸鎬�
+ * 鐢电珯鐨勮皟璇曠姸鎬侊紙鍏ㄩ儴锛岃皟璇曚腑锛岃皟璇曞畬鎴愶紝宸蹭氦浠橈紝鎺堟潈璋冭瘯锛�
*/
public @interface DebugStatus {
/**
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 0c8f3ff..a29c3ef 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java
@@ -4,6 +4,7 @@
import android.graphics.BitmapFactory;
import android.os.Build;
import android.text.TextUtils;
+import android.util.Log;
import com.google.gson.Gson;
import com.google.gson.JsonObject;
@@ -285,7 +286,6 @@
* ascending:鍗囧簭),
*/
public void getResidenceIdList(String key, String keyValue, CloudCallBeak<List<HouseIdBean>> cloudCallBeak) {
-
String requestUrl = HttpApi.POST_PowerStation_List;
JsonObject json = new JsonObject();
if (!TextUtils.isEmpty(key) && !TextUtils.isEmpty(keyValue)) {
@@ -346,7 +346,6 @@
}
});
}
-
}
@Override
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java b/app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java
index e73d49b..1f4d7b0 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java
@@ -76,6 +76,7 @@
holder.home_location_tv.setText(houseIdBean.getHomeAddress());
holder.item_parent_rl.setTag(position);
setHomeStateTextViewStyle(holder.home_state_tv, houseIdBean.getPowerStationStatus());
+ setHomeDebugStateTextViewStyle(holder.home_debug_state_tv, holder.home_debug_state_iv, houseIdBean.getDebugStatus());
GlideUtils.getRoundedCornersImage(mContext, houseIdBean.getPowerStationImage(), holder.homeIconIv, 6);
// HdlLogLogic.print("---鐢电珯鍚嶇О:" + houseIdBean.getHomeName() + "---鍥剧墖url:" + houseIdBean.getPowerStationImage(), false);
holder.item_parent_rl.setOnClickListener(new View.OnClickListener() {
@@ -106,6 +107,7 @@
//鏈氦浠樺畬瑕佹樉绀哄垹闄ゆ寜閽�
holder.home_del_ll.setVisibility(View.VISIBLE);
}
+
//鍒犻櫎鐢电珯
holder.home_del_ll.setOnClickListener(new View.OnClickListener() {
@Override
@@ -154,59 +156,39 @@
/**
* 璁剧疆銆愮數绔欒皟璇曠姸鎬併�戠粍浠舵牱寮�
*
- * @param textView 鏄剧ず缁勪欢
- * 濡傛灉璁惧浠庢潵娌′笂鎶ヨ繃鏁版嵁鏁版嵁 鐘舵�侊細杩炴帴涓�
- * 璁惧鍦ㄧ嚎 浣嗘槸褰撳墠澶勪簬鏁呴殰 鐘舵�侊細鏁呴殰
- * 璁惧鍦ㄧ嚎锛堟湁涓婃姤杩囨暟鎹紝娌℃湁鏁呴殰锛� 鐘舵�侊細鍦ㄧ嚎
- * 璁惧绂荤嚎 鐘舵�侊細绂荤嚎
- * @param state_value 鐢电珯鐘舵��(1:姝ｅ父(杩愯),2:绂荤嚎,3:杩炴帴涓�,4:鏁呴殰,5:绂荤嚎鏈夋晠闅�)
+ * @param textView 鏄剧ず浣忓畢鐘舵�佹枃鏈粍浠�
+ * @param imageView 鏄剧ず浣忓畢鐘舵�佸浘鏍囩粍浠�
+ * @param stateValue 鐢电珯鐘舵��(1:姝ｅ父(杩愯),2:绂荤嚎,3:杩炴帴涓�,4:鏁呴殰,5:绂荤嚎鏈夋晠闅�)
*/
- private void setHomeDebugStateTextViewStyle(TextView textView, int state_value) {
+ private void setHomeDebugStateTextViewStyle(TextView textView, ImageView imageView, String stateValue) {
- String text = mContext.getString(R.string.my_power_station_operation);
- Drawable drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_state_ff38c494);
- if (mPowerStationStatus.equals(DebugStatus.All)) {
- switch (state_value) {
- case 1: {
- text = mContext.getString(R.string.my_power_station_operation);
- }
- break;
-
- case 2: {
- text = mContext.getString(R.string.my_power_station_off_line);
- drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_state_ffb9b9b9);
- }
- break;
- case 3: {
- text = mContext.getString(R.string.my_power_station_connecting);
- drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_satte_ffb300);
- }
- break;
- case 4:
- case 5: {
- text = mContext.getString(R.string.my_power_station_malfunction);
- drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_state_fff55252);
- }
- //5:绂荤嚎鏈夋晠闅淥ffline_fault
- break;
-// case 5: {
-// text = mContext.getString(R.string.Offline_fault);
-// drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_e34343);
-// }
-// break;
+ String text = mContext.getString(R.string.be_debugging);
+ Drawable drawable = AppCompatResources.getDrawable(mContext, R.drawable.debugging);
+ switch (stateValue) {
+ case DebugStatus.Debugging: {
+ text = mContext.getString(R.string.be_debugging);
+ drawable = AppCompatResources.getDrawable(mContext, R.drawable.debugging);
}
- } else if (mPowerStationStatus.equals(PowerStationStatus.malfunction)) {
- text = mContext.getString(R.string.my_power_station_malfunction);
- drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_state_fff55252);
- } else if (mPowerStationStatus.equals(PowerStationStatus.off)) {
- text = mContext.getString(R.string.my_power_station_off_line);
- drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_state_ffb9b9b9);
- } else if (mPowerStationStatus.equals(PowerStationStatus.connecting)) {
- text = mContext.getString(R.string.my_power_station_connecting);
- drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_satte_ffb300);
+ break;
+
+ case DebugStatus.WAIT_DELIVERED: {
+ text = mContext.getString(R.string.debugging_completed);
+ drawable = AppCompatResources.getDrawable(mContext, R.drawable.done);
+ }
+ break;
+ case DebugStatus.Delivered: {
+ text = mContext.getString(R.string.delivered);
+ drawable = AppCompatResources.getDrawable(mContext, R.drawable.delivered);
+ }
+ break;
+ case DebugStatus.SECONDARY_DEBUGGIN: {
+ text = mContext.getString(R.string.authorization_debugging);
+ drawable = AppCompatResources.getDrawable(mContext, R.drawable.authorization_debugging);
+ }
+ break;
}
-// textView.setText(text);
- textView.setBackground(drawable);
+ textView.setText(text);
+ imageView.setBackground(drawable);
}
@@ -279,6 +261,9 @@
public ImageView homeIconIv;//浣忓畢鍥剧墖
public TextView homeNameTv;//浣忓畢鍚嶇О
+ public ImageView home_debug_state_iv;//浣忓畢璋冭瘯鐘舵�佸浘鏍�
+ public TextView home_debug_state_tv;//浣忓畢璋冭瘯鐘舵��
+
public TextView pv_value_tv;//缁勪覆瀹归噺
public TextView pv_kw_unit;//鍙戠數鍔熺巼鍗曚綅
public TextView generation_today_value_tv;//褰撴棩鍙戠數
@@ -298,6 +283,8 @@
super(itemView);
homeIconIv = itemView.findViewById(R.id.home_image_iv);
homeNameTv = itemView.findViewById(R.id.home_name_tv);
+ home_debug_state_iv = itemView.findViewById(R.id.home_debug_state_iv);
+ home_debug_state_tv = itemView.findViewById(R.id.home_debug_state_tv);
pv_value_tv = itemView.findViewById(R.id.pv_value_tv);
pv_kw_unit = itemView.findViewById(R.id.pv_kw_unit);
generation_today_value_tv = itemView.findViewById(R.id.generation_today_value_tv);
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 32fee9a..efa0636 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
@@ -5,7 +5,9 @@
import android.content.DialogInterface;
import android.content.Intent;
import android.os.Bundle;
+import android.os.SystemClock;
import android.text.TextUtils;
+import android.util.Log;
import android.view.View;
import androidx.recyclerview.widget.LinearLayoutManager;
@@ -72,7 +74,7 @@
//鍒濆鍖栫晫闈㈢洃鍚櫒
initEvent();
//鍚庡彴璇诲彇浣忓畢鍒楄〃
- downReadData(false);
+// downReadData(false);
}
private void initData() {
@@ -196,8 +198,8 @@
houseListAdapter.setList(houseListBeanIDList);
}
- }
+ }
}
nullDataUpdateUi(list);
}
diff --git a/app/src/main/res/drawable/add.png b/app/src/main/res/drawable-xhdpi/add.png
similarity index 100%
rename from app/src/main/res/drawable/add.png
rename to app/src/main/res/drawable-xhdpi/add.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/authorization_debugging.png b/app/src/main/res/drawable-xhdpi/authorization_debugging.png
new file mode 100644
index 0000000..688a6c1
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/authorization_debugging.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/condition_screening.png b/app/src/main/res/drawable-xhdpi/condition_screening.png
new file mode 100644
index 0000000..d86f704
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/condition_screening.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/search_path.png b/app/src/main/res/drawable-xhdpi/search_path.png
new file mode 100644
index 0000000..d702515
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/search_path.png
Binary files differ
diff --git a/app/src/main/res/drawable/default_condition.png b/app/src/main/res/drawable/default_condition.png
deleted file mode 100644
index a2a6477..0000000
--- a/app/src/main/res/drawable/default_condition.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable/search_path.png b/app/src/main/res/drawable/search_path.png
deleted file mode 100644
index 1f28c6a..0000000
--- a/app/src/main/res/drawable/search_path.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/layout/fragment_house_list.xml b/app/src/main/res/layout/fragment_house_list.xml
index 06f5911..0042957 100644
--- a/app/src/main/res/layout/fragment_house_list.xml
+++ b/app/src/main/res/layout/fragment_house_list.xml
@@ -119,7 +119,7 @@
android:layout_height="@dimen/dp_31"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
- android:src="@drawable/default_condition" />
+ android:src="@drawable/condition_screening" />
</RelativeLayout>
diff --git a/app/src/main/res/layout/item_plant_details.xml b/app/src/main/res/layout/item_plant_details.xml
index 328d31c..a0967e9 100644
--- a/app/src/main/res/layout/item_plant_details.xml
+++ b/app/src/main/res/layout/item_plant_details.xml
@@ -79,8 +79,7 @@
<ImageView
android:id="@+id/home_debug_state_iv"
android:layout_width="@dimen/dp_18"
- android:layout_height="@dimen/dp_18"
- android:src="@drawable/initiai" />
+ android:layout_height="@dimen/dp_18" />
<TextView
android:id="@+id/home_debug_state_tv"
@@ -88,7 +87,6 @@
android:layout_height="match_parent"
android:paddingStart="0dp"
android:paddingEnd="@dimen/dp_16"
- android:text="Initial"
android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_12" />
</LinearLayout>
--
Gitblit v1.8.0