提交分类： ui改版；

提交内容：  1、启动页3秒内没有完成网络请求也发生跳转
当前版本：  测试版本6.2.9
是否冲突：  否

WeiChat/build.gradle

@@ -5,7 +5,7 @@ apply plugin: 'AndResGuard'
 
 //定义时间
 def releaseTime() {
-   // return new Date().format("yyyyMMdd.HHmm.ss")
+    // return new Date().format("yyyyMMdd.HHmm.ss")
     return new Date().format("yyyyMMdd")
 }
 //设置发布的显示的版本号
@@ -19,33 +19,33 @@ def getVersionCode() {
     if (versionFile.canRead()) {
         Properties versionProps = new Properties()
         versionProps.load(new FileInputStream(versionFile))
-        def versionName=versionProps['versionName'].toInteger()
+        def versionName = versionProps['versionName'].toInteger()
         def versionCode = versionProps['versionCode'].toInteger()
-        def debugName=versionProps['debugName'].toInteger()
+        def debugName = versionProps['debugName'].toInteger()
         def debugCode = versionProps['debugCode'].toInteger()
-        def versionArray=new Integer[4]
-    
+        def versionArray = new Integer[4]
+
         def runTasks = gradle.startParameter.taskNames        //仅在assembleRelease任务是增加版本号
-        println 'runTasks:'+runTasks
-        if(':WeiChat:assembleBaiduDebug'in runTasks){
-            println 'runTasks:'+'debug模式打包apk'
+        println 'runTasks:' + runTasks
+        if (':WeiChat:assembleBaiduDebug' in runTasks) {
+            println 'runTasks:' + 'debug模式打包apk'
             versionProps['debugCode'] = (++debugCode).toString()
             versionProps['debugName'] = (++debugName).toString()
             versionProps.store(versionFile.newWriter(), null)
         }
-        if(':WeiChat:assembleBaiduRelease'in runTasks){
-            println 'runTasks:'+'发布模式打包apk'
+        if (':WeiChat:assembleBaiduRelease' in runTasks) {
+            println 'runTasks:' + '发布模式打包apk'
             versionProps['versionCode'] = (++versionCode).toString()
             versionProps['versionName'] = (++versionName).toString()
             versionProps.store(versionFile.newWriter(), null)
         }
-        versionArray[0]=versionName
-        versionArray[1]=versionCode
-        versionArray[2]=debugName
-        versionArray[3]=debugCode
-        
+        versionArray[0] = versionName
+        versionArray[1] = versionCode
+        versionArray[2] = debugName
+        versionArray[3] = debugCode
+
         println versionArray[0].toString()
-        return  versionArray
+        return versionArray
     } else {
         throw new GradleException("Could not find version.properties!")
     }
@@ -54,7 +54,7 @@ def getVersionCode() {
 
 android {
     def versionArray = getVersionCode()
-   
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
@@ -71,7 +71,7 @@ android {
     buildToolsVersion rootProject.ext.android.buildToolsVersion
 
     defaultConfig {
-        def versionNames="v"+versionArray[0].toString().substring(0,1)+"."+ versionArray[0].toString().substring(1,2)+"."+  versionArray[0].toString().substring(2,3)
+        def versionNames = "v" + versionArray[0].toString().substring(0, 1) + "." + versionArray[0].toString().substring(1, 2) + "." + versionArray[0].toString().substring(2, 3)
         applicationId project.applicationId
         minSdkVersion rootProject.ext.android.minSdkVersion
         targetSdkVersion rootProject.ext.android.targetSdkVersion
@@ -167,6 +167,7 @@ andResGuard {
             "R.string.firebase_database_url",
             "R.string.google_api_key",
             "R.string.google_crash_reporting_api_key",
+            "R.dimen.rc_*",
             //for umeng
             "R.anim.umeng*",
             "R.string.umeng*",
@@ -179,6 +180,7 @@ andResGuard {
             "R.color.umeng*",
             "R.color.tb_*",
             "R.style.*UM*",
+            "R.style.rc_*",
             "R.style.umeng*",
             "R.drawable.umeng*",
             "R.drawable.tb_*",
@@ -187,6 +189,7 @@ andResGuard {
             "R.drawable.tb_*",
             "R.id.umeng*",
             "R.id.*messager*",
+            "R.id.rc_*",
             "R.id.progress_bar_parent",
             "R.id.socialize_*",
             "R.id.webView",

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/SplashActivity.java

@@ -4,6 +4,7 @@ import android.Manifest;
 import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.os.Bundle;
+import android.os.Handler;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
@@ -63,7 +64,6 @@ public class SplashActivity extends BaseActivity {
     private final String IS_FIRST = "IS_FIRST";
     boolean isJumpable = false;
 
-    private long mStartTimeMs;// 记录进入该界面时间，保证至少在该界面停留3秒
     private boolean mConfigReady = false;// 配置获取成功
     private GifDrawable mGifDrawable;
     private boolean mAnimationCompleted = false;
@@ -75,6 +75,12 @@ public class SplashActivity extends BaseActivity {
         getSupportActionBar().hide();
         StatusBarUtil.immersive(this, 0x00000000, 0.0f);
 
+        new Handler().postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                jump();
+            }
+        }, 3000);
         mGifImageView = findViewById(R.id.splash_gif_view);
         try {
             mGifDrawable = new GifDrawable(getAssets(), "gif_splash_welcome.gif");

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Wed May 16 16:54:31 CST 2018
-debugName=260
+#Fri May 18 09:31:46 CST 2018
+debugName=261
 versionName=630
-debugCode=260
+debugCode=261
 versionCode=170

app_core/common/src/main/java/com/core/base/activity/BaseMVPActivity.java

@@ -3,7 +3,7 @@ package com.core.base.activity;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 
-import com.core.base.SupportToolBarActivity;
+import com.core.base.BaseActivity;
 import com.core.base.presenter.BasePresenter;
 import com.core.base.view.BaseView;
 
@@ -14,7 +14,7 @@ import com.core.base.view.BaseView;
  * @date 2017/11/9 14:20
  */
 
-public abstract class BaseMVPActivity<T extends BasePresenter> extends SupportToolBarActivity implements BaseView {
+public abstract class BaseMVPActivity<T extends BasePresenter> extends BaseActivity implements BaseView {
     protected T mPresenter;
 
     @Override

app_modular/applogin/src/main/AndroidManifest.xml

@@ -29,20 +29,15 @@
             android:windowSoftInputMode="adjustResize|stateHidden" />
         <activity android:name=".activity.EnterpriseCompleteActivity" />
         <activity android:name=".activity.IndustryChooseActivity" />
-        <activity android:name=".activity.ModifyPasswordModeActivity"
-                  android:theme="@style/MainBaseTheme"
-            />
+        <activity android:name=".activity.ModifyPasswordModeActivity" />
         <activity
             android:name=".activity.ModifyPasswordPhoneActivity"
-            android:theme="@style/MainBaseTheme"
             android:windowSoftInputMode="adjustResize|stateHidden" />
         <activity
             android:name=".activity.ModifyPasswordEmailActivity"
-            android:theme="@style/MainBaseTheme"
             android:windowSoftInputMode="adjustResize|stateHidden" />
         <activity
             android:name=".activity.ModifyPasswordEmailVerifyActivity"
-            android:theme="@style/MainBaseTheme"
             android:windowSoftInputMode="adjustResize|stateHidden" />
     </application>
 </manifest>