Merge branch 'v_1.6'

Author: fmtcias

app/build.gradle

@@ -12,8 +12,8 @@ android {
         applicationId "com.fmt.github"
         minSdkVersion 15
         targetSdkVersion 28
-        versionCode 5
-        versionName "1.5"
+        versionCode 6
+        versionName "1.6"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     signingConfigs {
@@ -44,47 +44,31 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     //Androidx
-    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-    implementation 'androidx.recyclerview:recyclerview:1.0.0'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0'
     implementation 'com.google.android.material:material:1.0.0'
 
     //Android KTX 是一组 Kotlin 扩展程序，属于 Android Jetpack 系列
-    implementation 'androidx.core:core-ktx:1.0.2'
+    implementation 'androidx.core:core-ktx:1.1.0'
 
     //协程
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.0-M2'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0-M2'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.1.0-beta01'
-
-    //第三方控件
-    implementation 'de.hdodenhof:circleimageview:3.0.0'
-    implementation 'com.just.agentweb:agentweb:4.0.3-beta'
-    implementation project(path: ':simplebehavior')
-    implementation 'com.github.bumptech.glide:glide:4.9.0'
-    implementation 'com.github.GrenderG:Toasty:1.4.2'
-    implementation 'com.github.jd-alexander:LikeButton:0.2.3'
-    implementation  'com.github.Kennyc1012:MultiStateView:2.1'
-    implementation 'com.jaredrummler:animated-svg-view:1.0.6'
-    implementation 'com.jeremyliao:live-event-bus-x:1.4.4'
-    implementation 'com.github.nitrico.lastadapter:lastadapter:2.3.0'
-    implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0-andx-15'
-    implementation 'com.scwang.smartrefresh:SmartRefreshHeader:1.1.0-andx-15'
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'com.lxj:xpopup:1.8.10-x'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.0'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0'
 
     //okhttp + retrofit(2.6.0支持协程)
     implementation("com.squareup.okhttp3:logging-interceptor:4.0.0")
     implementation 'com.squareup.retrofit2:retrofit:2.6.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.6.0'
 
     //协程 + room
-    implementation "androidx.room:room-runtime:2.1.0"
-    kapt "androidx.room:room-compiler:2.1.0"
-    implementation "androidx.room:room-ktx:2.1.0"
+    implementation "androidx.room:room-runtime:2.2.3"
+    kapt "androidx.room:room-compiler:2.2.3"
+    implementation "androidx.room:room-ktx:2.2.3"
 
     //koin(依赖注入)
     implementation "org.koin:koin-androidx-scope:2.0.1"
@@ -94,7 +78,22 @@ dependencies {
     //动态权限
     implementation 'com.afollestad:assent:2.3.1'
 
-    
+    //第三方控件
+    implementation 'de.hdodenhof:circleimageview:3.0.0'
+    implementation 'com.just.agentweb:agentweb:4.0.3-beta'
+    implementation project(path: ':simplebehavior')
+    implementation 'com.github.bumptech.glide:glide:4.9.0'
+    implementation 'com.github.GrenderG:Toasty:1.4.2'
+    implementation 'com.github.jd-alexander:LikeButton:0.2.3'
+    implementation  'com.github.Kennyc1012:MultiStateView:2.1'
+    implementation 'com.jaredrummler:animated-svg-view:1.0.6'
+    implementation 'com.jeremyliao:live-event-bus-x:1.4.4'
+    implementation 'com.github.nitrico.lastadapter:lastadapter:2.3.0'
+    implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0'
+    implementation 'com.scwang.smartrefresh:SmartRefreshHeader:1.1.0'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'com.lxj:xpopup:1.8.10-x'
+
     //bugly捕获异常
     implementation 'com.tencent.bugly:crashreport:latest.release'
 

app/src/main/java/com/fmt/github/WelcomeActivity.kt

@@ -1,13 +1,10 @@
 package com.fmt.github
 
 import android.content.Intent
-import com.afollestad.assent.Permission
-import com.afollestad.assent.askForPermissions
+import com.afollestad.assent.*
 import com.fmt.github.base.activity.BaseDataBindActivity
 import com.fmt.github.databinding.ActivityWelcomeBinding
-import com.fmt.github.ext.getVersionName
-import com.fmt.github.ext.otherwise
-import com.fmt.github.ext.yes
+import com.fmt.github.ext.*
 import com.fmt.github.home.activity.HomeActivity
 import com.fmt.github.user.activity.LoginActivity
 import com.fmt.github.user.dao.UserDao
@@ -38,13 +35,15 @@ class WelcomeActivity : BaseDataBindActivity<ActivityWelcomeBinding>() {
     }
 
     private fun askForPermission() {
-        askForPermissions(Permission.READ_PHONE_STATE) { result ->
-            result.isAllGranted(Permission.READ_PHONE_STATE).yes {
+        runWithPermissions(Permission.READ_PHONE_STATE, granted = object : Callback {
+            override fun invoke(result: AssentResult) {
                 checkIsLogin()
-            }.otherwise {
+            }
+        }, denied = object : Callback {
+            override fun invoke(result: AssentResult) {
                 finish()
             }
-        }
+        })
     }
 
     private fun checkIsLogin() {

app/src/main/java/com/fmt/github/base/activity/BaseActivity.kt

@@ -10,6 +10,10 @@ abstract class BaseActivity : AppCompatActivity(), CoroutineScope by MainScope()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        setContentLayout()
+    }
+
+    open fun setContentLayout() {
         setContentView(getLayoutId())
         initView()
         initData()

app/src/main/java/com/fmt/github/base/activity/BaseDataBindActivity.kt

@@ -1,32 +1,19 @@
 package com.fmt.github.base.activity
 
-import android.os.Bundle
-import androidx.appcompat.app.AppCompatActivity
 import androidx.databinding.DataBindingUtil
 import androidx.databinding.ViewDataBinding
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.cancel
 
-abstract class BaseDataBindActivity<DB : ViewDataBinding> : AppCompatActivity(), CoroutineScope by MainScope() {
+abstract class BaseDataBindActivity<DB : ViewDataBinding> : BaseActivity() {
 
     lateinit var mDataBind: DB
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        mDataBind = DataBindingUtil.setContentView(this,getLayoutId())
+    override fun setContentLayout() {
+        mDataBind = DataBindingUtil.setContentView(this, getLayoutId())
         initView()
         initData()
     }
 
-    abstract fun getLayoutId(): Int
-
-    abstract fun initView()
-
-    open fun initData() {
-
-    }
-
     override fun onDestroy() {
         super.onDestroy()
         cancel()

app/src/main/java/com/fmt/github/base/activity/BaseDataBindVMActivity.kt

@@ -1,79 +1,25 @@
 package com.fmt.github.base.activity
 
-import android.os.Bundle
-import androidx.appcompat.app.AppCompatActivity
 import androidx.databinding.DataBindingUtil
 import androidx.databinding.ViewDataBinding
-import androidx.lifecycle.Observer
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.ViewModelProvider
-import com.fmt.github.App
-import com.fmt.github.base.viewmodel.*
-import com.fmt.github.ext.errorToast
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.cancel
 
 /**
  * 封装带有协程基类(DataBinding + ViewModel),使用代理类完成
  *
  */
-abstract class BaseDataBindVMActivity<DB : ViewDataBinding> : AppCompatActivity(),
-    CoroutineScope by MainScope() {
+abstract class BaseDataBindVMActivity<DB : ViewDataBinding> : BaseVMActivity() {
 
     lateinit var mDataBind: DB
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
+    override fun setContentLayout() {
         mDataBind = DataBindingUtil.setContentView(this, getLayoutId())
         mDataBind.lifecycleOwner = this
         initViewModelAction()
         initView()
         initData()
     }
 
-    private fun initViewModelAction() {
-        getViewModel().let { baseViewModel ->
-            baseViewModel.mStateLiveData.observe(this, Observer { stateActionState ->
-                when (stateActionState) {
-                    LoadState -> showLoading()
-                    SuccessState -> dismissLoading()
-                    is ErrorState -> {
-                        dismissLoading()
-                        stateActionState.message?.apply {
-                            errorToast(this)
-                            handleError()
-                        }
-                    }
-                }
-            })
-        }
-    }
-
-    abstract fun getLayoutId(): Int
-
-    abstract fun initView()
-
-    abstract fun getViewModel(): BaseViewModel
-
-    open fun initData() {
-
-    }
-
-    //由于不同页面可能加载动画不一致，提供空实现，子类根据自身情况进行实现
-    open fun showLoading() {
-
-    }
-
-    open fun dismissLoading() {
-
-    }
-
-    //暴露自定义处理异常方法
-    open fun handleError() {
-
-    }
-
     override fun onDestroy() {
         super.onDestroy()
         cancel()//取消协程任务

app/src/main/java/com/fmt/github/base/activity/BaseVMActivity.kt

@@ -19,13 +19,10 @@ abstract class BaseVMActivity : AppCompatActivity(), CoroutineScope by MainScope
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(getLayoutId())
-        initViewModelAction()
-        initView()
-        initData()
+        setContentLayout()
     }
 
-    private fun initViewModelAction() {
+    protected fun initViewModelAction() {
         getViewModel().let { baseViewModel ->
             baseViewModel.mStateLiveData.observe(this, Observer { stateActionState ->
                 when (stateActionState) {
@@ -49,6 +46,13 @@ abstract class BaseVMActivity : AppCompatActivity(), CoroutineScope by MainScope
 
     abstract fun getViewModel(): BaseViewModel
 
+    open fun setContentLayout() {
+        setContentView(getLayoutId())
+        initViewModelAction()
+        initView()
+        initData()
+    }
+
     open fun initData() {
 
     }
@@ -69,5 +73,4 @@ abstract class BaseVMActivity : AppCompatActivity(), CoroutineScope by MainScope
         super.onDestroy()
         cancel()//取消协程任务
     }
-
 }