From 29e200b8db74d31f49d4d1ac64a41ad44e1b3a90 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 07 七月 2025 11:56:35 +0800
Subject: [PATCH] Merge branch 'master' into 1.2.1_google
---
app/src/main/java/com/hdl/photovoltaic/config/AppConfigManage.java | 6 +++++-
1 files changed, 5 insertions(+), 1 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 84c22ac..987b86f 100644
--- a/app/src/main/java/com/hdl/photovoltaic/config/AppConfigManage.java
+++ b/app/src/main/java/com/hdl/photovoltaic/config/AppConfigManage.java
@@ -1,5 +1,7 @@
package com.hdl.photovoltaic.config;
+import android.util.Log;
+
import com.hdl.photovoltaic.BuildConfig;
/**
@@ -8,7 +10,8 @@
public class AppConfigManage {
/*********鏄惁姝ｅ紡鏈嶅姟鍣�*********/
- private static final boolean isOnlineServer = false;
+// private static boolean isOnlineServer = UserConfigManage.getInstance().isOnlineServer();
+ private static boolean isOnlineServer = true;
/*********姝ｅ紡鐜*********/
private static final String APP_KEY_ONLINE = "CSZEMDJL";
private static final String APP_SECRET_ONLINE = "CSZEMDKBCSZEMDKR";
@@ -38,6 +41,7 @@
/*********getAppKey*********/
public static String getAppKey() {
+ Log.d("===2====", "2222222");
if (isOnlineServer) {
return APP_KEY_ONLINE;
} else {
--
Gitblit v1.8.0