From 9e431cafd682b50347bdbbbd50ad3b154e165751 Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期三, 10 七月 2024 16:26:33 +0800 Subject: [PATCH] 2024年07月10日16:26:31 --- local.properties | 4 ++-- app/build.gradle | 2 +- app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 450c492..f63765d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -153,7 +153,7 @@ implementation project(path: ':third-zxing') //Link鏈湴搴擄紙鍦ㄧ嚎渚濊禆缃戠粶搴擄級 implementation 'com.hdl.android:pmsdk:1.0.2' - implementation 'com.hdl.android:debugsdk:1.0.24' + implementation 'com.hdl.android:debugsdk:1.0.33' 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 d085b50..104b350 100644 --- a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java +++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java @@ -1414,6 +1414,7 @@ gatewayBean.setDeviceType(cloudInverterDeviceBean.getDeviceType());//璁惧绫诲瀷(INV:閫嗗彉鍣�;BMS:BMS鎺у埗鐩�;BATTERY:鐢垫睜鍗曞厓) gatewayBean.setAddresses(cloudInverterDeviceBean.getAddresses());//瀛愮綉鍙�/璁惧鍙�,閫嗗彉鍣ㄥ湴鍧� gatewayBean.setPowerPvNow(cloudInverterDeviceBean.getPowerPvNow());//鍙戠數鍔熺巼 + gatewayBean.setOutputActivePower(cloudInverterDeviceBean.getOutputActivePower());//閫嗗彉鍣ㄨ緭鍑烘湁鍔熷姛鐜� gatewayBean.setTotalElectricityPvToday(cloudInverterDeviceBean.getTotalElectricityPvToday());//浠婃棩鍙戠數閲� if (!TextUtils.isEmpty(cloudInverterDeviceBean.getOmodel())) { //鍙兘璁惧娌℃湁涓婃姤缁欎簯绔�,寤鸿缁戝畾閫嗗彉鍣ㄦ椂鍊欒拷鍔犱竴涓弬鏁�; diff --git a/local.properties b/local.properties index 5cb4a98..cf7466a 100644 --- a/local.properties +++ b/local.properties @@ -4,5 +4,5 @@ # Location of the SDK. This is only used by Gradle. # For customization when using a Version Control System, please read the # header note. -#Fri Feb 23 16:45:51 CST 2024 -sdk.dir=/Users/hdl/Library/Developer/Xamarin/android-sdk-macosx +#Wed Jul 10 16:17:02 CST 2024 +sdk.dir=/Users/user/Library/Android/sdk -- Gitblit v1.8.0