diff --git a/appcompatsample/.gitignore b/appcompatsample/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/appcompatsample/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/appcompatsample/build.gradle b/appcompatsample/build.gradle new file mode 100644 index 0000000..9b0e08d --- /dev/null +++ b/appcompatsample/build.gradle @@ -0,0 +1,44 @@ +plugins { + id 'com.android.application' + id 'kotlin-android' +} + +android { + compileSdkVersion 30 + buildToolsVersion "30.0.2" + + defaultConfig { + applicationId "com.allneliu.appcompatsample" + minSdkVersion 19 + targetSdkVersion 30 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } +} + +dependencies { + + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation 'com.android.support:appcompat-v7:28.0.0' + implementation 'com.android.support.constraint:constraint-layout:2.0.4' + testImplementation 'junit:junit:4.+' + androidTestImplementation 'com.android.support.test:runner:1.0.2' + implementation project(":library") + androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' +} \ No newline at end of file diff --git a/appcompatsample/proguard-rules.pro b/appcompatsample/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/appcompatsample/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/appcompatsample/src/androidTest/java/com/allneliu/appcompatsample/ExampleInstrumentedTest.kt b/appcompatsample/src/androidTest/java/com/allneliu/appcompatsample/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..28ab57e --- /dev/null +++ b/appcompatsample/src/androidTest/java/com/allneliu/appcompatsample/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package com.allneliu.appcompatsample + +import android.support.test.InstrumentationRegistry +import android.support.test.runner.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("com.allneliu.appcompatsample", appContext.packageName) + } +} \ No newline at end of file diff --git a/appcompatsample/src/main/AndroidManifest.xml b/appcompatsample/src/main/AndroidManifest.xml new file mode 100644 index 0000000..f133cec --- /dev/null +++ b/appcompatsample/src/main/AndroidManifest.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/appcompatsample/src/main/java/com/allneliu/appcompatsample/MainActivity.kt b/appcompatsample/src/main/java/com/allneliu/appcompatsample/MainActivity.kt new file mode 100644 index 0000000..62ba770 --- /dev/null +++ b/appcompatsample/src/main/java/com/allneliu/appcompatsample/MainActivity.kt @@ -0,0 +1,43 @@ +package com.allneliu.appcompatsample + +import android.os.Bundle +import android.support.annotation.Nullable +import android.support.v7.app.AppCompatActivity +import android.widget.Toast +import com.allenliu.versionchecklib.v2.AllenVersionChecker +import com.allenliu.versionchecklib.v2.builder.DownloadBuilder +import com.allenliu.versionchecklib.v2.builder.UIData +import com.allenliu.versionchecklib.v2.callback.RequestVersionListener + +class MainActivity : AppCompatActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_main) + sendDefaultReuqest() + } + + private fun sendDefaultReuqest() { + val builder = AllenVersionChecker + .getInstance() + .requestVersion() + .setRequestUrl("https://www.baidu.com") + .request(object : RequestVersionListener { + @Nullable + override fun onRequestVersionSuccess(downloadBuilder: DownloadBuilder, result: String): UIData? { +// V2.1.1可以根据服务器返回的结果,动态在此设置是否强制更新等 +// downloadBuilder.setForceUpdateListener(() -> { +// forceUpdate(); +// }); + Toast.makeText(this@MainActivity, "request successful", Toast.LENGTH_SHORT).show() + return UIData.create().setDownloadUrl("http://test-1251233192.coscd.myqcloud.com/1_1.apk") + } + + override fun onRequestVersionFailure(message: String) { + Toast.makeText(this@MainActivity, "request failed", Toast.LENGTH_SHORT).show() + } + }) + + builder.setForceRedownload(true) + builder.executeMission(this) + } +} \ No newline at end of file diff --git a/appcompatsample/src/main/res/drawable-v24/ic_launcher_foreground.xml b/appcompatsample/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/appcompatsample/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/appcompatsample/src/main/res/drawable/ic_launcher_background.xml b/appcompatsample/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..07d5da9 --- /dev/null +++ b/appcompatsample/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/appcompatsample/src/main/res/layout/activity_main.xml b/appcompatsample/src/main/res/layout/activity_main.xml new file mode 100644 index 0000000..84f1951 --- /dev/null +++ b/appcompatsample/src/main/res/layout/activity_main.xml @@ -0,0 +1,18 @@ + + + + + + \ No newline at end of file diff --git a/appcompatsample/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/appcompatsample/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/appcompatsample/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/appcompatsample/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/appcompatsample/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/appcompatsample/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/appcompatsample/src/main/res/mipmap-hdpi/ic_launcher.png b/appcompatsample/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..a571e60 Binary files /dev/null and b/appcompatsample/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/appcompatsample/src/main/res/mipmap-hdpi/ic_launcher_round.png b/appcompatsample/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..61da551 Binary files /dev/null and b/appcompatsample/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/appcompatsample/src/main/res/mipmap-mdpi/ic_launcher.png b/appcompatsample/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..c41dd28 Binary files /dev/null and b/appcompatsample/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/appcompatsample/src/main/res/mipmap-mdpi/ic_launcher_round.png b/appcompatsample/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..db5080a Binary files /dev/null and b/appcompatsample/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/appcompatsample/src/main/res/mipmap-xhdpi/ic_launcher.png b/appcompatsample/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..6dba46d Binary files /dev/null and b/appcompatsample/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/appcompatsample/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/appcompatsample/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000..da31a87 Binary files /dev/null and b/appcompatsample/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/appcompatsample/src/main/res/mipmap-xxhdpi/ic_launcher.png b/appcompatsample/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..15ac681 Binary files /dev/null and b/appcompatsample/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/appcompatsample/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/appcompatsample/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..b216f2d Binary files /dev/null and b/appcompatsample/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/appcompatsample/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/appcompatsample/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..f25a419 Binary files /dev/null and b/appcompatsample/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/appcompatsample/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/appcompatsample/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..e96783c Binary files /dev/null and b/appcompatsample/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/appcompatsample/src/main/res/values-night/themes.xml b/appcompatsample/src/main/res/values-night/themes.xml new file mode 100644 index 0000000..b9f2304 --- /dev/null +++ b/appcompatsample/src/main/res/values-night/themes.xml @@ -0,0 +1,10 @@ + + + + \ No newline at end of file diff --git a/appcompatsample/src/main/res/values/colors.xml b/appcompatsample/src/main/res/values/colors.xml new file mode 100644 index 0000000..f8c6127 --- /dev/null +++ b/appcompatsample/src/main/res/values/colors.xml @@ -0,0 +1,10 @@ + + + #FFBB86FC + #FF6200EE + #FF3700B3 + #FF03DAC5 + #FF018786 + #FF000000 + #FFFFFFFF + \ No newline at end of file diff --git a/appcompatsample/src/main/res/values/strings.xml b/appcompatsample/src/main/res/values/strings.xml new file mode 100644 index 0000000..789c23f --- /dev/null +++ b/appcompatsample/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + AppCompatSample + \ No newline at end of file diff --git a/appcompatsample/src/main/res/values/themes.xml b/appcompatsample/src/main/res/values/themes.xml new file mode 100644 index 0000000..c10df6c --- /dev/null +++ b/appcompatsample/src/main/res/values/themes.xml @@ -0,0 +1,10 @@ + + + + \ No newline at end of file diff --git a/appcompatsample/src/test/java/com/allneliu/appcompatsample/ExampleUnitTest.kt b/appcompatsample/src/test/java/com/allneliu/appcompatsample/ExampleUnitTest.kt new file mode 100644 index 0000000..4ddd55d --- /dev/null +++ b/appcompatsample/src/test/java/com/allneliu/appcompatsample/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package com.allneliu.appcompatsample + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} \ No newline at end of file diff --git a/library/build.gradle b/library/build.gradle index d19fb1b..23d6fb8 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -26,7 +26,7 @@ android { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - compileOnly 'androidx.appcompat:appcompat:1.1.0' + implementation 'com.android.support:appcompat-v7:28.0.0' implementation 'com.squareup.okhttp3:okhttp:4.3.1' implementation 'org.greenrobot:eventbus:3.1.1' diff --git a/library/src/main/java/com/allenliu/versionchecklib/utils/FileHelper.java b/library/src/main/java/com/allenliu/versionchecklib/utils/FileHelper.java index ba3e714..3840687 100644 --- a/library/src/main/java/com/allenliu/versionchecklib/utils/FileHelper.java +++ b/library/src/main/java/com/allenliu/versionchecklib/utils/FileHelper.java @@ -3,8 +3,8 @@ import android.content.Context; import android.os.Build; import android.os.Environment; +import android.support.annotation.NonNull; -import androidx.annotation.NonNull; import java.io.File; diff --git a/library/src/main/java/com/allenliu/versionchecklib/v2/builder/DownloadBuilder.java b/library/src/main/java/com/allenliu/versionchecklib/v2/builder/DownloadBuilder.java index 01cc5a6..2cd45fc 100644 --- a/library/src/main/java/com/allenliu/versionchecklib/v2/builder/DownloadBuilder.java +++ b/library/src/main/java/com/allenliu/versionchecklib/v2/builder/DownloadBuilder.java @@ -3,8 +3,8 @@ import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; +import android.support.annotation.NonNull; -import androidx.annotation.NonNull; import com.allenliu.versionchecklib.callback.APKDownloadListener; import com.allenliu.versionchecklib.callback.CommitClickListener; diff --git a/library/src/main/java/com/allenliu/versionchecklib/v2/ui/AllenBaseActivity.kt b/library/src/main/java/com/allenliu/versionchecklib/v2/ui/AllenBaseActivity.kt index 7500c1d..862892e 100644 --- a/library/src/main/java/com/allenliu/versionchecklib/v2/ui/AllenBaseActivity.kt +++ b/library/src/main/java/com/allenliu/versionchecklib/v2/ui/AllenBaseActivity.kt @@ -1,15 +1,14 @@ package com.allenliu.versionchecklib.v2.ui - import android.R import android.annotation.TargetApi import android.app.Activity import android.graphics.Color import android.os.Build import android.os.Bundle +import android.support.v7.app.AppCompatActivity import android.view.View import android.view.ViewGroup import android.view.WindowManager -import androidx.appcompat.app.AppCompatActivity import com.allenliu.versionchecklib.v2.builder.BuilderManager.doWhenNotNull import com.allenliu.versionchecklib.v2.eventbus.AllenEventType import com.allenliu.versionchecklib.v2.eventbus.CommonEvent diff --git a/library/src/main/java/com/allenliu/versionchecklib/v2/ui/DownloadFailedActivity.kt b/library/src/main/java/com/allenliu/versionchecklib/v2/ui/DownloadFailedActivity.kt index 933a7fd..300f3c4 100644 --- a/library/src/main/java/com/allenliu/versionchecklib/v2/ui/DownloadFailedActivity.kt +++ b/library/src/main/java/com/allenliu/versionchecklib/v2/ui/DownloadFailedActivity.kt @@ -3,8 +3,8 @@ package com.allenliu.versionchecklib.v2.ui import android.app.Dialog import android.content.DialogInterface import android.os.Bundle +import android.support.v7.app.AlertDialog import android.view.View -import androidx.appcompat.app.AlertDialog import com.allenliu.versionchecklib.R import com.allenliu.versionchecklib.utils.ALog import com.allenliu.versionchecklib.utils.AllenEventBusUtil diff --git a/library/src/main/java/com/allenliu/versionchecklib/v2/ui/DownloadingActivity.kt b/library/src/main/java/com/allenliu/versionchecklib/v2/ui/DownloadingActivity.kt index adb623d..9cc4f99 100644 --- a/library/src/main/java/com/allenliu/versionchecklib/v2/ui/DownloadingActivity.kt +++ b/library/src/main/java/com/allenliu/versionchecklib/v2/ui/DownloadingActivity.kt @@ -3,11 +3,11 @@ package com.allenliu.versionchecklib.v2.ui import android.app.Dialog import android.content.DialogInterface import android.os.Bundle +import android.support.v7.app.AlertDialog import android.view.LayoutInflater import android.view.View import android.widget.ProgressBar import android.widget.TextView -import androidx.appcompat.app.AlertDialog import com.allenliu.versionchecklib.R import com.allenliu.versionchecklib.core.http.AllenHttp import com.allenliu.versionchecklib.utils.ALog diff --git a/library/src/main/java/com/allenliu/versionchecklib/v2/ui/NotificationHelper.kt b/library/src/main/java/com/allenliu/versionchecklib/v2/ui/NotificationHelper.kt index 5cb6e9f..5f94a63 100644 --- a/library/src/main/java/com/allenliu/versionchecklib/v2/ui/NotificationHelper.kt +++ b/library/src/main/java/com/allenliu/versionchecklib/v2/ui/NotificationHelper.kt @@ -10,8 +10,9 @@ import android.graphics.Color import android.media.RingtoneManager import android.net.Uri import android.os.Build -import androidx.annotation.RequiresApi -import androidx.core.app.NotificationCompat +import android.support.annotation.RequiresApi +import android.support.v4.app.NotificationCompat + import com.allenliu.versionchecklib.R import com.allenliu.versionchecklib.core.PermissionDialogActivity import com.allenliu.versionchecklib.core.VersionFileProvider diff --git a/library/src/main/java/com/allenliu/versionchecklib/v2/ui/UIActivity.kt b/library/src/main/java/com/allenliu/versionchecklib/v2/ui/UIActivity.kt index 88a6fcd..79c388d 100644 --- a/library/src/main/java/com/allenliu/versionchecklib/v2/ui/UIActivity.kt +++ b/library/src/main/java/com/allenliu/versionchecklib/v2/ui/UIActivity.kt @@ -3,8 +3,8 @@ package com.allenliu.versionchecklib.v2.ui import android.app.Dialog import android.content.DialogInterface import android.os.Bundle +import android.support.v7.app.AlertDialog import android.view.View -import androidx.appcompat.app.AlertDialog import com.allenliu.versionchecklib.R import com.allenliu.versionchecklib.utils.ALog import com.allenliu.versionchecklib.utils.AllenEventBusUtil diff --git a/library/src/main/java/com/allenliu/versionchecklib/v2/ui/VersionService.kt b/library/src/main/java/com/allenliu/versionchecklib/v2/ui/VersionService.kt index 016514d..78bfc5d 100644 --- a/library/src/main/java/com/allenliu/versionchecklib/v2/ui/VersionService.kt +++ b/library/src/main/java/com/allenliu/versionchecklib/v2/ui/VersionService.kt @@ -5,7 +5,7 @@ import android.content.Context import android.content.Intent import android.os.Build import android.os.IBinder -import androidx.annotation.WorkerThread +import android.support.annotation.WorkerThread import com.allenliu.versionchecklib.R import com.allenliu.versionchecklib.callback.DownloadListener import com.allenliu.versionchecklib.core.DownloadManager diff --git a/settings.gradle b/settings.gradle index 657a610..1666c1c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,3 @@ +//include ':appcompatsample' include ':library' //rootProject.name = 'library'