Parcourir la source

修复与半袋米的冲突

zengjiebin il y a 8 ans
Parent
commit
827c07e4a6

+ 10 - 10
app/build.gradle

@@ -66,13 +66,13 @@ android {
     productFlavors {
         sheeptest {
             applicationId "com.sheep.jiuyan.samllsheep"
-            manifestPlaceholders = [UMENG_CHANNEL_VALUE   : "bandaimitest",
-                                    DUANDUAN_GRAPH        : "bandaimitest",
-                                    DUANDUAN_DATASHARE    : "bandaimitest",
+            manifestPlaceholders = [UMENG_CHANNEL_VALUE   : "sheeptest",
+                                    DUANDUAN_GRAPH        : "sheeptest",
+                                    DUANDUAN_DATASHARE    : "sheeptest",
                                     UMENG_APPKEY          : "58edcfeb310c93091c000be2"
             ]
-            buildConfigField "String", "DUANDUAN_DATASHARE", '"bandaimitest"'
-            buildConfigField "String", "DUANDUAN_GRAPH", '"bandaimitest"'
+            buildConfigField "String", "DUANDUAN_DATASHARE", '"sheeptest"'
+            buildConfigField "String", "DUANDUAN_GRAPH", '"sheeptest"'
             buildConfigField "boolean", "KF_DEBUG", 'true'
 //            buildConfigField "String", "API_DOMAIN", '"10.8.210.229:8081"'
 //            buildConfigField "String", "RN_DOMAIN", '"10.8.210.229:8070"'
@@ -86,13 +86,13 @@ android {
         sheep {
             applicationId "com.sheep.jiuyan.samllsheep"
 //            applicationId "com.kfzs.duanduan.bandaimi"
-            manifestPlaceholders = [UMENG_CHANNEL_VALUE   : "bandaimi",
-                                    DUANDUAN_GRAPH        : "bandaimi",
-                                    DUANDUAN_DATASHARE    : "bandaimi",
+            manifestPlaceholders = [UMENG_CHANNEL_VALUE   : "sheep",
+                                    DUANDUAN_GRAPH        : "sheep",
+                                    DUANDUAN_DATASHARE    : "sheep",
                                     UMENG_APPKEY          : "58edcfeb310c93091c000be2"
             ]
-            buildConfigField "String", "DUANDUAN_DATASHARE", '"bandaimi"'
-            buildConfigField "String", "DUANDUAN_GRAPH", '"bandaimi"'
+            buildConfigField "String", "DUANDUAN_DATASHARE", '"sheep"'
+            buildConfigField "String", "DUANDUAN_GRAPH", '"sheep"'
             buildConfigField "boolean", "KF_DEBUG", 'false'
             buildConfigField "String", "API_DOMAIN", '"app.bandai.yunduanzs.cn"'
             buildConfigField "String", "JFSC_DOMAIN", '"http://jf.bandaimi.com/"'//积分商城

+ 1 - 1
app/src/main/java/com/sheep/gamegroup/view/adapter/LieMakeMoneyAdp.java

@@ -126,7 +126,7 @@ public class LieMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
             case STATE_ON_HOOK_VC_OVERTIME://验证码超时请重新上传
                 earnings_name_tv.setText("验证码超时");
                 break;
-            case 7://用户已经验证等待脚本验证
+            case STATE_ON_HOOK_VERIFIED://用户已经验证等待脚本验证
                 earnings_name_tv.setText("等待服务器验证");
                 break;
             default:

+ 2 - 2
gradle.properties

@@ -17,8 +17,8 @@ org.gradle.jvmargs=-Xmx2048m
 # org.gradle.parallel=true
 android.injected.build.model.only.versioned = 3
 
-VERSION_NAME=1.1.1
-VERSION_CODE=101001
+VERSION_NAME=2.0.0
+VERSION_CODE=200000
 ANDROID_COMPILE_SDK_VERSION=27
 ANDROID_BUILD_TOOLS_VERSION=27.0.2
 ANDROID_MIN_SDK_VERSION=18