welfare activity list

app/src/main/java/com/sheep/gamegroup/model/entity/ArticleTag.java

@@ -30,7 +30,15 @@ public class ArticleTag {
 
     public ArticleTag(int id, int subType) {
         this.id = id;
-        this.name = name;
+        this.subType = subType;
+    }
+
+    public int getSubType() {
+        return subType;
+    }
+
+    public void setSubType(int subType) {
+        this.subType = subType;
     }
 
     public void setUpdated_at(int updated_at){

app/src/main/java/com/sheep/gamegroup/module/find/activity/ActFind.java

@@ -35,11 +35,12 @@ public class ActFind extends BaseContainerActivity {
         int forWhat = getIntent().getIntExtra("for_what", 0);
         if (forWhat == FOR_GAME) {
             int forType = getIntent().getIntExtra("for_type", 0);
+            int forSubtype = getIntent().getIntExtra("for_subtype", 0);
             TitleBarUtils.getInstance()
                     .setShowOrHide(this, true)
-                    .setTitle(this, forType == 1 ? "游戏资讯" : "游戏活动")
+                    .setTitle(this, forSubtype == 1 ? "游戏资讯" : "活动中心")
                     .setTitleFinish(this);
-            FgtFindChild fgt = FgtFindChild.newInstance(new ArticleTag(-1, forType));
+            FgtFindChild fgt = FgtFindChild.newInstance(new ArticleTag(-forType, forSubtype));
             fgt.setRefreshOnType(BaseListFragment5.REFRESH_ON_CREATE);
             return fgt;
         } else {

app/src/main/java/com/sheep/gamegroup/util/Jump2View.java

@@ -2627,10 +2627,11 @@ public class Jump2View {
         activity.startActivity(DataUtil.putObject(new Intent(activity, ActArticleComment.class), article_id));
     }
 
-    public void goActFind4Game(Activity activity, int type) {
+    public void goActFind4Game(Activity activity, int type, int subType) {
         Intent in = new Intent(activity, ActFind.class);
         in.putExtra("for_what", 1);
         in.putExtra("for_type", type);
+        in.putExtra("for_subtype", subType);
         activity.startActivity(in);
     }
 

app/src/main/java/com/sheep/gamegroup/util/js/KFZSJs.java

@@ -655,8 +655,8 @@ public class KFZSJs {
     }
 
     @JavascriptInterface
-    public void gotoFind4Game(int type) {
-        Jump2View.getInstance().goActFind4Game(activity, type);
+    public void gotoFind4Game(int type, int subType) {
+        Jump2View.getInstance().goActFind4Game(activity, type, subType);
     }
 
     @JavascriptInterface

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtFindChild.java

@@ -266,6 +266,7 @@ public class FgtFindChild extends BaseListFragment5<Article> {
             ArticleTag articleTag = DataUtil.getObject(bundle, ArticleTag.class);
             if (articleTag != null) {
                 type = articleTag.getId();
+                subType = articleTag.getSubType();
             }
         }
         if (type == 0) {