From 9b0db1279419f7f36cbcb1cd953c77ab5d04572d Mon Sep 17 00:00:00 2001 From: Mingyueyixi <1093286982@qq.com> Date: Mon, 28 Oct 2024 01:32:37 +0800 Subject: [PATCH] =?UTF-8?q?[add]=20=E6=8B=A6=E6=88=AAokhttp=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 10 +- app/proguard-rules.pro | 9 +- app/src/main/AndroidManifest.xml | 3 +- .../main/java/com/pic/catcher/MainHook.java | 39 ++-- .../com/pic/catcher/plugin/OKHttpPlugin.java | 135 ++++++++++++++ .../pic/catcher/plugin/PicExportManager.java | 5 +- .../plugin/X5WebViewCatcherPlugin.java | 44 +++++ .../java/com/pic/catcher/util/ext/AnyX.kt | 2 +- app/src/main/res/values/strings.xml | 2 +- build.gradle | 4 +- gradle.properties | 9 +- {app => keys}/key-store-test.jks | Bin props.gradle | 8 +- settings.gradle | 13 +- testapp/.gitignore | 1 + testapp/build.gradle | 80 +++++++++ testapp/proguard-rules.pro | 32 ++++ .../pic/testapp/ExampleInstrumentedTest.kt | 24 +++ testapp/src/main/AndroidManifest.xml | 29 +++ .../src/main/java/com/pic/testapp/App.java | 25 +++ .../src/main/java/com/pic/testapp/ItemBean.kt | 8 + .../com/pic/testapp/LauncherUiActivity.java | 23 +++ .../java/com/pic/testapp/LocalStorage.java | 20 +++ .../main/java/com/pic/testapp/MainFragment.kt | 84 +++++++++ .../java/com/pic/testapp/WebViewFragment.java | 118 ++++++++++++ .../com/pic/testapp/X5WebViewFragment.java | 136 ++++++++++++++ .../java/com/pic/testapp/action/Action.java | 12 ++ .../pic/testapp/action/LoadBitmapAction.java | 32 ++++ .../pic/testapp/action/LoadHttpPicAction.java | 141 +++++++++++++++ .../com/pic/testapp/base/BaseActivity.java | 76 ++++++++ .../com/pic/testapp/base/BaseFragment.java | 98 ++++++++++ .../com/pic/testapp/base/BindingFragment.java | 41 +++++ .../java/com/pic/testapp/util/AppExecutor.kt | 43 +++++ .../java/com/pic/testapp/util/LogUtil.java | 76 ++++++++ .../java/com/pic/testapp/vm/X5ViewModel.java | 62 +++++++ .../drawable-v24/ic_launcher_foreground.xml | 30 ++++ .../res/drawable/ic_launcher_background.xml | 170 ++++++++++++++++++ .../res/layout/act_frag_container_layout.xml | 8 + .../src/main/res/layout/frag_main_layout.xml | 7 + .../main/res/layout/frag_web_container.xml | 55 ++++++ .../res/layout/item_text_inline_block.xml | 30 ++++ .../res/mipmap-anydpi-v26/ic_launcher.xml | 6 + .../mipmap-anydpi-v26/ic_launcher_round.xml | 6 + .../src/main/res/mipmap-hdpi/ic_launcher.webp | Bin 0 -> 1404 bytes .../res/mipmap-hdpi/ic_launcher_round.webp | Bin 0 -> 2898 bytes .../src/main/res/mipmap-mdpi/ic_launcher.webp | Bin 0 -> 982 bytes .../res/mipmap-mdpi/ic_launcher_round.webp | Bin 0 -> 1772 bytes .../main/res/mipmap-xhdpi/ic_launcher.webp | Bin 0 -> 1900 bytes .../res/mipmap-xhdpi/ic_launcher_round.webp | Bin 0 -> 3918 bytes .../main/res/mipmap-xxhdpi/ic_launcher.webp | Bin 0 -> 2884 bytes .../res/mipmap-xxhdpi/ic_launcher_round.webp | Bin 0 -> 5914 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin 0 -> 3844 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin 0 -> 7778 bytes testapp/src/main/res/values-night/themes.xml | 16 ++ testapp/src/main/res/values/colors.xml | 10 ++ testapp/src/main/res/values/strings.xml | 3 + testapp/src/main/res/values/themes.xml | 16 ++ .../java/com/pic/testapp/ExampleUnitTest.kt | 17 ++ 58 files changed, 1772 insertions(+), 46 deletions(-) create mode 100644 app/src/main/java/com/pic/catcher/plugin/OKHttpPlugin.java create mode 100644 app/src/main/java/com/pic/catcher/plugin/X5WebViewCatcherPlugin.java rename {app => keys}/key-store-test.jks (100%) create mode 100644 testapp/.gitignore create mode 100644 testapp/build.gradle create mode 100644 testapp/proguard-rules.pro create mode 100644 testapp/src/androidTest/java/com/pic/testapp/ExampleInstrumentedTest.kt create mode 100644 testapp/src/main/AndroidManifest.xml create mode 100644 testapp/src/main/java/com/pic/testapp/App.java create mode 100644 testapp/src/main/java/com/pic/testapp/ItemBean.kt create mode 100644 testapp/src/main/java/com/pic/testapp/LauncherUiActivity.java create mode 100644 testapp/src/main/java/com/pic/testapp/LocalStorage.java create mode 100644 testapp/src/main/java/com/pic/testapp/MainFragment.kt create mode 100644 testapp/src/main/java/com/pic/testapp/WebViewFragment.java create mode 100644 testapp/src/main/java/com/pic/testapp/X5WebViewFragment.java create mode 100644 testapp/src/main/java/com/pic/testapp/action/Action.java create mode 100644 testapp/src/main/java/com/pic/testapp/action/LoadBitmapAction.java create mode 100644 testapp/src/main/java/com/pic/testapp/action/LoadHttpPicAction.java create mode 100644 testapp/src/main/java/com/pic/testapp/base/BaseActivity.java create mode 100644 testapp/src/main/java/com/pic/testapp/base/BaseFragment.java create mode 100644 testapp/src/main/java/com/pic/testapp/base/BindingFragment.java create mode 100644 testapp/src/main/java/com/pic/testapp/util/AppExecutor.kt create mode 100644 testapp/src/main/java/com/pic/testapp/util/LogUtil.java create mode 100644 testapp/src/main/java/com/pic/testapp/vm/X5ViewModel.java create mode 100644 testapp/src/main/res/drawable-v24/ic_launcher_foreground.xml create mode 100644 testapp/src/main/res/drawable/ic_launcher_background.xml create mode 100644 testapp/src/main/res/layout/act_frag_container_layout.xml create mode 100644 testapp/src/main/res/layout/frag_main_layout.xml create mode 100644 testapp/src/main/res/layout/frag_web_container.xml create mode 100644 testapp/src/main/res/layout/item_text_inline_block.xml create mode 100644 testapp/src/main/res/mipmap-anydpi-v26/ic_launcher.xml create mode 100644 testapp/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml create mode 100644 testapp/src/main/res/mipmap-hdpi/ic_launcher.webp create mode 100644 testapp/src/main/res/mipmap-hdpi/ic_launcher_round.webp create mode 100644 testapp/src/main/res/mipmap-mdpi/ic_launcher.webp create mode 100644 testapp/src/main/res/mipmap-mdpi/ic_launcher_round.webp create mode 100644 testapp/src/main/res/mipmap-xhdpi/ic_launcher.webp create mode 100644 testapp/src/main/res/mipmap-xhdpi/ic_launcher_round.webp create mode 100644 testapp/src/main/res/mipmap-xxhdpi/ic_launcher.webp create mode 100644 testapp/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp create mode 100644 testapp/src/main/res/mipmap-xxxhdpi/ic_launcher.webp create mode 100644 testapp/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp create mode 100644 testapp/src/main/res/values-night/themes.xml create mode 100644 testapp/src/main/res/values/colors.xml create mode 100644 testapp/src/main/res/values/strings.xml create mode 100644 testapp/src/main/res/values/themes.xml create mode 100644 testapp/src/test/java/com/pic/testapp/ExampleUnitTest.kt diff --git a/app/build.gradle b/app/build.gradle index 95fbcce..19b33a6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -61,12 +61,12 @@ this.afterEvaluate { android { namespace 'com.pic.catcher' - compileSdk 35 + compileSdk COMPILE_SDK_VERSION.toInteger() defaultConfig { applicationId "com.pic.catcher" minSdk 24 - targetSdk 35 + targetSdk TARGET_SDK_VERSION.toInteger() versionCode 1 versionName "1.0-gaoji" @@ -85,7 +85,7 @@ android { // } signingConfigs { alpha { - storeFile file("${rootDir}/app/key-store-test.jks") + storeFile file("${rootDir}/keys/key-store-test.jks") storePassword "123456" keyAlias "piccatch" keyPassword "123456" @@ -94,8 +94,8 @@ android { buildTypes { debug { debuggable true - minifyEnabled true - shrinkResources true + minifyEnabled false + shrinkResources false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro','proguard-rules-debug.pro' signingConfig signingConfigs.alpha } diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index fa17412..8e6fd2b 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -30,20 +30,17 @@ #} -keepclassmembers class * extends com.pic.catcher.base.BaseFragment { - (); + (); } -keepclassmembers class * extends com.pic.catcher.base.BaseViewModel { (); } -keepclassmembers class * extends com.pic.catcher.base.BaseFragment { - (*); + (); } -keepclassmembers class * extends com.pic.catcher.base.BaseViewModel { - (*); + (); } -keepclassmembers class * extends com.lu.lposed.plugin.IPlugin { (*); } --keepclassmembers class * extends com.lu.lposed.plugin.IPlugin { - (); -} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d9aed44..ff2e889 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -13,8 +13,7 @@ android:networkSecurityConfig="@xml/network_security_config" android:roundIcon="@mipmap/ic_launcher" android:supportsRtl="true" - android:theme="@style/Theme.PicCatcher" - tools:targetApi="31"> + android:theme="@style/Theme.PicCatcher"> diff --git a/app/src/main/java/com/pic/catcher/MainHook.java b/app/src/main/java/com/pic/catcher/MainHook.java index e5669b2..93aa482 100644 --- a/app/src/main/java/com/pic/catcher/MainHook.java +++ b/app/src/main/java/com/pic/catcher/MainHook.java @@ -16,8 +16,10 @@ import com.lu.magic.util.log.SimpleLogger; import com.pic.catcher.plugin.BitmapCatcherPlugin; import com.pic.catcher.plugin.GlideCatcherPlugin; +import com.pic.catcher.plugin.OKHttpPlugin; import com.pic.catcher.plugin.WebViewCatcherPlugin; +import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; import java.util.List; @@ -87,7 +89,11 @@ public void onLog(int level, @NonNull Object[] objects) { return (short) 0; } if (BuildConfig.DEBUG) { - LogUtil.w("setOnErrorReturnFallback", throwable); + if (throwable instanceof InvocationTargetException) { + LogUtil.w("setOnErrorReturnFallback", ((InvocationTargetException) throwable).getTargetException()); + } else { + LogUtil.w("setOnErrorReturnFallback2", throwable); + } } return null; }); @@ -119,18 +125,18 @@ protected void afterHookedMethod(MethodHookParam param) throws Throwable { // } // ); // - unhook = XposedHelpers2.findAndHookMethod( - Instrumentation.class.getName(), - lpparam.classLoader, - "callApplicationOnCreate", - Application.class.getName(), - new XC_MethodHook2() { - @Override - protected void afterHookedMethod(MethodHookParam param) throws Throwable { - initPlugin((Context) param.args[0], lpparam); - } - } - ); +// unhook = XposedHelpers2.findAndHookMethod( +// Instrumentation.class.getName(), +// lpparam.classLoader, +// "callApplicationOnCreate", +// Application.class.getName(), +// new XC_MethodHook2() { +// @Override +// protected void afterHookedMethod(MethodHookParam param) throws Throwable { +// initPlugin((Context) param.args[0], lpparam); +// } +// } +// ); initUnHookList.add(unhook); // // XposedHelpers2.findAndHookMethod( @@ -182,9 +188,10 @@ private void initSelfPlugins(Context context, XC_LoadPackage.LoadPackageParam lp private void initTargetPlugins(Context context, XC_LoadPackage.LoadPackageParam lpparam) { //目前生成的plugin都是单例的 PluginRegistry.register( - BitmapCatcherPlugin.class, - GlideCatcherPlugin.class, - WebViewCatcherPlugin.class +// BitmapCatcherPlugin.class, +// GlideCatcherPlugin.class, +// WebViewCatcherPlugin.class + OKHttpPlugin.class ).handleHooks(context, lpparam); diff --git a/app/src/main/java/com/pic/catcher/plugin/OKHttpPlugin.java b/app/src/main/java/com/pic/catcher/plugin/OKHttpPlugin.java new file mode 100644 index 0000000..5c5802a --- /dev/null +++ b/app/src/main/java/com/pic/catcher/plugin/OKHttpPlugin.java @@ -0,0 +1,135 @@ +package com.pic.catcher.plugin; + +import android.content.Context; +import android.text.TextUtils; +import android.webkit.MimeTypeMap; + +import com.lu.lposed.api2.XC_MethodHook2; +import com.lu.lposed.api2.XposedHelpers2; +import com.lu.lposed.plugin.IPlugin; +import com.lu.magic.util.AppUtil; +import com.lu.magic.util.log.LogUtil; +import com.pic.catcher.ClazzN; +import com.pic.catcher.util.Regexs; + +import java.io.ByteArrayOutputStream; +import java.lang.reflect.Method; +import java.util.Arrays; + +import de.robv.android.xposed.callbacks.XC_LoadPackage; + +/** + * @author Lu + * @date 2024/10/26 23:16 + * @description + */ +public class OKHttpPlugin implements IPlugin { + @Override + public void handleHook(Context context, XC_LoadPackage.LoadPackageParam loadPackageParam) { + handleHookOkHttp3(context, loadPackageParam); +// handleHookAndroidOkHttp(context, loadPackageParam); + } + + private void handleHookAndroidOkHttp(Context context, XC_LoadPackage.LoadPackageParam loadPackageParam) { + XposedHelpers2.findAndHookMethod( + ClazzN.from("com.android.okhttp.internal.http.HttpEngine"), + "readResponse", + new XC_MethodHook2() { + + @Override + protected void afterHookedMethod(MethodHookParam param) throws Throwable { + Object response = XposedHelpers2.getObjectField(param.thisObject, "userResponse"); + + LogUtil.d("response", response); + + String contentType = (String) XposedHelpers2.callMethod(response, "header", "Content-Type"); + if (TextUtils.isEmpty(contentType)) { + LogUtil.d("content-type is empty"); + return; + } + String guessFileEx = MimeTypeMap.getSingleton().getExtensionFromMimeType(contentType); + if (TextUtils.isEmpty(guessFileEx) || !Regexs.PIC_EXT.matcher(guessFileEx).find()) { + //不是图片 + return; + } + Object body = XposedHelpers2.callMethod(response, "body"); + LogUtil.d("body", body); + if (body == null) { + return; + } + //com.android.okhttp.internal.http.Http1xStream$FixedLengthSource + Object source = XposedHelpers2.callMethod(body, "source"); + LogUtil.d("bufferedSource", source); + if (source == null) { + return; + } + //读取二进制 + Object bytes = XposedHelpers2.callMethod(source, "readByteArray"); +// Object buffer = XposedHelpers2.getObjectField(source, "buffer"); + ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); + outputStream.write((byte[]) bytes); + Object sink = XposedHelpers2.callStaticMethod(ClazzN.from("com.android.okhttp.okio.Okio"), "sink", outputStream); + Object buffer = XposedHelpers2.callMethod(ClazzN.from("com.android.okhttp.okio.Okio"), "buffer", sink); + XposedHelpers2.setObjectField(body, "buffer", buffer); + + //com.android.okhttp.internal.http.Http1xStream$FixedLengthSource +// Object sourceField = XposedHelpers2.getObjectField(source, "source"); +// XposedHelpers2.callMethod(buffer, "read", bytes); + //读完就废了，所以复制一个给原先的结果 + +// LogUtil.d("readByteArray is ok", bytes + "", sourceField); + if (bytes != null) { + LogUtil.d("readByteArray is bytes. start download"); + PicExportManager.getInstance().exportByteArray((byte[]) bytes, guessFileEx); + } + } + } + ); + + } + + private void handleHookOkHttp3(Context context, XC_LoadPackage.LoadPackageParam loadPackageParam) { + ClassLoader clazzLoader = AppUtil.getClassLoader(); + LogUtil.d("OKHttpPlugin", "handleHook", clazzLoader); + Class realCallClazz = ClazzN.from("okhttp3.RealCall", clazzLoader); + if (realCallClazz == null) { + LogUtil.d("can not find RealCall class"); + return; + } + XposedHelpers2.findAndHookMethod( + realCallClazz, +// "execute", + "getResponseWithInterceptorChain", + new XC_MethodHook2() { + + @Override + protected void afterHookedMethod(MethodHookParam param) throws Throwable { + Object response = param.getResult(); + String contentType = (String) XposedHelpers2.callMethod(response, "header", "Content-Type"); + if (TextUtils.isEmpty(contentType)) { + LogUtil.d("content-type is empty"); + return; + } + String guessFileEx = MimeTypeMap.getSingleton().getExtensionFromMimeType(contentType); + if (TextUtils.isEmpty(guessFileEx) || !Regexs.PIC_EXT.matcher(guessFileEx).find()) { + //不是图片 + return; + } + + // 制造一个新的body，不影响原始数据读写 + Object response2 = XposedHelpers2.callMethod(response, "peekBody", Long.MAX_VALUE); + if (response2 == null) { + LogUtil.d("response2 is null"); + return; + } + Object bytes = XposedHelpers2.callMethod(response2, "bytes"); + if (bytes instanceof byte[]) { + LogUtil.d("readByteArray is bytes. start download"); + PicExportManager.getInstance().exportByteArray((byte[]) bytes, guessFileEx); + } + } + } + ); + + } +} diff --git a/app/src/main/java/com/pic/catcher/plugin/PicExportManager.java b/app/src/main/java/com/pic/catcher/plugin/PicExportManager.java index f957001..df0c9a4 100644 --- a/app/src/main/java/com/pic/catcher/plugin/PicExportManager.java +++ b/app/src/main/java/com/pic/catcher/plugin/PicExportManager.java @@ -168,6 +168,7 @@ public void exportByteArray(final byte[] dataBytes, String lastName) { final String finalLastName = lastName; runOnIo(() -> { if (dataBytes == null || dataBytes.length == 0) { + LogUtil.d("exportByteArray: dataBytes is empty"); return; } FileOutputStream fileOutputStream = null; @@ -175,6 +176,7 @@ public void exportByteArray(final byte[] dataBytes, String lastName) { String fileName = Md5Util.get(dataBytes) + finalLastName; File file = new File(this.exportDir, fileName); if (file.exists()) { + LogUtil.d("exportByteArray: file already exists:", file); return; } this.exportDir.mkdirs(); @@ -182,7 +184,8 @@ public void exportByteArray(final byte[] dataBytes, String lastName) { IOUtil.writeByByte(dataBytes, fileOutputStream); LogUtil.d("exportByteArray: ", file); } catch (Throwable th) { - th.printStackTrace(); +// th.printStackTrace(); + LogUtil.d(th); } finally { IOUtil.closeQuietly(fileOutputStream); } diff --git a/app/src/main/java/com/pic/catcher/plugin/X5WebViewCatcherPlugin.java b/app/src/main/java/com/pic/catcher/plugin/X5WebViewCatcherPlugin.java new file mode 100644 index 0000000..c389b01 --- /dev/null +++ b/app/src/main/java/com/pic/catcher/plugin/X5WebViewCatcherPlugin.java @@ -0,0 +1,44 @@ +package com.pic.catcher.plugin; + +import android.content.Context; +import android.webkit.WebView; + +import com.lu.lposed.api2.XC_MethodHook2; +import com.lu.lposed.api2.XposedHelpers2; +import com.lu.lposed.plugin.IPlugin; +import com.lu.magic.util.log.LogUtil; +import com.pic.catcher.ClazzN; + +import de.robv.android.xposed.callbacks.XC_LoadPackage; + +/** + * @author Lu + * @date 2024/10/13 14:48 + * @description x5webview 网页图片加载获取 + */ +public class X5WebViewCatcherPlugin implements IPlugin { + + @Override + public void handleHook(Context context, XC_LoadPackage.LoadPackageParam loadPackageParam) { + Class webViewClientClazz = ClazzN.from("com.tencent.smtt.sdk.WebViewClient"); + Class webViewClazz = ClazzN.from("com.tencent.smtt.sdk.WebView"); + if (webViewClientClazz == null || webViewClazz == null) { + return; + } + XposedHelpers2.findAndHookMethod( + webViewClientClazz, + "onLoadResource", + webViewClazz, + String.class, + new XC_MethodHook2() { + @Override + protected void afterHookedMethod(MethodHookParam param) throws Throwable { + WebView webView = (WebView) param.args[0]; + String url = (String) param.args[1]; + LogUtil.d("WebViewClient.onLoadResource", "url=" + url); + PicExportManager.getInstance().exportUrlIfNeed(url); + } + } + ); + } +} diff --git a/app/src/main/java/com/pic/catcher/util/ext/AnyX.kt b/app/src/main/java/com/pic/catcher/util/ext/AnyX.kt index 525f53c..f4c799c 100644 --- a/app/src/main/java/com/pic/catcher/util/ext/AnyX.kt +++ b/app/src/main/java/com/pic/catcher/util/ext/AnyX.kt @@ -57,7 +57,7 @@ fun TextView.setTextColorTheme(color: Int) { } -inline fun T?.takeNotNull(fallback: T): T { +fun T?.takeNotNull(fallback: T): T { if (this == null) { return fallback } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 435cd5d..4ab1489 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,5 +1,5 @@ - PicCatcher + 图片捕手 App图片抓取器 模块未激活 模块已激活 diff --git a/build.gradle b/build.gradle index 4b62788..5d375a0 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { } plugins { - id 'com.android.application' version '8.5.2' apply false - id 'com.android.library' version '8.5.2' apply false + id 'com.android.application' version '8.6.0' apply false + id 'com.android.library' version '8.6.0' apply false id 'org.jetbrains.kotlin.android' version '2.0.20' apply false } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 532582a..9f71aa8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,5 +21,10 @@ kotlin.code.style=official # resources declared in the library itself and none from the library's dependencies, # thereby reducing the size of the R class for that library android.nonTransitiveRClass=true -#?debug apk??????? -android.injected.testOnly = false \ No newline at end of file +#设置debug apk也可以点击直接安装 +android.injected.testOnly=false + +TARGET_SDK_VERSION=35 +COMPILE_SDK_VERSION=35 + +#org.gradle.java.home=C\:\\Programing\\Android\\android-studio\\jbr \ No newline at end of file diff --git a/app/key-store-test.jks b/keys/key-store-test.jks similarity index 100% rename from app/key-store-test.jks rename to keys/key-store-test.jks diff --git a/props.gradle b/props.gradle index 262e18e..3ed1179 100644 --- a/props.gradle +++ b/props.gradle @@ -28,11 +28,9 @@ ext { 'com.github.Mingyueyixi.frame-base-utils:core' : 'com.github.Mingyueyixi.frame-base-utils:core:40657f21dc', -// 'com.github.Mingyueyixi:frame-ui' : 'com.github.Mingyueyixi:frame-ui:main-SNAPSHOT', -// 'com.github.Mingyueyixi:frame-ui' : 'com.github.Mingyueyixi:frame-ui:v1.0.0-alpha.2', -// 'com.github.Mingyueyixi.frame-ui:ui-all' : 'com.github.Mingyueyixi.frame-ui:ui-all:8db89324ba', -// 'com.github.Mingyueyixi.frame-ui:ui-material' : 'com.github.Mingyueyixi.frame-ui:ui-material:8db89324ba', -// 'com.github.Mingyueyixi.frame-ui:ui-base' : 'com.github.Mingyueyixi.frame-ui:ui-base:8db89324ba', +// 'com.github.Mingyueyixi.frame-ui:ui-all' : 'com.github.Mingyueyixi.frame-ui:ui-all:332536884f', + 'com.github.Mingyueyixi.frame-ui:ui-material' : 'com.github.Mingyueyixi.frame-ui:ui-material:332536884f', +// 'com.github.Mingyueyixi.frame-ui:ui-base' : 'com.github.Mingyueyixi.frame-ui:ui-base:332536884f', 'com.github.Mingyueyixi.frame-ui:ui-appcompat' : 'com.github.Mingyueyixi.frame-ui:ui-appcompat:332536884f', 'com.github.Mingyueyixi:frame-multi-preference' : 'com.github.Mingyueyixi:frame-multi-preference:main-SNAPSHOT', diff --git a/settings.gradle b/settings.gradle index 8cf7a0f..13902a9 100644 --- a/settings.gradle +++ b/settings.gradle @@ -4,12 +4,13 @@ pluginManagement { // allowInsecureProtocol = true // url "http://127.0.0.1:10072" // } - maven { url 'https://jitpack.io/' } maven { url 'https://mirrors.cloud.tencent.com/nexus/repository/maven-public' } maven { url 'https://repo.huaweicloud.com/repository/maven' } + maven { url "https://maven.aliyun.com/repository/public" } + maven { url 'https://jitpack.io/' } + //central有的，public聚合仓不一定有，奇葩 maven { url 'https://maven.aliyun.com/repository/central' } - maven { url "https://maven.aliyun.com/repository/public" } maven { url "https://maven.aliyun.com/repository/google" } maven { url "https://maven.aliyun.com/repository/gradle-plugin" } @@ -26,12 +27,13 @@ dependencyResolutionManagement { // url "http://127.0.0.1:10072" // } - maven { url 'https://jitpack.io/' } maven { url 'https://mirrors.cloud.tencent.com/nexus/repository/maven-public' } maven { url 'https://repo.huaweicloud.com/repository/maven' } + maven { url "https://maven.aliyun.com/repository/public" } + maven { url 'https://jitpack.io/' } + //central有的，public聚合仓不一定有，奇葩 maven { url 'https://maven.aliyun.com/repository/central' } - maven { url "https://maven.aliyun.com/repository/public" } maven { url "https://maven.aliyun.com/repository/google" } maven { url "https://maven.aliyun.com/repository/gradle-plugin" } @@ -40,4 +42,5 @@ dependencyResolutionManagement { } } rootProject.name = "PicCatcher" -include ':app' \ No newline at end of file +include ':app' +include ':testapp' diff --git a/testapp/.gitignore b/testapp/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/testapp/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/testapp/build.gradle b/testapp/build.gradle new file mode 100644 index 0000000..b4f1859 --- /dev/null +++ b/testapp/build.gradle @@ -0,0 +1,80 @@ +import org.json.JSONObject + +import java.text.SimpleDateFormat + +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' +} +apply { + from rootProject.file('props.gradle') +} + +android { + namespace 'com.pic.testapp' + compileSdk COMPILE_SDK_VERSION.toInteger() + + defaultConfig { + applicationId "com.pic.testapp" + minSdk 23 + targetSdk TARGET_SDK_VERSION.toInteger() + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + signingConfigs { + alpha { + storeFile file("${rootDir}/keys/key-store-test.jks") + storePassword "123456" + keyAlias "piccatch" + keyPassword "123456" + } + } + buildTypes { + debug { + debuggable true + minifyEnabled false + shrinkResources false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro','proguard-rules-debug.pro' + signingConfig signingConfigs.alpha + } + release { + debuggable false + minifyEnabled true + shrinkResources true + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + signingConfig signingConfigs.alpha + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + buildFeatures { + viewBinding true + } +} + +dependencies { + implementation 'androidx.core:core-ktx:1.10.1' + implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'com.google.android.material:material:1.10.0' + // Flex布局依赖，可配合RecyclerView也可以单独使用 + // https://mvnrepository.com/artifact/com.google.android.flexbox/flexbox + implementation 'com.google.android.flexbox:flexbox:3.0.0' + implementation deps['com.github.Mingyueyixi.frame-ui:ui-material'] + api 'com.tencent.tbs:tbssdk:44286' + implementation 'com.squareup.okhttp3:okhttp:3.14.7' + implementation 'com.squareup.okio:okio:1.17.5' + implementation(deps['com.github.Mingyueyixi.frame-base-utils:base']) + +// implementation('com.github.Mingyueyixi.frame-base-utils:core') + +// testImplementation 'junit:junit:4.14-SNAPSHOT' +// androidTestImplementation 'androidx.test.ext:junit:1.1.5' +// androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' +} \ No newline at end of file diff --git a/testapp/proguard-rules.pro b/testapp/proguard-rules.pro new file mode 100644 index 0000000..107b7ee --- /dev/null +++ b/testapp/proguard-rules.pro @@ -0,0 +1,32 @@ +# 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 + +-dontwarn dalvik.** +-dontwarn com.tencent.smtt.** + +-keep class com.tencent.smtt.** { + *; +} + +-keep class com.tencent.tbs.** { + *; +} \ No newline at end of file diff --git a/testapp/src/androidTest/java/com/pic/testapp/ExampleInstrumentedTest.kt b/testapp/src/androidTest/java/com/pic/testapp/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..af142c8 --- /dev/null +++ b/testapp/src/androidTest/java/com/pic/testapp/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package com.pic.testapp + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.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.pic.testapp", appContext.packageName) + } +} \ No newline at end of file diff --git a/testapp/src/main/AndroidManifest.xml b/testapp/src/main/AndroidManifest.xml new file mode 100644 index 0000000..f9e2978 --- /dev/null +++ b/testapp/src/main/AndroidManifest.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/testapp/src/main/java/com/pic/testapp/App.java b/testapp/src/main/java/com/pic/testapp/App.java new file mode 100644 index 0000000..44c84e5 --- /dev/null +++ b/testapp/src/main/java/com/pic/testapp/App.java @@ -0,0 +1,25 @@ +package com.pic.testapp; + +import android.app.Application; +import android.content.Context; + +/** + * @author Lu + * @date 2024/10/26 20:11 + * @description + */ +public class App extends Application { + private static App instance; + + + public static App getInstance() { + return instance; + } + + @Override + protected void attachBaseContext(Context base) { + instance = this; + super.attachBaseContext(base); + } + +} diff --git a/testapp/src/main/java/com/pic/testapp/ItemBean.kt b/testapp/src/main/java/com/pic/testapp/ItemBean.kt new file mode 100644 index 0000000..8648a9d --- /dev/null +++ b/testapp/src/main/java/com/pic/testapp/ItemBean.kt @@ -0,0 +1,8 @@ +package com.pic.testapp + +/** + * @author Lu + * @date 2024/10/26 19:24 + * @description + */ +class ItemBean(val title: String, val action: Any) \ No newline at end of file diff --git a/testapp/src/main/java/com/pic/testapp/LauncherUiActivity.java b/testapp/src/main/java/com/pic/testapp/LauncherUiActivity.java new file mode 100644 index 0000000..2cba44e --- /dev/null +++ b/testapp/src/main/java/com/pic/testapp/LauncherUiActivity.java @@ -0,0 +1,23 @@ +package com.pic.testapp; + +import android.os.Bundle; + +import androidx.annotation.Nullable; + +import com.pic.testapp.base.BaseActivity; + +import okhttp3.Response; +import okio.Buffer; + +/** + * @author Lu + * @date 2024/10/26 12:57 + * @description + */ +public class LauncherUiActivity extends BaseActivity { + @Override + protected void onCreate(@Nullable Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + addFragment(new MainFragment()); + } +} diff --git a/testapp/src/main/java/com/pic/testapp/LocalStorage.java b/testapp/src/main/java/com/pic/testapp/LocalStorage.java new file mode 100644 index 0000000..2720fcf --- /dev/null +++ b/testapp/src/main/java/com/pic/testapp/LocalStorage.java @@ -0,0 +1,20 @@ +package com.pic.testapp; + +import android.content.Context; +import android.content.SharedPreferences; + +/** + * @author Lu + * @date 2024/10/26 20:24 + * @description + */ +public class LocalStorage { + public static SharedPreferences getDefault() { + return App.getInstance().getSharedPreferences("appDefaultConfig", Context.MODE_PRIVATE); + } + + public interface Key { + String X5_WEB_VIEW_LAST_URL = "x5WebViewLastUrl"; + String WEB_VIEW_LAST_URL = "WebViewLastUrl"; + } +} diff --git a/testapp/src/main/java/com/pic/testapp/MainFragment.kt b/testapp/src/main/java/com/pic/testapp/MainFragment.kt new file mode 100644 index 0000000..114c6eb --- /dev/null +++ b/testapp/src/main/java/com/pic/testapp/MainFragment.kt @@ -0,0 +1,84 @@ +package com.pic.testapp + +import android.view.LayoutInflater +import android.view.ViewGroup +import android.widget.Toast +import com.google.android.flexbox.FlexDirection +import com.google.android.flexbox.FlexWrap +import com.google.android.flexbox.FlexboxLayoutManager +import com.lu.magic.ui.recycler.MultiAdapter +import com.lu.magic.ui.recycler.MultiViewHolder +import com.lu.magic.ui.recycler.SimpleItemType +import com.pic.testapp.action.Action +import com.pic.testapp.action.LoadBitmapAction +import com.pic.testapp.action.LoadHttpPicAction +import com.pic.testapp.base.BaseFragment +import com.pic.testapp.base.BindingFragment +import com.pic.testapp.databinding.FragMainLayoutBinding +import com.pic.testapp.databinding.ItemTextInlineBlockBinding + +class MainFragment : BindingFragment() { + + private lateinit var mAdapter: MultiAdapter + + override fun onCreateBinding(inflater: LayoutInflater, container: ViewGroup?): FragMainLayoutBinding { + return FragMainLayoutBinding.inflate(inflater, container, false) + } + + override fun initView() { + mBinding.mainRecyclerView.layoutManager = object : FlexboxLayoutManager(context, FlexDirection.ROW, FlexWrap.WRAP) { + override fun canScrollVertically(): Boolean { + return true + } + } + + mBinding.mainRecyclerView.adapter = MultiAdapter().addItemType(object : SimpleItemType() { + override fun createViewHolder(adapter: MultiAdapter, parent: ViewGroup, viewType: Int): MultiViewHolder { + return ItemBindingViewHolder(ItemTextInlineBlockBinding.inflate(layoutInflater, parent, false)) + } + }).also { + mAdapter = it + } + } + + override fun initData() { + mAdapter.setData( + listOf( + ItemBean("显示网络图片", LoadHttpPicAction()), + ItemBean("loadBitmap", LoadBitmapAction()), + ItemBean("webview", WebViewFragment::class.java), + ItemBean("x5Webview", X5WebViewFragment::class.java), + ) + ) + } + + + inner class ItemBindingViewHolder(val itemBinding: ItemTextInlineBlockBinding) : MultiViewHolder(itemBinding.root) { + + override fun onBindView(adapter: MultiAdapter, itemModel: ItemBean, position: Int) { + itemBinding.itemTextContent.setText(itemModel.title) + itemBinding.itemTextContent.setOnClickListener { + if (itemModel.action is Class<*>) { + if (BaseFragment::class.java.isAssignableFrom(itemModel.action)) { + //传入的是BaseFragment子类型 + try { +// var fragment = parentFragmentManager.fragmentFactory.instantiate( +// itemModel.action.classLoader, +// itemModel.action.name +// ) as BaseFragment? + addActivityFragment(itemModel.action.getConstructor().newInstance() as BaseFragment) + } catch (e: Exception) { + Toast.makeText(context, "无法创建对象", Toast.LENGTH_SHORT).show() + e.printStackTrace() + } + } + } else if (itemModel.action is Action) { + itemModel.action.doAction(context) + } + } + + } + + } + +} \ No newline at end of file diff --git a/testapp/src/main/java/com/pic/testapp/WebViewFragment.java b/testapp/src/main/java/com/pic/testapp/WebViewFragment.java new file mode 100644 index 0000000..65eda90 --- /dev/null +++ b/testapp/src/main/java/com/pic/testapp/WebViewFragment.java @@ -0,0 +1,118 @@ +package com.pic.testapp; + +import android.graphics.Bitmap; +import android.net.http.SslError; +import android.os.Bundle; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.webkit.SslErrorHandler; +import android.webkit.WebChromeClient; +import android.webkit.WebResourceRequest; +import android.webkit.WebSettings; +import android.webkit.WebView; +import android.webkit.WebViewClient; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + +import com.pic.testapp.base.BindingFragment; +import com.pic.testapp.databinding.FragWebContainerBinding; +import com.tencent.smtt.sdk.URLUtil; + + +/** + * @author Lu + * @date 2024/10/26 19:31 + * @description + */ +public class WebViewFragment extends BindingFragment { + private WebView mWebView; + + @Override + protected FragWebContainerBinding onCreateBinding(@NonNull LayoutInflater inflater, @Nullable ViewGroup container) { + return FragWebContainerBinding.inflate(inflater, container, false); + } + + @Override + protected void initView() { + mWebView = new WebView(getContext()); + initWebView(); + mBinding.etWebUrl.setText(LocalStorage.getDefault().getString(LocalStorage.Key.WEB_VIEW_LAST_URL, "")); + mBinding.flWebContainer.addView(mWebView); + mBinding.tvGo.setOnClickListener(v -> openUrl(mBinding.etWebUrl.getText().toString())); + } + + private void initWebView() { + WebSettings setting = mWebView.getSettings(); + setting.setJavaScriptEnabled(true); + setting.setDomStorageEnabled(true); + setting.setDatabaseEnabled(true); + setting.setAllowUniversalAccessFromFileURLs(true); + + mWebView.setWebViewClient(new WebViewClient() { + @Override + public void onReceivedSslError(WebView webView, SslErrorHandler sslErrorHandler, SslError sslError) { + sslErrorHandler.proceed(); + } + + @Override + public void onPageStarted(WebView view, String url, Bitmap favicon) { + super.onPageStarted(view, url, favicon); + mBinding.etWebUrl.setText(url); + mBinding.lpbProgress.setVisibility(View.VISIBLE); + recordLoadUrl(url); + } + + @Override + public void onPageFinished(WebView webView, String s) { + super.onPageFinished(webView, s); + mBinding.lpbProgress.setVisibility(View.INVISIBLE); + } + }); + + mWebView.setWebChromeClient(new WebChromeClient() { + @Override + public void onProgressChanged(WebView view, int newProgress) { + super.onProgressChanged(view, newProgress); + mBinding.lpbProgress.setProgress(newProgress); + } + }); + } + + private void recordLoadUrl(String url) { + if (TextUtils.isEmpty(url)) { + return; + } + if (URLUtil.isHttpsUrl(url) || URLUtil.isHttpUrl(url) || URLUtil.isFileUrl(url)) { + LocalStorage.getDefault().edit().putString(LocalStorage.Key.WEB_VIEW_LAST_URL, url).commit(); + } + } + + private void openUrl(String url) { + recordLoadUrl(url); + mWebView.loadUrl(url); + mBinding.etWebUrl.clearFocus(); + } + + @Override + protected void initData() { + + } + + @Override + public boolean onBackPressed() { + if (mWebView.canGoBack()) { + mWebView.goBack(); + return true; + } + return super.onBackPressed(); + } + + @Override + public void onDestroy() { + super.onDestroy(); + mWebView.destroy(); + } +} diff --git a/testapp/src/main/java/com/pic/testapp/X5WebViewFragment.java b/testapp/src/main/java/com/pic/testapp/X5WebViewFragment.java new file mode 100644 index 0000000..db4a509 --- /dev/null +++ b/testapp/src/main/java/com/pic/testapp/X5WebViewFragment.java @@ -0,0 +1,136 @@ +package com.pic.testapp; + +import android.app.ProgressDialog; +import android.graphics.Bitmap; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.Toast; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + +import com.pic.testapp.base.BindingFragment; +import com.pic.testapp.databinding.FragWebContainerBinding; +import com.pic.testapp.vm.X5ViewModel; +import com.tencent.smtt.export.external.interfaces.SslError; +import com.tencent.smtt.export.external.interfaces.SslErrorHandler; +import com.tencent.smtt.sdk.URLUtil; +import com.tencent.smtt.sdk.WebChromeClient; +import com.tencent.smtt.sdk.WebSettings; +import com.tencent.smtt.sdk.WebView; +import com.tencent.smtt.sdk.WebViewClient; + +/** + * @author Lu + * @date 2024/10/26 16:06 + * @description + */ +public class X5WebViewFragment extends BindingFragment { + private X5ViewModel mViewModel; + private ProgressDialog progressDialog; + private WebView mWebView; + + @Override + protected FragWebContainerBinding onCreateBinding(@NonNull LayoutInflater inflater, @Nullable ViewGroup container) { + return FragWebContainerBinding.inflate(inflater, container, false); + } + + @Override + protected void initView() { + progressDialog = new ProgressDialog(getContext()); + progressDialog.show(); + mViewModel = getViewModel(X5ViewModel.class); + mViewModel.initX5().observe(this, aBoolean -> { + if (!aBoolean) { + Toast.makeText(getContext(), "x5内核未启用", Toast.LENGTH_SHORT).show(); + } + onViewReady(); + }); + } + + private void onViewReady() { + progressDialog.dismiss(); + mWebView = new WebView(getContext()); + initWebView(); + mBinding.etWebUrl.setText(LocalStorage.getDefault().getString(LocalStorage.Key.X5_WEB_VIEW_LAST_URL, "")); + mBinding.flWebContainer.addView(mWebView); + + mBinding.tvGo.setOnClickListener(v -> openUrl(mBinding.etWebUrl.getText().toString())); + } + + private void initWebView() { + WebSettings setting = mWebView.getSettings(); + setting.setJavaScriptEnabled(true); + setting.setDomStorageEnabled(true); + setting.setDatabaseEnabled(true); + setting.setAllowUniversalAccessFromFileURLs(true); + + mWebView.setWebViewClient(new WebViewClient() { + @Override + public void onReceivedSslError(WebView webView, SslErrorHandler sslErrorHandler, SslError sslError) { + sslErrorHandler.proceed(); + } + + + @Override + public void onPageStarted(WebView webView, String url, Bitmap bitmap) { + super.onPageStarted(webView, url, bitmap); + mBinding.etWebUrl.setText(url); + mBinding.lpbProgress.setVisibility(View.VISIBLE); + recordLoadUrl(url); + } + + @Override + public void onPageFinished(WebView webView, String s) { + super.onPageFinished(webView, s); + mBinding.lpbProgress.setVisibility(View.INVISIBLE); + } + }); + + mWebView.setWebChromeClient(new WebChromeClient() { + @Override + public void onProgressChanged(WebView webView, int i) { + super.onProgressChanged(webView, i); + mBinding.lpbProgress.setProgress(i); + } + }); + } + + private void openUrl(String url) { + recordLoadUrl(url); + mWebView.loadUrl(url); + mBinding.etWebUrl.clearFocus(); + } + + private void recordLoadUrl(String url) { + if (TextUtils.isEmpty(url)) { + return; + } + if (URLUtil.isHttpsUrl(url) || URLUtil.isHttpUrl(url) || URLUtil.isFileUrl(url)) { + LocalStorage.getDefault().edit().putString(LocalStorage.Key.X5_WEB_VIEW_LAST_URL, url).commit(); + } + } + + @Override + protected void initData() { + + } + + @Override + public boolean onBackPressed() { + if (mWebView.canGoBack()) { + mWebView.goBack(); + return true; + } + return super.onBackPressed(); + } + + @Override + public void onDestroy() { + super.onDestroy(); + progressDialog.dismiss(); + mWebView.destroy(); + } +} diff --git a/testapp/src/main/java/com/pic/testapp/action/Action.java b/testapp/src/main/java/com/pic/testapp/action/Action.java new file mode 100644 index 0000000..0b51079 --- /dev/null +++ b/testapp/src/main/java/com/pic/testapp/action/Action.java @@ -0,0 +1,12 @@ +package com.pic.testapp.action; + +import android.content.Context; + +/** + * @author Lu + * @date 2024/10/26 19:45 + * @description + */ +public interface Action { + void doAction(Context context); +} diff --git a/testapp/src/main/java/com/pic/testapp/action/LoadBitmapAction.java b/testapp/src/main/java/com/pic/testapp/action/LoadBitmapAction.java new file mode 100644 index 0000000..2cce43d --- /dev/null +++ b/testapp/src/main/java/com/pic/testapp/action/LoadBitmapAction.java @@ -0,0 +1,32 @@ +package com.pic.testapp.action; + +import android.app.AlertDialog; +import android.content.Context; +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; +import android.widget.ImageView; + +import com.pic.testapp.R; + +/** + * @author Lu + * @date 2024/10/26 19:43 + * @description + */ +public class LoadBitmapAction implements Action { + + @Override + public void doAction(Context context) { + BitmapFactory.Options opt = new BitmapFactory.Options(); + opt.inPreferredConfig = Bitmap.Config.ARGB_8888; + + Bitmap bitmap = BitmapFactory.decodeResource(context.getResources(), android.R.mipmap.sym_def_app_icon, opt); + ImageView iv = new ImageView(context); + iv.setLayoutParams(new android.view.ViewGroup.LayoutParams(100, 100)); + iv.setImageBitmap(bitmap); + iv.setScaleType(ImageView.ScaleType.FIT_XY); + new AlertDialog.Builder(context) + .setView(iv) + .show(); + } +} diff --git a/testapp/src/main/java/com/pic/testapp/action/LoadHttpPicAction.java b/testapp/src/main/java/com/pic/testapp/action/LoadHttpPicAction.java new file mode 100644 index 0000000..61e3825 --- /dev/null +++ b/testapp/src/main/java/com/pic/testapp/action/LoadHttpPicAction.java @@ -0,0 +1,141 @@ +package com.pic.testapp.action; + +import android.app.AlertDialog; +import android.content.Context; +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; +import android.view.ViewGroup; +import android.view.Window; +import android.view.WindowManager; +import android.widget.ImageView; +import android.widget.Toast; + +import com.lu.magic.util.IOUtil; +import com.pic.testapp.util.AppExecutor; +import com.pic.testapp.util.LogUtil; + +import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.lang.ref.WeakReference; +import java.net.HttpURLConnection; +import java.net.URL; +import java.util.concurrent.TimeUnit; + +import okhttp3.OkHttpClient; +import okhttp3.Request; +import okhttp3.Response; +import okhttp3.ResponseBody; +import okio.Buffer; +import okio.BufferedSource; + +/** + * @author Lu + * @date 2024/10/26 23:56 + * @description + */ +public class LoadHttpPicAction implements Action { + WeakReference mContextRef; + + @Override + public void doAction(Context context) { + mContextRef = new WeakReference<>(context); + LogUtil.d("doAction"); + AppExecutor.INSTANCE.runOnNetworkIo(() -> { + LogUtil.d("runOnNetworkIo"); + try { + doNetworkTask(); + } catch (Throwable e) { + LogUtil.d(e); + } + }); + } + + private InputStream getUrlStream(String picUrl) throws IOException { + InputStream iStream = null; + try { + URL url = new URL(picUrl); + HttpURLConnection conn = (HttpURLConnection) url.openConnection(); + conn.setConnectTimeout(5000); + conn.setReadTimeout(5000); + iStream = conn.getInputStream(); + } catch (Exception e) { + LogUtil.d(e); + } + return iStream; + } + + private InputStream getOkHttpStream(String picUrl) throws IOException { + OkHttpClient.Builder builder = new OkHttpClient.Builder() + .callTimeout(5000L, TimeUnit.MILLISECONDS) + .connectTimeout(5000L, TimeUnit.MILLISECONDS) + .readTimeout(5000L, TimeUnit.MILLISECONDS) + .writeTimeout(5000L, TimeUnit.MILLISECONDS); + LogUtil.d("builder"); + OkHttpClient client = builder.build(); + LogUtil.d("client"); + Response response = client.newCall(new Request.Builder().url(picUrl).build()).execute(); + LogUtil.d("response"); + ResponseBody body = response.body(); + LogUtil.d("body"); + ResponseBody bodyNew = response.peekBody(Long.MAX_VALUE); +// byte[] bytes = IOUtil.readToBytes(bodyNew.byteStream()); + + //返回一个新的 +// BufferedSource peeked = bufferedSource.peek(); +// Buffer buffer = new Buffer(); +// peeked.request(Long.MAX_VALUE); +// buffer.write(peeked, Math.min(Long.MAX_VALUE, peeked.getBuffer().size())); +// byte[] bytes = buffer.readByteArray(); +// LogUtil.d("LoadHttpPicAction", "doNetworkTask", "bytes length", bytes.length); +// InputStream iStream = body.byteStream(); +// bytes = IOUtil.readToBytes(iStream); +// IOUtil.closeQuietly(peeked); + return body.byteStream(); + } + + public void doNetworkTask() throws IOException { +// String picUrl = "https://csdnimg.cn/release/blogv2/dist/pc/img/btnGuideSide1.gif"; + String picUrl = "https://ts2.cn.mm.bing.net/th?id=ORMS.96254be2fd646fe1f697a79490ffc4e9&pid=Wdp&w=612&h=328&qlt=90&c=1&rs=1&dpr=1.25&p=0"; +// String picUrl = "https://192.168.33.66/th?id=ORMS.96254be2fd646fe1f697a79490ffc4e9&pid=Wdp&w=612&h=328&qlt=90&c=1&rs=1&dpr=1.25&p=0"; + LogUtil.d(picUrl); + InputStream iStream = getUrlStream(picUrl); +// InputStream iStream = getOkHttpStream(picUrl); + LogUtil.d(iStream); + Bitmap bitmap = BitmapFactory.decodeStream(iStream); + LogUtil.d(bitmap); +// iStream.close(); + LogUtil.i("LoadHttpPicAction", "doNetworkTask"); + AppExecutor.INSTANCE.runOnUiThread(() -> { + doUiTask(bitmap); + }); + } + + private void doUiTask(Bitmap bitmap) { + if (bitmap == null) { + Toast.makeText(mContextRef.get(), "bitmap is null", Toast.LENGTH_SHORT).show(); + return; + } + LogUtil.i("LoadHttpPicAction", "doUiTask"); + Context context = mContextRef.get(); + if (context == null) { + return; + } + ImageView iv = new ImageView(context); + iv.setLayoutParams(new ViewGroup.MarginLayoutParams(ViewGroup.MarginLayoutParams.MATCH_PARENT, ViewGroup.MarginLayoutParams.MATCH_PARENT)); + iv.setScaleType(ImageView.ScaleType.FIT_CENTER); + iv.setImageBitmap(bitmap); + AlertDialog dialog = new AlertDialog.Builder(context) + .setView(iv) + .show(); + Window window = dialog.getWindow(); + WindowManager.LayoutParams lp = window.getAttributes(); + lp.width = bitmap.getWidth(); + lp.height = bitmap.getHeight(); + window.getDecorView().setPadding(0, 0, 0, 0); + } +} diff --git a/testapp/src/main/java/com/pic/testapp/base/BaseActivity.java b/testapp/src/main/java/com/pic/testapp/base/BaseActivity.java new file mode 100644 index 0000000..957eb9b --- /dev/null +++ b/testapp/src/main/java/com/pic/testapp/base/BaseActivity.java @@ -0,0 +1,76 @@ +package com.pic.testapp.base; + +import android.os.Bundle; + +import androidx.activity.OnBackPressedCallback; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; +import androidx.lifecycle.ViewModel; +import androidx.lifecycle.ViewModelProvider; + +import com.pic.testapp.R; + +/** + * @author Lu + * @date 2024/10/26 13:21 + * @description + */ +public class BaseActivity extends AppCompatActivity { + + private BaseFragment mRootFragment; + private ViewModelProvider mViewModelProvider; + + public VM getViewModel(Class vmClass) { + if (mViewModelProvider == null) { + mViewModelProvider = new ViewModelProvider(this); + } + return mViewModelProvider.get(vmClass); + } + + @Override + protected void onCreate(@Nullable Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.act_frag_container_layout); + + getOnBackPressedDispatcher().addCallback(this, new OnBackPressedCallback(true) { + @Override + public void handleOnBackPressed() { + BaseFragment fragment = getCurrentFragment(); + if (fragment != null && fragment.onBackPressed()) { + return; + } + if (fragment == null || isOnRootFragment()) { + finish(); + return; + } + popCurrentFragment(); + } + }); + + } + + private void popCurrentFragment() { + getSupportFragmentManager().popBackStack(); + } + + + public void addFragment(BaseFragment fragment) { + if (fragment == null) { + return; + } + if (mRootFragment == null) { + mRootFragment = fragment; + } + getSupportFragmentManager().beginTransaction().add(R.id.act_root_container, fragment).addToBackStack(fragment.getClass().getName()).commitAllowingStateLoss(); + } + + public boolean isOnRootFragment() { + return getSupportFragmentManager().findFragmentById(R.id.act_root_container) == mRootFragment; + } + + public BaseFragment getCurrentFragment() { + return (BaseFragment) getSupportFragmentManager().findFragmentById(R.id.act_root_container); + } + + +} diff --git a/testapp/src/main/java/com/pic/testapp/base/BaseFragment.java b/testapp/src/main/java/com/pic/testapp/base/BaseFragment.java new file mode 100644 index 0000000..04aa73a --- /dev/null +++ b/testapp/src/main/java/com/pic/testapp/base/BaseFragment.java @@ -0,0 +1,98 @@ +package com.pic.testapp.base; + +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.FrameLayout; + +import androidx.annotation.LayoutRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.lifecycle.ViewModel; +import androidx.lifecycle.ViewModelProvider; + +/** + * @author Lu + * @date 2024/10/26 13:23 + * @description + */ +public abstract class BaseFragment extends Fragment { + private ViewModelProvider mViewModelProvider; + protected FrameLayout mRootView; + /** + * 处理返回事件 + * + * @return + */ + public boolean onBackPressed() { + return false; + } + + public VM getViewModel(Class vmClass) { + if (mViewModelProvider == null) { + mViewModelProvider = new ViewModelProvider(this); + } + return mViewModelProvider.get(vmClass); + } + + public BaseActivity getBaseActivity() { + return (BaseActivity) getActivity(); + } + + public void addActivityFragment(BaseFragment fragment) { + getBaseActivity().addFragment(fragment); + } + + + public boolean isOnRootFragment() { + return getBaseActivity().isOnRootFragment(); + } + + public BaseFragment getCurrentFragment() { + return getBaseActivity().getCurrentFragment(); + } + + @Nullable + @Override + public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { + int resId = getLayoutResId(); + mRootView = new FrameLayout(getBaseActivity()); + mRootView.setLayoutParams(new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)); + mRootView.setClickable(true); + + //resId != Resources.ID_NULL + if (resId != 0 && resId != View.NO_ID) { + View.inflate(getContext(), resId, mRootView); + } + onRootViewCreate(mRootView); + return mRootView; + } + + protected void onRootViewCreate(FrameLayout rootView) { + mRootView.setBackgroundColor(getResources().getColor(android.R.color.background_light, getContext().getTheme())); + } + + @Override + public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); + initView(); + initData(); + } + + public T findViewById(int id) { + View view = getView(); + if (view == null) { + return null; + } + return view.findViewById(id); + } + + protected abstract @LayoutRes int getLayoutResId(); + + protected abstract void initView(); + + protected abstract void initData(); + +} diff --git a/testapp/src/main/java/com/pic/testapp/base/BindingFragment.java b/testapp/src/main/java/com/pic/testapp/base/BindingFragment.java new file mode 100644 index 0000000..3becb2d --- /dev/null +++ b/testapp/src/main/java/com/pic/testapp/base/BindingFragment.java @@ -0,0 +1,41 @@ +package com.pic.testapp.base; + +import android.content.res.Resources; +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.FrameLayout; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.viewbinding.ViewBinding; + +/** + * @author Lu + * @date 2024/10/26 15:12 + * @description + */ +public abstract class BindingFragment extends BaseFragment { + protected VB mBinding; + + @Override + protected int getLayoutResId() { + return View.NO_ID; + } + + @Override + protected void onRootViewCreate(FrameLayout rootView) { + super.onRootViewCreate(rootView); + mBinding = onCreateBinding(getLayoutInflater(), rootView); + mRootView.addView(mBinding.getRoot()); + } + + protected abstract VB onCreateBinding(@NonNull LayoutInflater inflater, @Nullable ViewGroup container); + + @Override + protected abstract void initView(); + + @Override + protected abstract void initData(); +} diff --git a/testapp/src/main/java/com/pic/testapp/util/AppExecutor.kt b/testapp/src/main/java/com/pic/testapp/util/AppExecutor.kt new file mode 100644 index 0000000..162bcbd --- /dev/null +++ b/testapp/src/main/java/com/pic/testapp/util/AppExecutor.kt @@ -0,0 +1,43 @@ +package com.pic.testapp.util + +import android.os.Handler +import android.os.Looper +import java.util.concurrent.Executor +import java.util.concurrent.Executors + +object AppExecutor { + private val mDiskIO: Executor by lazy { DiskIOThreadExecutor() } + private val mNetworkIO: Executor by lazy { Executors.newFixedThreadPool(3) } + private val mMainThread: Executor by lazy { MainThreadExecutor() } + fun runOnDiskIo(command: Runnable) { + mDiskIO.execute(command) + } + + fun runOnNetworkIo(command: Runnable) { + mNetworkIO.execute(command) + } + + fun runOnUiThread(command: Runnable) { + mMainThread.execute(command) + } + + class MainThreadExecutor : Executor { + private val mainThreadHandler = Handler(Looper.getMainLooper()) + override fun execute(command: Runnable) { + if (Looper.myLooper() == Looper.getMainLooper()) { + command.run() + return + } + mainThreadHandler.post(command) + } + } + + class DiskIOThreadExecutor : Executor { + private val mDiskIO = Executors.newSingleThreadExecutor() + override fun execute(command: Runnable) { + mDiskIO.execute(command) + } + } + + +} diff --git a/testapp/src/main/java/com/pic/testapp/util/LogUtil.java b/testapp/src/main/java/com/pic/testapp/util/LogUtil.java new file mode 100644 index 0000000..d49621a --- /dev/null +++ b/testapp/src/main/java/com/pic/testapp/util/LogUtil.java @@ -0,0 +1,76 @@ +package com.pic.testapp.util; + +import android.util.Log; + +import java.lang.reflect.Array; +import java.util.Arrays; + +/** + * @author Lu + * @date 2024/10/26 22:25 + * @description + */ +public class LogUtil { + private static final String TAG = ">>>"; + + public static void d(Object... msg) { + printLog(Log.DEBUG, msg); + } + + + public static void e(Object... msg) { + printLog(Log.ERROR, msg); + } + + public static void w(Object... msg) { + printLog(Log.WARN, msg); + } + + public static void i(Object... msg) { + printLog(Log.INFO, msg); + } + + public static void v(Object... msg) { + printLog(Log.VERBOSE, msg); + } + + private static String buildMessage(Object... msg) { + StringBuilder msgBuilder = new StringBuilder(); + msgBuilder.append(Thread.currentThread().getName() + " "); + for (Object o : msg) { + if (o instanceof Throwable) { + msgBuilder.append(Log.getStackTraceString((Throwable) o)); + } else if (o == null) { + msgBuilder.append("null"); + } else if (o.getClass().isArray()) { + msgBuilder.append(Arrays.toString((Object[]) o)); + } else { + msgBuilder.append(o); + } + msgBuilder.append(" "); + } + return msgBuilder.toString(); + } + + + private static void printLog(int level, Object[] msg) { + switch (level) { + case Log.VERBOSE: + Log.v(TAG, buildMessage(msg)); + break; + case Log.INFO: + Log.i(TAG, buildMessage(msg)); + break; + case Log.WARN: + Log.w(TAG, buildMessage(msg)); + break; + case Log.ERROR: + Log.e(TAG, buildMessage(msg)); + break; + case Log.DEBUG: + default: + Log.d(TAG, buildMessage(msg)); + break; + } + } +} diff --git a/testapp/src/main/java/com/pic/testapp/vm/X5ViewModel.java b/testapp/src/main/java/com/pic/testapp/vm/X5ViewModel.java new file mode 100644 index 0000000..04c55b7 --- /dev/null +++ b/testapp/src/main/java/com/pic/testapp/vm/X5ViewModel.java @@ -0,0 +1,62 @@ +package com.pic.testapp.vm; + +import android.content.Context; + +import androidx.constraintlayout.widget.ConstraintLayout; +import androidx.lifecycle.MutableLiveData; +import androidx.lifecycle.ViewModel; + +import com.pic.testapp.App; +import com.pic.testapp.util.LogUtil; +import com.tencent.smtt.export.external.TbsCoreSettings; +import com.tencent.smtt.sdk.QbSdk; +import com.tencent.smtt.utils.LogFileUtils; + +import java.util.HashMap; +import java.util.logging.LogManager; + +/** + * @author Lu + * @date 2024/10/26 20:08 + * @description + */ +public class X5ViewModel extends ViewModel { + private MutableLiveData mX5InitLiveData; + + public MutableLiveData initX5() { + if (mX5InitLiveData == null) { + mX5InitLiveData = new MutableLiveData<>(); + } + if (QbSdk.isTbsCoreInited()) { + mX5InitLiveData.postValue(QbSdk.isX5Core()); + LogUtil.d("isTbsCoreInited true"); + return mX5InitLiveData; + } + + // 在调用TBS初始化、创建WebView之前进行如下配置 + HashMap map = new HashMap(); + map.put(TbsCoreSettings.TBS_SETTINGS_USE_SPEEDY_CLASSLOADER, true); + map.put(TbsCoreSettings.TBS_SETTINGS_USE_DEXLOADER_SERVICE, true); + QbSdk.initTbsSettings(map); + QbSdk.initX5Environment(App.getInstance(), new QbSdk.PreInitCallback() { + @Override + public void onCoreInitFinished() { + // 内核初始化完成，可能为系统内核，也可能为系统内核 + LogUtil.d("onCoreInitFinished"); + } + + /** + * 预初始化结束 + * 由于X5内核体积较大，需要依赖网络动态下发，所以当内核不存在的时候，默认会回调false，此时将会使用系统内核代替 + * @param isX5 是否使用X5内核 + */ + @Override + public void onViewInitFinished(boolean isX5) { + LogUtil.d("onViewInitFinished isX5:" + isX5); + mX5InitLiveData.postValue(QbSdk.isX5Core()); + + } + }); + return mX5InitLiveData; + } +} diff --git a/testapp/src/main/res/drawable-v24/ic_launcher_foreground.xml b/testapp/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/testapp/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/testapp/src/main/res/drawable/ic_launcher_background.xml b/testapp/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..07d5da9 --- /dev/null +++ b/testapp/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/testapp/src/main/res/layout/act_frag_container_layout.xml b/testapp/src/main/res/layout/act_frag_container_layout.xml new file mode 100644 index 0000000..ceb2ff6 --- /dev/null +++ b/testapp/src/main/res/layout/act_frag_container_layout.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/testapp/src/main/res/layout/frag_main_layout.xml b/testapp/src/main/res/layout/frag_main_layout.xml new file mode 100644 index 0000000..9f4c6ef --- /dev/null +++ b/testapp/src/main/res/layout/frag_main_layout.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/testapp/src/main/res/layout/frag_web_container.xml b/testapp/src/main/res/layout/frag_web_container.xml new file mode 100644 index 0000000..9f41a24 --- /dev/null +++ b/testapp/src/main/res/layout/frag_web_container.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/testapp/src/main/res/layout/item_text_inline_block.xml b/testapp/src/main/res/layout/item_text_inline_block.xml new file mode 100644 index 0000000..e7cbb86 --- /dev/null +++ b/testapp/src/main/res/layout/item_text_inline_block.xml @@ -0,0 +1,30 @@ + + + + + \ No newline at end of file diff --git a/testapp/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/testapp/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..6f3b755 --- /dev/null +++ b/testapp/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/testapp/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/testapp/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..6f3b755 --- /dev/null +++ b/testapp/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/testapp/src/main/res/mipmap-hdpi/ic_launcher.webp b/testapp/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..c209e78ecd372343283f4157dcfd918ec5165bb3 GIT binary patch literal 1404 zcmV-?1%vuhNk&F=1pok7MM6+kP&il$0000G0000-002h-06|PpNX!5L00Dqw+t%{r zzW2vH!KF=w&cMnnN@{whkTw+#mAh0SV?YL=)3MimFYCWp#fpdtz~8$hD5VPuQgtcN zXl<@<#Cme5f5yr2h%@8TWh?)bSK`O z^Z@d={gn7J{iyxL_y_%J|L>ep{dUxUP8a{byupH&!UNR*OutO~0{*T4q5R6@ApLF! z5{w?Z150gC7#>(VHFJZ-^6O@PYp{t!jH(_Z*nzTK4 zkc{fLE4Q3|mA2`CWQ3{8;gxGizgM!zccbdQoOLZc8hThi-IhN90RFT|zlxh3Ty&VG z?Fe{#9RrRnxzsu|Lg2ddugg7k%>0JeD+{XZ7>Z~{=|M+sh1MF7~ zz>To~`~LVQe1nNoR-gEzkpe{Ak^7{{ZBk2i_<+`Bq<^GB!RYG+z)h;Y3+<{zlMUYd zrd*W4w&jZ0%kBuDZ1EW&KLpyR7r2=}fF2%0VwHM4pUs}ZI2egi#DRMYZPek*^H9YK zay4Iy3WXFG(F14xYsoDA|KXgGc5%2DhmQ1gFCkrgHBm!lXG8I5h*uf{rn48Z!_@ z4Bk6TJAB2CKYqPjiX&mWoW>OPFGd$wqroa($ne7EUK;#3VYkXaew%Kh^3OrMhtjYN?XEoY`tRPQsAkH-DSL^QqyN0>^ zmC>{#F14jz4GeW{pJoRpLFa_*GI{?T93^rX7SPQgT@LbLqpNA}<@2wH;q493)G=1Y z#-sCiRNX~qf3KgiFzB3I>4Z%AfS(3$`-aMIBU+6?gbgDb!)L~A)je+;fR0jWLL-Fu z4)P{c7{B4Hp91&%??2$v9iRSFnuckHUm}or9seH6 z>%NbT+5*@L5(I9j@06@(!{ZI?U0=pKn8uwIg&L{JV14+8s2hnvbRrU|hZCd}IJu7*;;ECgO%8_*W Kmw_-CKmY()leWbG literal 0 HcmV?d00001 diff --git a/testapp/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/testapp/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..b2dfe3d1ba5cf3ee31b3ecc1ced89044a1f3b7a9 GIT binary patch literal 2898 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 literal 0 HcmV?d00001 diff --git a/testapp/src/main/res/mipmap-mdpi/ic_launcher.webp b/testapp/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..4f0f1d64e58ba64d180ce43ee13bf9a17835fbca GIT binary patch literal 982 zcmV;{11bDcNk&G_0{{S5MM6+kP&il$0000G0000l001ul06|PpNU8t;00Dqo+t#w^ z^1csucXz7-Qrhzl9HuHB%l>&>1tG2^vb*E&k^T3$FG1eQZ51g$uv4V+kI`0<^1Z@N zk?Jjh$olyC%l>)Xq;7!>{iBj&BjJ`P&$fsCfpve_epJOBkTF?nu-B7D!hO=2ZR}

C%4 zc_9eOXvPbC4kzU8YowIA8cW~Uv|eB&yYwAObSwL2vY~UYI7NXPvf3b+c^?wcs~_t{ ze_m66-0)^{JdOMKPwjpQ@Sna!*?$wTZ~su*tNv7o!gXT!GRgivP}ec?5>l1!7<(rT zds|8x(qGc673zrvYIz;J23FG{9nHMnAuP}NpAED^laz3mAN1sy+NXK)!6v1FxQ;lh zOBLA>$~P3r4b*NcqR;y6pwyhZ3_PiDb|%n1gGjl3ZU}ujInlP{eks-#oA6>rh&g+!f`hv#_%JrgYPu z(U^&XLW^QX7F9Z*SRPpQl{B%x)_AMp^}_v~?j7 zapvHMKxSf*Mtyx8I}-<*UGn3)oHd(nn=)BZ`d$lDBwq_GL($_TPaS{UeevT(AJ`p0 z9%+hQb6z)U9qjbuXjg|dExCLjpS8$VKQ55VsIC%@{N5t{NsW)=hNGI`J=x97_kbz@ E0Of=7!TQj4N+cqN`nQhxvX7dAV-`K|Ub$-q+H-5I?Tx0g9jWxd@A|?POE8`3b8fO$T))xP* z(X?&brZw({`)WU&rdAs1iTa0x6F@PIxJ&&L|dpySV!ID|iUhjCcKz(@mE z!x@~W#3H<)4Ae(4eQJRk`Iz3<1)6^m)0b_4_TRZ+cz#eD3f8V;2r-1fE!F}W zEi0MEkTTx}8i1{`l_6vo0(Vuh0HD$I4SjZ=?^?k82R51bC)2D_{y8mi_?X^=U?2|F{Vr7s!k(AZC$O#ZMyavHhlQ7 zUR~QXuH~#o#>(b$u4?s~HLF*3IcF7023AlwAYudn0FV~|odGH^05AYPEfR)8p`i{n zwg3zPVp{+wOsxKc>)(pMupKF!Y2HoUqQ3|Yu|8lwR=?5zZuhG6J?H`bSNk_wPoM{u zSL{c@pY7+c2kck>`^q1^^gR0QB7Y?KUD{vz-uVX~;V-rW)PDcI)$_UjgVV?S?=oLR zf4}zz{#*R_{LkiJ#0RdQLNC^2Vp%JPEUvG9ra2BVZ92(p9h7Ka@!yf9(lj#}>+|u* z;^_?KWdzkM`6gqPo9;;r6&JEa)}R3X{(CWv?NvgLeOTq$cZXqf7|sPImi-7cS8DCN zGf;DVt3Am`>hH3{4-WzH43Ftx)SofNe^-#|0HdCo<+8Qs!}TZP{HH8~z5n`ExcHuT zDL1m&|DVpIy=xsLO>8k92HcmfSKhflQ0H~9=^-{#!I1g(;+44xw~=* zxvNz35vfsQE)@)Zsp*6_GjYD};Squ83<_?^SbALb{a`j<0Gn%6JY!zhp=Fg}Ga2|8 z52e1WU%^L1}15Ex0fF$e@eCT(()_P zvV?CA%#Sy08_U6VPt4EtmVQraWJX` zh=N|WQ>LgrvF~R&qOfB$!%D3cGv?;Xh_z$z7k&s4N)$WYf*k=|*jCEkO19{h_(%W4 zPuOqbCw`SeAX*R}UUsbVsgtuG?xs(#Ikx9`JZoQFz0n*7ZG@Fv@kZk`gzO$HoA9kN z8U5{-yY zvV{`&WKU2$mZeoBmiJrEdzUZAv1sRxpePdg1)F*X^Y)zp^Y*R;;z~vOv-z&)&G)JQ{m!C9cmziu1^nHA z`#`0c>@PnQ9CJKgC5NjJD8HM3|KC(g5nnCq$n0Gsu_DXk36@ql%npEye|?%RmG)

FJ$wK}0tWNB{uH;AM~i literal 0 HcmV?d00001 diff --git a/testapp/src/main/res/mipmap-xhdpi/ic_launcher.webp b/testapp/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..948a3070fe34c611c42c0d3ad3013a0dce358be0 GIT binary patch literal 1900 zcmV-y2b1_xNk&Fw2LJ$9MM6+kP&il$0000G0001A003VA06|PpNH75a00DqwTbm-~ zullQTcXxO9ki!OCRx^i?oR|n!<8G0=kI^!JSjFi-LL*`V;ET0H2IXfU0*i>o6o6Gy zRq6Ap5(_{XLdXcL-MzlN`ugSdZY_`jXhcENAu)N_0?GhF))9R;E`!bo9p?g?SRgw_ zEXHhFG$0{qYOqhdX<(wE4N@es3VIo$%il%6xP9gjiBri+2pI6aY4 zJbgh-Ud|V%3O!IcHKQx1FQH(_*TK;1>FQWbt^$K1zNn^cczkBs=QHCYZ8b&l!UV{K z{L0$KCf_&KR^}&2Fe|L&?1I7~pBENnCtCuH3sjcx6$c zwqkNkru);ie``q+_QI;IYLD9OV0ZxkuyBz|5<$1BH|vtey$> z5oto4=l-R-Aaq`Dk0}o9N0VrkqW_#;!u{!bJLDq%0092{Ghe=F;(kn} z+sQ@1=UlX30+2nWjkL$B^b!H2^QYO@iFc0{(-~yXj2TWz?VG{v`Jg zg}WyYnwGgn>{HFaG7E~pt=)sOO}*yd(UU-D(E&x{xKEl6OcU?pl)K%#U$dn1mDF19 zSw@l8G!GNFB3c3VVK0?uyqN&utT-D5%NM4g-3@Sii9tSXKtwce~uF zS&Jn746EW^wV~8zdQ1XC28~kXu8+Yo9p!<8h&(Q({J*4DBglPdpe4M_mD8AguZFn~ ztiuO~{6Bx?SfO~_ZV(GIboeR9~hAym{{fV|VM=77MxDrbW6`ujX z<3HF(>Zr;#*uCvC*bpoSr~C$h?_%nXps@A)=l_;({Fo#6Y1+Zv`!T5HB+)#^-Ud_; zBwftPN=d8Vx)*O1Mj+0oO=mZ+NVH*ptNDC-&zZ7Hwho6UQ#l-yNvc0Cm+2$$6YUk2D2t#vdZX-u3>-Be1u9gtTBiMB^xwWQ_rgvGpZ6(C@e23c!^K=>ai-Rqu zhqT`ZQof;9Bu!AD(i^PCbYV%yha9zuoKMp`U^z;3!+&d@Hud&_iy!O-$b9ZLcSRh? z)R|826w}TU!J#X6P%@Zh=La$I6zXa#h!B;{qfug}O%z@K{EZECu6zl)7CiNi%xti0 zB{OKfAj83~iJvmpTU|&q1^?^cIMn2RQ?jeSB95l}{DrEPTW{_gmU_pqTc)h@4T>~& zluq3)GM=xa(#^VU5}@FNqpc$?#SbVsX!~RH*5p0p@w z;~v{QMX0^bFT1!cXGM8K9FP+=9~-d~#TK#ZE{4umGT=;dfvWi?rYj;^l_Zxywze`W z^Cr{55U@*BalS}K%Czii_80e0#0#Zkhlij4-~I@}`-JFJ7$5{>LnoJSs??J8kWVl6|8A}RCGAu9^rAsfCE=2}tHwl93t0C?#+jMpvr7O3`2=tr{Hg$=HlnjVG^ewm|Js0J*kfPa6*GhtB>`fN!m#9J(sU!?(OSfzY*zS(FJ<-Vb zfAIg+`U)YaXv#sY(c--|X zEB+TVyZ%Ie4L$gi#Fc++`h6%vzsS$pjz9aLt+ZL(g;n$Dzy5=m=_TV(3H8^C{r0xd zp#a%}ht55dOq?yhwYPrtp-m1xXp;4X;)NhxxUpgP%XTLmO zcjaFva^}dP3$&sfFTIR_jC=2pHh9kpI@2(6V*GQo7Ws)`j)hd+tr@P~gR*2gO@+1? zG<`_tB+LJuF|SZ9tIec;h%}}6WClT`L>HSW?E{Hp1h^+mlbf_$9zA>!ug>NALJsO{ mU%z=YwVD?}XMya)Bp;vlyE5&E_6!fzx9pwrdz474!~g(M6R?N? literal 0 HcmV?d00001 diff --git a/testapp/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/testapp/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..1b9a6956b3acdc11f40ce2bb3f6efbd845cc243f GIT binary patch literal 3918 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�(p-{x$&=IACIfoAR!za)F-^da-t3#0Dycnp zwO~NVXwXCl;jE<}>%@xz|=8fIJAB?>+E{7)|4l${4ngA3G|=r z2Dyv;VVWSgZx9Wj>qUjleGl3Ei9K4>h!(lPS%8VOG>Xu0%6VDz^O=bjJmuP7>DeUv zrbI}MlHB^^d?{zv6d=@_ZD2lg1&G7UjnVN{1}9WkaM3H~btX0GtSzB+tZ^qRgWo4m z!GmimlG$=wgXCnr6j@m<1gAL46#T~5Bnm=2{^@>|t&`9mkEPddj zAvG~@Tv~TAm2i%VW}R-g(Z0)z-Y|szHr@rk>4MAyG*Ma*7Yh#H7(!-5>DZ@8r;_dx z{prSe<>~099F8vsYd2xff7uAS%7{S)f(|@me3t2$iy&NEc7OUEchp@9A|X;;IA>8!oX+y(BKJ$EzV* znR$z;!L$s7uy@{OT~nG#B!NRraT8(X##Ho!0r_o@gg0CA-9H^;-uE&?$2$nHv_00o z%cbuUc-tCx$Uh&EZ4Nf4Zgqv)Y6>usG3>GeQnxx_Z6+PcbX-+ysbt1hQ`K1LDpOE? zrAhIZhSN9yVIAOa22gn577tbc&i3|3V8NWy&!tw##`}9*x}gtI^h1DzZRA>UuaJG) zaZ7j)dq!O}{?#8Y7~7i6fHh4{`pL?>-18|p!S75Y#^DM>-S3)vuZG+Q7l@ek zQP~#cBpWgg#mApc_sPYjpw8odQuRokmTkzcNl`^CcKB7e&;zViV;{Y{o^Y$%7i0m# z62%#1Lq!RC?}lK>%mp}T!3Xv;L*0v*>USLm``N%>w>@fwC+#T&Tx2bN4w(20JB}oU zuSa6v^kXi0xPs?pbaOHnyiqq6By1EZY9OZ^^QA>{q-Hsd&m`pbQ%8121aWG-F5xf zlZ%;B{;C>X19|`^_?dVyCq>n+41w7|!tUS!{9rHlbhX=SZO5CQ^;!Du_E7*`GiR^Q w)2!4MKjfSAeNo!9>IaV6aUZ*?W>} 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

UmY2RIYtNPVDpE$%vda+HD#3m z&VuXJ{BK&Qe+rBa7eq}Q(bq|tn(RrJAk|ztj2(i{d>nmQnM?;HF2k&9sA6up5tmjl z7lySlzMbifH17-m-Lwa_F&e7nOH?ESi3#ckR3tsM+jsck3`oG!uMS}|eAwVXv>}qxwq?QY%QJ0}r@^;fhuUA9W z*BVl>TGo&N004@xSiwDUXUvp51sVmqO3m)=B55aPwf@0=e}cN+$-BdKxY`YrT_4)0 z_d10#i44Q*rFr8MC>*)v$EJvz``(pb{e&*6k+b zsMz%($|1+8hn8c2?P(l@;Rb&CsZeYoCI3?2!LqjbwPXW3z4G$Qfj=cT5Yb%vY0(AX oeb?AaKtwrnc|$|zzw9vfvn^aJJ!zd)XFXqqy0000001=f@-~a#s literal 0 HcmV?d00001 diff --git a/testapp/src/main/res/values-night/themes.xml b/testapp/src/main/res/values-night/themes.xml new file mode 100644 index 0000000..b7e6280 --- /dev/null +++ b/testapp/src/main/res/values-night/themes.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/testapp/src/main/res/values/colors.xml b/testapp/src/main/res/values/colors.xml new file mode 100644 index 0000000..f8c6127 --- /dev/null +++ b/testapp/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/testapp/src/main/res/values/strings.xml b/testapp/src/main/res/values/strings.xml new file mode 100644 index 0000000..ae0adfd --- /dev/null +++ b/testapp/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + testapp + \ No newline at end of file diff --git a/testapp/src/main/res/values/themes.xml b/testapp/src/main/res/values/themes.xml new file mode 100644 index 0000000..71b3fc6 --- /dev/null +++ b/testapp/src/main/res/values/themes.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/testapp/src/test/java/com/pic/testapp/ExampleUnitTest.kt b/testapp/src/test/java/com/pic/testapp/ExampleUnitTest.kt new file mode 100644 index 0000000..f21a5b7 --- /dev/null +++ b/testapp/src/test/java/com/pic/testapp/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package com.pic.testapp + +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