From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/util/Constant.java | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 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 a1b3eeb..96941af 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;
@@ -13,13 +14,11 @@
public class Constant {
public static boolean IS_TASK = false;
// 澶栫綉鐜
- public static boolean IS_OUTNET = true;
+ public static boolean IS_OUTNET = false;
- public static boolean IS_TEST = false;
+ public static boolean IS_TEST = true;
public static int PAGE_SIZE = 20;
- public static int[] TASK_TYPE = { 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008// 寰俊浠诲姟绫诲瀷缂栧彿
- };
public final static String UIDAESKEY = "WW782ss@8*px/%2v";
@@ -88,6 +87,8 @@
public static final int SOURCE_TYPE_TAOBAO = 1;
// 鏉ユ簮-浜笢
public static final int SOURCE_TYPE_JD = 2;
+ // 鏉ユ簮-鎷煎澶�
+ public static final int SOURCE_TYPE_PDD = 3;
// 鑷喘-杩斿埄
public static final int TYPE_REBATE = 1;
@@ -107,6 +108,8 @@
public static AlipayConfig alipayConfig;
public static ZNXConfig znxConfig;
+
+ public static ConstantConfig constantConfig;
/**
* 娣樺疂鍟嗗搧绾㈠寘
@@ -163,8 +166,7 @@
// 鏂颁汉鎶藉-鏈�澶ф鏁�
public static final int MAX_COUNT_LOTTERY_NEWBIES = 5;
-
-
+
static {
if (smsConfig == null) {
@@ -198,6 +200,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