From 2c5b6e472c368e80d85b8ea2b461c9ea62981d9b Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期日, 08 十月 2023 11:28:56 +0800
Subject: [PATCH] 广告升级/bug修复

---
 BuWanVideo/src/com/weikou/beibeivideo/ui/main/MainActivity.java |   48 ++++++++++++++++++++++++++++++++++--------------
 1 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/BuWanVideo/src/com/weikou/beibeivideo/ui/main/MainActivity.java b/BuWanVideo/src/com/weikou/beibeivideo/ui/main/MainActivity.java
index d01f2a9..a5c22c8 100644
--- a/BuWanVideo/src/com/weikou/beibeivideo/ui/main/MainActivity.java
+++ b/BuWanVideo/src/com/weikou/beibeivideo/ui/main/MainActivity.java
@@ -69,7 +69,6 @@
 import com.weikou.beibeivideo.util.ui.AiDaoUtil;
 import com.weikou.beibeivideo.util.ui.TopStatusSettings;
 import com.yeshi.appupdate.AppUpdate;
-import com.yeshi.push.PushUtil;
 
 import org.apache.http.Header;
 import org.greenrobot.eventbus.EventBus;
@@ -130,7 +129,7 @@
 
         return new Fragment[]{
                 new HomeFragment(), new DrawVideoFragment(getSupportFragmentManager()),
-                new DYNewsFragment(getSupportFragmentManager()), new MineFragment(), new NovelFragment(getSupportFragmentManager())
+                new DYNewsFragment(getSupportFragmentManager()),new DYDramaVideoFragment(getSupportFragmentManager()), new MineFragment()
 
         };
     }
@@ -148,20 +147,21 @@
                         .changeFragment(DrawVideoFragment.class);
             }
             break;
+            case R.id.rb_nav_short_tv: {
+                mFragmentSwitchHelper
+                        .changeFragment(DYDramaVideoFragment.class);
+            }
+            break;
             case R.id.rb_nav_discover: {
                 mFragmentSwitchHelper
                         .changeFragment(DYNewsFragment.class);
-            }
-            break;
-            case R.id.rb_nav_novel: {
-                mFragmentSwitchHelper
-                        .changeFragment(NovelFragment.class);
             }
             break;
             case R.id.rb_nav_mine: {
                 mFragmentSwitchHelper.changeFragment(MineFragment.class);
             }
             break;
+
         }
     }
 
@@ -170,7 +170,7 @@
         super.onCreate(savedInstanceState);
         setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);// 閿佸畾绔栧睆
         setContentView(R.layout.activity_main);
-        if(ConfigUtil.isAiDaoMode(this)){
+        if (ConfigUtil.isAiDaoMode(this)) {
             AiDaoUtil.setAiDaoMode(this);
         }
 
@@ -214,6 +214,16 @@
                 R.id.fl_main_fragment_container, getSupportFragmentManager(), getFragments()
         );
 
+        findViewById(R.id.tv_nav_cartoon).setOnClickListener(new View.OnClickListener() {
+
+            @Override
+            public void onClick(View v) {
+                Intent intent = new Intent(MainActivity.this, BrowserActivity.class);
+//                intent.putExtra("title", "妞拌婕敾");
+//                intent.putExtra("url", "http:///")m.cartoon.yeshitv.com;
+                startActivity(intent);
+            }
+        });
 
 
         rg_nav = findViewById(R.id.rg_nav);
@@ -309,6 +319,7 @@
             mAQuery.id(R.id.rb_nav_discover).visibility(View.GONE);
             mAQuery.id(R.id.rb_nav_draw_video).visibility(View.GONE);
             mAQuery.id(R.id.rb_nav_novel).visibility(View.GONE);
+            mAQuery.id(R.id.rb_nav_short_tv).visibility(View.GONE);
         } else {
             setSearchBarVisibility();
             mAQuery.id(R.id.rb_nav_draw_video).visibility(View.VISIBLE);
@@ -335,12 +346,12 @@
         if (YouthUtil.isOpenYouthMode(getApplicationContext())) {
             mAQuery.id(R.id.ll_top).visibility(View.GONE);
         } else {
-            if (mAQuery.id(R.id.rb_nav_draw_video).isChecked() || mAQuery.id(R.id.rb_nav_novel).isChecked() || mAQuery.id(R.id.rb_nav_discover).isChecked()) {
+            if (mAQuery.id(R.id.rb_nav_draw_video).isChecked() || mAQuery.id(R.id.rb_nav_novel).isChecked() || mAQuery.id(R.id.rb_nav_discover).isChecked()|| mAQuery.id(R.id.rb_nav_short_tv).isChecked()) {
                 mAQuery.id(R.id.ll_top).visibility(View.GONE);
             } else {
                 mAQuery.id(R.id.ll_top).visibility(View.VISIBLE);
             }
-            if (mAQuery.id(R.id.rb_nav_draw_video).isChecked()) {
+            if (mAQuery.id(R.id.rb_nav_draw_video).isChecked()||mAQuery.id(R.id.rb_nav_short_tv).isChecked()) {
 //                mAQuery.id(R.id.v_status_bar).background(Color.BLACK);
                 //TODO 璁剧疆鐘舵�佹爮涓烘繁鑹�
                 TopStatusSettings.setStatusViewAndLightColor(this);
@@ -413,6 +424,15 @@
         final AdUtil.AD_TYPE adType = AdUtil.getAdType(getApplicationContext(), AdPositionEnum.homeInterstitial);
         if (adType == null) {
             return;
+        }
+
+        String channel = ManifestDataUtil.getAppMetaData(getApplicationContext(), "UMENG_CHANNEL");
+        if ("huawei".equalsIgnoreCase(channel)) {
+            // 鍗庝负骞冲彴鐨勫脊鍑哄箍鍛婃瘡澶╁彧鑳藉脊鍑轰竴娆�
+            if (!AdUtil.canShowAdHuaWei(getApplicationContext(), AdPositionEnum.homeInterstitial)) {
+                return;
+            }
+            AdUtil.showAdHuaWei(getApplicationContext(),AdPositionEnum.homeInterstitial);
         }
 
         adCallback = new Runnable() {
@@ -722,12 +742,12 @@
                     findViewById(R.id.rb_nav_draw_video).performClick();
                     break;
                 case 2:
-                    findViewById(R.id.rb_nav_discover).performClick();
+                    findViewById(R.id.rb_nav_short_tv).performClick();
                     break;
+//                case 3:
+//                    findViewById(R.id.rb_nav_novel).performClick();
+//                    break;
                 case 3:
-                    findViewById(R.id.rb_nav_novel).performClick();
-                    break;
-                case 4:
                     findViewById(R.id.rb_nav_mine).performClick();
                     break;
             }

--
Gitblit v1.8.0