Skip to content

A
android_payclear
Commit 5b3ec32a authored by mengcuiguang's avatar mengcuiguang
Browse files
Options

解决广告中微信库冲突

parent 8fdc3fbb
Show whitespace changes
Inline Side-by-side
Showing with 178 additions and 173 deletions
payclear/app/build.gradle
View file @ 5b3ec32a
...@@ -2,6 +2,7 @@ apply plugin: 'com.android.application' ...@@ -2,6 +2,7 @@ apply plugin: 'com.android.application'
apply plugin: 'kotlin-android' apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-android-extensions'
apply plugin: 'kotlin-kapt' apply plugin: 'kotlin-kapt'
//sharesdk //sharesdk
apply plugin: 'com.mob.sdk' apply plugin: 'com.mob.sdk'
...@@ -227,7 +228,9 @@ dependencies { ...@@ -227,7 +228,9 @@ dependencies {
implementation 'com.bytedance.applog:RangersAppLog-Lite-cn:6.10.0' implementation 'com.bytedance.applog:RangersAppLog-Lite-cn:6.10.0'
// talkingdata接入 // talkingdata接入
//RxPay //RxPay
implementation 'com.cuieney:rxpay-api:2.2.3' implementation 'com.cuieney:rxpay-api:2.2.3', {
exclude group: 'com.tencent.mm.opensdk', module: 'wechat-sdk-android-with-mta'
}
kapt 'com.cuieney:rxpay-compiler:2.1.1' kapt 'com.cuieney:rxpay-compiler:2.1.1'
// bugly // bugly
implementation 'com.tencent.bugly:crashreport:3.3.92' implementation 'com.tencent.bugly:crashreport:3.3.92'
......
payclear/app/proguard-rules.pro
View file @ 5b3ec32a
...@@ -444,3 +444,5 @@ ...@@ -444,3 +444,5 @@
-dontwarn com.mbridge.** -dontwarn com.mbridge.**
-keep class **.R$* { public static final int mbridge*; } -keep class **.R$* { public static final int mbridge*; }
# ======================= 穿山甲 GroMore END ================ # ======================= 穿山甲 GroMore END ================
-keep class com.tencent.mm.opensdk.** { *; }
\ No newline at end of file
payclear/app/src/main/AndroidManifest.xml
View file @ 5b3ec32a
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<application <application
android:name=".MintsApplication" android:name=".MintsApplication"
android:allowBackup="true" android:allowBackup="false"
android:requestLegacyExternalStorage="true" android:requestLegacyExternalStorage="true"
android:icon="@mipmap/ic_launcher_main" android:icon="@mipmap/ic_launcher_main"
android:label="@string/app_name" android:label="@string/app_name"
...@@ -176,179 +176,179 @@ ...@@ -176,179 +176,179 @@
android:resource="@xml/provider_paths" /> android:resource="@xml/provider_paths" />
</provider> </provider>
<!-- &lt;!&ndash; 穿山甲广告 &ndash;&gt;--> <!-- 穿山甲广告 -->
<!-- <provider--> <provider
<!-- android:name="com.bytedance.sdk.openadsdk.multipro.TTMultiProvider"--> android:name="com.bytedance.sdk.openadsdk.multipro.TTMultiProvider"
<!-- android:authorities="${applicationId}.TTMultiProvider"--> android:authorities="${applicationId}.TTMultiProvider"
<!-- android:exported="false"--> android:exported="false"
<!-- tools:replace="android:authorities" />--> tools:replace="android:authorities" />
<!-- <provider--> <provider
<!-- android:name="com.bytedance.sdk.openadsdk.TTFileProvider"--> android:name="com.bytedance.sdk.openadsdk.TTFileProvider"
<!-- android:authorities="${applicationId}.TTFileProvider"--> android:authorities="${applicationId}.TTFileProvider"
<!-- android:exported="false"--> android:exported="false"
<!-- android:grantUriPermissions="true"--> android:grantUriPermissions="true"
<!-- tools:replace="android:authorities">--> tools:replace="android:authorities">
<!-- <meta-data--> <meta-data
<!-- android:name="android.support.FILE_PROVIDER_PATHS"--> android:name="android.support.FILE_PROVIDER_PATHS"
<!-- android:resource="@xml/file_paths"--> android:resource="@xml/file_paths"
<!-- tools:replace="android:resource" />--> tools:replace="android:resource" />
<!-- </provider>--> </provider>
<!-- &lt;!&ndash; 广告 Activity &ndash;&gt;--> <!-- 广告 Activity -->
<!-- <activity--> <activity
<!-- android:name="com.qq.e.ads.RewardvideoPortraitADActivity"--> android:name="com.qq.e.ads.RewardvideoPortraitADActivity"
<!-- android:configChanges="keyboard|keyboardHidden|orientation|screenSize"--> android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
<!-- android:multiprocess="true"--> android:multiprocess="true"
<!-- android:theme="@android:style/Theme.Light.NoTitleBar">--> android:theme="@android:style/Theme.Light.NoTitleBar">
<!-- <meta-data--> <meta-data
<!-- android:name="android.notch_support"--> android:name="android.notch_support"
<!-- android:value="true" />--> android:value="true" />
<!-- </activity>--> </activity>
<!-- <activity--> <activity
<!-- android:name="com.qq.e.ads.RewardvideoLandscapeADActivity"--> android:name="com.qq.e.ads.RewardvideoLandscapeADActivity"
<!-- android:configChanges="keyboard|keyboardHidden|orientation|screenSize"--> android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
<!-- android:multiprocess="true"--> android:multiprocess="true"
<!-- android:screenOrientation="landscape"--> android:screenOrientation="landscape"
<!-- android:theme="@android:style/Theme.Light.NoTitleBar">--> android:theme="@android:style/Theme.Light.NoTitleBar">
<!-- <meta-data--> <meta-data
<!-- android:name="android.notch_support"--> android:name="android.notch_support"
<!-- android:value="true" />--> android:value="true" />
<!-- </activity>--> </activity>
<!-- <activity--> <activity
<!-- android:name="com.bytedance.sdk.openadsdk.stub.activity.Stub_Standard_Activity"--> android:name="com.bytedance.sdk.openadsdk.stub.activity.Stub_Standard_Activity"
<!-- android:configChanges="orientation|keyboardHidden|navigation|screenSize"--> android:configChanges="orientation|keyboardHidden|navigation|screenSize"
<!-- android:exported="false"--> android:exported="false"
<!-- android:launchMode="standard"--> android:launchMode="standard"
<!-- android:windowSoftInputMode="adjustResize|stateHidden" />--> android:windowSoftInputMode="adjustResize|stateHidden" />
<!-- <activity--> <activity
<!-- android:name="com.bytedance.sdk.openadsdk.stub.activity.Stub_Standard_Portrait_Activity"--> android:name="com.bytedance.sdk.openadsdk.stub.activity.Stub_Standard_Portrait_Activity"
<!-- android:configChanges="orientation|keyboardHidden|navigation|screenSize"--> android:configChanges="orientation|keyboardHidden|navigation|screenSize"
<!-- android:exported="false"--> android:exported="false"
<!-- android:launchMode="standard"--> android:launchMode="standard"
<!-- android:screenOrientation="portrait"--> android:screenOrientation="portrait"
<!-- android:windowSoftInputMode="adjustResize|stateHidden" />--> android:windowSoftInputMode="adjustResize|stateHidden" />
<!-- <activity--> <activity
<!-- android:name="com.bytedance.sdk.openadsdk.stub.activity.Stub_Standard_Activity_T"--> android:name="com.bytedance.sdk.openadsdk.stub.activity.Stub_Standard_Activity_T"
<!-- android:configChanges="orientation|keyboardHidden|navigation|screenSize"--> android:configChanges="orientation|keyboardHidden|navigation|screenSize"
<!-- android:exported="false"--> android:exported="false"
<!-- android:launchMode="standard"--> android:launchMode="standard"
<!-- android:windowSoftInputMode="adjustResize|stateHidden" />--> android:windowSoftInputMode="adjustResize|stateHidden" />
<!-- <activity--> <activity
<!-- android:name="com.bytedance.sdk.openadsdk.stub.activity.Stub_Standard_Landscape_Activity"--> android:name="com.bytedance.sdk.openadsdk.stub.activity.Stub_Standard_Landscape_Activity"
<!-- android:configChanges="orientation|keyboardHidden|navigation|screenSize"--> android:configChanges="orientation|keyboardHidden|navigation|screenSize"
<!-- android:exported="false"--> android:exported="false"
<!-- android:launchMode="standard"--> android:launchMode="standard"
<!-- android:screenOrientation="landscape"--> android:screenOrientation="landscape"
<!-- android:windowSoftInputMode="adjustResize|stateHidden" />--> android:windowSoftInputMode="adjustResize|stateHidden" />
<!-- <activity--> <activity
<!-- android:name="com.bytedance.sdk.openadsdk.stub.activity.Stub_Activity"--> android:name="com.bytedance.sdk.openadsdk.stub.activity.Stub_Activity"
<!-- android:configChanges="orientation|keyboardHidden|navigation|screenSize"--> android:configChanges="orientation|keyboardHidden|navigation|screenSize"
<!-- android:exported="false"--> android:exported="false"
<!-- android:windowSoftInputMode="adjustResize|stateHidden" />--> android:windowSoftInputMode="adjustResize|stateHidden" />
<!-- <activity--> <activity
<!-- android:name="com.bytedance.sdk.openadsdk.stub.activity.Stub_SingleTask_Activity_T"--> android:name="com.bytedance.sdk.openadsdk.stub.activity.Stub_SingleTask_Activity_T"
<!-- android:configChanges="orientation|keyboardHidden|navigation|screenSize"--> android:configChanges="orientation|keyboardHidden|navigation|screenSize"
<!-- android:exported="false"--> android:exported="false"
<!-- android:launchMode="singleTask"--> android:launchMode="singleTask"
<!-- android:windowSoftInputMode="adjustResize|stateHidden" />--> android:windowSoftInputMode="adjustResize|stateHidden" />
<!-- <activity--> <activity
<!-- android:name="com.bytedance.sdk.openadsdk.stub.activity.Stub_SingleTask_Activity"--> android:name="com.bytedance.sdk.openadsdk.stub.activity.Stub_SingleTask_Activity"
<!-- android:configChanges="orientation|keyboardHidden|navigation|screenSize"--> android:configChanges="orientation|keyboardHidden|navigation|screenSize"
<!-- android:exported="false"--> android:exported="false"
<!-- android:launchMode="singleTask"--> android:launchMode="singleTask"
<!-- android:windowSoftInputMode="adjustResize|stateHidden" />--> android:windowSoftInputMode="adjustResize|stateHidden" />
<!-- <activity--> <activity
<!-- android:name="com.kwad.sdk.api.proxy.app.KSRewardLandScapeVideoActivity"--> android:name="com.kwad.sdk.api.proxy.app.KSRewardLandScapeVideoActivity"
<!-- android:configChanges="keyboardHidden|orientation|screenSize"--> android:configChanges="keyboardHidden|orientation|screenSize"
<!-- android:screenOrientation="landscape"--> android:screenOrientation="landscape"
<!-- android:theme="@android:style/Theme.Light.NoTitleBar.Fullscreen" />--> android:theme="@android:style/Theme.Light.NoTitleBar.Fullscreen" />
<!-- <activity--> <activity
<!-- android:name="com.kwad.sdk.api.proxy.app.KsRewardVideoActivity"--> android:name="com.kwad.sdk.api.proxy.app.KsRewardVideoActivity"
<!-- android:configChanges="keyboardHidden|orientation|screenSize"--> android:configChanges="keyboardHidden|orientation|screenSize"
<!-- android:screenOrientation="portrait"--> android:screenOrientation="portrait"
<!-- android:theme="@android:style/Theme.Light.NoTitleBar.Fullscreen" />--> android:theme="@android:style/Theme.Light.NoTitleBar.Fullscreen" />
<!-- <activity--> <activity
<!-- android:name="com.kwad.sdk.api.proxy.app.KsFullScreenLandScapeVideoActivity"--> android:name="com.kwad.sdk.api.proxy.app.KsFullScreenLandScapeVideoActivity"
<!-- android:configChanges="keyboardHidden|orientation|screenSize"--> android:configChanges="keyboardHidden|orientation|screenSize"
<!-- android:screenOrientation="landscape"--> android:screenOrientation="landscape"
<!-- android:theme="@android:style/Theme.Light.NoTitleBar.Fullscreen" />--> android:theme="@android:style/Theme.Light.NoTitleBar.Fullscreen" />
<!-- <activity--> <activity
<!-- android:name="com.kwad.sdk.api.proxy.app.KsFullScreenVideoActivity"--> android:name="com.kwad.sdk.api.proxy.app.KsFullScreenVideoActivity"
<!-- android:configChanges="keyboardHidden|orientation|screenSize"--> android:configChanges="keyboardHidden|orientation|screenSize"
<!-- android:screenOrientation="behind"--> android:screenOrientation="behind"
<!-- android:theme="@android:style/Theme.Light.NoTitleBar.Fullscreen" />--> android:theme="@android:style/Theme.Light.NoTitleBar.Fullscreen" />
<!-- <activity--> <activity
<!-- android:name="com.kwad.sdk.api.proxy.app.FeedDownloadActivity"--> android:name="com.kwad.sdk.api.proxy.app.FeedDownloadActivity"
<!-- android:configChanges="keyboardHidden|orientation|screenSize"--> android:configChanges="keyboardHidden|orientation|screenSize"
<!-- android:screenOrientation="portrait"--> android:screenOrientation="portrait"
<!-- android:theme="@android:style/Theme.Light.NoTitleBar.Fullscreen" />--> android:theme="@android:style/Theme.Light.NoTitleBar.Fullscreen" />
<!-- <provider--> <provider
<!-- android:name="com.qq.e.comm.GDTFileProvider"--> android:name="com.qq.e.comm.GDTFileProvider"
<!-- android:authorities="${applicationId}.gdt.fileprovider"--> android:authorities="${applicationId}.gdt.fileprovider"
<!-- android:exported="false"--> android:exported="false"
<!-- android:grantUriPermissions="true">--> android:grantUriPermissions="true">
<!-- <meta-data--> <meta-data
<!-- android:name="android.support.FILE_PROVIDER_PATHS"--> android:name="android.support.FILE_PROVIDER_PATHS"
<!-- android:resource="@xml/gdt_file_path" />--> android:resource="@xml/gdt_file_path" />
<!-- </provider>--> </provider>
<!-- <activity--> <activity
<!-- android:name="com.qq.e.ads.PortraitADActivity"--> android:name="com.qq.e.ads.PortraitADActivity"
<!-- android:configChanges="keyboard|keyboardHidden|orientation|screenSize"--> android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
<!-- android:screenOrientation="portrait" />--> android:screenOrientation="portrait" />
<!-- <activity--> <activity
<!-- android:name="com.qq.e.ads.LandscapeADActivity"--> android:name="com.qq.e.ads.LandscapeADActivity"
<!-- android:configChanges="keyboard|keyboardHidden|orientation|screenSize"--> android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
<!-- android:screenOrientation="landscape"--> android:screenOrientation="landscape"
<!-- tools:replace="android:screenOrientation" /> &lt;!&ndash; 声明SDK所需要的组件 &ndash;&gt;--> tools:replace="android:screenOrientation" /> <!-- 声明SDK所需要的组件 -->
<!-- <service--> <service
<!-- android:name="com.qq.e.comm.DownloadService"--> android:name="com.qq.e.comm.DownloadService"
<!-- android:exported="false" /> &lt;!&ndash; 请开发者注意字母的大小写，ADActivity，而不是AdActivity &ndash;&gt;--> android:exported="false" /> <!-- 请开发者注意字母的大小写，ADActivity，而不是AdActivity -->
<!-- <activity--> <activity
<!-- android:name="com.qq.e.ads.ADActivity"--> android:name="com.qq.e.ads.ADActivity"
<!-- android:configChanges="keyboard|keyboardHidden|orientation|screenSize" /> &lt;!&ndash; GDT end================== &ndash;&gt;--> android:configChanges="keyboard|keyboardHidden|orientation|screenSize" />
<!-- &lt;!&ndash; sigmob start================== &ndash;&gt;--> <!-- sigmob start================== -->
<!-- <activity--> <activity
<!-- android:name="com.sigmob.sdk.base.common.AdActivity"--> android:name="com.sigmob.sdk.base.common.AdActivity"
<!-- android:configChanges="keyboard|keyboardHidden|orientation|screenSize"--> android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
<!-- android:theme="@android:style/Theme.Light.NoTitleBar" />--> android:theme="@android:style/Theme.Light.NoTitleBar" />
<!-- <provider--> <provider
<!-- android:name="com.sigmob.sdk.SigmobFileProvider"--> android:name="com.sigmob.sdk.SigmobFileProvider"
<!-- android:authorities="${applicationId}.sigprovider"--> android:authorities="${applicationId}.sigprovider"
<!-- android:exported="false"--> android:exported="false"
<!-- android:grantUriPermissions="true">--> android:grantUriPermissions="true">
<!-- <meta-data--> <meta-data
<!-- android:name="android.support.FILE_PROVIDER_PATHS"--> android:name="android.support.FILE_PROVIDER_PATHS"
<!-- android:resource="@xml/sigmob_provider_paths" />--> android:resource="@xml/sigmob_provider_paths" />
<!-- </provider>--> </provider>
<!-- <provider--> <provider
<!-- android:name="com.mbridge.msdk.foundation.tools.MBFileProvider"--> android:name="com.mbridge.msdk.foundation.tools.MBFileProvider"
<!-- android:authorities="${applicationId}.mbFileProvider"--> android:authorities="${applicationId}.mbFileProvider"
<!-- android:exported="false"--> android:exported="false"
<!-- android:grantUriPermissions="true">--> android:grantUriPermissions="true">
<!-- <meta-data--> <meta-data
<!-- android:name="android.support.FILE_PROVIDER_PATHS"--> android:name="android.support.FILE_PROVIDER_PATHS"
<!-- android:resource="@xml/mb_provider_paths" />--> android:resource="@xml/mb_provider_paths" />
<!-- </provider> &lt;!&ndash; mintegral end================== &ndash;&gt;--> </provider> <!-- mintegral end================== -->
<!-- <activity--> <activity
<!-- android:name="com.baidu.mobads.sdk.api.AppActivity"--> android:name="com.baidu.mobads.sdk.api.AppActivity"
<!-- android:configChanges="screenSize|keyboard|keyboardHidden|orientation"--> android:configChanges="screenSize|keyboard|keyboardHidden|orientation"
<!-- android:theme="@android:style/Theme.NoTitleBar" /> &lt;!&ndash; 声明打开显示激励视频/全屏视频的Activity &ndash;&gt;--> android:theme="@android:style/Theme.NoTitleBar" /> <!-- 声明打开显示激励视频/全屏视频的Activity -->
<!-- <activity--> <activity
<!-- android:name="com.baidu.mobads.sdk.api.MobRewardVideoActivity"--> android:name="com.baidu.mobads.sdk.api.MobRewardVideoActivity"
<!-- android:configChanges="screenSize|orientation|keyboardHidden"--> android:configChanges="screenSize|orientation|keyboardHidden"
<!-- android:launchMode="singleTask"--> android:launchMode="singleTask"
<!-- android:theme="@android:style/Theme.Translucent.NoTitleBar" /> &lt;!&ndash; 如果targetSdkVersion设置值>=24，则强烈建议添加以下provider，否则会影响app变现 &ndash;&gt;--> android:theme="@android:style/Theme.Translucent.NoTitleBar" /> <!-- 如果targetSdkVersion设置值>=24，则强烈建议添加以下provider，否则会影响app变现 -->
<!-- <provider--> <provider
<!-- android:name="com.baidu.mobads.sdk.api.BdFileProvider"--> android:name="com.baidu.mobads.sdk.api.BdFileProvider"
<!-- android:authorities="${applicationId}.bd.provider"--> android:authorities="${applicationId}.bd.provider"
<!-- android:exported="false"--> android:exported="false"
<!-- android:grantUriPermissions="true">--> android:grantUriPermissions="true">
<!-- <meta-data--> <meta-data
<!-- android:name="android.support.FILE_PROVIDER_PATHS"--> android:name="android.support.FILE_PROVIDER_PATHS"
<!-- android:resource="@xml/bd_file_paths"--> android:resource="@xml/bd_file_paths"
<!-- tools:replace="android:allowBackup"/>--> />
<!-- </provider>--> </provider>
</application> </application>
</manifest> </manifest>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment