Merge remote-tracking branch 'origin/dev' into dev

# Conflicts: #	build.gradle

Author: AriesHoo

README.md

@@ -186,7 +186,7 @@ dependencies {
 <dependency>
  <groupId>com.github.AriesHoo</groupId>
  <artifactId>FastLib</artifactId>
- <version>2.3.2</version>
+ <version>2.3.4</version>
 </dependency>
 ```
 
@@ -200,11 +200,13 @@ implementation project(':fastLib')
 
 ```
  compileSdkVersion = 28
- minSdkVersion = 16
+ minSdkVersion = 19
  minLibSdkVersion = 15
  targetSdkVersion = 28
  supportVersion = "1.0.0"
  widgetVersion = "3.2.24"
+ versionCode = 246
+ versionName = "2.3.4"
 ```
 
 ```
@@ -219,7 +221,7 @@ dependencies {
  //下拉刷新库
  compileOnly 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0-andx-14'
  //图片加载
- compileOnly 'com.github.bumptech.glide:glide:4.8.0'
+ compileOnly 'com.github.bumptech.glide:glide:4.10.0'
  //常用UI控件(TitleBarView、RadiusView等)
  api "com.github.AriesHoo.UIWidget:widget-core:$rootProject.widgetVersion"
  //快速Tab库

app/build.gradle

@@ -76,7 +76,7 @@ android {
 dependencies {
  implementation fileTree(include: ['*.jar'], dir: 'libs')
  implementation project(':library')
- // implementation 'com.github.AriesHoo:FastLib:2.3.2'
+// implementation 'com.github.AriesHoo:FastLib:2.3.4'
  debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.6.3'
  releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.6.3'
  testImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.6.3'
@@ -102,16 +102,16 @@ dependencies {
  //下拉刷新库注意刷新头SmartRefreshHeader版本最好对应尤其头版本不要低于SmartRefreshLayout版本
  implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0-andx-14'
  //Glide图片加载
- implementation 'com.github.bumptech.glide:glide:4.8.0'
- annotationProcessor 'com.github.bumptech.glide:compiler:4.8.0'
+ implementation 'com.github.bumptech.glide:glide:4.10.0'
+ annotationProcessor 'com.github.bumptech.glide:compiler:4.10.0'
  annotationProcessor 'com.jakewharton:butterknife-compiler:10.1.0'
  //以上库FastLib里使用compileOnly只是编译,使用时需根据项目选择相应版本
  implementation 'cn.bingoogolapple:bga-banner:2.1.7@aar'
  implementation 'com.scwang.smartrefresh:SmartRefreshHeader:1.1.0-andx-14'
  implementation 'com.github.lygttpod:SuperTextView:2.1.8'
  implementation 'com.flyco.labelview:FlycoLabelView_Lib:1.0.2@aar'
  //文件选择器
- implementation 'com.github.LuckSiege.PictureSelector:picture_library:v2.2.3'
+ implementation 'com.github.LuckSiege.PictureSelector:picture_library:v2.2.5'
  //友盟统计
  implementation 'com.umeng.analytics:analytics:latest.integration'
  //Bugly

app/src/main/AndroidManifest.xml

@@ -1,26 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="com.aries.library.fast.demo">
+ package="com.aries.library.fast.demo">
 
  <!--<uses-feature android:name="android.hardware.screen.portrait"/>-->
 
- <uses-permission android:name="android.permission.INTERNET"/>
- <uses-permission android:name="android.permission.CAMERA"/>
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
- <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
- <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+ <uses-permission android:name="android.permission.INTERNET" />
+ <uses-permission android:name="android.permission.CAMERA" />
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+ <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+ <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
  <!-- AgentWeb 是默认启动定位 -->
- <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
- <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
- <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
- <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
- <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
+ <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+ <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+ <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+ <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+ <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
 
 
  <application
  android:name=".App"
  android:allowBackup="true"
  android:icon="@drawable/ic_launcher"
+ android:roundIcon="@drawable/ic_launcher"
  android:label="@string/app_name"
  android:supportsRtl="true"
  android:theme="@style/AppTheme">
@@ -33,7 +34,8 @@
  android:value="${app_channel}" />
  <meta-data
  android:name="BaiduMobAd_CHANNEL"
- android:value="${app_channel}"/>
+ android:value="${app_channel}" />
+
  <provider
  android:name="androidx.core.content.FileProvider"
  android:authorities="${applicationId}.fileprovider"
@@ -47,78 +49,79 @@
  <provider
  android:name="com.pgyersdk.PgyerProvider"
  android:authorities="${applicationId}.com.pgyer.provider"
- android:exported="false"/>
+ android:exported="false" />
  <!-- 必填 -->
  <meta-data
  android:name="PGYER_APPID"
- android:value="${PGYER_ID}">
- </meta-data>
+ android:value="${PGYER_ID}"></meta-data>
+
  <activity
  android:name=".module.SplashActivity"
- android:configChanges="locale|layoutDirection|mcc|mnc">
+ android:configChanges="locale|layoutDirection|mcc|mnc"
+ android:theme="@style/NormalSplash">
  <intent-filter>
- <action android:name="android.intent.action.MAIN"/>
- <category android:name="android.intent.category.LAUNCHER"/>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.LAUNCHER" />
  </intent-filter>
  </activity>
  <activity
  android:name=".module.main.MainActivity"
- android:launchMode="singleTop"
- android:configChanges="locale|layoutDirection|mcc|mnc|orientation|screenSize"/>
+ android:configChanges="locale|layoutDirection|mcc|mnc|orientation|screenSize"
+ android:launchMode="singleTop" />
  <!-- 应用内浏览器 -->
  <activity
  android:name=".module.WebViewActivity"
  android:configChanges="locale|layoutDirection|mcc|mnc|orientation|screenSize"
  android:hardwareAccelerated="true"
- android:label="@string/fast_loading"/>
+ android:label="@string/fast_loading" />
  <activity
  android:name=".module.WebAppActivity"
  android:configChanges="locale|layoutDirection|mcc|mnc|orientation|screenSize"
  android:hardwareAccelerated="true"
- android:label="@string/fast_loading"/>
+ android:label="@string/fast_loading" />
  <activity
  android:name=".module.main.sample.TitleWithEditTextActivity"
  android:configChanges="locale|layoutDirection|mcc|mnc"
- android:label="Title+底部输入框测试"/>
+ android:label="Title+底部输入框测试" />
  <activity
  android:name=".module.main.sample.ToastActivity"
- android:label="ToastUtil工具类示例"/>
+ android:label="ToastUtil工具类示例" />
  <activity
  android:name=".module.main.sample.SingleFragmentActivity"
  android:configChanges="locale|layoutDirection|mcc|mnc"
- android:label="Activity直接嵌套Fragment懒加载效果"/>
+ android:label="Activity直接嵌套Fragment懒加载效果" />
  <activity
  android:name=".module.main.sample.SwipeBackActivity"
  android:configChanges="locale|layoutDirection|mcc|mnc"
- android:label="微信滑动返回样式效果"/>
+ android:label="微信滑动返回样式效果" />
  <activity
  android:name=".module.main.sample.QQTitleActivity"
  android:configChanges="locale|layoutDirection|mcc|mnc"
- android:label="QQ默认主题TitleBar背景渐变"/>
+ android:label="QQ默认主题TitleBar背景渐变" />
  <activity
  android:name=".module.main.sample.ali.ALiPayMainActivity"
  android:configChanges="locale|layoutDirection|mcc|mnc"
- android:label="支付宝主界面效果"/>
+ android:label="支付宝主界面效果" />
  <activity
  android:name=".module.main.sample.news.NewsMainActivity"
  android:configChanges="locale|layoutDirection|mcc|mnc"
- android:label="腾讯新闻主界面效果"/>
+ android:label="腾讯新闻主界面效果" />
  <activity
  android:name=".module.main.sample.TestStatusActivity"
  android:configChanges="locale|layoutDirection|mcc|mnc"
- android:label="@string/test_status"/>
+ android:label="@string/test_status" />
  <activity
  android:name=".module.main.sample.FastViewActivity"
  android:configChanges="locale|layoutDirection|mcc|mnc"
- android:label="模拟快速下拉刷新及TitleBarView统一设置"/>
+ android:label="模拟快速下拉刷新及TitleBarView统一设置" />
  <activity
  android:name=".module.mine.SettingActivity"
  android:configChanges="locale|layoutDirection|mcc|mnc"
- android:label="@string/setting"/>
+ android:label="@string/setting" />
  <activity
  android:name=".module.mine.ThirdLibraryActivity"
  android:configChanges="locale|layoutDirection|mcc|mnc"
- android:label="@string/third_part"/>
+ android:label="@string/third_part" />
  </application>
 
 </manifest>

app/src/main/java/com/aries/library/fast/demo/module/SplashActivity.java

@@ -1,5 +1,9 @@
 package com.aries.library.fast.demo.module;
 
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.animation.AnimatorSet;
+import android.animation.ObjectAnimator;
 import android.graphics.Color;
 import android.os.Bundle;
 import android.view.View;
@@ -16,6 +20,8 @@
 import com.aries.library.fast.retrofit.FastObserver;
 import com.aries.library.fast.util.FastStackUtil;
 import com.aries.library.fast.util.FastUtil;
+import com.aries.library.fast.util.SizeUtil;
+import com.aries.ui.helper.navigation.NavigationBarUtil;
 import com.aries.ui.util.DrawableUtil;
 import com.aries.ui.util.StatusBarUtil;
 import com.aries.ui.view.title.TitleBarView;
@@ -34,6 +40,10 @@ public class SplashActivity extends FastTitleActivity {
  @BindView(R.id.tv_appSplash) TextView tvApp;
  @BindView(R.id.tv_versionSplash) TextView tvVersion;
  @BindView(R.id.tv_copyRightSplash) TextView tvCopyRight;
+ /**
+ * 闪屏
+ */
+ private long mDelayTime = 1800;
 
  @Override
  public void beforeSetContentView() {
@@ -68,20 +78,72 @@ public void initView(Bundle savedInstanceState) {
  getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
  }
  tvApp.setCompoundDrawablesWithIntrinsicBounds(null,
- DrawableUtil.setTintDrawable(ContextCompat.getDrawable(mContext, R.drawable.ic_launcher).mutate(), Color.WHITE)
+ DrawableUtil.setTintDrawable(ContextCompat.getDrawable(mContext, R.drawable.img_splash).mutate(), Color.WHITE)
  , null, null);
  mContentView.setBackgroundResource(R.drawable.img_bg_login);
  tvVersion.setText("V" + FastUtil.getVersionName(mContext));
  tvVersion.setTextColor(Color.WHITE);
  tvCopyRight.setTextColor(Color.WHITE);
- RxJavaManager.getInstance().setTimer(2000)
+ startAnimator();
+ }
+
+ /**
+ * 动画
+ */
+ private void startAnimator() {
+ float transY = (SizeUtil.getScreenHeight() + NavigationBarUtil.getNavigationBarHeight(this)) * 0.25f;
+ //以控件自身所在的位置为原点，从下方距离原点200像素的位置移动到原点
+ ObjectAnimator tranCenter = ObjectAnimator.ofFloat(tvVersion, "translationY", transY, 0);
+ ObjectAnimator tranBottom = ObjectAnimator.ofFloat(tvCopyRight, "translationY", transY, 0);
+ //将控件alpha属性从0变到1
+ ObjectAnimator alphaCenter = ObjectAnimator.ofFloat(tvVersion, "alpha", 0, 1);
+ ObjectAnimator alphaBottom = ObjectAnimator.ofFloat(tvCopyRight, "alpha", 0, 1);
+ //初始化logo的移动和缩放动画
+
+ //logo由屏幕中间移动回原始位置
+ ObjectAnimator tranLogo = ObjectAnimator.ofFloat(tvApp, "translationY", transY, 0);
+ //ivLogo在X轴和Y轴上都由0.5倍缩放到原本尺寸
+ ObjectAnimator scaleXLogo = ObjectAnimator.ofFloat(tvApp, "scaleX", 0.5f, 1f);
+ ObjectAnimator scaleYLogo = ObjectAnimator.ofFloat(tvApp, "scaleY", 0.5f, 1f);
+ AnimatorSet animatorSet = new AnimatorSet();
+ animatorSet.setDuration(mDelayTime*2/3);
+ animatorSet.play(tranLogo)
+ .with(scaleXLogo)
+ .with(scaleYLogo)
+ .with(tranCenter)
+ .with(tranBottom)
+ .with(alphaCenter)
+ .with(alphaBottom);
+ animatorSet.start();
+
+ animatorSet.addListener(new AnimatorListenerAdapter() {
+ @Override
+ public void onAnimationEnd(Animator animation) {
+ super.onAnimationEnd(animation);
+ startGo();
+ }
+ });
+ }
+
+ private void startGo() {
+ RxJavaManager.getInstance().setTimer(mDelayTime/3)
  .compose(bindUntilEvent(ActivityEvent.DESTROY))
  .subscribe(new FastObserver<Long>() {
  @Override
  public void _onNext(Long entity) {
+ if (isFinishing() || isDestroyed()) {
+ return;
+ }
  FastUtil.startActivity(mContext, MainActivity.class);
  finish();
  }
  });
  }
+
+ @Override
+ public void onWindowFocusChanged(boolean hasFocus) {
+ super.onWindowFocusChanged(hasFocus);
+ StatusBarUtil.hideStatusBar(this,true);
+ NavigationBarUtil.hideNavigationBar(this,true);
+ }
 }

app/src/main/res/drawable-xxxhdpi/img_splash.png

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:drawable="@drawable/img_bg_login" />
+ <item>
+ <bitmap
+ android:gravity="center"
+ android:src="@drawable/img_splash" />
+ </item>
+</layer-list>

app/src/main/res/drawable/layer_bg_splash.xml

@@ -19,7 +19,7 @@
  android:layout_width="wrap_content"
  android:layout_height="wrap_content"
  android:drawablePadding="12dp"
- android:drawableTop="@drawable/ic_launcher"
+ android:drawableTop="@drawable/img_splash"
  android:gravity="center"
  android:text="@string/app_name"
  android:textColor="@color/colorWhite"

app/src/main/res/layout/activity_splash.xml

@@ -1,5 +1,4 @@
-<resources
- xmlns:tools="http://schemas.android.com/tools">
+<resources xmlns:tools="http://schemas.android.com/tools">
 
  <!-- Base application theme. -->
  <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
@@ -14,6 +13,21 @@
  <item name="android:windowIsTranslucent">false</item>
  </style>
 
+ <style name="NormalSplash" parent="AppTheme">
+ <item name="android:windowBackground">@drawable/layer_bg_splash</item>
+ <item name="android:windowDisablePreview">false</item>
+ <item name="android:windowNoDisplay">false</item>
+ <item name="android:windowNoTitle">true</item>
+ <item name="windowActionBar">false</item>
+ <item name="windowNoTitle">true</item>
+ <item name="android:windowLightStatusBar" tools:targetApi="M">true</item>
+ <item name="android:windowLightNavigationBar" tools:targetApi="O_MR1">true</item>
+ <item name="android:statusBarColor" tools:targetApi="lollipop">@color/transparent</item>
+ <item name="android:navigationBarColor" tools:targetApi="lollipop">@color/transparent</item>
+ <item name="android:windowFullscreen">false</item>
+ <item name="android:windowContentOverlay">@null</item>
+ </style>
+
  <style name="SupperTextStyleItem">
  <item name="android:layout_width">match_parent</item>
  <item name="android:layout_height">wrap_content</item>

app/src/main/res/values/styles.xml

@@ -55,7 +55,7 @@ dependencies {
  //下拉刷新库
  compileOnly 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0-andx-14'
  //图片加载
- compileOnly 'com.github.bumptech.glide:glide:4.8.0'
+ compileOnly 'com.github.bumptech.glide:glide:4.10.0'
  //常用UI控件(TitleBarView、RadiusView等)
  api "com.github.AriesHoo.UIWidget:widget-core:$rootProject.widgetVersion"
  //快速Tab库

library/build.gradle

@@ -49,6 +49,8 @@
  **[] $VALUES;
  public *;
 }
+# for DexGuard only
+-keepresourcexmlelements manifest/application/meta-data@value=GlideModule
 #Glide-END
 
 #EventBus-START