From e40f505d8ea791b18387df3641154899ea629b68 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期一, 29 四月 2024 13:55:42 +0800
Subject: [PATCH] 2024年04月29日13:55:38

---
 app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java         |    9 +++------
 app/src/main/res/values/strings.xml                                          |   11 +++++++++++
 app/src/main/java/com/hdl/photovoltaic/ui/home/CustomStyleChartComposer.java |    7 +++----
 app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java                |   22 +++++++++++-----------
 4 files changed, 28 insertions(+), 21 deletions(-)

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 f94c1b4..16cf484 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -681,9 +681,9 @@
                         }
 
                         if (isBoolean) {
-                            uniCallbackData(type, null, 0, "鍐欏叆鏂伴┍鍔ㄦ枃浠跺埌鍐呭瓨鎴愬姛", callback);
+                            uniCallbackData(type, null, 0, HDLApp.getInstance().getString(R.string.writing_firmware_upgrade_memory_succeeded), callback);
                         } else {
-                            uniCallbackData(type, null, -2, "涓嬭浇鍥轰欢鍗囩骇鏂囦欢澶辫触", callback);
+                            uniCallbackData(type, null, -2, HDLApp.getInstance().getString(R.string.download_firmware_upgrade_file_failed), callback);
                         }
                     }
                 });
@@ -728,7 +728,7 @@
                             String firmwarePathFileName = HdlFileLogic.getInstance().getFirmwarePathFileName(oid, imageId, version);
                             byte[] data = HdlFileLogic.getInstance().readFileByte(firmwarePathFileName);
                             if (data == null || data.length == 0) {
-                                uniCallbackData(type, null, -2, "鏈湴鎵句笉鍒板崌绾у浐浠舵枃浠�,璇蜂笅杞藉ソ鍥轰欢鏂囦欢,鍐嶉噸鏂板崌绾�.", callback);
+                                uniCallbackData(type, null, -2, HDLApp.getInstance().getString(R.string.found_locally_firmware_upgrade_file), callback);
                                 return;
                             }
                             String md5 = HDLMD5Utils.encodeMD5(data);//缃戝叧鍥轰欢闇�瑕�
@@ -743,14 +743,14 @@
 
                                 @Override
                                 public void onError(HDLLinkException e) {
-                                    uniCallbackData(type, null, -2, "閫氱煡缁欑綉鍏冲崌绾у浐浠舵枃浠跺湴鍧�澶辫触,鏃犳硶鍗囩骇,", callback);
+                                    uniCallbackData(type, null, -2, HDLApp.getInstance().getString(R.string.notify_gateway_firmware_upgrade_failed), callback);
                                 }
                             });
                         }
 
                         @Override
                         public void onServiceDisconnected(ComponentName name) {
-                            uniCallbackData(type, null, -2, "鏈湴鏈嶅姟鏈夊紓甯稿け璐�,鏃犳硶鍗囩骇,", callback);
+                            uniCallbackData(type, null, -2, HDLApp.getInstance().getString(R.string.local_service_fails), callback);
                         }
                     });
                 } else {
@@ -934,9 +934,9 @@
                             HdlFileLogic.getInstance().deleteFile(drivePathFileName);//涓嬭浇澶辫触锛屽垹闄や笉瀹屾暣椹卞姩鏂囦欢;
                         }
                         if (isBoolean) {
-                            uniCallbackData(type, null, 0, "鍐欏叆鏂伴┍鍔ㄦ枃浠跺埌鍐呭瓨鎴愬姛", callback);
+                            uniCallbackData(type, null, 0, HDLApp.getInstance().getString(R.string.writing_drive_memory_succeeded), callback);
                         } else {
-                            uniCallbackData(type, null, -2, "涓嬭浇椹卞姩鍗囩骇鏂囦欢澶辫触", callback);
+                            uniCallbackData(type, null, -2, HDLApp.getInstance().getString(R.string.download_drive_file_failed), callback);
                         }
                     }
                 });
@@ -980,7 +980,7 @@
                             String drivePathFileName = HdlFileLogic.getInstance().getDrivePathFileName(driverCode, version);
                             byte[] data = HdlFileLogic.getInstance().readFileByte(drivePathFileName);
                             if (data == null || data.length == 0) {
-                                uniCallbackData(type, null, -2, "鏈湴鎵句笉鍒板崌绾ч┍鍔ㄦ枃浠�,璇蜂笅杞藉ソ椹卞姩鏂囦欢,鍐嶉噸鏂板崌绾�.", callback);
+                                uniCallbackData(type, null, -2, HDLApp.getInstance().getString(R.string.found_locally_drive_file), callback);
                                 return;
                             }
                             String md5 = HDLMD5Utils.encodeMD5(data);//缃戝叧椹卞姩闇�瑕�
@@ -995,14 +995,14 @@
 
                                 @Override
                                 public void onError(HDLLinkException e) {
-                                    uniCallbackData(type, null, -2, "閫氱煡缁欑綉鍏冲崌绾ч┍鍔ㄦ枃浠跺湴鍧�澶辫触,鏃犳硶鍗囩骇,", callback);
+                                    uniCallbackData(type, null, -2, HDLApp.getInstance().getString(R.string.notify_gateway_drive_failed), callback);
                                 }
                             });
                         }
 
                         @Override
                         public void onServiceDisconnected(ComponentName name) {
-                            uniCallbackData(type, null, -2, "鏈湴鏈嶅姟鏈夊紓甯稿け璐�,鏃犳硶鍗囩骇,", callback);
+                            uniCallbackData(type, null, -2, HDLApp.getInstance().getString(R.string.local_service_fails), callback);
                         }
                     });
                 } else {
@@ -1089,7 +1089,7 @@
      */
     private void uniCancelDownloadingUpgradeFile(String type, Object data, DCUniMPJSCallback callback) {
         HdlOtaLogic.getInstance().stopDownloadUpgradeFile();
-        uniCallbackData(type, null, 0, "鍙栨秷涓嬭浇鎴愬姛.", callback);
+        uniCallbackData(type, null, 0, HDLApp.getInstance().getString(R.string.cancel_download_successfully), callback);
     }
 
     /**
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/home/CustomStyleChartComposer.java b/app/src/main/java/com/hdl/photovoltaic/ui/home/CustomStyleChartComposer.java
index 041828a..891401c 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/home/CustomStyleChartComposer.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/home/CustomStyleChartComposer.java
@@ -184,7 +184,7 @@
 
     }
 
-    public static AAChartModel configureColorfulColumnChart() {
+    public static AAChartModel configureColorfulColumnChart(String tipSuspendName, String[] categories, Object[] data) {
         Object[][] stopsArr = {
                 {1.00, "#38C494"},
         };//棰滆壊瀛楃涓茶缃敮鎸佸崄鍏繘鍒剁被鍨嬪拰 rgba 绫诲瀷
@@ -197,8 +197,7 @@
                 .chartType(AAChartType.Column)
                 .backgroundColor("#EDEFF2")
                 .colorsTheme(new String[]{"#38C494",})
-                .categories(new String[]{"涓�鏈�", "浜屾湀", "涓夋湀", "鍥涙湀", "浜旀湀", "鍏湀",
-                        "涓冩湀", "鍏湀", "涔濇湀", "鍗佹湀", "鍗佷竴鏈�", "鍗佷簩鏈�", "鍗佷簩鏈�", "鍗佷簩鏈�", "鍗佷簩鏈�", "鍗佷簩鏈�", "鍗佷簩鏈�", "鍗佷簩鏈�", "鍗佷簩鏈�", "鍗佷簩鏈�", "鍗佷簩鏈�", "鍗佷簩鏈�", "鍗佷簩鏈�", "鍗佷簩鏈�", "鍗佷簩鏈�", "鍗佷簩鏈�", "鍗佷簩鏈�", "鍗佷簩鏈�", "鍗佷簩鏈�", "鍗佷簩鏈�", "鍗佷簩鏈�", "鍗佷簩鏈�", "鍗佷簩鏈�", "鍗佷簩鏈�",})
+                .categories(categories)
                 .xAxisLabelsEnabled(true)
                 .zoomType(AAChartZoomType.XY)
                 .legendEnabled(false)
@@ -206,7 +205,7 @@
                         new AASeriesElement()
 //                                .color(linearGradientColor)
                                 .name("涓滀含")
-                                .data(new Object[]{149.9, 171.5, 106.4, 129.2, 144.0, 176.0, 135.6, 188.5, 276.4, 214.1, 95.6, 54.4, 149.9, 171.5, 106.4, 129.2, 144.0, 176.0, 135.6, 188.5, 276.4, 214.1, 95.6, 149.9, 171.5, 106.4, 129.2, 144.0, 176.0, 135.6, 188.5, 276.4, 214.1, 95.6})
+                                .data(data)
 //                                .colorByPoint(true)
                                 .tooltip(new AATooltip().style(new AAStyle().backgroundColor("#FFFFFF").fontSize(25)))
 
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 474231d..69a46c0 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
@@ -7,7 +7,7 @@
 import android.text.TextUtils;
 import android.view.View;
 
-import androidx.annotation.RequiresPermission;
+
 import androidx.appcompat.content.res.AppCompatResources;
 
 import com.bigkoo.pickerview.builder.TimePickerBuilder;
@@ -17,7 +17,6 @@
 import com.github.AAChartModel.AAChartCore.AAChartCreator.AAChartView;
 import com.github.AAChartModel.AAChartCore.AAChartCreator.AAMoveOverEventMessageModel;
 import com.hdl.linkpm.sdk.core.exception.HDLException;
-import com.hdl.photovoltaic.HDLApp;
 import com.hdl.photovoltaic.R;
 import com.hdl.photovoltaic.base.CustomBaseFragment;
 import com.hdl.photovoltaic.config.ConstantManage;
@@ -266,6 +265,7 @@
             }
         });
     }
+
     /**
      * 鏃堕棿閫夋嫨鍣�
      */
@@ -334,7 +334,7 @@
         } else if (TimeType.month.equals(timeType)
                 || TimeType.year.equals(timeType)
                 || TimeType.all.equals(timeType)) {
-            aaChartModel = configureColorfulColumnChart();
+            aaChartModel = configureColorfulColumnChart("Pv鍙戠數鍔熺巼", fieldNames, fieldValues);
         }
         aaChartView.aa_drawChartWithChartModel(aaChartModel);
     }
@@ -371,9 +371,6 @@
         viewBinding.homePageStationSelectTimeLl.setVisibility(View.VISIBLE);
         setUpAAChartView();//鍥捐〃鍔犺浇
     }
-
-
-
 
 
     @Override
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1c28425..3654355 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -247,6 +247,17 @@
     <string name="port_conflict">搴旂敤鍐茬獊锛岄渶瑕佸叧闂璷npro鎴栬�呭叾瀹冪増鏈殑璋冭瘯杞欢鐒跺悗鍐嶉噸鏂板惎鍔ㄨ繖涓蒋浠惰瘯璇�</string>
 
 
+
+    <string name="cancel_download_successfully">鍙栨秷涓嬭浇鎴愬姛.</string>
+    <string name="writing_firmware_upgrade_memory_succeeded">鍐欏叆鏂板浐浠舵枃浠跺埌鍐呭瓨鎴愬姛.</string>
+    <string name="download_firmware_upgrade_file_failed">涓嬭浇鍥轰欢鍗囩骇鏂囦欢澶辫触.</string>
+    <string name="found_locally_firmware_upgrade_file">鏈湴鎵句笉鍒板崌绾у浐浠舵枃浠�,璇蜂笅杞藉ソ鍥轰欢鏂囦欢,鍐嶉噸鏂板崌绾�.</string>
+    <string name="notify_gateway_firmware_upgrade_failed">閫氱煡缁欑綉鍏冲崌绾у浐浠舵枃浠跺湴鍧�澶辫触,鏃犳硶鍗囩骇.</string>
+    <string name="local_service_fails">鏈湴鏈嶅姟鏈夊紓甯稿け璐�,鏃犳硶鍗囩骇.</string>
+    <string name="writing_drive_memory_succeeded">鍐欏叆鏂伴┍鍔ㄦ枃浠跺埌鍐呭瓨鎴愬姛.</string>
+    <string name="download_drive_file_failed">涓嬭浇椹卞姩鍗囩骇鏂囦欢澶辫触.</string>
+    <string name="found_locally_drive_file">鏈湴鎵句笉鍒板崌绾ч┍鍔ㄦ枃浠�,璇蜂笅杞藉ソ椹卞姩鏂囦欢,鍐嶉噸鏂板崌绾�.</string>
+    <string name="notify_gateway_drive_failed">閫氱煡缁欑綉鍏冲崌绾ч┍鍔ㄦ枃浠跺湴鍧�澶辫触,鏃犳硶鍗囩骇.</string>
     <string name="time_selectd">鏃堕棿閫夋嫨</string>
     <string name="life_cycle">鐢熷懡鏈�</string>
     <string name="year">骞�</string>

--
Gitblit v1.8.0