Explorar o código

刮奖区域提示信息展示;
上次刮奖时间判断修改为这个周期之前;
添加游戏详情页面扩展字段展示;
版本升级为3.4.0

zengjiebin %!s(int64=7) %!d(string=hai) anos
pai
achega
7a0414cddd

+ 10 - 0
app/src/main/java/com/sheep/gamegroup/model/entity/Applications.java

@@ -71,6 +71,8 @@ public class Applications implements IDownload, Serializable {
 
     private String game_tag;
 
+    private String ext_detail;
+
     private int sort;
 
     private int IsPlay;
@@ -343,6 +345,14 @@ public class Applications implements IDownload, Serializable {
         return comment_num;
     }
 
+    public String getExt_detail() {
+        return ext_detail;
+    }
+
+    public void setExt_detail(String ext_detail) {
+        this.ext_detail = ext_detail;
+    }
+
     @Override
     public String getPackage_names() {
         return package_name;

+ 19 - 0
app/src/main/java/com/sheep/gamegroup/model/entity/GameRecommend.java

@@ -1,5 +1,7 @@
 package com.sheep.gamegroup.model.entity;
 
+import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
+
 /**
  * Created by realicing on 2018/10/31.
  * realicing@sina.com
@@ -49,6 +51,7 @@ public class GameRecommend {
     private int EndTime;
 
     private int Status;
+    private int TagId;
 
     private int Order;
 
@@ -158,4 +161,20 @@ public class GameRecommend {
         return this.DisplayType;
     }
 
+    public int getTagId() {
+        return TagId;
+    }
+
+    public void setTagId(int tagId) {
+        TagId = tagId;
+    }
+
+
+
+    public GameListType getType() {
+        GameListType gameListType = new GameListType();
+        gameListType.setTag_id(TagId);
+        gameListType.setTitle(Title);
+        return gameListType;
+    }
 }

+ 2 - 1
app/src/main/java/com/sheep/gamegroup/view/adapter/AdpGameCenter1_2List.java

@@ -36,6 +36,7 @@ public class AdpGameCenter1_2List extends RecyclerViewAdapter<ListTypeList<GameR
         TextView item_play_game_list_tv = viewHolder.itemView.findViewById(R.id.item_play_game_list_tv);
         TextView item_play_game_list_more_tv = viewHolder.itemView.findViewById(R.id.item_play_game_list_more_tv);
         ViewUtil.setText(item_play_game_list_tv, gameListTypeList.getType().getTitle());
+        ViewUtil.setVisibility(item_play_game_list_more_tv, false);
         item_play_game_list_more_tv.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
@@ -71,7 +72,7 @@ public class AdpGameCenter1_2List extends RecyclerViewAdapter<ListTypeList<GameR
                     holder.itemView.setOnClickListener(new View.OnClickListener() {
                         @Override
                         public void onClick(View view) {
-                            Jump2View.getInstance().goPlayGameDetail((Activity) mContext, item.getAppId());
+                            Jump2View.getInstance().goActPlayGameList((Activity) mContext, item.getType());
                         }
                     });
                 }

+ 11 - 1
app/src/main/java/com/sheep/gamegroup/view/fragment/FgtGcGameAppDetail.java

@@ -7,6 +7,7 @@ import android.text.TextUtils;
 import android.view.View;
 import android.widget.TextView;
 
+import com.alibaba.fastjson.JSONObject;
 import com.kfzs.appstore.utils.adapter.recyclerview.RecyclerViewAdapter;
 import com.kfzs.appstore.utils.adapter.recyclerview.ViewHolder;
 import com.sheep.gamegroup.absBase.BaseRefreshLoadMoreFragment;
@@ -32,6 +33,7 @@ import com.sheep.jiuyan.samllsheep.SheepApp;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 import butterknife.BindView;
@@ -127,7 +129,15 @@ public class FgtGcGameAppDetail extends BaseRefreshLoadMoreFragment implements A
         entryList.add(new Entry<>("大小", gameApp.getPackage_size()));
         entryList.add(new Entry<>("更新日期", TimeUtil.TimeStamp2Date(gameApp.getDownload_at(), "yyyy-MM-dd")));
         entryList.add(new Entry<>("发行商", gameApp.getManufacturer()));
-        entryList.add(new Entry<>("开发商", gameApp.getManufacturer()));
+
+        JSONObject jsonObject = JSONObject.parseObject(gameApp.getExt_detail());
+        for (Map.Entry<String, Object> item : jsonObject.entrySet()) {
+            try {
+                entryList.add(new Entry<>(item.getKey(), item.getValue().toString()));
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
         gameInfoListArrayList.add(new GameInfoList("详细信息", new RecyclerViewAdapter<Entry<String, String>>(SheepApp.getInstance(), R.layout.item_gc_game_info, entryList) {
             @Override
             public void convert(ViewHolder viewHolder, Entry<String, String> item, int position) {

+ 2 - 2
gradle.properties

@@ -17,8 +17,8 @@
 # org.gradle.parallel=true
 #android.injected.build.model.only.versioned = 3
 
-VERSION_NAME=3.3.5
-VERSION_CODE=3003005
+VERSION_NAME=3.4.0
+VERSION_CODE=3004000
 ANDROID_COMPILE_SDK_VERSION=28
 ANDROID_BUILD_TOOLS_VERSION=28.0.3
 ANDROID_MIN_SDK_VERSION=18