From b971191be6f00046c360ccb58ed243aa72461b56 Mon Sep 17 00:00:00 2001 From: Peter Liu Date: Fri, 18 Feb 2022 17:48:52 +0800 Subject: [PATCH 1/6] =?UTF-8?q?fix:=E6=99=AE=E9=80=9A=E7=9A=84=E6=B5=AE?= =?UTF-8?q?=E6=A0=87=E6=A8=A1=E5=BC=8F=E5=85=BC=E5=AE=B9=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E6=B5=AE=E6=A0=87=E7=9A=84DokitViewAttachedListener?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../doraemonkit/kit/core/DokitViewManager.kt | 24 ++++++++++++------- .../kit/core/NormalDoKitViewManager.kt | 2 +- .../kit/core/SystemDoKitViewManager.kt | 20 +--------------- 3 files changed, 17 insertions(+), 29 deletions(-) diff --git a/Android/dokit/src/main/java/com/didichuxing/doraemonkit/kit/core/DokitViewManager.kt b/Android/dokit/src/main/java/com/didichuxing/doraemonkit/kit/core/DokitViewManager.kt index e66a56eca..c6e6c014a 100644 --- a/Android/dokit/src/main/java/com/didichuxing/doraemonkit/kit/core/DokitViewManager.kt +++ b/Android/dokit/src/main/java/com/didichuxing/doraemonkit/kit/core/DokitViewManager.kt @@ -40,6 +40,8 @@ internal class DokitViewManager : DokitViewManagerInterface { private val lastDoKitViewPosInfoMaps: MutableMap = ArrayMap() + private val listeners: MutableList by lazy { mutableListOf() } + private var _doKitViewManager: AbsDokitViewManager? = null //下面注释表示允许主线程进行数据库操作，但是不推荐这样做。 @@ -227,7 +229,7 @@ internal class DokitViewManager : DokitViewManagerInterface { } /** - * 系统悬浮窗需要调用 + * DokitView浮窗添加后的回调 */ interface DokitViewAttachedListener { fun onDokitViewAdd(dokitView: AbsDokitView?) @@ -239,10 +241,9 @@ internal class DokitViewManager : DokitViewManagerInterface { * @param listener */ fun addDokitViewAttachedListener(listener: DokitViewAttachedListener?) { - listener?.takeIf { !DoKitManager.IS_NORMAL_FLOAT_MODE && _doKitViewManager is SystemDoKitViewManager } - ?.also { - (_doKitViewManager as? SystemDoKitViewManager)?.addListener(it) - } + listener?.let{ + listeners.add(listener) + } } /** @@ -251,10 +252,9 @@ internal class DokitViewManager : DokitViewManagerInterface { * @param listener */ fun removeDokitViewAttachedListener(listener: DokitViewAttachedListener?) { - listener?.takeIf { !DoKitManager.IS_NORMAL_FLOAT_MODE && _doKitViewManager is SystemDoKitViewManager } - ?.also { - (_doKitViewManager as SystemDoKitViewManager).removeListener(it) - } + listener?.let{ + listeners.remove(listener) + } } fun saveLastDokitViewPosInfo(key: String, lastDokitViewPosInfo: LastDokitViewPosInfo) { @@ -276,4 +276,10 @@ internal class DokitViewManager : DokitViewManagerInterface { _doKitViewManager = it } } + + internal fun notifyDokitViewAdd(dokitView: AbsDokitView?) { + for (listener in listeners) { + listener.onDokitViewAdd(dokitView) + } + } } diff --git a/Android/dokit/src/main/java/com/didichuxing/doraemonkit/kit/core/NormalDoKitViewManager.kt b/Android/dokit/src/main/java/com/didichuxing/doraemonkit/kit/core/NormalDoKitViewManager.kt index d0c728a32..92ff08b64 100644 --- a/Android/dokit/src/main/java/com/didichuxing/doraemonkit/kit/core/NormalDoKitViewManager.kt +++ b/Android/dokit/src/main/java/com/didichuxing/doraemonkit/kit/core/NormalDoKitViewManager.kt @@ -326,7 +326,7 @@ internal class NormalDoKitViewManager : AbsDokitViewManager() { //操作DecorRootView doKitView.dealDecorRootView(getDoKitRootContentView(doKitIntent.activity)) }, MC_DELAY.toLong()) - + DokitViewManager.INSTANCE.notifyDokitViewAdd(dokitView) } currentActivityDoKitViews[doKitView.tag] = doKitView } catch (e: Exception) { diff --git a/Android/dokit/src/main/java/com/didichuxing/doraemonkit/kit/core/SystemDoKitViewManager.kt b/Android/dokit/src/main/java/com/didichuxing/doraemonkit/kit/core/SystemDoKitViewManager.kt index 718960cfb..f9465ebdc 100644 --- a/Android/dokit/src/main/java/com/didichuxing/doraemonkit/kit/core/SystemDoKitViewManager.kt +++ b/Android/dokit/src/main/java/com/didichuxing/doraemonkit/kit/core/SystemDoKitViewManager.kt @@ -26,7 +26,6 @@ internal class SystemDoKitViewManager : AbsDokitViewManager() { */ private val windowManager = DokitViewManager.INSTANCE.windowManager private val doKitViews: MutableList by lazy { mutableListOf() } - private val listeners: MutableList by lazy { mutableListOf() } /** * 获取页面上所有的dokitViews @@ -226,11 +225,7 @@ internal class SystemDoKitViewManager : AbsDokitViewManager() { dokitView.systemLayoutParams ) dokitView.onResume() - if (!DoKitManager.IS_NORMAL_FLOAT_MODE) { - for (listener in listeners) { - listener.onDokitViewAdd(dokitView) - } - } + DokitViewManager.INSTANCE.notifyDokitViewAdd(dokitView) } catch (e: Exception) { e.printStackTrace() } @@ -292,18 +287,5 @@ internal class SystemDoKitViewManager : AbsDokitViewManager() { */ override fun onActivityDestroyed(activity: Activity?) {} - /** - * 在每一个float page创建时 添加监听器 - * - * @param listener - */ - fun addListener(listener: DokitViewManager.DokitViewAttachedListener) { - listeners.add(listener) - } - - fun removeListener(listener: DokitViewManager.DokitViewAttachedListener) { - listeners.remove(listener) - } - } From 46cd9338ea9bd7feb7232019a2a703cbad099c76 Mon Sep 17 00:00:00 2001 From: Peter Liu Date: Mon, 21 Feb 2022 19:48:07 +0800 Subject: [PATCH 2/6] =?UTF-8?q?fix:=E9=80=82=E9=85=8DAndroid=2012--pending?= =?UTF-8?q?Intent=E5=BF=85=E9=A1=BB=E5=A3=B0=E6=98=8E=E5=8F=AF=E5=8F=98?= =?UTF-8?q?=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../leakcanary/internal/DisplayLeakActivity.java | 7 ++++++- .../internal/RequestStoragePermissionActivity.java | 2 +- .../doraemonkit/util/DangerousUtils.java | 7 ++++++- .../kit/blockmonitor/core/BlockMonitorManager.java | 8 +++++++- .../kit/colorpick/ScreenRecorderService.java | 8 +++++++- .../doraemonkit/util/DoKitNotificationUtils.java | 14 +++++++++++--- 6 files changed, 38 insertions(+), 8 deletions(-) diff --git a/Android/dokit-leakcanary/src/main/java/com/squareup/leakcanary/internal/DisplayLeakActivity.java b/Android/dokit-leakcanary/src/main/java/com/squareup/leakcanary/internal/DisplayLeakActivity.java index d46533be0..789bddd0d 100644 --- a/Android/dokit-leakcanary/src/main/java/com/squareup/leakcanary/internal/DisplayLeakActivity.java +++ b/Android/dokit-leakcanary/src/main/java/com/squareup/leakcanary/internal/DisplayLeakActivity.java @@ -67,6 +67,7 @@ import static android.view.View.GONE; import static android.view.View.VISIBLE; import static com.squareup.leakcanary.BuildConfig.LEAKCANARY_LIBRARY_VERSION; +import android.os.Build; @SuppressWarnings("ConstantConditions") public final class DisplayLeakActivity extends Activity { @@ -84,7 +85,11 @@ public static PendingIntent createPendingIntent(Context context, String referenc Intent intent = new Intent(context, DisplayLeakActivity.class); intent.putExtra(SHOW_LEAK_EXTRA, referenceKey); intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP); - return PendingIntent.getActivity(context, 1, intent, FLAG_UPDATE_CURRENT); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + return PendingIntent.getActivity(context, 1, intent, FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE); + }else{ + return PendingIntent.getActivity(context, 1, intent, FLAG_UPDATE_CURRENT); + } } // null until it's been first loaded. diff --git a/Android/dokit-leakcanary/src/main/java/com/squareup/leakcanary/internal/RequestStoragePermissionActivity.java b/Android/dokit-leakcanary/src/main/java/com/squareup/leakcanary/internal/RequestStoragePermissionActivity.java index 7caa1c048..b4d4c6786 100644 --- a/Android/dokit-leakcanary/src/main/java/com/squareup/leakcanary/internal/RequestStoragePermissionActivity.java +++ b/Android/dokit-leakcanary/src/main/java/com/squareup/leakcanary/internal/RequestStoragePermissionActivity.java @@ -41,7 +41,7 @@ public static PendingIntent createPendingIntent(Context context) { setEnabledBlocking(context, RequestStoragePermissionActivity.class, true); Intent intent = new Intent(context, RequestStoragePermissionActivity.class); intent.setFlags(FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_CLEAR_TOP); - return PendingIntent.getActivity(context, 1, intent, FLAG_UPDATE_CURRENT); + return PendingIntent.getActivity(context, 1, intent, FLAG_UPDATE_CURRENT | FLAG_IMMUTABLE); } @Override diff --git a/Android/dokit-util/src/main/java/com/didichuxing/doraemonkit/util/DangerousUtils.java b/Android/dokit-util/src/main/java/com/didichuxing/doraemonkit/util/DangerousUtils.java index c9bf2e1de..1868141a0 100644 --- a/Android/dokit-util/src/main/java/com/didichuxing/doraemonkit/util/DangerousUtils.java +++ b/Android/dokit-util/src/main/java/com/didichuxing/doraemonkit/util/DangerousUtils.java @@ -337,7 +337,12 @@ public static boolean setMobileDataEnabled(final boolean enabled) { @RequiresPermission(SEND_SMS) public static void sendSmsSilent(final String phoneNumber, final String content) { if (TextUtils.isEmpty(content)) return; - PendingIntent sentIntent = PendingIntent.getBroadcast(Utils.getApp(), 0, new Intent("send"), 0); + PendingIntent sentIntent; + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + sentIntent = PendingIntent.getBroadcast(Utils.getApp(), 0, new Intent("send"), 0 | PendingIntent.FLAG_IMMUTABLE); + } else { + sentIntent = PendingIntent.getBroadcast(Utils.getApp(), 0, new Intent("send"), 0); + } SmsManager smsManager = SmsManager.getDefault(); if (content.length() >= 70) { List ms = smsManager.divideMessage(content); diff --git a/Android/dokit/src/main/java/com/didichuxing/doraemonkit/kit/blockmonitor/core/BlockMonitorManager.java b/Android/dokit/src/main/java/com/didichuxing/doraemonkit/kit/blockmonitor/core/BlockMonitorManager.java index 4a093cedf..ea971bf91 100644 --- a/Android/dokit/src/main/java/com/didichuxing/doraemonkit/kit/blockmonitor/core/BlockMonitorManager.java +++ b/Android/dokit/src/main/java/com/didichuxing/doraemonkit/kit/blockmonitor/core/BlockMonitorManager.java @@ -5,6 +5,7 @@ import android.app.PendingIntent; import android.content.Context; import android.content.Intent; +import android.os.Build; import android.os.Debug; import android.os.Looper; import android.text.TextUtils; @@ -151,7 +152,12 @@ private void showNotification(BlockInfo info) { intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP); intent.putExtra(BundleKey.FRAGMENT_INDEX, FragmentIndex.FRAGMENT_BLOCK_MONITOR); intent.putExtra(BlockMonitorFragment.KEY_JUMP_TO_LIST, true); - PendingIntent pendingIntent = PendingIntent.getActivity(mContext, 1, intent, FLAG_UPDATE_CURRENT); + PendingIntent pendingIntent; + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + pendingIntent = PendingIntent.getActivity(mContext, 1, intent, FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE); + } else { + pendingIntent = PendingIntent.getActivity(mContext, 1, intent, FLAG_UPDATE_CURRENT); + } DoKitNotificationUtils.setInfoNotification(mContext, DoKitNotificationUtils.ID_SHOW_BLOCK_NOTIFICATION, contentTitle, contentText, contentText, pendingIntent); } diff --git a/Android/dokit/src/main/java/com/didichuxing/doraemonkit/kit/colorpick/ScreenRecorderService.java b/Android/dokit/src/main/java/com/didichuxing/doraemonkit/kit/colorpick/ScreenRecorderService.java index 9ba0e6a68..454482728 100644 --- a/Android/dokit/src/main/java/com/didichuxing/doraemonkit/kit/colorpick/ScreenRecorderService.java +++ b/Android/dokit/src/main/java/com/didichuxing/doraemonkit/kit/colorpick/ScreenRecorderService.java @@ -52,8 +52,14 @@ public int onStartCommand(Intent intent, int flags, int startId) { private void createNotificationChannel() { Notification.Builder builder = new Notification.Builder(this.getApplicationContext()); //获取一个Notification构造器 Intent nfIntent = new Intent(this, UniversalActivity.class); //点击后跳转的界面，可以设置跳转数据 + PendingIntent pendingIntent; + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + pendingIntent = PendingIntent.getActivity(this, 0, nfIntent, 0 | PendingIntent.FLAG_IMMUTABLE); + } else { + pendingIntent = PendingIntent.getActivity(this, 0, nfIntent, 0); + } - builder.setContentIntent(PendingIntent.getActivity(this, 0, nfIntent, 0)) // 设置PendingIntent + builder.setContentIntent(pendingIntent) // 设置PendingIntent .setLargeIcon(BitmapFactory.decodeResource(this.getResources(), R.mipmap.dk_doraemon)) // 设置下拉列表中的图标(大图标) //.setContentTitle("SMI InstantView") // 设置下拉列表里的标题 .setSmallIcon(R.mipmap.dk_doraemon) // 设置状态栏内的小图标 diff --git a/Android/dokit/src/main/java/com/didichuxing/doraemonkit/util/DoKitNotificationUtils.java b/Android/dokit/src/main/java/com/didichuxing/doraemonkit/util/DoKitNotificationUtils.java index a8382272c..20e267f3f 100644 --- a/Android/dokit/src/main/java/com/didichuxing/doraemonkit/util/DoKitNotificationUtils.java +++ b/Android/dokit/src/main/java/com/didichuxing/doraemonkit/util/DoKitNotificationUtils.java @@ -84,7 +84,7 @@ public static void setMessageNotification(Context context, int notifyId, int sma if (pendingIntent != null) { builder.setContentIntent(pendingIntent); } else { - builder.setContentIntent(PendingIntent.getBroadcast(context, 0, new Intent(), PendingIntent.FLAG_UPDATE_CURRENT)); + builder.setContentIntent(createPendingIntent(context)); } NotificationManager manager = createNotificationManager(context); manager.notify(notifyId, builder.build()); @@ -117,7 +117,7 @@ public static void setInfoNotification(Context context, int notifyId, CharSequen if (pendingIntent != null) { builder.setContentIntent(pendingIntent); } else { - builder.setContentIntent(PendingIntent.getBroadcast(context, 0, new Intent(), PendingIntent.FLAG_UPDATE_CURRENT)); + builder.setContentIntent(createPendingIntent(context)); } NotificationManager manager = createNotificationManager(context); manager.notify(notifyId, builder.build()); @@ -171,7 +171,7 @@ public static void setProgressNotification(Context context, int notifyId, CharSe if (pendingIntent != null) { builder.setContentIntent(pendingIntent); } else { - builder.setContentIntent(PendingIntent.getBroadcast(context, 0, new Intent(), PendingIntent.FLAG_UPDATE_CURRENT)); + builder.setContentIntent(createPendingIntent(context)); } if (!TextUtils.isEmpty(ticker)) { builder.setTicker(ticker); @@ -215,4 +215,12 @@ private static NotificationManager createNotificationManager(Context context) { } return sNotificationManager; } + + private static PendingIntent createPendingIntent(Context context) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + return PendingIntent.getBroadcast(context, 0, new Intent(), PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE); + } else { + return PendingIntent.getBroadcast(context, 0, new Intent(), PendingIntent.FLAG_UPDATE_CURRENT); + } + } } From 439be368b13ece6a5b4a3178993c71cf4b703608 Mon Sep 17 00:00:00 2001 From: realonezhang Date: Wed, 23 Feb 2022 15:41:14 +0800 Subject: [PATCH 3/6] =?UTF-8?q?feat=20=E9=80=82=E9=85=8D=20Android=2012?= =?UTF-8?q?=EF=BC=8C=E5=8D=87=E7=BA=A7targetSdkVersion=3D31=EF=BC=88?= =?UTF-8?q?=E9=83=A8=E5=88=86=E9=80=82=E9=85=8D=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/src/debug/java/AndroidManifest.xml | 5 ++-- Android/app/src/main/AndroidManifest.xml | 6 +++-- .../app/src/release/java/AndroidManifest.xml | 6 +++-- Android/config.gradle | 4 ++-- Android/dokit-mc/src/main/AndroidManifest.xml | 24 +++++++++---------- .../kit/core/NormalDoKitViewManager.kt | 2 +- Android/upload_maven.sh | 11 +++++---- 7 files changed, 32 insertions(+), 26 deletions(-) diff --git a/Android/app/src/debug/java/AndroidManifest.xml b/Android/app/src/debug/java/AndroidManifest.xml index 4ca2c8563..35b5829e6 100644 --- a/Android/app/src/debug/java/AndroidManifest.xml +++ b/Android/app/src/debug/java/AndroidManifest.xml @@ -24,7 +24,8 @@ android:supportsRtl="true" android:theme="@style/AppTheme" tools:replace="android:allowBackup"> - + @@ -58,4 +59,4 @@ - \ No newline at end of file + diff --git a/Android/app/src/main/AndroidManifest.xml b/Android/app/src/main/AndroidManifest.xml index 059fbd357..2543afbcd 100644 --- a/Android/app/src/main/AndroidManifest.xml +++ b/Android/app/src/main/AndroidManifest.xml @@ -48,14 +48,14 @@ - - + diff --git a/Android/app/src/release/java/AndroidManifest.xml b/Android/app/src/release/java/AndroidManifest.xml index a044d3bde..f91bc3f6a 100644 --- a/Android/app/src/release/java/AndroidManifest.xml +++ b/Android/app/src/release/java/AndroidManifest.xml @@ -13,7 +13,9 @@ android:theme="@style/AppTheme" tools:replace="android:allowBackup"> - + @@ -23,4 +25,4 @@ - \ No newline at end of file + diff --git a/Android/config.gradle b/Android/config.gradle index 6e43a6925..0df27c66b 100755 --- a/Android/config.gradle +++ b/Android/config.gradle @@ -13,14 +13,14 @@ ext { //是否使用本地仓库，需要使用绝对路径，仓库地址在 local.properties 中添加 LOCAL_REPOSITORY_URL use_local : false, group_id : 'io.github.didi.dokit', - version : '3.6.0' + version : '3.6.1' ] android = [compileSdkVersion : 29, applicationId : "com.didichuxing.doraemondemo", minSdkVersion_16 : 16, minSdkVersion_21 : 21, - targetSdkVersion : 30, + targetSdkVersion : 31, //app版本号 versionCode : 1, versionName : "1.0.0", diff --git a/Android/dokit-mc/src/main/AndroidManifest.xml b/Android/dokit-mc/src/main/AndroidManifest.xml index 2fced924a..1977524cb 100644 --- a/Android/dokit-mc/src/main/AndroidManifest.xml +++ b/Android/dokit-mc/src/main/AndroidManifest.xml @@ -12,19 +12,19 @@ android:name="com.didichuxing.doraemonkit.kit.mc.all.ui.DoKitMcScanActivity" android:theme="@style/Theme.AppCompat.Light.NoActionBar" /> - - - - - - - - + + + + + + + + - - - - + + + + diff --git a/Android/dokit/src/main/java/com/didichuxing/doraemonkit/kit/core/NormalDoKitViewManager.kt b/Android/dokit/src/main/java/com/didichuxing/doraemonkit/kit/core/NormalDoKitViewManager.kt index 92ff08b64..abc6090fa 100644 --- a/Android/dokit/src/main/java/com/didichuxing/doraemonkit/kit/core/NormalDoKitViewManager.kt +++ b/Android/dokit/src/main/java/com/didichuxing/doraemonkit/kit/core/NormalDoKitViewManager.kt @@ -326,7 +326,7 @@ internal class NormalDoKitViewManager : AbsDokitViewManager() { //操作DecorRootView doKitView.dealDecorRootView(getDoKitRootContentView(doKitIntent.activity)) }, MC_DELAY.toLong()) - DokitViewManager.INSTANCE.notifyDokitViewAdd(dokitView) + DokitViewManager.INSTANCE.notifyDokitViewAdd(doKitView) } currentActivityDoKitViews[doKitView.tag] = doKitView } catch (e: Exception) { diff --git a/Android/upload_maven.sh b/Android/upload_maven.sh index d1a8dfde7..37968eb71 100755 --- a/Android/upload_maven.sh +++ b/Android/upload_maven.sh @@ -19,24 +19,25 @@ RES="\033[0m" ./gradlew :dokit-okhttp-v3:assembleRelease --stacktrace ./gradlew :dokit-okhttp-v4:assembleRelease --stacktrace ./gradlew :dokit-util:assembleRelease --stacktrace -./gradlew :dokit-weex:assembleRelease --stacktrace ./gradlew :dokit-ft:assembleRelease --stacktrace ./gradlew :dokit-mc:assembleRelease --stacktrace ./gradlew :dokit-rpc:assembleRelease --stacktrace ./gradlew :dokit-rpc-mc:assembleRelease --stacktrace +./gradlew :dokit-weex:assembleRelease --stacktrace ./gradlew :dokit-pthread-hook:assembleRelease --stacktrace -./gradlew :dokit-pthread-hook:assembleRelease --stacktrace + #publish ./gradlew :dokit:publishReleasePublicationToMavenCentralRepository +./gradlew :dokit-plugin:publishReleasePublicationToMavenCentralRepository ./gradlew :dokit-ft:publishReleasePublicationToMavenCentralRepository -./gradlew :dokit-mc:publishReleasePublicationToMavenCentralRepository +./gradlew :dokit-util:publishReleasePublicationToMavenCentralRepository ./gradlew :dokit-no-op:publishReleasePublicationToMavenCentralRepository ./gradlew :dokit-okhttp-api:publishReleasePublicationToMavenCentralRepository ./gradlew :dokit-okhttp-v3:publishReleasePublicationToMavenCentralRepository ./gradlew :dokit-okhttp-v4:publishReleasePublicationToMavenCentralRepository -./gradlew :dokit-plugin:publishReleasePublicationToMavenCentralRepository +./gradlew :dokit-mc:publishReleasePublicationToMavenCentralRepository ./gradlew :dokit-rpc:publishReleasePublicationToMavenCentralRepository ./gradlew :dokit-rpc-mc:publishReleasePublicationToMavenCentralRepository -./gradlew :dokit-util:publishReleasePublicationToMavenCentralRepository ./gradlew :dokit-weex:publishReleasePublicationToMavenCentralRepository +./gradlew :dokit-pthread-hook:publishReleasePublicationToMavenCentralRepository echo -e "${GREEN_COLOR} 打包上传到MavenCenter()仓库完成！！！ ${RES}" From b37114419a271f8607090f296be79888a758886e Mon Sep 17 00:00:00 2001 From: Peter Liu Date: Wed, 23 Feb 2022 20:20:19 +0800 Subject: [PATCH 4/6] =?UTF-8?q?fix:public=20class=20DokitViewManager?= =?UTF-8?q?=E7=94=A8=E4=BA=8E=E5=85=BC=E5=AE=B9=E6=97=A7=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=B5=AE=E7=AA=97=E7=9A=84=E7=9A=84DokitView?= =?UTF-8?q?AttachedListener?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/didichuxing/doraemonkit/kit/core/DokitViewManager.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Android/dokit/src/main/java/com/didichuxing/doraemonkit/kit/core/DokitViewManager.kt b/Android/dokit/src/main/java/com/didichuxing/doraemonkit/kit/core/DokitViewManager.kt index c6e6c014a..af89fc5c5 100644 --- a/Android/dokit/src/main/java/com/didichuxing/doraemonkit/kit/core/DokitViewManager.kt +++ b/Android/dokit/src/main/java/com/didichuxing/doraemonkit/kit/core/DokitViewManager.kt @@ -16,7 +16,7 @@ import com.didichuxing.doraemonkit.util.ScreenUtils * Created by jintai on 2018/10/23. * 浮标管理类 */ -internal class DokitViewManager : DokitViewManagerInterface { +class DokitViewManager : DokitViewManagerInterface { companion object { private const val TAG = "DokitViewManagerProxy" From b576e7b1b02028a416de76648fb7a0c25841f55e Mon Sep 17 00:00:00 2001 From: realonezhang Date: Thu, 24 Feb 2022 17:02:12 +0800 Subject: [PATCH 5/6] =?UTF-8?q?feat:=20Android=2012=20=E9=80=82=E9=85=8D?= =?UTF-8?q?=20=E5=8D=87=E7=BA=A7=E7=89=88=E6=9C=AC3.6.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Android/config.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Android/config.gradle b/Android/config.gradle index 0df27c66b..c6bdb75fa 100755 --- a/Android/config.gradle +++ b/Android/config.gradle @@ -13,7 +13,7 @@ ext { //是否使用本地仓库，需要使用绝对路径，仓库地址在 local.properties 中添加 LOCAL_REPOSITORY_URL use_local : false, group_id : 'io.github.didi.dokit', - version : '3.6.1' + version : '3.6.2' ] android = [compileSdkVersion : 29, From 6a32df9f4b6b82f1345c923a178c7813e4fbb160 Mon Sep 17 00:00:00 2001 From: realonezhang Date: Mon, 6 Jun 2022 10:48:46 +0800 Subject: [PATCH 6/6] =?UTF-8?q?feat:=20=E9=80=82=E9=85=8DAndroid=2012?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC=E5=8F=B7=203.7.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Android/app/src/main/AndroidManifest.xml | 10 +++------- Android/config.gradle | 6 +++--- Android/dokit/src/main/AndroidManifest.xml | 6 ++++++ .../doraemonkit/kit/core/NormalDoKitViewManager.kt | 2 +- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/Android/app/src/main/AndroidManifest.xml b/Android/app/src/main/AndroidManifest.xml index 084388b02..d26be9c8a 100644 --- a/Android/app/src/main/AndroidManifest.xml +++ b/Android/app/src/main/AndroidManifest.xml @@ -35,7 +35,8 @@ + android:theme="@style/NoTitleTheme" + android:exported="true"> @@ -76,13 +77,8 @@ android:name="com.baidu.location.f" android:enabled="true" android:process=":remote" /> - - + + + + diff --git a/Android/dokit/src/main/java/com/didichuxing/doraemonkit/kit/core/NormalDoKitViewManager.kt b/Android/dokit/src/main/java/com/didichuxing/doraemonkit/kit/core/NormalDoKitViewManager.kt index 2049e2870..00a026eb2 100644 --- a/Android/dokit/src/main/java/com/didichuxing/doraemonkit/kit/core/NormalDoKitViewManager.kt +++ b/Android/dokit/src/main/java/com/didichuxing/doraemonkit/kit/core/NormalDoKitViewManager.kt @@ -326,7 +326,7 @@ internal class NormalDoKitViewManager : AbsDoKitViewManager() { //操作DecorRootView doKitView.dealDecorRootView(getDoKitRootContentView(doKitIntent.activity)) }, MC_DELAY.toLong()) - DokitViewManager.INSTANCE.notifyDokitViewAdd(doKitView) +// DoKitViewManager.INSTANCE.notifyDokitViewAdd(doKitView) } currentActivityDoKitViews[doKitView.tag] = doKitView } catch (e: Exception) {