fix #96

hegaojian · Jan 4, 2022 · 474e6c7 · 474e6c7
1 parent 6b8950b
commit 474e6c7
Show file tree

Hide file tree

Showing 28 changed files with 60 additions and 899 deletions.
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
diff --git a/JetpackMvvm/build.gradle b/JetpackMvvm/build.gradle
@@ -2,16 +2,14 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
-apply plugin: 'com.github.dcendents.android-maven'
-group='com.github.hegaojian'
 android {
     compileSdkVersion 30
     buildToolsVersion "30.0.3"
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 25
-        versionName "1.2.5"
+        versionCode 26
+        versionName "1.2.6"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
     }

diff --git a/JetpackMvvm/src/main/java/me/hgj/jetpackmvvm/base/fragment/BaseVmDbFragment.kt b/JetpackMvvm/src/main/java/me/hgj/jetpackmvvm/base/fragment/BaseVmDbFragment.kt
@@ -24,16 +24,21 @@ import me.hgj.jetpackmvvm.network.manager.NetworkStateManager
 abstract class BaseVmDbFragment<VM : BaseViewModel, DB : ViewDataBinding> : BaseVmFragment<VM>() {
 
     //该类绑定的ViewDataBinding
-    lateinit var mDatabind: DB
+    private var _binding: DB? = null
+    val mDatabind: DB get() = _binding!!
 
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        mDatabind = DataBindingUtil.inflate(inflater, layoutId(), container, false)
+        _binding = DataBindingUtil.inflate(inflater, layoutId(), container, false)
         mDatabind.lifecycleOwner = this
         return mDatabind.root
     }
 
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
 }
diff --git a/app/build.gradle b/app/build.gradle
@@ -13,8 +13,8 @@ android {
         applicationId "me.hgj.jetpackmvvm.demo"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 25
-        versionName "1.2.5"
+        versionCode 26
+        versionName "1.2.6"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
       /* ndk {
             // 设置支持的SO库架构 一般只设置这个就阔以设配所有的设备了，还可以减少apk的大小
@@ -129,9 +129,4 @@ dependencies {
     implementation 'me.jessyan:autosize:1.2.1'
     //防崩溃
     implementation 'cat.ereza:customactivityoncrash:2.3.0'
-    //下载
-    implementation("com.liulishuo.filedownloader:library:1.7.7") {
-        exclude group: "com.android.support"
-    }
-    implementation 'com.louiscad.splitties:splitties-collections:2.1.1'
 }
diff --git a/app/src/main/java/me/hgj/jetpackmvvm/demo/app/ext/download/AppDownloaderExt.kt b/app/src/main/java/me/hgj/jetpackmvvm/demo/app/ext/download/AppDownloaderExt.kt
diff --git a/app/src/main/java/me/hgj/jetpackmvvm/demo/ui/fragment/demo/DemoFragment.kt b/app/src/main/java/me/hgj/jetpackmvvm/demo/ui/fragment/demo/DemoFragment.kt
diff --git a/app/src/main/java/me/hgj/jetpackmvvm/demo/ui/fragment/demo/DownLoadFragment.kt b/app/src/main/java/me/hgj/jetpackmvvm/demo/ui/fragment/demo/DownLoadFragment.kt