From 88b1db20a0e17f78194f31fc42ed1e06ec478ee1 Mon Sep 17 00:00:00 2001 From: Lihongda <963140097@qq.com> Date: Fri, 5 Jan 2024 02:07:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E9=98=BF=E9=87=8C=E4=BA=91?= =?UTF-8?q?=E6=8E=A8=E9=80=81SDK?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- iFish7/build.gradle | 33 +--- iFish7/src/main/AndroidManifest.xml | 264 +++++----------------------- 2 files changed, 47 insertions(+), 250 deletions(-) diff --git a/iFish7/build.gradle b/iFish7/build.gradle index 472e10f4a..08cee2a34 100644 --- a/iFish7/build.gradle +++ b/iFish7/build.gradle @@ -66,16 +66,6 @@ repositories { } } -configurations.all { - resolutionStrategy.eachDependency { DependencyResolveDetails details -> - def requested = details.requested - if (requested.group == 'com.android.support') { - if (!requested.name.startsWith("multidex")) { - details.useVersion '26.+' - } - } - } -} dependencies { implementation files('libs/xUtils-2.6.14.jar') implementation files('libs/commons-logging-1.1.1.jar') @@ -86,8 +76,6 @@ dependencies { implementation 'com.google.code.gson:gson:2.8.9' //bugly implementation files('libs/commons-io-1.4.jar') -// implementation files('libs/locSDK_6.13.jar') -// implementation files('libs/BaiduLBS_Android.jar') implementation files('libs/TalkingDataAnalytics_V2.1.37.jar') implementation 'de.greenrobot:eventbus:2.4.0' @@ -96,15 +84,6 @@ dependencies { implementation 'com.google.zxing:core:3.3.0' //云信聊天 implementation 'androidx.multidex:multidex:2.0.1' -// implementation files('libs/AMap_Services_V2.3.1.jar') - //定位 -// implementation files('libs/Android_2DMap_V2.4.0.jar') - //地图 -// implementation files('libs/MobCommons-2016.1012.1447.jar') -// implementation files('libs/MobTools-2016.1012.1447.jar') - - //MOB短信平台 -// implementation name: 'SMSSDK-2.1.2', ext: 'aar' //自动滚动ViewPager implementation 'com.jude:rollviewpager:1.4.5' @@ -123,8 +102,7 @@ dependencies { implementation 'com.github.PhilJay:MPAndroidChart:v3.0.3' implementation files('libs/mina-core-2.0.17.jar') implementation files('libs/fastjson-1.1.34.android.jar') - implementation 'com.aliyun.ams:alicloud-android-push:3.1.9.1' - implementation(name: 'alicloud-android-third-push-3.0.6', ext: 'aar') + // implementation 'com.p2p.core:p2p-core:0.4.4.9' implementation(name: 'p2p-core-release', ext: 'aar') implementation(name: 'pano-release', ext: 'aar') @@ -155,6 +133,9 @@ dependencies { implementation 'io.reactivex:rxandroid:1.2.1' implementation 'io.reactivex:rxjava:1.1.6' -// implementation 'com.github.EspressifApp:lib-esptouch-v2-android:2.2.1' -} -//apply plugin: 'com.getkeepsafe.dexcount' \ No newline at end of file + //阿里云推送相关 + api "com.aliyun.ams:alicloud-android-push:${gradle.pushVersion}" + api "com.aliyun.ams:alicloud-android-third-push:${gradle.thirdPushVersion}" + api "com.aliyun.ams:alicloud-android-third-push-xiaomi:3.8.6.1" + api "com.aliyun.ams:alicloud-android-third-push-huawei:${gradle.thirdPushVersion}" +} \ No newline at end of file diff --git a/iFish7/src/main/AndroidManifest.xml b/iFish7/src/main/AndroidManifest.xml index 699ad5e53..8b9ea3db7 100644 --- a/iFish7/src/main/AndroidManifest.xml +++ b/iFish7/src/main/AndroidManifest.xml @@ -26,8 +26,6 @@ - - - - - - - - - - - - - - - @@ -116,7 +98,6 @@ - @@ -129,8 +110,6 @@ - - @@ -139,11 +118,8 @@ - - - @@ -151,8 +127,8 @@ - - + @@ -160,12 +136,8 @@ - - - - @@ -178,13 +150,12 @@ - - + - - - - - - - - - - - - - - - - - - - - - - - @@ -227,16 +176,10 @@ - - - - - - @@ -245,21 +188,20 @@ - - - + + + tools:ignore="Instantiatable" + android:exported="true"> @@ -293,7 +236,8 @@ + android:theme="@android:style/Theme.NoTitleBar.Fullscreen" + android:exported="true"> @@ -963,11 +907,11 @@ - + + + + + @@ -980,7 +924,8 @@ + android:screenOrientation="portrait" + android:exported="true"> @@ -1020,155 +965,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> android:name="com.tencent.tauth.AuthActivity" android:launchMode="singleTask" android:noHistory="true" - android:screenOrientation="portrait"> + android:screenOrientation="portrait" + android:exported="true"> @@ -1279,6 +1076,20 @@ android:configChanges="keyboardHidden|orientation|screenSize" />--> android:theme="@android:style/Theme.Translucent.NoTitleBar"> + + + + + + + + + + + + @@ -1307,5 +1118,10 @@ android:configChanges="keyboardHidden|orientation|screenSize" />--> + + + \ No newline at end of file