From 2bc156ec08369884b44961cd446201d35a66fff0 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 25 六月 2024 10:50:40 +0800
Subject: [PATCH] Merge branch 'feature/v1.4.1' of http://59.41.255.150:6688/r/~wjc/HDLPhotovoltaicDebugAPP into feature/v1.4.1
---
app/src/main/java/com/hdl/photovoltaic/config/AppConfigManage.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
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 4ff9ec2..d4dd89b 100644
--- a/app/src/main/java/com/hdl/photovoltaic/config/AppConfigManage.java
+++ b/app/src/main/java/com/hdl/photovoltaic/config/AppConfigManage.java
@@ -2,26 +2,30 @@
import com.hdl.photovoltaic.BuildConfig;
+/**
+ * 鍒濆鍖朅pp閰嶇疆鏁版嵁
+ */
public class AppConfigManage {
-
/*********鏄惁姝ｅ紡鏈嶅姟鍣�*********/
- private static final boolean isOnlineServer = true;
+ private static final boolean isOnlineServer = false;
/*********姝ｅ紡鐜*********/
private static final String APP_KEY_ONLINE = "CSZEMDJL";
private static final String APP_SECRET_ONLINE = "CSZEMDKBCSZEMDKR";
private static final String APP_REGIONURL_ONLINE = "https://nearest.hdlcontrol.com";
+
/*********娴嬭瘯鐜*********/
private static final String APP_KEY_TEST = "CTBGMNUV";
private static final String APP_SECRET_TEST = "CTBGMNVLCTBGMNWB";
private static final String APP_REGIONURL_TEST = "https://test-gz.hdlcontrol.com";
+
/*********鑾峰彇褰撳墠鏄惁浣跨敤姝ｅ紡鏈嶅姟鍣ㄧ幆澧�*********/
public static boolean isIsOnlineServer() {
return isOnlineServer;
}
- /// 鐢ㄦ埛娉ㄥ唽鎵�鍦ㄦ湇鍔″櫒鍩熷悕鍦板潃
+ /// 鐢ㄦ埛娉ㄥ唽鎵�鍦ㄦ湇鍔″櫒鍩熷悕鍦板潃(鐢ㄦ埛璇锋眰缃戠粶鐢ㄧ殑)
private static String sUserRegionUrl;
public static String getUserRegionUrl() {
--
Gitblit v1.8.0