Merge branch 'sheep2.0' of http://10.8.230.114:3000/kemllor/small_sheep_android into sheep2.0

app/build.gradle

@@ -77,6 +77,7 @@ android {
             buildConfigField "boolean", "KF_DEBUG", 'true'
 //            buildConfigField "String", "API_DOMAIN", '"10.8.210.229:8081"'
             buildConfigField "String", "API_DOMAIN", '"test.bdmapp.kfzs.com"'
+            buildConfigField "String", "APP_URL", '"http://test.sheep.kfzs.com/"'
 //            buildConfigField "String", "API_DOMAIN", '"10.8.210.229:8081"'
             buildConfigField "String", "JFSC_DOMAIN", '"http://10.8.210.190:8080/"'//积分商城
             buildConfigField "String", "CAPTCHA_DOMAIN", '"captcha.kuaifazs.com"'
@@ -95,6 +96,7 @@ android {
             buildConfigField "String", "DUANDUAN_GRAPH", '"sheep"'
             buildConfigField "boolean", "KF_DEBUG", 'false'
             buildConfigField "String", "API_DOMAIN", '"app.bandai.yunduanzs.cn"'
+            buildConfigField "String", "APP_URL", '"http://ss.kfzs.com/"'
             buildConfigField "String", "JFSC_DOMAIN", '"http://jf.bandaimi.com/"'//积分商城
 //            buildConfigField "String", "API_DOMAIN", '"app.bdmoem.kfzs.com"'
 //            buildConfigField "String", "JFSC_DOMAIN", '"http://jf.bdmoem.kfzs.com/"'//积分商城

app/src/main/java/com/sheep/gamegroup/util/ConnectAddress.java

@@ -1,28 +1,18 @@
 package com.sheep.gamegroup.util;
 
+import com.sheep.jiuyan.samllsheep.BuildConfig;
+
 /**
  * Created by ljy on 2018/3/15.
  */
 
 public class ConnectAddress {
 
-//  public static final String BASE_HTTP = "http://10.8.220.6:8080/";//何威
-//    public static final String BASE_HTTP = "http://10.8.220.5:8080/";//张伟
-//   public static final String BASE_HTTP = "http://test.sheep.kfzs.com/";//测试服地址
-   public static final String BASE_HTTP = "http://ss.kfzs.com/";//正式地址
-
     public static final String V1 = "/v1/";
 
     /**
      * 接口地址
      */
-    public static final String APP_URL = BASE_HTTP;
-
-    private  static String   getAddress(){
-
-        return BASE_HTTP+V1;
-    }
-
-
+    public static final String APP_URL = BuildConfig.APP_URL;
 
 }