Merge branch 'master' of https://git.coding.net/chengfeng-piaopiao/DuoBaoJingCai

.idea/misc.xml

@@ -27,7 +27,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

app/src/main/java/com/maile/jingcai/base/Constant.java

@@ -19,6 +19,12 @@ public class Constant {
     public static final boolean DEBUG = true;
 
     public static final String BASE_URL = "http://api.7peng.cn";
+    //大厅
+    public static final String GAME_HOME = "http://h5.7peng.cn/";
+    //商城
+    public static final String SHOP_HOME = "http://api.7peng.cn/shop";
+    //个人主页
+    public static final String PERSONALE_HOME = "http://h5.7peng.cn/profile.html";
 
     public static final String WEIXIN_APP_ID = "wxac811a3942bd3638";
     public static final String WEIXIN_APP_SECRET = "182ad59bb146ed391f7d6c8ce5664903";
@@ -35,27 +41,27 @@ public class Constant {
     //分享图片路径
     public final static String SHARE_DIR = sBANANA_DIR + "/share/";
 
-    //正式地址
-    public static final String RELEASE_BASE_URL = "http://700sport.com/";
-
-    //外部测试地址
-    public static final String OUT_BASE_URL_TEST = "http://106.75.137.139/"; //  测服的外网
-
-    //测试地址
-    public static final String BASE_URL_TEST = "http://192.168.175.136:8080/";
-
-
-    public static String getBaseUrl() {
-        switch (BuildConfig.network_type){
-            case networkType.TEST:
-                return BASE_URL_TEST;
-
-            case networkType.OUT_TEST:
-                return OUT_BASE_URL_TEST;
-
-            case networkType.RELEASE:
-            default:
-                return RELEASE_BASE_URL;
-        }
-    }
+//    //正式地址
+//    public static final String RELEASE_BASE_URL = "http://700sport.com/";
+//
+//    //外部测试地址
+//    public static final String OUT_BASE_URL_TEST = "http://106.75.137.139/"; //  测服的外网
+//
+//    //测试地址
+//    public static final String BASE_URL_TEST = "http://192.168.175.136:8080/";
+//
+//
+//    public static String getBaseUrl() {
+//        switch (BuildConfig.network_type){
+//            case networkType.TEST:
+//                return BASE_URL_TEST;
+//
+//            case networkType.OUT_TEST:
+//                return OUT_BASE_URL_TEST;
+//
+//            case networkType.RELEASE:
+//            default:
+//                return RELEASE_BASE_URL;
+//        }
+//    }
 }

app/src/main/java/com/maile/jingcai/view/activity/MainActivity.java

@@ -109,7 +109,7 @@ public class MainActivity extends FragmentActivity implements IWebView ,Activity
     //http://api.7peng.cn/shop  商城
     //http://h5.7peng.cn/profile.html 个人主页
     //
-    private String[] urls = {"http://h5.7peng.cn/","http://api.7peng.cn/shop","http://h5.7peng.cn/profile.html"};
+    private String[] urls = {Constant.GAME_HOME,Constant.SHOP_HOME,Constant.PERSONALE_HOME};
     private String uid;