liujiangyao преди 7 години
родител
ревизия
7bcf50edc3

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

@@ -1330,7 +1330,7 @@ public class CommonUtil {
                 .xiaomiGameList(
                         page,
                         per_page,
-                        0,
+                        1,
                         1,
                         name)
                 .subscribeOn(Schedulers.io())
@@ -1506,7 +1506,7 @@ public class CommonUtil {
      */
     public void xiaomiRevieceAcctoun(TextView find_information_game_task_top, final Object items, final Activity activity){
         XIAOMI_GAME_RECEIVE.onEvent();
-        find_information_game_task_top.setText("取福利号");
+        find_information_game_task_top.setText("取福利号");
         find_information_game_task_top.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {

+ 10 - 0
app/src/main/java/com/sheep/gamegroup/util/ConnectAddress.java

@@ -42,6 +42,16 @@ public enum ConnectAddress {
         public String getName() {
             return "张伟";
         }
+    },developSheeptest {
+
+        @Override
+        public String getAppUrl() {
+            return "http://test.sheep.kfzs.com/";
+        }
+        @Override
+        public String getName() {
+            return "开发测试服";
+        }
     },sheeptest {
 
         @Override

+ 6 - 5
app/src/main/java/com/sheep/gamegroup/view/activity/ActXiaomiGame.java

@@ -87,7 +87,7 @@ public class ActXiaomiGame extends BaseActivity {
     private List<XiaomiGameEntity> list = ListUtil.emptyList();
     private boolean isRefresh;
     private int page;
-    private int per_page;
+    private int per_page = 20;
 
     @Override
     protected int getLayoutId() {
@@ -129,9 +129,9 @@ public class ActXiaomiGame extends BaseActivity {
             }
             @Override
             public int getViewIdByType(int type) {//type来源于 getItemViewType 返回的值
-                if(type == -1 + list.size()){
-                    return R.layout.find_item_bottom;
-                }
+//                if(type == -1 + list.size()){
+//                    return R.layout.find_item_bottom;
+//                }
                 return R.layout.try_makemoney_item_recommend;
             }
 
@@ -158,6 +158,7 @@ public class ActXiaomiGame extends BaseActivity {
                 item_num_tv.setText(item.getType()+"");
                 item_date_tv.setText(DeviceIDUtil.newInstance().numberCnvert(item.getDownload_count_increment())+"人在玩");
                 detail_task_tv_center.setTag(PUBLIC_TAG_PREFIX_TEXTVIEW_LIST + item.getDownload_url());
+                detail_task_tv_center.setVisibility(View.VISIBLE);
 
                 if(item.getReceive_account() == 0){//未领取账号
 
@@ -250,7 +251,7 @@ public class ActXiaomiGame extends BaseActivity {
 
                                 if (page == 1)
                                     list.clear();
-                                ListUtil.addAll(list, newList);
+                                CommonUtil.getInstance().updateEmptyView(empty_view, ListUtil.addAll(list, newList) == 0?true:false);
                                 view_list.getAdapter().notifyDataSetChanged();
                             }
                         } catch (Exception e) {

+ 3 - 3
app/src/main/java/com/sheep/gamegroup/view/activity/XiaomiGameEntity.java

@@ -57,7 +57,7 @@ public class XiaomiGameEntity implements Serializable,IDownload {
     private int status;//integer($int32)1:开启 2:关闭
 
     private long updated_at;//integer($int64)
-    private long versions;//string版本号
+    private String versions;//string版本号
 
     private int download_count_increment;//下载数量的增量
 
@@ -305,11 +305,11 @@ public class XiaomiGameEntity implements Serializable,IDownload {
         this.updated_at = updated_at;
     }
 
-    public long getVersions() {
+    public String getVersions() {
         return versions;
     }
 
-    public void setVersions(long versions) {
+    public void setVersions(String versions) {
         this.versions = versions;
     }
     private DownloadHelper downloadHelper = new DownloadHelper();