From 1e92eff67b997263ecefa255c63eb6641c47b57f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 14 六月 2019 10:22:33 +0800
Subject: [PATCH] 设备消息BUG解决，品牌
---
fanli/src/main/java/com/yeshi/fanli/util/Constant.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/Constant.java b/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
index 26a1673..aa868b7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
@@ -3,6 +3,7 @@
import java.util.Properties;
import com.yeshi.fanli.entity.config.AlipayConfig;
+import com.yeshi.fanli.entity.config.ConstantConfig;
import com.yeshi.fanli.entity.config.SMSConfig;
import com.yeshi.fanli.entity.config.SystemCommonConfig;
import com.yeshi.fanli.entity.config.WXGZConfig;
@@ -18,7 +19,7 @@
public static boolean IS_TEST = false;
public static int PAGE_SIZE = 20;
-
+
public final static String UIDAESKEY = "WW782ss@8*px/%2v";
public final static String ADMINH5_AESKEY = "WW782Ss@0*px/,2v";
@@ -105,6 +106,8 @@
public static AlipayConfig alipayConfig;
public static ZNXConfig znxConfig;
+
+ public static ConstantConfig constantConfig;
/**
* 娣樺疂鍟嗗搧绾㈠寘
@@ -195,6 +198,19 @@
znxConfig = (ZNXConfig) MapUtil.parseMap(ZNXConfig.class, ps);
}
+ if (constantConfig == null) {
+ Properties ps = org.yeshi.utils.PropertiesUtil
+ .getProperties(TaoBaoUtil.class.getClassLoader().getResourceAsStream("constant.properties"));
+ constantConfig = (ConstantConfig) MapUtil.parseMap(ConstantConfig.class, ps);
+ IS_OUTNET = Boolean.parseBoolean(constantConfig.getOutNetWork());
+ IS_TASK = Boolean.parseBoolean(constantConfig.getTask());
+ IS_TEST = Boolean.parseBoolean(constantConfig.getTest());
+
+ System.out.println("IS_OUTNET:"+IS_OUTNET);
+ System.out.println("IS_TASK:"+IS_TASK);
+ System.out.println("IS_TEST:"+IS_TEST);
+ }
+
Extract_Activty = String.format("%s.ui.mine.MyRedPacketsActivity",
Constant.systemCommonConfig.getAndroidBaseactivityName());
HB_Activity = String.format("%s.ui.main.MainActivity",
--
Gitblit v1.8.0