优化部分api

932707629 · Aug 16, 2021 · cba8796 · cba8796
1 parent 8970b9f
commit cba8796
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 56 deletions.
diff --git a/app/src/main/java/com/soushin/tinmvvm/app/AppLifecycleImpl.kt b/app/src/main/java/com/soushin/tinmvvm/app/AppLifecycleImpl.kt
@@ -9,7 +9,6 @@ import com.soushin.tinmvvm.BuildConfig
 import com.soushin.tinmvvm.app.utils.CrashHandler
 import com.tencent.mmkv.MMKV
 import leakcanary.AppWatcher
-import leakcanary.LeakCanary
 import me.soushin.tinmvvm.config.AppComponent
 import me.soushin.tinmvvm.listener.AppLifecycle
 import rxhttp.RxHttpPlugins

diff --git a/app/src/main/java/com/soushin/tinmvvm/app/utils/FlingHelper.java b/app/src/main/java/com/soushin/tinmvvm/app/utils/FlingHelper.java
diff --git a/app/src/main/java/com/soushin/tinmvvm/mvvm/ui/DemoActivity.kt b/app/src/main/java/com/soushin/tinmvvm/mvvm/ui/DemoActivity.kt
@@ -6,8 +6,6 @@ import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import androidx.core.view.forEach
-import androidx.drawerlayout.widget.DrawerLayout
-import androidx.fragment.app.Fragment
 import androidx.navigation.Navigation
 import androidx.navigation.fragment.NavHostFragment
 import androidx.navigation.ui.AppBarConfiguration

diff --git a/app/src/main/res/layout/fragment_data_binding_layout.xml b/app/src/main/res/layout/fragment_data_binding_layout.xml
@@ -18,6 +18,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
+
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
@@ -73,7 +74,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"/>
 
-            <androidx.appcompat.widget.AppCompatImageView
+            <!--<androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/iv1"
                 android:src="@mipmap/ic_launcher"
                 app:error="@{DataBindingLayoutViewModel.user.error}"
@@ -82,8 +83,11 @@
                 app:layout_constraintTop_toBottomOf="@+id/tv3"
                 app:layout_constraintLeft_toLeftOf="@+id/tv1"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
+                android:layout_height="wrap_content"/>-->
 
         </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+
     </androidx.core.widget.NestedScrollView>
-</layout>
+</layout>
diff --git a/build.gradle b/build.gradle
@@ -25,11 +25,11 @@ buildscript {
 
 allprojects {
     repositories {
+        mavenCentral()
         maven { url "https://www.jitpack.io" }
         maven { url 'https://maven.aliyun.com/repository/public/' }
         maven { url 'https://maven.aliyun.com/repository/google/' }
         maven { url 'https://maven.aliyun.com/repository/jcenter' }
-        mavenCentral()
         google()
         jcenter()
     }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
+
diff --git a/tinmvvm/build.gradle b/tinmvvm/build.gradle
@@ -1,11 +1,12 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
-//apply plugin: 'com.github.dcendents.android-maven'
+//jitpack编译使用
+apply plugin: 'com.github.dcendents.android-maven'
 group = 'com.github.932707629'
-//apply plugin: 'kotlin-android-extensions'
-//版本更新的命令
-//gradlew clean build bintrayUpload -PbintrayUser=soushin -PbintrayKey=41191f3e38ba571be46a639901db861ee8053346 -PdryRun=false
+
+
+
 android {
     compileSdkVersion rootProject.compileSdkVersion
     buildToolsVersion rootProject.buildToolVersion
@@ -46,12 +47,6 @@ android {
     }
 }
 
-// 打包源码jar
-/*task sourcesJar(type: Jar) {
-    from android.sourceSets.main.java.srcDirs
-    archiveClassifier = 'sources'
-}*/
-
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     //kt+jetpack+androidx
@@ -63,14 +58,8 @@ dependencies {
     api(deps.alog)
     //第三方工具库
     api(deps.rxandroid3)
-    /*api(deps.rxandroid2) {
-        exclude group: "io.reactivex.rxjava2", module: 'rxjava'
-    }*/
-//    api(deps.rxjava2)
     api(deps.rxjava3)
-//    api(deps.rxlife_rxjava2)
     api(deps.rxlife_rxjava3)
-//    api(deps.rxerrorhandler)
     api(deps.conscrypt)
     api(deps.okhttp)
     api(deps.glide)
@@ -82,4 +71,4 @@ dependencies {
     api(deps.immersionbar_ktx)
 }
 
-//apply from: "../bintrayUpload.gradle"
+