浏览代码

修复游戏中心不能跳转网页的bug

zengjiebin 7 年之前
父节点
当前提交
55c75607ad

+ 0 - 9
app/src/main/java/com/sheep/gamegroup/model/entity/SlideshowEty.java

@@ -18,7 +18,6 @@ public class SlideshowEty {
     private int TypeId;
     private String Title;
 
-    private String objects;//预留字段
 
     public int getTypeId() {
         return TypeId;
@@ -36,14 +35,6 @@ public class SlideshowEty {
         Title = title;
     }
 
-    public String getObjects() {
-        return objects;
-    }
-
-    public void setObjects(String objects) {
-        this.objects = objects;
-    }
-
     public String getCreateTime() {
         return CreateTime;
     }

+ 14 - 16
app/src/main/java/com/sheep/gamegroup/util/CommonUtil.java

@@ -2364,8 +2364,7 @@ public class CommonUtil {
         Ext ext;
         switch (item.getType()) {// 0,类型 1跳转试玩赚钱、2单个任务详情、3信用卡办理、4 H5页面、5 微信二维码任务
             case 1:
-                Jump2View.getInstance()
-                        .goTryplayView(activity, null);
+                Jump2View.getInstance().goTryplayView(activity, null);
                 break;
             case 2:
                 ext = EntityUtils.getExtInfo(item.getExt());
@@ -2380,30 +2379,29 @@ public class CommonUtil {
                         .goCreditCardTaskList(activity, 3);
                 break;
             case 4:
-                if (!TextUtils.isEmpty(item.getObjects())) {
-                    ext = EntityUtils.getExtInfo(item.getExt());
-                    if (ext == null) {
-                        G.showToast(R.string.error_data);
-                        return;
-                    }
-                    if (ext.getTitle() == null)//外部浏览器加载H5
-                        Jump2View.getInstance().goWeb(activity, ext.getUrl());
-                    else//内部WebView加载H5
-                        Jump2View.getInstance().goWeb(activity, ext.getUrl(), ext.getTitle());
+                ext = EntityUtils.getExtInfo(item.getExt());
+                if (ext == null) {
+                    G.showToast(R.string.error_data);
+                    return;
                 }
-
+                if (ext.getTitle() == null)//外部浏览器加载H5
+                    Jump2View.getInstance().goWeb(activity, ext.getUrl());
+                else//内部WebView加载H5
+                    Jump2View.getInstance().goWeb(activity, ext.getUrl(), ext.getTitle());
                 break;
             case 5:
-                if (!TextUtils.isEmpty(item.getObjects())) {
-                    Jump2View.getInstance().goWeb(activity, item.getObjects(), "微信二维码辅助好友注册任务");
+                ext = EntityUtils.getExtInfo(item.getExt());
+                if (ext == null || ext.getUrl() == null) {
+                    G.showToast(R.string.error_data);
+                    return;
                 }
+                Jump2View.getInstance().goWeb(activity, ext.getUrl(), "微信二维码辅助好友注册任务");
 
                 break;
             case 6://连续任务
                 Jump2View.getInstance().goSequentialTaskView(activity);
                 break;
             case 9://打卡赚钱
-                G.showToast("打卡赚钱");
                 Jump2View.getInstance().goSignCardAct(activity, null);
                 break;
             case 7://玩转游戏

+ 0 - 2
app/src/main/java/com/sheep/gamegroup/view/fragment/FgtPlayGame.java

@@ -317,7 +317,6 @@ public class FgtPlayGame extends BaseFragment {
             slideshowEtyLists.clear();
             slideshowTitleList.clear();
             for (SlideshowEty slideshowEty : cacheSlideshowEtyList) {
-                slideshowEty.setObjects(CommonUtil.getInstance().getValue(slideshowEty.getExt()));
                 slideshowEtyLists.add(slideshowEty);
                 slideshowTitleList.add(slideshowEty.getTitle());
             }
@@ -344,7 +343,6 @@ public class FgtPlayGame extends BaseFragment {
                                 slideshowEtyLists.clear();
                                 slideshowTitleList.clear();
                                 for (SlideshowEty slideshowEty : slideshowEtyList) {
-                                    slideshowEty.setObjects(CommonUtil.getInstance().getValue(slideshowEty.getExt()));
                                     slideshowEtyLists.add(slideshowEty);
                                     slideshowTitleList.add(slideshowEty.getTitle());
                                 }

+ 0 - 2
app/src/main/java/com/sheep/gamegroup/view/fragment/FgtSmallSheep.java

@@ -848,7 +848,6 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
             banner.setVisibility(View.GONE);
         } else {
             for (SlideshowEty slideshowEty : cacheSlideshowEtyList) {
-                slideshowEty.setObjects(CommonUtil.getInstance().getValue(slideshowEty.getExt()));
                 slideshowEtyLists.add(slideshowEty);
                 slideshowTitleList.add(slideshowEty.getTitle());
             }
@@ -1195,7 +1194,6 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
                 slideshowEtyLists.clear();
                 slideshowTitleList.clear();
                 for (SlideshowEty slideshowEty : slideshowEtyList) {
-                    slideshowEty.setObjects(CommonUtil.getInstance().getValue(slideshowEty.getExt()));
                     slideshowEtyLists.add(slideshowEty);
                     slideshowTitleList.add(slideshowEty.getTitle());
                 }

+ 6 - 3
app/src/main/res/layout/fgt_welfare_center.xml

@@ -18,7 +18,8 @@
                 android:id="@+id/wc_hot_welfare_list_ll"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                android:visibility="gone">
 
                 <RelativeLayout style="@style/style_wc_rl">
 
@@ -42,7 +43,8 @@
                 android:id="@+id/wc_download_welfare_list_ll"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                android:visibility="gone">
 
                 <RelativeLayout style="@style/style_wc_rl">
 
@@ -72,7 +74,8 @@
 
             <RelativeLayout
                 android:id="@+id/wc_gift_center_title_container"
-                style="@style/style_wc_rl">
+                style="@style/style_wc_rl"
+                android:visibility="gone">
 
                 <TextView
                     style="@style/style_wc_line_title"