From 1981dee5aec45793d3c4ebdbc4e637528c71b3c5 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 03 二月 2021 19:20:47 +0800
Subject: [PATCH] 'PPTV'

---
 BuWanVideo/src/com/weikou/beibeivideo/ui/main/HomeFragment.java |   63 ++++++++++++-------------------
 1 files changed, 24 insertions(+), 39 deletions(-)

diff --git a/BuWanVideo/src/com/weikou/beibeivideo/ui/main/HomeFragment.java b/BuWanVideo/src/com/weikou/beibeivideo/ui/main/HomeFragment.java
index 5acb867..0c088a2 100644
--- a/BuWanVideo/src/com/weikou/beibeivideo/ui/main/HomeFragment.java
+++ b/BuWanVideo/src/com/weikou/beibeivideo/ui/main/HomeFragment.java
@@ -39,7 +39,6 @@
 import com.weikou.beibeivideo.ui.MyRetainViewFragment;
 import com.weikou.beibeivideo.ui.dialog.FloatADDialog;
 import com.weikou.beibeivideo.ui.dialog.UserProtocolDialog;
-import com.weikou.beibeivideo.ui.recommend.NovelJNZFragment;
 import com.weikou.beibeivideo.ui.recommend.RecommendFragment;
 import com.weikou.beibeivideo.util.BeibeiConstant;
 import com.weikou.beibeivideo.util.UserUtil;
@@ -84,39 +83,9 @@
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         if (!BeibeiConstant.IS_TEST)
-            showProtocol();
-    }
-
-
-    private void showProtocol() {
-        String data = "鎰熻阿鎮ㄥ" + getResources().getString(R.string.app_name) + "涓�鐩翠互鏉ョ殑淇′换锛�<br>";
-        data += "鎴戜滑渚濈収鏂扮殑鐩戠瑕佹眰鏉′緥鏇存柊浜�";
-        data += String.format("<a href='%s'>銆婇殣绉佹斂绛栥��</a>鍜�", BeibeiConstant.PRIVACY_POLICY);
-        data += String.format("<a href='%s'>銆婄敤鎴峰崗璁��</a>", BeibeiConstant.USER_AGREEMENT);
-        data += "涓洪噰鍙栫浉搴斿畨鍏ㄤ繚鎶ゆ帾鏂斤紝灏藉姏淇濇姢鎮ㄧ殑涓汉淇℃伅瀹夊叏鍙帶锛岀壒鍚戜綘璇存槑濡備笅锛�<br>" +
-                "1銆佹偍鍦ㄤ娇鐢�" + getResources().getString(R.string.app_name) + "鍚勯」浜у搧鎴栨湇鍔℃椂锛屽皢浼氭彁渚涗笌鍏蜂綋鍔熻兘鐩稿叧鐨勪釜浜轰俊鎭紙鍙兘娑夊強甯愬彿銆佷綅缃�佸瓨鍌ㄧ瓑淇℃伅锛夈��<br>" +
-                "2銆佹偍鍙互闅忔椂鏌ヨ銆佹洿姝c�佸垹闄ゆ偍鐨勪釜浜轰俊鎭紝鎴戜滑涔熸彁渚涜处鎴锋敞閿�鐨勬笭閬撱��<br>" +
-                "3銆佹湭缁忔偍鐨勫啀娆″悓鎰忥紝鎴戜滑涓嶄細灏嗕笂杩颁俊鎭敤浜庢偍鏈巿鏉冪殑鍏朵粬鐢ㄩ�旀垨鐩殑銆�<br>" +
-                "4銆佹湭缁忕洃鎶や汉鍚屾剰锛屾垜浠笉浼氭敹闆嗕娇鐢�14鍛ㄥ瞾浠ヤ笅锛堝惈14鍛ㄥ瞾锛夋湭鎴愬勾浜轰釜浜轰俊鎭紝涓斾笉浼氬埄鐢ㄥ叾淇℃伅鎺ㄩ�佹柊闂汇�佹椂鏀夸俊鎭�佸箍鍛婄瓑瀹氬悜鎺ㄩ�佹椿鍔ㄣ��";
-
-        if (!UserUtil.isAgreeUserProtocol(getContext())) {
-            new UserProtocolDialog.Builder(getActivity()).setNegativeButton("涓嶅悓鎰�", new DialogInterface.OnClickListener() {
-                @Override
-                public void onClick(DialogInterface dialog, int which) {
-                    getActivity().finish();
-                }
-            }).setPositiveButton("鍚屾剰", new DialogInterface.OnClickListener() {
-                @Override
-                public void onClick(DialogInterface dialog, int which) {
-                    dialog.dismiss();
-                    UserUtil.agreeUserProtocol(getContext());
-                    showFloatImgAd();
-                }
-            }).setData(data).create().show();
-        } else {
             showFloatImgAd();
-        }
     }
+
 
     /**
      * 灞曠ず鎮诞骞垮憡
@@ -149,7 +118,11 @@
                                         fl_indicator.postDelayed(new Runnable() {
                                             @Override
                                             public void run() {
-                                                builder.create().show();
+                                                try {
+                                                    builder.create().show();
+                                                } catch (Exception e) {
+
+                                                }
                                             }
                                         }, 2000);
 
@@ -204,6 +177,13 @@
                     cacheValue,
                     new TypeToken<List<HomeClass>>() {
                     }.getType());
+            if (list != null)
+                for (int i = 0; i < list.size(); i++) {
+                    if (list.get(i).getDataType().equalsIgnoreCase("novel")) {
+                        list.remove(i--);
+                    }
+                }
+
             categories.addAll(list);
         }
 
@@ -272,6 +252,13 @@
                                     }.getType());
 
                             categories.addAll(list);
+                            if (categories != null)
+                                for (int i = 0; i < categories.size(); i++) {
+                                    if (categories.get(i).getDataType().equalsIgnoreCase("novel")) {
+                                        categories.remove(i--);
+                                    }
+                                }
+
                             adapter.notifyDataSetChanged();
                             indicator.notifyDataSetChanged();
 
@@ -305,12 +292,10 @@
 
         @Override
         public Fragment getItem(int position) {
-            if ("novel".equalsIgnoreCase(mlist.get(position).getDataType())) {
-                return NovelJNZFragment.newInstance();
-            } else {
-                Fragment fragment = RecommendFragment.newInstance(mlist.get(position), position + "");
-                return fragment;
-            }
+
+            Fragment fragment = RecommendFragment.newInstance(mlist.get(position), position + "");
+            return fragment;
+
         }
 
         @Override

--
Gitblit v1.8.0