From a3ea58065f61d16f06a0883737eae320eef5c33a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 01 八月 2019 15:47:12 +0800
Subject: [PATCH] 非任务模式不执行京东/拼多多订单

---
 fanli/src/main/java/com/yeshi/fanli/util/Constant.java |   24 +++++++++++++++++++-----
 1 files changed, 19 insertions(+), 5 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 96941af..e3d530b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
@@ -196,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);
 		}
 
@@ -207,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",
@@ -218,4 +218,18 @@
 		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 "";
+		}
+
+	}
 }

--
Gitblit v1.8.0