From f723205213f94e291f140425c0d670f43e213c96 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 02 九月 2019 10:48:05 +0800
Subject: [PATCH] 金币明细-文字修改
---
fanli/src/main/java/com/yeshi/fanli/util/Constant.java | 73 ++++++++++++++++++++++++++++++++----
1 files changed, 65 insertions(+), 8 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 fb57864..ea6b540 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
@@ -1,25 +1,27 @@
package com.yeshi.fanli.util;
+import java.util.HashSet;
import java.util.Properties;
+import java.util.Set;
+
+import org.yeshi.utils.annotation.MapUtil;
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;
import com.yeshi.fanli.entity.config.ZNXConfig;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
-import org.yeshi.utils.annotation.MapUtil;
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 +90,12 @@
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 SOURCE_TYPE_WPH = 4;
+ // 鏉ユ簮-鑻忓畞
+ public static final int SOURCE_TYPE_SUNING = 5;
// 鑷喘-杩斿埄
public static final int TYPE_REBATE = 1;
@@ -95,6 +103,11 @@
public static final int TYPE_SHAER = 2;
// 閭�璇�
public static final int TYPE_INVITE = 3;
+
+ // 鍙d护鏈夋晥鏈�-澶�
+ public static final int TOKEN_DAYS = 1;
+ // 璧犻�佹湁鏁堟湡-澶�
+ public static final int GIVE_DAYS = 1;
public static WXGZConfig wxGZConfig;
@@ -107,6 +120,8 @@
public static AlipayConfig alipayConfig;
public static ZNXConfig znxConfig;
+
+ public static ConstantConfig constantConfig;
/**
* 娣樺疂鍟嗗搧绾㈠寘
@@ -158,8 +173,11 @@
public static final String WEBPAGE_SIGN_KEY = "@?,223Hbb88lll";
- // public static final String TAOKE_ANDROID_APPKEY = "24587154";
- // public static final String TAOKE_IOS_APPKEY = "24838852";
+ // 鏂颁汉鎶藉-鏈�澶ф鏁�
+ public static final int MAX_COUNT_LOTTERY_NEWBIES = 5;
+
+ // 绾跨▼绛夊緟鏁伴噺
+ public static Set<Long> waitingThreadSet = new HashSet<>();
static {
@@ -190,8 +208,21 @@
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);
+ }
+
+ 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",
@@ -199,4 +230,30 @@
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 "鎷煎澶�";
+ case SOURCE_TYPE_WPH:
+ return "鍞搧浼�";
+ case SOURCE_TYPE_SUNING:
+ 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