From b198cb447af8f4392349f4ba01f85537ed391428 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期三, 22 五月 2024 15:42:35 +0800
Subject: [PATCH] 1.3版本问题修复
---
build.gradle | 2 +-
app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java | 2 +-
local.properties | 4 ++--
app/src/main/java/com/hdl/photovoltaic/config/AppConfigManage.java | 2 +-
config.gradle | 9 +++++++++
app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java | 2 +-
app/build.gradle | 3 ++-
7 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index c0fe43a..ef7ab57 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -128,7 +128,8 @@
implementation project(path: ':third-zxing')
//Link鏈湴搴擄紙鍦ㄧ嚎渚濊禆缃戠粶搴擄級
implementation 'com.hdl.android:pmsdk:1.0.2'
- implementation 'com.hdl.android:debugsdk:1.0.16'
+// implementation 'com.hdl.android:debugsdk:1.0.23'
+ implementation project(path:':sdk')
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
diff --git a/app/src/main/java/com/hdl/photovoltaic/config/AppConfigManage.java b/app/src/main/java/com/hdl/photovoltaic/config/AppConfigManage.java
index b4a5c81..d3c3419 100644
--- a/app/src/main/java/com/hdl/photovoltaic/config/AppConfigManage.java
+++ b/app/src/main/java/com/hdl/photovoltaic/config/AppConfigManage.java
@@ -9,7 +9,7 @@
/*********鏄惁姝ｅ紡鏈嶅姟鍣�*********/
- private static final boolean isOnlineServer = false;
+ private static final boolean isOnlineServer = true;
/*********姝ｅ紡鐜*********/
private static final String APP_KEY_ONLINE = "CSZEMDJL";
private static final String APP_SECRET_ONLINE = "CSZEMDKBCSZEMDKR";
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java
index e1e9f89..b562be2 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java
@@ -343,7 +343,7 @@
@Override
public void onSuccess(MqttInfo info) {
if (info != null) {
- MqttRecvClient.getInstance().setConnectParam(info.getUrl(), info.getClientId(), info.getUserName(), info.getPassWord(), null);
+ MqttRecvClient.getInstance().setConnectParam(info.getUrl(), info.getClientId(), info.getUserName(), info.getPassWord());
MqttRecvClient.getInstance().connect();
}
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
index 0f32e3a..6ba844c 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
@@ -407,7 +407,7 @@
@Override
public void onSuccess(MqttInfo info) {
if (info != null) {
- MqttRecvClient.getInstance().setConnectParam(info.getUrl(), info.getClientId(), info.getUserName(), info.getPassWord(), null);
+ MqttRecvClient.getInstance().setConnectParam(info.getUrl(), info.getClientId(), info.getUserName(), info.getPassWord());
MqttRecvClient.getInstance().connect();
}
}
diff --git a/build.gradle b/build.gradle
index 15d7362..701432e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
+apply from:"config.gradle"
buildscript {
repositories {
diff --git a/config.gradle b/config.gradle
new file mode 100644
index 0000000..9b09e9e
--- /dev/null
+++ b/config.gradle
@@ -0,0 +1,9 @@
+Properties properties = new Properties()
+properties.load(project.rootProject.file('local.properties').newDataInputStream())
+
+ext {
+ //浣跨敤鍥哄畾璐﹀彿
+ ALIYUN_USER_NAME = '5f0673aa7cd41782836e7d3e'
+ ALIYUN_PASSWORD = 'lBNkb1So7zEY'
+ BASE_URL = 'https://packages.aliyun.com'
+}
\ No newline at end of file
diff --git a/local.properties b/local.properties
index 7e45c0e..176dc40 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/user/Library/Android/sdk
+#Wed May 22 13:42:11 CST 2024
+sdk.dir=/Users/hdl/Library/Developer/Xamarin/android-sdk-macosx
--
Gitblit v1.8.0