整理build.gradle并添加极光推送测试key

app/build.gradle

@@ -59,58 +59,35 @@ android {
         }
     }
     productFlavors.all { flavor ->
-        flavor.manifestPlaceholders = [UMENG_CHANNEL_VALUE: "${flavor.name}",
-                                       DUANDUAN_GRAPH     : "${flavor.name}",
+        flavor.manifestPlaceholders = [DUANDUAN_GRAPH     : "${flavor.name}",
                                        DUANDUAN_DATASHARE : "${flavor.name}",
         ]
     }
     productFlavors {
-        sheepzhangwei {
-            applicationId "com.sheep.jiuyan.samllsheep"
-            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "sheeptest",
-                                    DUANDUAN_GRAPH     : "sheeptest",
-                                    DUANDUAN_DATASHARE : "sheeptest",
-                                    UMENG_APPKEY       : "58edcfeb310c93091c000be2"
-            ]
-            buildConfigField "String", "DUANDUAN_DATASHARE", '"sheeptest"'
-            buildConfigField "String", "DUANDUAN_GRAPH", '"sheeptest"'
-            buildConfigField "boolean", "XXTEA_ENCRYPT", 'true'//false为不用加密
-            buildConfigField "String", "API_DOMAIN", '"test.bdmapp.kfzs.com"'
-            buildConfigField "String", "JFSC_DOMAIN", '"http://10.8.210.190:8080/"'//积分商城
-            buildConfigField "String", "CAPTCHA_DOMAIN", '"captcha.kuaifazs.com"'
-            buildConfigField "String", "umeng_appkey", '"58dc9509aed17959a3001bff"'
-            signingConfig signingConfigs.config
-        }
         sheeptest {
             applicationId "com.sheep.jiuyan.samllsheep"
-            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "sheeptest",
-                                    DUANDUAN_GRAPH     : "sheeptest",
+            manifestPlaceholders = [DUANDUAN_GRAPH     : "sheeptest",
                                     DUANDUAN_DATASHARE : "sheeptest",
+                                    JPUSH_APPKEY       : "4fea09bdbf9661a9689ee306",
                                     UMENG_APPKEY       : "58edcfeb310c93091c000be2"
             ]
             buildConfigField "String", "DUANDUAN_DATASHARE", '"sheeptest"'
             buildConfigField "String", "DUANDUAN_GRAPH", '"sheeptest"'
             buildConfigField "boolean", "XXTEA_ENCRYPT", 'true'
-            buildConfigField "String", "API_DOMAIN", '"test.bdmapp.kfzs.com"'
-            buildConfigField "String", "JFSC_DOMAIN", '"http://10.8.210.190:8080/"'//积分商城
-            buildConfigField "String", "CAPTCHA_DOMAIN", '"captcha.kuaifazs.com"'
-            buildConfigField "String", "umeng_appkey", '"58dc9509aed17959a3001bff"'
+            buildConfigField "String", "API_DOMAIN", '"app.ss.kfzs.com"'
             signingConfig signingConfigs.config
         }
         sheep {
             applicationId "com.sheep.jiuyan.samllsheep"
-            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "sheep",
-                                    DUANDUAN_GRAPH     : "sheep",
+            manifestPlaceholders = [DUANDUAN_GRAPH     : "sheep",
                                     DUANDUAN_DATASHARE : "sheep",
+                                    JPUSH_APPKEY       : "28b74d520261c6f78e3e0921",
                                     UMENG_APPKEY       : "58edcfeb310c93091c000be2"
             ]
             buildConfigField "String", "DUANDUAN_DATASHARE", '"sheep"'
             buildConfigField "String", "DUANDUAN_GRAPH", '"sheep"'
             buildConfigField "boolean", "XXTEA_ENCRYPT", 'true'
             buildConfigField "String", "API_DOMAIN", '"app.ss.kfzs.com"'
-            buildConfigField "String", "JFSC_DOMAIN", '"http://jf.bandaimi.com/"'//积分商城
-            buildConfigField "String", "CAPTCHA_DOMAIN", '"captcha.kuaifazs.com"'
-            buildConfigField "String", "umeng_appkey", '"58dc9509aed17959a3001bff"'
             signingConfig signingConfigs.config
 
         }

app/src/main/java/com/kfzs/duanduan/bll/UrlBll.java

@@ -48,10 +48,6 @@ public final class UrlBll {
      */
 
     /**
-     * 服务器地址
-     */
-    public static final String CAPTCHA_DOMAIN = PROTOCOL_HTTP + BuildConfig.CAPTCHA_DOMAIN;
-    /**
      * API服务器地址
      */
     public static final String API_DOMAIN = PROTOCOL_HTTP + BuildConfig.API_DOMAIN;
@@ -88,7 +84,6 @@ public final class UrlBll {
     }
 
     public final class AuthApi {
-        public static final String SHOW_CAPTCHA = CAPTCHA_DOMAIN + "/showimage?key=";
         public static final String AUTH = API_VERSION + "/auth";
         public static final String CAPTCHA = AUTH + "/captcha";
         public static final String FIND_PWD = AUTH + "/findPwd";

app/src/main/java/com/kfzs/duanduan/db/DataSave.java

@@ -78,16 +78,6 @@ public class DataSave {
         return channelName;
     }
 
-    public String getUmengKey() {
-        if (umengKey == null) {
-            if (TextUtils.isEmpty(BuildConfig.umeng_appkey)) {
-                umengKey = BuildConfig.umeng_appkey;
-            } else {
-                umengKey = "58bd0a3475ca3518a2002436";
-            }
-        }
-        return umengKey;
-    }
 
     public static synchronized DataSave getInstance() {
         if (instance == null) {

app/src/main/java/com/kfzs/duanduan/utils/net/ResponseAuthCaptcha.java

@@ -1,45 +0,0 @@
-package com.kfzs.duanduan.utils.net;
-
-import com.android.volleyplus.Response;
-import com.kfzs.duanduan.bll.UrlBll;
-import com.kfzs.duanduan.proto.ApiResponseOuterClass;
-import com.kfzs.duanduan.proto.Captcha;
-
-/**
- * <pre>
- *     sinlov
- *
- *     /\__/\
- *    /`    '\
- *  ≈≈≈ 0  0 ≈≈≈ Hello world!
- *    \  --  /
- *   /        \
- *  /          \
- * |            |
- *  \  ||  ||  /
- *   \_oo__oo_/≡≡≡≡≡≡≡≡o
- *
- * </pre>
- * Created by sinlov on 17/2/28.
- */
-public abstract class ResponseAuthCaptcha implements Response.Listener<ApiResponseOuterClass.ApiResponse> {
-    @Override
-    public void onResponse(ApiResponseOuterClass.ApiResponse apiResponse) {
-        int code = apiResponse.getCodeValue();
-        if (code == ApiResponseOuterClass.Codes.Success_VALUE) {
-            Captcha.CaptchaOut captchaOut = apiResponse.getCaptchaOut();
-            if (null != captchaOut) {
-                String key = captchaOut.getKey();
-                onAuthCaptchaURL(key, UrlBll.AuthApi.SHOW_CAPTCHA + key);
-            } else {
-                onErrorAuthCaptchaURL(code, "parse error getCaptchaOut is Empty!");
-            }
-        } else {
-            onErrorAuthCaptchaURL(code, apiResponse.getMsg());
-        }
-    }
-
-    public abstract void onAuthCaptchaURL(String key, String url);
-
-    public abstract void onErrorAuthCaptchaURL(int code, String msg);
-}