From cba879618efee84ac58cd838d86c16c74ee15e84 Mon Sep 17 00:00:00 2001 From: SouShin <932707629@qq.com> Date: Mon, 16 Aug 2021 10:25:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86api?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../soushin/tinmvvm/app/AppLifecycleImpl.kt | 1 - .../tinmvvm/app/utils/FlingHelper.java | 31 ------------------- .../soushin/tinmvvm/mvvm/ui/DemoActivity.kt | 2 -- .../layout/fragment_data_binding_layout.xml | 10 ++++-- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 3 +- tinmvvm/build.gradle | 23 ++++---------- 7 files changed, 16 insertions(+), 56 deletions(-) delete mode 100644 app/src/main/java/com/soushin/tinmvvm/app/utils/FlingHelper.java diff --git a/app/src/main/java/com/soushin/tinmvvm/app/AppLifecycleImpl.kt b/app/src/main/java/com/soushin/tinmvvm/app/AppLifecycleImpl.kt index 741c948..88b2b5f 100644 --- 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 deleted file mode 100644 index 269b6b8..0000000 --- a/app/src/main/java/com/soushin/tinmvvm/app/utils/FlingHelper.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.soushin.tinmvvm.app.utils; - -import android.content.Context; -import android.view.ViewConfiguration; - -public class FlingHelper { - private static float DECELERATION_RATE = ((float) (Math.log(0.78d) / Math.log(0.9d))); - private static float mFlingFriction = ViewConfiguration.getScrollFriction(); - private static float mPhysicalCoeff; - - public FlingHelper(Context context) { - mPhysicalCoeff = context.getResources().getDisplayMetrics().density * 160.0f * 386.0878f * 0.84f; - } - - private double getSplineDeceleration(int i) { - return Math.log((double) ((0.35f * ((float) Math.abs(i))) / (mFlingFriction * mPhysicalCoeff))); - } - - private double getSplineDecelerationByDistance(double d) { - return ((((double) DECELERATION_RATE) - 1.0d) * Math.log(d / ((double) (mFlingFriction * mPhysicalCoeff)))) / ((double) DECELERATION_RATE); - } - - public double getSplineFlingDistance(int i) { - return Math.exp(getSplineDeceleration(i) * (((double) DECELERATION_RATE) / (((double) DECELERATION_RATE) - 1.0d))) * ((double) (mFlingFriction * mPhysicalCoeff)); - } - - public int getVelocityByDistance(double d) { - return Math.abs((int) (((Math.exp(getSplineDecelerationByDistance(d)) * ((double) mFlingFriction)) * ((double) mPhysicalCoeff)) / 0.3499999940395355d)); - } -} - 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 index 3dd068b..c72dc19 100644 --- 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 index cfbe93a..7cf4e85 100644 --- 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"> + @@ -73,7 +74,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content"/> - + android:layout_height="wrap_content"/>--> + + + - \ No newline at end of file + diff --git a/build.gradle b/build.gradle index 5c8e49b..a55c014 100644 --- 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 index 3aef06e..7426dcd 100644 --- 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 \ No newline at end of file +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip + diff --git a/tinmvvm/build.gradle b/tinmvvm/build.gradle index d32450f..492412b 100644 --- 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" +