From d0b7f936a3ae253efc67be35c349a647fec94594 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 05 八月 2019 10:52:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/Constant.java | 38 +++++++++++++++++++++++++++++++-------
1 files changed, 31 insertions(+), 7 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 aa868b7..d3963d8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
@@ -14,9 +14,9 @@
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;
@@ -87,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;
@@ -194,7 +196,7 @@
if (znxConfig == null) {
Properties ps = org.yeshi.utils.PropertiesUtil
- .getProperties(TaoBaoUtil.class.getClassLoader().getResourceAsStream("znx_msg.properties"));
+ .getProperties(TaoBaoUtil.class.getClassLoader().getResourceAsStream("push_msg.properties"));
znxConfig = (ZNXConfig) MapUtil.parseMap(ZNXConfig.class, ps);
}
@@ -205,10 +207,10 @@
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);
+
+ 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",
@@ -216,4 +218,26 @@
HB_Activity = String.format("%s.ui.main.MainActivity",
Constant.systemCommonConfig.getAndroidBaseactivityName());
}
+
+ public static String getSourceName(int sourceType) {
+ switch (sourceType) {
+ case SOURCE_TYPE_TAOBAO:
+ return "娣樺疂";
+ case SOURCE_TYPE_JD:
+ return "浜笢";
+ case SOURCE_TYPE_PDD:
+ return "鎷煎澶�";
+ default:// 鍏朵粬绫诲瀷
+ return "";
+ }
+ }
+
+ public static int getPlatformCode(String platform) {
+ if ("android".equalsIgnoreCase(platform))
+ return 1;
+ else if ("ios".equalsIgnoreCase(platform))
+ return 2;
+ else
+ return 0;// 鏈煡
+ }
}
--
Gitblit v1.8.0