| BuWanVideo/AndroidManifest.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| BuWanVideo/build.gradle | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| BuWanVideo/src/com/weikou/beibeivideo/ui/SplashActivity.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| BuWanVideo/src/com/weikou/beibeivideo/ui/recommend/SearchActivity.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| BuWanVideo/src/com/weikou/beibeivideo/ui/recommend/SearchResultActivity.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
BuWanVideo/AndroidManifest.xml
@@ -333,7 +333,7 @@ android:value="570f28a578d6e12cba6f7f200b8d1c83"></meta-data> <meta-data android:name="UMENG_CHANNEL" android:value="baidu"></meta-data> android:value="meizu"></meta-data> <provider @@ -444,7 +444,6 @@ android:exported="true" android:label="@string/app_name" android:launchMode="singleTop" android:taskAffinity="" android:theme="@android:style/Theme.Translucent.NoTitleBar" /> <!-- QQ分享 --> @@ -524,19 +523,19 @@ android:name="XIAOMI_APPKEY" android:value="${XIAOMI_APPKEY}"></meta-data> <receiver android:name=".receiver.XMPushMessageReceiver" android:exported="true"> <intent-filter> <action android:name="com.xiaomi.mipush.RECEIVE_MESSAGE" /> </intent-filter> <intent-filter> <action android:name="com.xiaomi.mipush.MESSAGE_ARRIVED" /> </intent-filter> <intent-filter> <action android:name="com.xiaomi.mipush.ERROR" /> </intent-filter> </receiver> <!-- <receiver--> <!-- android:name=".receiver.XMPushMessageReceiver"--> <!-- android:exported="true">--> <!-- <intent-filter>--> <!-- <action android:name="com.xiaomi.mipush.RECEIVE_MESSAGE" />--> <!-- </intent-filter>--> <!-- <intent-filter>--> <!-- <action android:name="com.xiaomi.mipush.MESSAGE_ARRIVED" />--> <!-- </intent-filter>--> <!-- <intent-filter>--> <!-- <action android:name="com.xiaomi.mipush.ERROR" />--> <!-- </intent-filter>--> <!-- </receiver>--> <!--OPPO --> <meta-data BuWanVideo/build.gradle
@@ -61,7 +61,6 @@ implementation files('libs/nb_trade-4.0.0.27.aar') implementation 'androidx.cardview:cardview:1.0.0' // //视频播放器 @@ -79,7 +78,7 @@ implementation project(path: ':library-gallery') annotationProcessor 'com.github.jokermonn:permissions4m:2.1.2-processor' //微信SDK // api 'com.tencent.mm.opensdk:wechat-sdk-android-without-mta:+' api 'com.tencent.mm.opensdk:wechat-sdk-android-without-mta:+' //加载动画库 implementation 'com.github.ybq:Android-SpinKit:1.4.0' @@ -87,19 +86,18 @@ implementation 'com.qhutch.elevationimageview:elevationimageview:2.4' //穿山甲 implementation 'com.pangle.cn:ads-sdk-pro:4.9.0.8' implementation('com.pangle.cn:pangrowth-sdk:3.1.0.1') { exclude group: 'com.pangle.cn', module: 'pangrowth-dpsdk-live' //为保证兼容性 建议使用广告SDK版本 implementation "com.pangle.cn:mediation-sdk:5.7.0.9" implementation('com.pangle.cn:pangrowth-sdk:3.9.0.2') { exclude group: 'com.pangle.cn', module: 'partner-live-sdk' exclude group: 'com.pangle.cn', module: 'pangrowth-novel-sdk' exclude group: 'com.pangle.cn', module: 'pangrowth-game-sdk' exclude group: 'com.pangle.cn', module: 'pangrowth-luckycat-sdk' exclude group: 'com.squareup.okhttp3', module: 'okhttp' exclude group: 'com.pangle.cn', module: 'pangrowth-reward-sdk' // exclude group: 'com.pangle.cn', module: 'pangrowth-dpsdk' exclude group: 'com.pangle.cn', module: 'partner-live-sdk' exclude group: 'com.pangle.cn', module: 'partner-luckycat-api-sdk' exclude group: 'com.pangle.cn', module: 'pangrowth-luckycat-api' } implementation('com.bytedance.applog:RangersAppLog-Lite-cn:6.6.2') // implementation('com.bytedance.applog:RangersAppLog-Lite-cn:6.6.2') implementation('com.volcengine:apm_insight_crash:1.4.2') implementation('com.volcengine:apm_insight_sdk:1.0.3') @@ -132,16 +130,27 @@ disable 'MissingTranslation' } sourceSets { main { java { exclude '**/XMPushMessageReceiver.java' } } } defaultConfig { applicationId "com.doudou.ysvideo" versionCode 138 versionName "3.10.20" versionCode 143 versionName "3.10.25" multiDexEnabled = true minSdkVersion 17 targetSdkVersion 29 targetSdkVersion 30 ndk { //兼容64位与32位系统 abiFilters 'armeabi-v7a', 'arm64-v8a'//, 'x86', 'x86_64' abiFilters 'armeabi-v7a', 'arm64-v8a' // abiFilters 'arm64-v8a' } manifestPlaceholders = [ @@ -165,6 +174,7 @@ APPLOG_SCHEME : "rangersapplog.ffdaf9a8c6428599".toLowerCase() ] } dexOptions { javaMaxHeapSize = "4g" } @@ -239,13 +249,17 @@ //删除注释，防止注释里面的中文乱码导致更改后的内容系统无法正常解析 manifestContent = manifestContent.replaceAll("<!--[\\s\\S]*?-->", "") manifestContent = manifestContent.replace('<uses-permission android:name="android.permission.CAMERA" />', '') manifestContent = manifestContent.replace('<uses-permission android:name="android.permission.CAMERA"/>', '') manifestContent = manifestContent.replace('<uses-permission android:name="android.permission.BLUETOOTH" />', '') manifestContent = manifestContent.replace('<uses-permission android:name="android.permission.BLUETOOTH" />', '') manifestContent = manifestContent.replace('<uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />', '') manifestContent = manifestContent.replace('<uses-permission android:name="com.android.launcher.permission.UNINSTALL_SHORTCUT" />', '') manifestContent = manifestContent.replace('<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />', '') manifestContent = manifestContent.replace('<uses-permission android:name="android.permission.REORDER_TASKS" />', '') manifestContent = manifestContent.replace('<uses-permission android:name="android.permission.VIBRATE"/>', '') println "AndroidManifest-Content:" println "AndroidManifest-Content:--------------------------------------" println manifestContent file(manifestPath).write(manifestContent) } BuWanVideo/src/com/weikou/beibeivideo/ui/SplashActivity.java
@@ -30,6 +30,7 @@ import com.google.gson.Gson; import com.lcjian.library.dialog.DialogUtil; import com.lcjian.library.util.ManifestDataUtil; import com.lcjian.library.util.ScreenUtils; import com.lcjian.library.util.common.BitmapUtils; import com.lcjian.library.util.common.DrawableUtils; @@ -76,6 +77,7 @@ private ImageView iv_bg; private TextView ad_close_time; private Dialog pdialog; private static String TAG = "SplashActivity"; @@ -135,16 +137,30 @@ data += String.format("<a href='%s'>《隐私政策》</a>和", BeibeiConstant.PRIVACY_POLICY); data += String.format("<a href='%s'>《用户协议》</a>", BeibeiConstant.USER_AGREEMENT); data += "内的所有条款，<b>尤其是：<br>" + "1、我们对您的个人信息（包括但不限于<font color='#FF0000'>设备MAC地址、DEVICEID/IMEI/AndroidID/OAID/IMSI/ICCID/GAID/MEID</font>等信息）的收集/保存/使用/对外提供/保护等规则条款,以及您的用户权利等条款；<br>" + "1、)为识别您的设备,并预防恶意程序及反作弊、提高服务安全性、保障运营质量及效率，我们会收集您" + "的设备信息（包括<font color='#FF0000'>IMEI、设备序列号、OAID、MEID、Android ID、IMSI、GUID、MAC地址、SIM卡序列号</font> ）、<font color='#FF0000'>已安装APP信息</font>或运行中的进程信息<br>" + "2、约定我们的限制责任、免责条款；<br>" + "3、其他以加粗或斜体字进行标识的重要条款。</b><br>" + "如您对协议有任何疑虑，可通过电子邮箱： yesbd@qq.com 向我们询问，我们将为您竭诚解答。您点击“同意并继续”的行为代表您已阅读完毕并接受以上协议全部条款。如您同意以上协议内容，请您点击“同意并继续”，开始使用您的产品。"; if (!UserUtil.isAgreeUserProtocol(BeibeiVideoApplication.application) && !BeibeiConstant.IS_TEST) { Dialog dialog = new UserProtocolDialog.Builder(this).setNegativeButton("不同意", new DialogInterface.OnClickListener() { pdialog = new UserProtocolDialog.Builder(this).setNegativeButton("不同意", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { DialogUtil.dismiss(pdialog); AlertDialog alertDialog = new AlertDialog.Builder(SplashActivity.this).setTitle("温馨提示").setMessage("我们非常重视对您个人信息的保护，承诺严格按照"+ getResources().getString(R.string.app_name) +"隐私权政策保护及处理您的信息，如不同意该政策，很遗憾我们将无法提供服务").setNegativeButton("退出应用", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { SplashActivity.this.finish(); } }).setPositiveButton("再次查看", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog_, int which) { DialogUtil.show(pdialog); } }).create(); alertDialog.setCanceledOnTouchOutside(false); alertDialog.show(); } }).setPositiveButton("同意并继续", new DialogInterface.OnClickListener() { @Override @@ -156,22 +172,21 @@ @Override public void run() { new PermissionAuthNotifyDialog.Builder(SplashActivity.this).setPositiveButton(null, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialogInterface, int i) { dialogInterface.dismiss(); // new PermissionAuthNotifyDialog.Builder(SplashActivity.this).setPositiveButton(null, new DialogInterface.OnClickListener() { // @Override // public void onClick(DialogInterface dialogInterface, int i) { // dialogInterface.dismiss(); // init(); // } // }).create().show(); init(); } }).create().show(); } }); } }).setData(data).create(); if (!isFinishing()) { DialogUtil.show(dialog); DialogUtil.show(pdialog); } } else { @@ -460,22 +475,42 @@ } private void myRequetPermission() { if (ContextCompat.checkSelfPermission(this, Manifest.permission.READ_PHONE_STATE) != PERMISSION_GRANTED) { SharedPreferences sharedPreferences = getSharedPreferences("permission", Context.MODE_PRIVATE); //是否需要再次请求权限 if (sharedPreferences.getBoolean("show", true)) ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.READ_PHONE_STATE}, REQUEST_CODE); else { // final String channel = ManifestDataUtil.getAppMetaData(getApplicationContext(), "UMENG_CHANNEL"); // // 小米不弹出权限申请框 // if (ContextCompat.checkSelfPermission(this, Manifest.permission.READ_PHONE_STATE) != PERMISSION_GRANTED && !"xiaomi".equalsIgnoreCase(channel)) { // SharedPreferences sharedPreferences = getSharedPreferences("permission", Context.MODE_PRIVATE); // //是否需要再次请求权限 // if (sharedPreferences.getBoolean("show", true)) { // if ("huawei".equalsIgnoreCase(channel)) { // next(); // } else { // ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.READ_PHONE_STATE}, REQUEST_CODE); // iv_bg.post(new Runnable() { // @Override // public void run() { // findViewById(R.id.ll_authority_notify).setVisibility(View.VISIBLE); // } // }); // } // } else { // next(); // } // } else { // next(); // } next(); } } else { next(); } } private void next() { //百度内容联盟 // MobadsPermissionSettings.setPermissionReadDeviceID(true); iv_bg.post(new Runnable() { @Override public void run() { findViewById(R.id.ll_authority_notify).setVisibility(View.GONE); } }); if (!BeibeiVideoApplication.IsInited()) { BeibeiVideoApplication.init(BeibeiVideoApplication.application, new BeibeiVideoApplication.InitListener() { @Override @@ -529,8 +564,6 @@ // 设置哀悼模式 ConfigUtil.saveAiDaoMode(getApplicationContext(), data.optBoolean("aiDaoMode")); //保存免广告权益持续时间 @@ -593,6 +626,7 @@ if (requestCode == REQUEST_CODE) { for (int i = 0; i < permissions.length; i++) { if (grantResults[i] == PERMISSION_GRANTED) {//选择了“始终允许” init(); } else { //拒绝了授权 BuWanVideo/src/com/weikou/beibeivideo/ui/recommend/SearchActivity.java
@@ -450,9 +450,9 @@ // 1.加载广告，先设置加载上下文环境和条件 private void initAdvertisement() { //vivo无广告 if ("vivo".equalsIgnoreCase(ManifestDataUtil.getAppMetaData(getApplicationContext(), "UMENG_CHANNEL"))) { return; } // if ("vivo".equalsIgnoreCase(ManifestDataUtil.getAppMetaData(getApplicationContext(), "UMENG_CHANNEL"))) { // return; // } AdUtil.AD_TYPE adType1 = AdUtil.getAdType(getApplicationContext(), AdPositionEnum.videoSearch); if (adType1 == AdUtil.AD_TYPE.gdt) { BuWanVideo/src/com/weikou/beibeivideo/ui/recommend/SearchResultActivity.java
@@ -430,9 +430,9 @@ //拉取2.0的自渲染广告 private void loadAd() { //vivo无广告 if ("vivo".equalsIgnoreCase(ManifestDataUtil.getAppMetaData(getApplicationContext(), "UMENG_CHANNEL"))) { return; } // if ("vivo".equalsIgnoreCase(ManifestDataUtil.getAppMetaData(getApplicationContext(), "UMENG_CHANNEL"))) { // return; // } String pid = GDTConstant.PID_2_SEARCH_RESULT_ALBUM; NativeUnifiedAD mAdManager = new NativeUnifiedAD(this, pid, new NativeADUnifiedListener() {
