Merge pull request Blankj#843 from Blankj/1.23.5

1.23.5

Author: Blankj

README-CN.md

@@ -41,7 +41,7 @@
 
 [logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png
 
-[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.23.4-brightgreen.svg
+[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.23.5-brightgreen.svg
 [auc]: https://github.com/Blankj/AndroidUtilCode
 
 [apiSvg]: https://img.shields.io/badge/API-14+-brightgreen.svg

README.md

@@ -41,7 +41,7 @@ If this project helps you a lot and you want to support the project's developmen
 
 [logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png
 
-[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.23.4-brightgreen.svg
+[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.23.5-brightgreen.svg
 [auc]: https://github.com/Blankj/AndroidUtilCode
 
 [apiSvg]: https://img.shields.io/badge/API-14+-brightgreen.svg

config.gradle

@@ -5,8 +5,8 @@ ext {
     compileSdkVersion = 27
     minSdkVersion = 14
     targetSdkVersion = 27
-    versionCode = 1_023_004
-    versionName = '1.23.4'// E.g. 1.9.72 => 1,009,072
+    versionCode = 1_023_005
+    versionName = '1.23.5'// E.g. 1.9.72 => 1,009,072
 
     bus = [
             isDebug: false,

launcher/pkg/src/main/java/com/blankj/launcher/pkg/MainActivity.kt

@@ -22,9 +22,7 @@ import kotlinx.android.synthetic.main.activity_main.*
  */
 class MainActivity : BaseDrawerActivity() {
 
-    override fun initData(bundle: Bundle?) {
-
-    }
+    override fun initData(bundle: Bundle?) {}
 
     override fun bindLayout(): Int {
         return R.layout.activity_main
@@ -53,17 +51,11 @@ class MainActivity : BaseDrawerActivity() {
         launcherMainSubUtilBtn.setOnClickListener {
             BusUtils.post<Any>("SubUtilActivity#start", this)
         }
-//        getWindow().setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE);
-
     }
 
-    override fun doBusiness() {
+    override fun doBusiness() {}
 
-    }
-
-    override fun onWidgetClick(view: View) {
-
-    }
+    override fun onWidgetClick(view: View) {}
 
     override fun onBackPressed() {
         ActivityUtils.startHomeActivity()

launcher/pkg/src/main/java/com/blankj/launcher/pkg/SplashActivity.kt

@@ -5,6 +5,10 @@ import android.view.View
 import com.blankj.lib.base.BaseActivity
 
 class SplashActivity : BaseActivity() {
+    override fun isSwipeBack(): Boolean {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
     override fun initData(bundle: Bundle?) {
         TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }

lib/base/build.gradle

@@ -15,5 +15,5 @@ dependencies {
     api dep.free_proguard
     api 'com.r0adkll:slidableactivity:2.0.5'
     compileOnly dep.leakcanary.android_no_op
-//    api 'com.blankj:utilcode:1.23.4'
+//    api 'com.blankj:utilcode:1.23.5'
 }

lib/base/src/main/java/com/blankj/lib/base/BaseActivity.kt

@@ -5,7 +5,11 @@ import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
 import android.view.LayoutInflater
 import android.view.View
-import com.blankj.utilcode.util.*
+import com.blankj.utilcode.util.AntiShakeUtils
+import com.blankj.utilcode.util.AppUtils
+import com.blankj.utilcode.util.ToastUtils
+import com.blankj.utilcode.util.Utils
+import com.r0adkll.slidr.Slidr
 
 /**
  * ```
@@ -20,13 +24,19 @@ abstract class BaseActivity : AppCompatActivity(), IBaseView {
     protected lateinit var mContentView: View
     protected lateinit var mActivity: Activity
 
+    abstract fun isSwipeBack(): Boolean
+
     override fun onCreate(savedInstanceState: Bundle?) {
         mActivity = this
         super.onCreate(savedInstanceState)
         initData(intent.extras)
         setRootLayout(bindLayout())
         initView(savedInstanceState, mContentView)
         doBusiness()
+
+        if (isSwipeBack()) {
+            Slidr.attach(this)
+        }
         AppUtils.registerAppStatusChangedListener(this, object : Utils.OnAppStatusChangedListener {
             override fun onForeground() {
                 ToastUtils.showShort("foreground")
@@ -53,6 +63,5 @@ abstract class BaseActivity : AppCompatActivity(), IBaseView {
     override fun onDestroy() {
         super.onDestroy()
         AppUtils.unregisterAppStatusChangedListener(this)
-        KeyboardUtils.fixSoftInputLeaks(this);
     }
 }

lib/base/src/main/java/com/blankj/lib/base/BaseDrawerActivity.kt

@@ -23,6 +23,10 @@ abstract class BaseDrawerActivity : BaseActivity() {
     protected lateinit var mBaseDrawerRootLayout: DrawerLayout
     protected lateinit var mBaseDrawerContainerView: FrameLayout
 
+    override fun isSwipeBack(): Boolean {
+        return false
+    }
+
     override fun setRootLayout(layoutId: Int) {
         super.setRootLayout(R.layout.activity_drawer)
         if (layoutId > 0) {

lib/base/src/main/java/com/blankj/lib/base/BaseLazyFragment.kt

@@ -30,7 +30,7 @@ abstract class BaseLazyFragment : BaseFragment() {
     }
 
     override fun doBusiness() {
-        if (userVisibleHint) {
+        if (userVisibleHint && !isDataLoaded) {
             doLazyBusiness()
             isDataLoaded = true
         }

lib/base/src/main/java/com/blankj/lib/base/BaseBackActivity.kt renamed to lib/base/src/main/java/com/blankj/lib/base/BaseTitleBarActivity.kt

@@ -1,35 +1,35 @@
 package com.blankj.lib.base
 
-import android.support.annotation.StringRes
-import android.support.v4.content.ContextCompat
 import android.view.LayoutInflater
 import android.view.MenuItem
 import com.blankj.utilcode.util.BarUtils
-import com.blankj.utilcode.util.Utils
-import com.r0adkll.slidr.Slidr
+import com.blankj.utilcode.util.ColorUtils
 import kotlinx.android.synthetic.main.activity_back.*
 
 /**
  * ```
  * author: blankj
  * blog  : http://blankj.com
  * time  : 2018/11/16
- * desc  : base about back activity
+ * desc  : base about title bar activity
  * ```
  */
-abstract class BaseBackActivity : BaseActivity() {
+abstract class BaseTitleBarActivity : BaseActivity() {
+
+    abstract fun bindTitle(): CharSequence
 
     override fun setRootLayout(layoutId: Int) {
         super.setRootLayout(R.layout.activity_back)
-        Slidr.attach(this)
         if (layoutId > 0) {
             LayoutInflater.from(this).inflate(layoutId, baseBackContainerView)
         }
         setSupportActionBar(baseBackToolbar)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
 
-        BarUtils.setStatusBarColor(this, ContextCompat.getColor(Utils.getApp(), R.color.colorPrimary))
+        BarUtils.setStatusBarColor(this, ColorUtils.getColor(R.color.colorPrimary))
         BarUtils.addMarginTopEqualStatusBarHeight(baseBackRootLayout)
+
+        supportActionBar?.title = bindTitle()
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
@@ -39,7 +39,7 @@ abstract class BaseBackActivity : BaseActivity() {
         return super.onOptionsItemSelected(item)
     }
 
-    override fun setTitle(@StringRes resId: Int) {
-        supportActionBar?.title = getString(resId)
+    override fun isSwipeBack(): Boolean {
+        return true
     }
 }

lib/base/src/main/res/layout/activity_back.xml

@@ -21,6 +21,7 @@
     </android.support.design.widget.AppBarLayout>
 
     <android.support.v4.widget.NestedScrollView
+        android:id="@+id/baseBackNsv"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">

subutil/lib/src/main/java/com/blankj/subutil/util/HttpsUtil.java

@@ -10,7 +10,7 @@
 /**
  * Create by MilkZS on 2019/1/9 13:36
  */
-public class HttpsUtil {
+public final class HttpsUtil {
 
     private static final int CONNECT_TIMEOUT_TIME = 15000;
     private static final int READ_TIMEOUT_TIME    = 19000;

subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/SubUtilActivity.kt

@@ -4,7 +4,7 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.view.View
-import com.blankj.lib.base.BaseBackActivity
+import com.blankj.lib.base.BaseTitleBarActivity
 import com.blankj.subutil.pkg.R
 import com.blankj.subutil.pkg.feature.location.LocationActivity
 import com.blankj.subutil.pkg.feature.pinyin.PinyinActivity
@@ -18,7 +18,7 @@ import com.blankj.utilcode.util.BusUtils
  * desc  : MainActivity
  * ```
  */
-class SubUtilActivity : BaseBackActivity() {
+class SubUtilActivity : BaseTitleBarActivity() {
 
     companion object {
         @BusUtils.Subscribe(name = "SubUtilActivity#start")
@@ -28,25 +28,21 @@ class SubUtilActivity : BaseBackActivity() {
         }
     }
 
-    override fun initData(bundle: Bundle?) {
-
+    override fun bindTitle(): CharSequence {
+        return getString(R.string.sub_util)
     }
 
+    override fun initData(bundle: Bundle?) {}
+
     override fun bindLayout(): Int {
         return R.layout.activity_util_sub
     }
 
-    override fun initView(savedInstanceState: Bundle?, contentView: View) {
-        setTitle(R.string.sub_util)
-    }
+    override fun initView(savedInstanceState: Bundle?, contentView: View) {}
 
-    override fun doBusiness() {
+    override fun doBusiness() {}
 
-    }
-
-    override fun onWidgetClick(view: View) {
-
-    }
+    override fun onWidgetClick(view: View) {}
 
     fun locationClick(view: View) {
         LocationActivity.start(this)

subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/location/LocationActivity.kt

@@ -7,7 +7,7 @@ import android.content.ServiceConnection
 import android.os.Bundle
 import android.os.IBinder
 import android.view.View
-import com.blankj.lib.base.BaseBackActivity
+import com.blankj.lib.base.BaseTitleBarActivity
 import com.blankj.subutil.pkg.R
 import com.blankj.subutil.pkg.helper.PermissionHelper
 import com.blankj.utilcode.util.SpanUtils
@@ -21,7 +21,7 @@ import kotlinx.android.synthetic.main.activity_location.*
  * desc  : demo about LocationUtils
  * ```
  */
-class LocationActivity : BaseBackActivity() {
+class LocationActivity : BaseTitleBarActivity() {
 
     companion object {
         fun start(context: Context) {
@@ -41,9 +41,7 @@ class LocationActivity : BaseBackActivity() {
     private lateinit var mLocationService: LocationService
 
     private var conn: ServiceConnection = object : ServiceConnection {
-        override fun onServiceDisconnected(name: ComponentName) {
-
-        }
+        override fun onServiceDisconnected(name: ComponentName) {}
 
         override fun onServiceConnected(name: ComponentName, service: IBinder) {
             mLocationService = (service as LocationService.LocationBinder).service
@@ -66,17 +64,17 @@ class LocationActivity : BaseBackActivity() {
         }
     }
 
-    override fun initData(bundle: Bundle?) {
-
+    override fun bindTitle(): CharSequence {
+        return getString(R.string.demo_location)
     }
 
+    override fun initData(bundle: Bundle?) {}
+
     override fun bindLayout(): Int {
         return R.layout.activity_location
     }
 
     override fun initView(savedInstanceState: Bundle?, contentView: View) {
-        setTitle(R.string.demo_location)
-
         SpanUtils.with(locationAboutTv)
                 .appendLine("lastLatitude: unknown")
                 .appendLine("lastLongitude: unknown")
@@ -92,9 +90,7 @@ class LocationActivity : BaseBackActivity() {
         bindService(Intent(this, LocationService::class.java), conn, Context.BIND_AUTO_CREATE)
     }
 
-    override fun onWidgetClick(view: View) {
-
-    }
+    override fun onWidgetClick(view: View) {}
 
     override fun onDestroy() {
         unbindService(conn)

subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/location/LocationService.kt

@@ -49,9 +49,7 @@ class LocationService : Service() {
             mOnGetLocationListener?.getLocation(lastLatitude, lastLongitude, latitude, longitude, country, locality, street)
         }
 
-        override fun onStatusChanged(provider: String, status: Int, extras: Bundle) {
-
-        }
+        override fun onStatusChanged(provider: String, status: Int, extras: Bundle) {}
     }
 
     fun setOnGetLocationListener(onGetLocationListener: OnGetLocationListener) {

subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/pinyin/PinyinActivity.kt

@@ -4,7 +4,7 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.view.View
-import com.blankj.lib.base.BaseBackActivity
+import com.blankj.lib.base.BaseTitleBarActivity
 import com.blankj.subutil.pkg.R
 import com.blankj.subutil.util.PinyinUtils
 import kotlinx.android.synthetic.main.activity_pinyin.*
@@ -17,7 +17,7 @@ import kotlinx.android.synthetic.main.activity_pinyin.*
  * desc  : demo about PinyinUtils
  * ```
  */
-class PinyinActivity : BaseBackActivity() {
+class PinyinActivity : BaseTitleBarActivity() {
 
     companion object {
         fun start(context: Context) {
@@ -26,17 +26,17 @@ class PinyinActivity : BaseBackActivity() {
         }
     }
 
-    override fun initData(bundle: Bundle?) {
-
+    override fun bindTitle(): CharSequence {
+        return getString(R.string.demo_pinyin)
     }
 
+    override fun initData(bundle: Bundle?) {}
+
     override fun bindLayout(): Int {
         return R.layout.activity_pinyin
     }
 
     override fun initView(savedInstanceState: Bundle?, contentView: View) {
-        setTitle(R.string.demo_pinyin)
-
         val surnames = "乐乘乜仇会便区单参句召员宓弗折曾朴查洗盖祭种秘繁缪能蕃覃解谌适都阿难黑"
         val size = surnames.length
         val sb = StringBuilder("汉字转拼音: " + PinyinUtils.ccs2Pinyin("汉字转拼音", " ")
@@ -58,11 +58,7 @@ class PinyinActivity : BaseBackActivity() {
         pinyinAboutTv.text = sb.toString()
     }
 
-    override fun doBusiness() {
+    override fun doBusiness() {}
 
-    }
-
-    override fun onWidgetClick(view: View) {
-
-    }
+    override fun onWidgetClick(view: View) {}
 }