Merge branch 'master' of http://192.168.3.207:10080/qmx/jyapp

android/app/app.iml

@@ -102,6 +102,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/reports" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 26 Platform" jdkType="Android SDK" />

android/app/build.gradle

@@ -7,7 +7,7 @@ android {
         minSdkVersion 19
         targetSdkVersion 26
         versionCode 1
-        versionName "1.0.1"
+        versionName "1.0.2"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

android/app/src/main/java/com/topsoft/jianyu/MainActivity.java

@@ -77,8 +77,8 @@ public class MainActivity extends AppCompatActivity {
         SharedPreferences sp = getSharedPreferences("jy", Context.MODE_PRIVATE);
         String token = sp.getString("token", "");
         if("".equals(token)){
-            //initWebview(AppUtil.AppUrl+"/jyapp/free/index");
-            initWebview(AppUtil.AppUrl+"/jyapp/free/login");
+            initWebview(AppUtil.AppUrl+"/jyapp/free/index");
+            //initWebview(AppUtil.AppUrl+"/jyapp/free/login");
         }else{
             initWebview(AppUtil.AppUrl+"/jyapp/free/login?sign="+token+"&url="+URLEncoder.encode("/jyapp/jylab/mainSearch")+"&from=restart");
         }
@@ -332,8 +332,8 @@ public class MainActivity extends AppCompatActivity {
                             public void onResponse(String s, int i) {
                                 webViewFinish=false;
                                 if(AppUtil.NetworkState(ctx)){
-                                    // wv.loadUrl(AppUtil.AppUrl+"/jyapp/free/kicked");
-                                    wv.loadUrl(AppUtil.AppUrl+"/jyapp/free/login");
+                                    wv.loadUrl(AppUtil.AppUrl+"/jyapp/free/kicked");
+                                    //wv.loadUrl(AppUtil.AppUrl+"/jyapp/free/login");
                                     new Timer().schedule(new TimerTask() {
                                         @Override
                                         public void run() {

android/app/src/main/java/com/topsoft/jianyu/util/AppUtil.java

@@ -30,8 +30,7 @@ public class AppUtil {
 
     //public static String AppUrl="http://webwcj.qmx.top";
     //public static String AppUrl="http://w2blmjy.qmx.top";
-    public static String AppUrl="http://192.168.100.65:8010";
-    //public static String AppUrl="https://www.jianyu360.com/";
+    public static String AppUrl="https://www.jianyu360.com/";
     /**
      * 判断当前应用是否是debug状态
      */