Skip to content

A
android_vedio
Commit b2119c53 authored by mengcuiguang's avatar mengcuiguang
Browse files
Options

代码优化

parent 1b5fd834
Hide whitespace changes
Inline Side-by-side
Showing with 215 additions and 85 deletions
video/alipay/build/generated/source/buildConfig/debug/com/jobo/alipay/BuildConfig.java 0 → 100644
View file @ b2119c53
/**
* Automatically generated file. DO NOT MODIFY
*/
package com.jobo.alipay;
public final class BuildConfig {
public static final boolean DEBUG = Boolean.parseBoolean("true");
public static final String LIBRARY_PACKAGE_NAME = "com.jobo.alipay";
public static final String BUILD_TYPE = "debug";
}
video/alipay/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml 0 → 100644
View file @ b2119c53
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.jobo.alipay" >
<uses-sdk
android:minSdkVersion="21"
android:targetSdkVersion="31" />
</manifest>
\ No newline at end of file
video/alipay/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output-metadata.json 0 → 100644
View file @ b2119c53
{
"version": 3,
"artifactType": {
"type": "AAPT_FRIENDLY_MERGED_MANIFESTS",
"kind": "Directory"
},
"applicationId": "com.jobo.alipay",
"variantName": "debug",
"elements": [
{
"type": "SINGLE",
"filters": [],
"attributes": [],
"outputFile": "AndroidManifest.xml"
}
],
"elementType": "File"
}
\ No newline at end of file
video/alipay/build/intermediates/aar_metadata/debug/aar-metadata.properties 0 → 100644
View file @ b2119c53
aarFormatVersion=1.0
aarMetadataVersion=1.0
minCompileSdk=1
minAndroidGradlePluginVersion=1.0.0
video/alipay/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml 0 → 100644
View file @ b2119c53
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/src/main/jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/src/debug/jniLibs"/></dataSet></merger>
\ No newline at end of file
video/alipay/build/intermediates/incremental/mergeDebugShaders/merger.xml 0 → 100644
View file @ b2119c53
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/src/main/shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/src/debug/shaders"/></dataSet></merger>
\ No newline at end of file
video/alipay/build/intermediates/incremental/packageDebugAssets/merger.xml 0 → 100644
View file @ b2119c53
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/src/main/assets"/><source path="/Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/build/intermediates/shader_assets/debug/out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/src/debug/assets"/></dataSet></merger>
\ No newline at end of file
video/alipay/build/intermediates/incremental/packageDebugResources/merger.xml 0 → 100644
View file @ b2119c53
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/src/main/res"/><source path="/Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/build/generated/res/rs/debug"/><source path="/Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/build/generated/res/resValues/debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/src/main/res"/><source path="/Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/build/generated/res/rs/debug"/><source path="/Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/build/generated/res/resValues/debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/src/debug/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/src/debug/res"/></dataSet><mergedItems/></merger>
\ No newline at end of file
video/alipay/build/intermediates/local_only_symbol_list/debug/R-def.txt 0 → 100644
View file @ b2119c53
R_DEF: Internal format may change without notice
local
video/alipay/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt 0 → 100644
View file @ b2119c53
1<?xml version="1.0" encoding="utf-8"?>
2<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3 package="com.jobo.alipay" >
4
5 <uses-sdk
6 android:minSdkVersion="21"
6-->/Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/src/main/AndroidManifest.xml
7 android:targetSdkVersion="31" />
7-->/Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/src/main/AndroidManifest.xml
8
9</manifest>
video/alipay/build/intermediates/merged_manifest/debug/AndroidManifest.xml 0 → 100644
View file @ b2119c53
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.jobo.alipay" >
<uses-sdk
android:minSdkVersion="21"
android:targetSdkVersion="31" />
</manifest>
\ No newline at end of file
video/alipay/build/intermediates/packaged_manifests/debug/output-metadata.json 0 → 100644
View file @ b2119c53
{
"version": 3,
"artifactType": {
"type": "PACKAGED_MANIFESTS",
"kind": "Directory"
},
"applicationId": "com.jobo.alipay",
"variantName": "debug",
"elements": [
{
"type": "SINGLE",
"filters": [],
"attributes": [],
"outputFile": "../../merged_manifest/debug/AndroidManifest.xml"
}
],
"elementType": "File"
}
\ No newline at end of file
video/alipay/build/outputs/logs/manifest-merger-debug-report.txt 0 → 100644
View file @ b2119c53
-- Merging decision tree log ---
manifest
ADDED from /Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/src/main/AndroidManifest.xml:2:1-5:12
INJECTED from /Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/src/main/AndroidManifest.xml:2:1-5:12
INJECTED from /Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/src/main/AndroidManifest.xml:2:1-5:12
package
ADDED from /Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/src/main/AndroidManifest.xml:3:5-30
INJECTED from /Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/src/main/AndroidManifest.xml
INJECTED from /Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/src/main/AndroidManifest.xml
xmlns:android
ADDED from /Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/src/main/AndroidManifest.xml:2:11-69
uses-sdk
INJECTED from /Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/src/main/AndroidManifest.xml reason: use-sdk injection requested
INJECTED from /Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/src/main/AndroidManifest.xml
INJECTED from /Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/src/main/AndroidManifest.xml
INJECTED from /Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/src/main/AndroidManifest.xml
INJECTED from /Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/src/main/AndroidManifest.xml
android:targetSdkVersion
INJECTED from /Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/src/main/AndroidManifest.xml
ADDED from /Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/src/main/AndroidManifest.xml
INJECTED from /Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/src/main/AndroidManifest.xml
android:minSdkVersion
INJECTED from /Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/src/main/AndroidManifest.xml
ADDED from /Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/src/main/AndroidManifest.xml
INJECTED from /Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/src/main/AndroidManifest.xml
video/app/build.gradle
View file @ b2119c53
......@@ -28,7 +28,6 @@ android {
manifestPlaceholders = [CHANNEL_NAME_VALUE: "smartclean",
WEIXIN_ID : WEIXIN_APP_ID,
UMENG_KEY : RELEASE_UMENG_KEY,
SHARE_KEY : RELEASE_SHARESDK_KEY,
SHARE_SECRET : RELEASE_SHARESDK_SECRET]
}
......@@ -68,7 +67,6 @@ android {
buildConfigField "String", "GROMORE_EXPRESS_CODE", GROMORE_EXPRESS_CODE
buildConfigField "String", "GROMORE_BANNER_CODE", GROMORE_BANNER_CODE
buildConfigField "String", "WEIXIN_APP_PAY_ID", WEIXIN_APP_PAY_ID
buildConfigField "String", "RELEASE_TALKING_DATA_KEY", RELEASE_TALKING_DATA_KEY
//混淆
minifyEnabled false
......@@ -91,7 +89,6 @@ android {
buildConfigField "String", "GROMORE_EXPRESS_CODE", GROMORE_EXPRESS_CODE
buildConfigField "String", "GROMORE_BANNER_CODE", GROMORE_BANNER_CODE
buildConfigField "String", "WEIXIN_APP_PAY_ID", WEIXIN_APP_PAY_ID
buildConfigField "String", "RELEASE_TALKING_DATA_KEY", RELEASE_TALKING_DATA_KEY
//混淆
minifyEnabled true
......@@ -226,7 +223,6 @@ dependencies {
// 支付
api project(':rxpay')
api project(':wxpay')
// api project(':alipay')
api project(':oaid')
implementation 'com.github.CymChad:BaseRecyclerViewAdapterHelper:3.0.4'
// bugly
......
video/app/src/main/assets/SDK_Setting_5423461.json → video/app/src/main/assets/SDK_Setting_5427620.json
View file @ b2119c53
{
"init": {
"site_id": "5423461",
"app_id": "518779",
"partner": "pangle_518779",
"secure_key": "9f3b49c414b30e9d9f44daca4b5cff54"
"site_id": "5427620",
"app_id": "521658",
"partner": "pangle_521658",
"secure_key": "7c31fd2e48089cc1a4c6be6792af864f"
},
"feed": {
"news_list_ad_code_id": "",
......@@ -12,37 +12,37 @@
"video_first_ad_code_id": "",
"video_second_ad_code_id": "",
"related_ad_code_id": "",
"news_draw_ad_code_id": "953183571",
"news_draw_native_ad_code_id": "953183575",
"news_draw_ad_code_id": "953341345",
"news_draw_native_ad_code_id": "953341330",
"news_outer_list_ad_code_id": "",
"news_outer_first_ad_code_id": "",
"news_outer_second_ad_code_id": "",
"outer_video_second_ad_code_id": "",
"outer_related_ad_code_id": "",
"news_outer_draw_ad_code_id": "953183564",
"news_outer_draw_native_ad_code_id": "953183578",
"news_outer_draw_ad_code_id": "953341346",
"news_outer_draw_native_ad_code_id": "953341333",
"news_interstitial_code_id": ""
},
"small_video": {
"draw_ad_code_id": "953183569",
"draw_native_ad_code_id": "953183565",
"grid_ad_code_id": "953183574",
"grid_draw_ad_code_id": "953183568",
"grid_draw_native_ad_code_id": "953183581",
"video_card_ad_code_id": "953183580",
"video_card_draw_ad_code_id": "953183579",
"video_card_draw_native_ad_code_id": "953183567",
"draw_ad_code_id": "953341344",
"draw_native_ad_code_id": "953341337",
"grid_ad_code_id": "953341342",
"grid_draw_ad_code_id": "953341340",
"grid_draw_native_ad_code_id": "953341336",
"video_card_ad_code_id": "953341335",
"video_card_draw_ad_code_id": "953341334",
"video_card_draw_native_ad_code_id": "953341327",
"interstitial_ad_code_id": "",
"interstitial_note_ad_code_id": "953183562",
"staggered_grid_ad_code_id": "953183566",
"staggered_grid_draw_ad_code_id": "953183569",
"staggered_grid_draw_native_ad_code_id": "953183565",
"draw_interstitial_ad_code_id": "953183572",
"draw_fullscreen_interstitial_ad_code_id": "953183573",
"draw_banner_code_id": "953183570",
"drama_rewarded_ad_code_id": "953183576",
"drama_rewarded_ad_code_id_02": "953183563",
"drama_draw_ad_code_id": "953183577"
"interstitial_note_ad_code_id": "953341341",
"staggered_grid_ad_code_id": "953341331",
"staggered_grid_draw_ad_code_id": "953341344",
"staggered_grid_draw_native_ad_code_id": "953341337",
"draw_interstitial_ad_code_id": "953341339",
"draw_fullscreen_interstitial_ad_code_id": "953341328",
"draw_banner_code_id": "953341329",
"drama_rewarded_ad_code_id": "953341338",
"drama_rewarded_ad_code_id_02": "953341343",
"drama_draw_ad_code_id": "953341332"
},
"novel": {
"status": 0,
......
video/app/src/main/java/com/duben/xixifree/MintsApplication.java
View file @ b2119c53
......@@ -12,7 +12,6 @@ import com.downloader.PRDownloaderConfig;
import com.duben.xixifree.ad.TTAdManagerHolder;
import com.duben.xixifree.common.Constant;
import com.duben.xixifree.manager.TXCSDKService;
import com.duben.xixifree.manager.TalkingDataManager;
import com.duben.xixifree.net.LoanService;
import com.duben.xixifree.net.V6Service;
import com.duben.xixifree.utils.AppPreferencesManager;
......@@ -79,8 +78,6 @@ public class MintsApplication extends MultiDexApplication {
TXCSDKService.init(this);
TalkingDataManager.INSTANCE.init(this);
// 判断应用是否在前台
ForegroundOrBackground.init(this);
......
video/app/src/main/java/com/duben/xixifree/ad/TTAdManagerHolder.java
View file @ b2119c53
......@@ -13,6 +13,7 @@ import com.bytedance.sdk.openadsdk.mediation.init.MediationPrivacyConfig;
import com.duben.xixifree.BuildConfig;
import com.duben.xixifree.MintsApplication;
import com.duben.xixifree.common.Constant;
import com.duben.xixifree.utils.AppPreferencesManager;
import com.duben.xixifree.utils.DeviceUuidFactory;
import com.duben.xixifree.utils.LogUtil;
......@@ -79,7 +80,7 @@ public class TTAdManagerHolder {
* 使用聚合功能此开关必须设置为true，默认为false，不会初始化聚合模板，聚合功能会吟唱
*/
.useMediation(true)
// .customController(getTTCustomController()) //如果您需要设置隐私策略请参考该api
.customController(getTTCustomController()) //如果您需要设置隐私策略请参考该api
// .setMediationConfig(new MediationConfig.Builder() //可设置聚合特有参数详细设置请参考该api
// .setMediationConfigUserInfoForSegment(getUserInfoForSegment())//如果您需要配置流量分组信息请参考该api
// .build())
......@@ -105,47 +106,63 @@ public class TTAdManagerHolder {
private static TTCustomController getTTCustomController(){
return new TTCustomController() {
@Override
public boolean isCanUsePhoneState() {
return false;
}
@Override
public boolean isCanUseWifiState() {
return super.isCanUseWifiState();
return false;
}
@Override
public String getMacAddress() {
return super.getMacAddress();
return "";
}
@Override
public boolean isCanUseWriteExternal() {
return super.isCanUseWriteExternal();
return false;
}
@Override
public String getDevOaid() {
return super.getDevOaid();
return "";
}
@Override
public boolean isCanUseAndroidId() {
return super.isCanUseAndroidId();
return false;
}
@Override
public String getAndroidId() {
return super.getAndroidId();
return "";
}
@Override
public MediationPrivacyConfig getMediationPrivacyConfig() {
return new MediationPrivacyConfig() {
@Override
public boolean isCanUseOaid() {
return false;
}
@Override
public boolean isLimitPersonalAds() {
if (AppPreferencesManager.INSTANCE.get()
.getBoolean(Constant.LOAN_PERMISSION_FLAG, true)) return false;
return super.isLimitPersonalAds();
}
@Override
public boolean isProgrammaticRecommend() {
if (AppPreferencesManager.INSTANCE.get()
.getBoolean(Constant.LOAN_PERMISSION_FLAG, true)) return false;
return super.isProgrammaticRecommend();
}
};
......@@ -153,6 +170,9 @@ public class TTAdManagerHolder {
@Override
public boolean isCanUsePermissionRecordAudio() {
if (AppPreferencesManager.INSTANCE.get()
.getBoolean(Constant.LOAN_PERMISSION_FLAG, true)) return false;
return super.isCanUsePermissionRecordAudio();
}
};
......
video/app/src/main/java/com/duben/xixifree/manager/TalkingDataManager.kt deleted 100644 → 0
View file @ 1b5fd834
package com.duben.xixifree.manager
import android.app.Application
import android.content.Context
import com.duben.xixifree.BuildConfig
import com.duben.xixifree.common.Constant
import com.duben.xixifree.utils.AppPreferencesManager.get
import com.duben.xixifree.utils.MateUtils
import com.tendcloud.tenddata.TCAgent
/**
* TalkingData
*/
object TalkingDataManager {
private const val APP_KEY =BuildConfig.RELEASE_TALKING_DATA_KEY
fun init(application:Application) {
try {
//打开日志
TCAgent.LOG_ON = BuildConfig.LOG_DEBUG
/**
* 动态获取渠道ID（类似友盟）
* AppID说是xml文件里的密钥？
*/
TCAgent.init(application, APP_KEY
, MateUtils.getAppMetaData(application, "CHANNEL_NAME"))
/**
* true-开启自动捕获错误
*/
TCAgent.setReportUncaughtExceptions(true)
} catch (e: Exception) {
e.printStackTrace()
}
}
fun onResume(cxt:Context,name:String){
// 未同意权限弹窗，不进行SDK初始化
// if (get().getBoolean(Constant.LOAN_PERMISSION_FLAG, true)) return
//
// TCAgent.onPageStart(cxt, name)
}
fun onPause(cxt:Context,name:String){
// 未同意权限弹窗，不进行SDK初始化
// if (get().getBoolean(Constant.LOAN_PERMISSION_FLAG, true)) return
//
// TCAgent.onPageEnd(cxt, name)
}
}
\ No newline at end of file
video/app/src/main/java/com/duben/xixifree/video/DPHolderManager.kt
View file @ b2119c53
......@@ -18,7 +18,7 @@ object DPHolderManager {
//1. 初始化，最好放到application.onCreate()执行
val configBuilder = DPSdkConfig.Builder().debug(true)
DPSdk.init(context, "SDK_Setting_5423461.json", configBuilder.build())
DPSdk.init(context, "SDK_Setting_5427620.json", configBuilder.build())
startDpSdk()
}
......
video/gradle.properties
View file @ b2119c53
......@@ -36,20 +36,13 @@ RELEASE_SHARESDK_KEY=385c5ea9c5393
RELEASE_SHARESDK_SECRET=e5512fc5eeaf0ed73dd8f1685e6ea9d3
#weixin
WEIXIN_APP_PAY_ID ="wx10e29b733b8c71c7"
WEIXIN_APP_ID =wx10e29b733b8c71c7
WEIXIN_APP_SECRET =93add1e49825bd4992ba8b6792630a7d
#umeng
RELEASE_UMENG_KEY=64b8de13a1a164591b5133df
#TalkingData
RELEASE_TALKING_DATA_KEY="15DEBB2C366A4911A0BA5326A071B579"
GROMORE_APP_ID="5423461"
GROMORE_SPLASH_CODE="102418768"
GROMORE_VIDEO_CODE="102418861"
GROMORE_EXPRESS_CODE="102419307"
GROMORE_DRAW_CODE="102418862"
GROMORE_BANNER_CODE="102418767"
WEIXIN_APP_PAY_ID ="wx4fe06dc52b1fed8e"
WEIXIN_APP_ID =wx4fe06dc52b1fed8e
WEIXIN_APP_SECRET =d07a6b2194ef2fb125abe325aa174dcf
GROMORE_APP_ID="5427620"
GROMORE_SPLASH_CODE="102428544"
GROMORE_VIDEO_CODE="102428643"
GROMORE_EXPRESS_CODE="102429208"
GROMORE_DRAW_CODE="102428352"
GROMORE_BANNER_CODE="102427871"
video/settings.gradle
View file @ b2119c53
include ':app'
include ':oaid'
include ':rxpay'
//include ':alipay'
include ':wxpay'
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