AndroidBaseLibrary1.2.0

迁移网络库 去除部分内容

Author: wsdydeni

app/build.gradle

@@ -4,12 +4,12 @@ plugins {
 }
 
 android {
-    compileSdk 32
+    compileSdk 30
 
     defaultConfig {
         applicationId "wsdydeni.widget.library"
         minSdk 21
-        targetSdk 32
+        targetSdk 30
         versionCode 1
         versionName "1.0"
 
@@ -29,15 +29,21 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+    viewBinding {
+        enabled = true
+    }
 }
 
 dependencies {
     implementation project(':baselib')
-    implementation 'androidx.core:core-ktx:1.7.0'
-    implementation 'androidx.appcompat:appcompat:1.4.1'
-    implementation 'com.google.android.material:material:1.5.0'
+    implementation 'androidx.core:core-ktx:1.3.2'
+    implementation 'androidx.appcompat:appcompat:1.3.1'
+    implementation 'com.google.android.material:material:1.3.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1")
+    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1")
+}
+
+dependencies {
+    implementation 'com.github.wsdydeni:AndroidBaseLibraryNetwork:1.2.0'
 }

app/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     package="wsdydeni.widget.library">
 
     <application
@@ -10,7 +9,6 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        tools:replace="android:name"
         android:theme="@style/Theme.AndroidBaseLibrary">
         <activity
             android:windowSoftInputMode="adjustNothing"

app/src/main/java/wsdydeni/widget/library/MainActivity.kt

@@ -1,10 +1,13 @@
 package wsdydeni.widget.library
 
+import android.view.MotionEvent
 import android.view.View
 import android.widget.EditText
 import android.widget.LinearLayout
 import androidx.core.content.ContextCompat
+import androidx.lifecycle.Lifecycle
 import wsdydeni.library.android.base.BaseActivity
+import wsdydeni.library.android.base.BaseViewModel
 import wsdydeni.library.android.utils.another.LogUtil
 import wsdydeni.library.android.utils.density.AutoDensity
 import wsdydeni.library.android.utils.display.PixelUtil
@@ -15,6 +18,8 @@ import wsdydeni.library.android.utils.keyboard.addKeyboardMonitor
 
 class MainActivity : BaseActivity(R.layout.activity_main) {
 
+    private var lastClickTime: Long = 0L
+
     override var isLightSystemBar = true
 
     override var immersiveNavigation = true
@@ -27,8 +32,7 @@ class MainActivity : BaseActivity(R.layout.activity_main) {
                 return@addKeyboardMonitor
             }
             if(keyboardHeight == 0) {
-                val inputLayout = findViewById<LinearLayout>(R.id.input_layout) as LinearLayout
-//                val content = findViewById<View>(android.R.id.content) as ViewGroup
+                val inputLayout = findViewById<LinearLayout>(R.id.input_layout)
                 inputLayout.translationY = 0f
                 return@addKeyboardMonitor
             }
@@ -50,15 +54,28 @@ class MainActivity : BaseActivity(R.layout.activity_main) {
                     val difference = (generalHeight + getStatusBarHeight()) - (focusBottom + keyboardHeight)
                     LogUtil.d("布局纵向偏移量: $difference")
                     LogUtil.d("偏移量dp: ${PixelUtil.px2dp(this,difference)}")
-                    val inputLayout = findViewById<LinearLayout>(R.id.input_layout) as LinearLayout
-//                    val content = findViewById<View>(android.R.id.content) as ViewGroup
+                    val inputLayout = findViewById<LinearLayout>(R.id.input_layout)
                     inputLayout.translationY = difference.toFloat()
                 }
             }
         }
-        showStatusBarView(
-            findViewById(wsdydeni.library.android.R.id.fillStatusBarView),
-            ContextCompat.getColor(this, wsdydeni.library.android.R.color.color_6d7174)
-        )
+        showStatusBarView(findViewById(R.id.fillStatusBarView), ContextCompat.getColor(this, R.color.color_6d7174))
+    }
+
+    /**
+     * 防止多次点击
+     */
+    override fun dispatchTouchEvent(ev: MotionEvent?): Boolean {
+        if(ev?.action == MotionEvent.ACTION_DOWN) {
+            if(System.currentTimeMillis() - lastClickTime < 500L) {
+                return true
+            }
+            lastClickTime = System.currentTimeMillis()
+        }
+        return super.dispatchTouchEvent(ev)
+    }
+
+    private fun observeEffect(viewModel: BaseViewModel) {
+        Lifecycle.State.STARTED
     }
 }

app/src/main/java/wsdydeni/widget/library/MainFragment.kt

@@ -0,0 +1,9 @@
+package wsdydeni.widget.library
+
+import wsdydeni.library.android.base.BaseFragment
+
+class MainFragment : BaseFragment(R.layout.activity_main) {
+  override fun initView() {
+    viewLifecycleOwner.lifecycle
+  }
+}

app/src/main/java/wsdydeni/widget/library/MainViewModel.kt

@@ -0,0 +1,42 @@
+package wsdydeni.widget.library
+
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.CoroutineExceptionHandler
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import wsdydeni.library.android.utils.another.LogUtil
+import wsdydeni.library.android_network.network.BaseResponse
+import wsdydeni.library.android_network.network.associatedView
+import wsdydeni.widget.library.base.BaseViewModel
+
+class MainViewModel : BaseViewModel() {
+
+  class TestResponse : BaseResponse<Int>() {
+    override fun getResponseCode(): String = "200"
+    override fun getResponseData(): Int = 20
+    override fun getResponseMsg(): String = "success"
+    override fun isSuccess(): Boolean = true
+  }
+
+  private suspend fun request1() : TestResponse {
+    return TestResponse()
+  }
+
+  fun send() {
+    val coroutineExceptionHandler = CoroutineExceptionHandler { coroutineContext, throwable ->
+      coroutineContext[Job]?.cancel()
+      LogUtil.d("MainViewModel coroutineExceptionHandler send" + throwable.message)
+    }
+    viewModelScope.launch(Dispatchers.IO + coroutineExceptionHandler) {
+      associatedView(suspend { request1() },{
+        // show dialog
+      },{
+        // close dialog
+      }) { errorMsg, errorCode ->
+        // close dialog
+        // show error message
+      }
+    }
+  }
+}

app/src/main/java/wsdydeni/widget/library/MyApplication.kt

@@ -1,12 +1,14 @@
 package wsdydeni.widget.library
 
 import android.app.Application
+import wsdydeni.library.android.utils.another.LogUtil
 import wsdydeni.library.android.utils.density.AutoDensity
 import wsdydeni.library.android.utils.density.DesignDraft
 
 class MyApplication : Application() {
     override fun onCreate() {
         super.onCreate()
+        LogUtil.init(true)
         AutoDensity.instance.init(this, DesignDraft(designSize = 360f))
     }
 }

app/src/main/java/wsdydeni/widget/library/base/BaseViewModel.kt

@@ -0,0 +1,15 @@
+package wsdydeni.widget.library.base
+
+import androidx.lifecycle.ViewModel
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.flow.receiveAsFlow
+
+open class BaseViewModel : ViewModel() {
+  private val _effect = Channel<ViewModelEffect>()
+  val effect = _effect.receiveAsFlow()
+
+  suspend fun setEffect(builder: () -> ViewModelEffect) {
+    val newEffect = builder()
+    _effect.send(newEffect)
+  }
+}

app/src/main/java/wsdydeni/widget/library/base/ViewModelEffect.kt

@@ -0,0 +1,7 @@
+package wsdydeni.widget.library.base
+
+sealed class ViewModelEffect
+
+object DialogShowEffect : ViewModelEffect()
+
+object DialogDismissEffect : ViewModelEffect()

baselib/src/main/kotlin/wsdydeni/library/android/view/LoadingDialog.kt app/src/main/java/wsdydeni/widget/library/dialog/LoadingDialog.kt

@@ -1,13 +1,13 @@
-package wsdydeni.library.android.view
+package wsdydeni.widget.library.dialog
 
 import android.app.Dialog
 import android.content.Context
 import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.WindowManager
 import kotlinx.coroutines.Job
-import wsdydeni.library.android.R
-import wsdydeni.library.android.databinding.DialogLoadingBinding
+import wsdydeni.widget.library.R
+import wsdydeni.widget.library.databinding.DialogLoadingBinding
 
 
 class LoadingDialog(context: Context) : Dialog(context, R.style.TransparentDialog) {

baselib/src/main/kotlin/wsdydeni/library/android/utils/viewbind/ActivityViewBindings.kt app/src/main/java/wsdydeni/widget/library/viewbind/ActivityViewBindings.kt

@@ -1,4 +1,4 @@
-package wsdydeni.library.android.utils.viewbind
+package wsdydeni.widget.library.viewbind
 
 import android.view.View
 import androidx.activity.ComponentActivity

baselib/src/main/kotlin/wsdydeni/library/android/utils/viewbind/BindUtils.kt app/src/main/java/wsdydeni/widget/library/viewbind/BindUtils.kt

@@ -1,4 +1,4 @@
-package wsdydeni.library.android.utils.viewbind
+package wsdydeni.widget.library.viewbind
 
 import android.app.Activity
 import android.view.View

baselib/src/main/kotlin/wsdydeni/library/android/utils/viewbind/DialogFragmentViewBindings.kt app/src/main/java/wsdydeni/widget/library/viewbind/DialogFragmentViewBindings.kt

@@ -1,4 +1,4 @@
-package wsdydeni.library.android.utils.viewbind
+package wsdydeni.widget.library.viewbind
 
 import androidx.annotation.RestrictTo
 import androidx.fragment.app.DialogFragment

baselib/src/main/kotlin/wsdydeni/library/android/utils/viewbind/FragmentViewbindings.kt app/src/main/java/wsdydeni/widget/library/viewbind/FragmentViewbindings.kt

@@ -1,4 +1,4 @@
-package wsdydeni.library.android.utils.viewbind
+package wsdydeni.widget.library.viewbind
 
 import android.view.View
 import androidx.annotation.IdRes

baselib/src/main/kotlin/wsdydeni/library/android/utils/viewbind/ViewBindingProperty.kt app/src/main/java/wsdydeni/widget/library/viewbind/ViewBindingProperty.kt

@@ -1,4 +1,4 @@
-package wsdydeni.library.android.utils.viewbind
+package wsdydeni.widget.library.viewbind
 
 import android.os.Handler
 import android.os.Looper
@@ -29,7 +29,7 @@ interface ViewBindingProperty<in R : Any, out T : ViewBinding> : ReadOnlyPropert
  */
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 open class LazyViewBindingProperty<in R : Any, out T : ViewBinding>(protected val viewBinder: (R) -> T) :
-    ViewBindingProperty<R, T> {
+  ViewBindingProperty<R, T> {
 
     private var viewBinding: Any? = null
 
@@ -53,7 +53,7 @@ open class LazyViewBindingProperty<in R : Any, out T : ViewBinding>(protected va
  */
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 abstract class LifecycleViewBindingProperty<in R : Any, out T : ViewBinding>(private val viewBinder: (R) -> T) :
-    ViewBindingProperty<R, T> {
+  ViewBindingProperty<R, T> {
 
     private var viewBinding: T? = null
 

baselib/src/main/kotlin/wsdydeni/library/android/utils/viewbind/ViewGroupBindings.kt app/src/main/java/wsdydeni/widget/library/viewbind/ViewGroupBindings.kt

@@ -1,4 +1,4 @@
-package wsdydeni.library.android.utils.viewbind
+package wsdydeni.widget.library.viewbind
 
 import android.view.View
 import android.view.ViewGroup

baselib/src/main/res/anim/dialog_enter.xml app/src/main/res/anim/dialog_enter.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"

baselib/src/main/res/anim/dialog_exit.xml app/src/main/res/anim/dialog_exit.xml

@@ -1,10 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="purple_200">#FFBB86FC</color>
-    <color name="purple_500">#FF6200EE</color>
-    <color name="purple_700">#FF3700B3</color>
-    <color name="teal_200">#FF03DAC5</color>
-    <color name="teal_700">#FF018786</color>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
+    <color name="thirty_percent_transparent">#80FFFFFF</color>
+
+    <color name="silver_chalice">#A0A0A0</color>
+    <color name="endeavour">#00599B</color>
+    <color name="cinder">#181819</color>
+    <color name="swirl">#D4D1CD</color>
+    <color name="oslo_gray">#949697</color>
+    <color name="color_FAFAFA">#FAFAFA</color>
+    <color name="color_FEFEFE">#fefefe</color>
+    <color name="color_ffd4d4d4">#ffd4d4d4</color>
+    <color name="color_6d7174">#6d7174</color>
+    <color name="color_9ca3a8">#9ca3a8</color>
+    <color name="color_ebebeb">#ebebeb</color>
 </resources>