From cbb88109494ffc7916f6639c20ce05c0cec941a9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 07 四月 2021 15:07:45 +0800
Subject: [PATCH] 3.9.1bug修复
---
BuWanVideo/src/com/weikou/beibeivideo/ui/SplashActivity.java | 129 +++++++++++++++++--------------------------
1 files changed, 51 insertions(+), 78 deletions(-)
diff --git a/BuWanVideo/src/com/weikou/beibeivideo/ui/SplashActivity.java b/BuWanVideo/src/com/weikou/beibeivideo/ui/SplashActivity.java
index c2ca03b..bccf7e0 100644
--- a/BuWanVideo/src/com/weikou/beibeivideo/ui/SplashActivity.java
+++ b/BuWanVideo/src/com/weikou/beibeivideo/ui/SplashActivity.java
@@ -9,6 +9,8 @@
import android.content.SharedPreferences;
import android.content.pm.ActivityInfo;
import android.content.pm.PackageManager;
+import android.graphics.Bitmap;
+import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.AsyncTask;
import android.os.Build;
@@ -24,14 +26,20 @@
import com.bumptech.glide.Glide;
import com.google.gson.Gson;
+import com.lcjian.library.util.ScreenUtils;
+import com.lcjian.library.util.common.BitmapUtils;
+import com.lcjian.library.util.common.DrawableUtils;
import com.lcjian.library.util.common.StringUtils;
import com.lcjian.library.util.glide.GlideRoundTransform;
import com.weikou.beibeivideo.BasicTextHttpResponseHandler;
import com.weikou.beibeivideo.BeibeiVideoAPI;
import com.weikou.beibeivideo.BeibeiVideoApplication;
import com.weikou.beibeivideo.R;
+import com.weikou.beibeivideo.entity.ad.AdPidInfo;
import com.weikou.beibeivideo.entity.ad.AdPositionEnum;
import com.weikou.beibeivideo.entity.ad.AdTypeVO;
+import com.weikou.beibeivideo.entity.ad.SplashAdLoadInfo;
+import com.weikou.beibeivideo.ui.ad.SplashADFragment;
import com.weikou.beibeivideo.ui.dialog.UserProtocolDialog;
import com.weikou.beibeivideo.ui.main.MainActivity;
import com.weikou.beibeivideo.util.BeibeiConstant;
@@ -43,6 +51,7 @@
import com.weikou.beibeivideo.util.ad.CSJConstant;
import com.weikou.beibeivideo.util.ad.GDTConstant;
import com.weikou.beibeivideo.util.ad.SplashAdUtil;
+import com.weikou.beibeivideo.util.ui.TopStatusSettings;
import org.apache.http.Header;
import org.json.JSONObject;
@@ -58,10 +67,9 @@
private ViewGroup vg_ad;
private ViewGroup vg_input;
+ private ImageView iv_bg;
private TextView ad_close_time;
-
- private ImageView iv_logo;
private static String TAG = "SplashActivity";
@@ -81,14 +89,12 @@
// }
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
setContentView(R.layout.activity_splash);
- initStatusBar();
+ TopStatusSettings.setStatusViewAndDeepColor(this);
vg_ad = findViewById(R.id.fl_splash_ad);
vg_input = findViewById(R.id.fl_input);
ad_close_time = findViewById(R.id.ad_close_time);
- iv_logo = findViewById(R.id.iv_logo);
-
- Glide.with(getApplicationContext()).load(R.drawable.ic_launcher).transform(new GlideRoundTransform(getApplicationContext(), 5)).into(iv_logo);
+ iv_bg = findViewById(R.id.iv_bg);
SharedPreferences preferences = getSharedPreferences("link_page",
Context.MODE_PRIVATE);
@@ -108,7 +114,17 @@
//鍒濆鍖栦竴娆anner锛屽惁鍒欏悗闈anner浣跨敤鏃朵細鍑虹幇鍗￠】
// new BannerView(SplashActivity.this, ADSize.BANNER, BeibeiConstant.GDT_ID, BeibeiConstant.GDT_PLAYER_DETAIL);
//寮圭敤鎴峰崗璁
+
showProtocol();
+
+
+ //璁剧疆鑳屾櫙鍥剧墖
+ Drawable drawable = getResources().getDrawable(R.drawable.ic_splash_bg);
+ Bitmap bitmap = DrawableUtils.drawableToBitmap(drawable);
+ int width = ScreenUtils.getScreenWidth(this);
+ float scaleRate = width * 1.0f / bitmap.getWidth();
+ Bitmap bitmap1 = BitmapUtils.scaleImage(bitmap, scaleRate, scaleRate);
+ iv_bg.setImageBitmap(bitmap1);
}
@@ -124,7 +140,7 @@
"4銆佹湭缁忕洃鎶や汉鍚屾剰锛屾垜浠笉浼氭敹闆嗕娇鐢�14鍛ㄥ瞾浠ヤ笅锛堝惈14鍛ㄥ瞾锛夋湭鎴愬勾浜轰釜浜轰俊鎭紝涓斾笉浼氬埄鐢ㄥ叾淇℃伅鎺ㄩ�佹柊闂汇�佹椂鏀夸俊鎭�佸箍鍛婄瓑瀹氬悜鎺ㄩ�佹椿鍔ㄣ��";
if (!UserUtil.isAgreeUserProtocol(BeibeiVideoApplication.application) && !BeibeiConstant.IS_TEST) {
- new UserProtocolDialog.Builder(this).setNegativeButton("涓嶅悓鎰�", new DialogInterface.OnClickListener() {
+ Dialog dialog = new UserProtocolDialog.Builder(this).setNegativeButton("涓嶅悓鎰�", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
SplashActivity.this.finish();
@@ -142,7 +158,12 @@
}
});
}
- }).setData(data).create().show();
+ }).setData(data).create();
+
+ if (!isFinishing()) {
+ dialog.show();
+ }
+
} else {
//璇锋眰鏉冮檺
vg_ad.post(new Runnable() {
@@ -399,79 +420,26 @@
*
* @param adType
*/
- private void loadSplashAd(final AdUtil.AD_TYPE adType, final String pid) {
- SplashAdUtil.loadAD(pid, adType, SplashActivity.this, vg_input, vg_ad, ad_close_time, new SplashAdUtil.SplashAdListener() {
+
+ private SplashADFragment splashADFragment;
+
+ private void loadSplashAd(AdUtil.AD_TYPE adType, String pid) {
+ AdPidInfo adPidInfo2 = null;
+ if (adType == AdUtil.AD_TYPE.gdt) {
+ adPidInfo2 = new AdPidInfo(AdUtil.AD_TYPE.csj, CSJConstant.SPLASH_AD);
+ } else {
+ adPidInfo2 = new AdPidInfo(AdUtil.AD_TYPE.gdt, BeibeiConstant.GDT_SPLASH_POSITION_ID);
+ }
+
+ splashADFragment = SplashADFragment.newInstance(new AdPidInfo(adType, pid), adPidInfo2);
+ splashADFragment.setAdShowListener(new SplashADFragment.AdShowListener() {
@Override
- public void close() {
- runOnUiThread(new Runnable() {
- @Override
- public void run() {
- toMainActivity();
- }
- });
- }
-
- @Override
- public void noAd() {//鍒濇鍔犺浇鏈姞杞藉嚭骞垮憡
- if (AdUtil.AD_TYPE.csj == adType) {
- //鍐嶆鍔犺浇骞跨偣閫氬箍鍛�
- SplashAdUtil.loadAD(pid, AdUtil.AD_TYPE.gdt, SplashActivity.this, vg_input, vg_ad, ad_close_time, new SplashAdUtil.SplashAdListener() {
- @Override
- public void close() {
- runOnUiThread(new Runnable() {
- @Override
- public void run() {
- toMainActivity();
- }
- });
- }
-
- @Override
- public void noAd() {
- runOnUiThread(new Runnable() {
- @Override
- public void run() {
- toMainActivity();
- }
- });
- }
- });
-
- } else if (AdUtil.AD_TYPE.gdt == adType) {
- //鍐嶆鍔犺浇绌垮北鐢插箍鍛�
- //鍐嶆鍔犺浇骞跨偣閫氬箍鍛�
- SplashAdUtil.loadAD(pid, AdUtil.AD_TYPE.csj, SplashActivity.this, vg_input, vg_ad, ad_close_time, new SplashAdUtil.SplashAdListener() {
- @Override
- public void close() {
- runOnUiThread(new Runnable() {
- @Override
- public void run() {
- toMainActivity();
- }
- });
- }
-
- @Override
- public void noAd() {
- runOnUiThread(new Runnable() {
- @Override
- public void run() {
- toMainActivity();
- }
- });
- }
- });
-
- } else {
- runOnUiThread(new Runnable() {
- @Override
- public void run() {
- toMainActivity();
- }
- });
- }
+ public void onClose() {
+ toMainActivity();
}
});
+ //鐩存帴鍔犺浇骞垮憡
+ getSupportFragmentManager().beginTransaction().replace(R.id.fl_splash_ad, splashADFragment).commitAllowingStateLoss();
}
private void myRequetPermission() {
@@ -501,6 +469,11 @@
//缃戦〉鍔犻�熷煙鍚�
String webSpeedUpHost = data.optString("webSpeedUpHost");
ConfigUtil.saveWebSpeedUpHost(getApplicationContext(), webSpeedUpHost);
+ //璁剧疆鎴戠殑椤甸潰banner
+ ConfigUtil.saveMinePageBanner(getApplicationContext(), data.optString("minePageBanner"));
+
+ ConfigUtil.savePlayerJumpOutProtocolPrefix(getApplicationContext(), data.optString("jumpAppProtocolPrefix"));
+
//淇濆瓨鍏嶅箍鍛婃潈鐩婃寔缁椂闂�
AdUtil.setPPTVNoAdRewardHour(getApplicationContext(), pptvNoAdRewardHour);
--
Gitblit v1.8.0