Просмотр исходного кода

领取成功新增两个字段/小米新需求修改,小绵羊发版本

liujiangyao лет назад: 7
Родитель
Сommit
f617990382

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

@@ -1529,6 +1529,8 @@ public class CommonUtil {
                                 G.showToast(baseMessage.getMsg());
                                 ViewUtil.newInstance().hideProgress(activity);
                                 String text = String.format(activity.getResources().getString(R.string.get_xiaomi_game_success_dialog),"小米账号","等带服务器开发");
+                                final JSONObject jsonObject1 = JSONObject.parseObject(JSONObject.toJSONString(baseMessage.getData()));
+
                                 ViewUtil.showMsgDialog(activity,
                                         text,
                                         "恭喜你获得福利号",
@@ -1544,7 +1546,8 @@ public class CommonUtil {
                                                     intent.setData(uri);
                                                     activity.sendBroadcast(intent); // 发送广播通知相册
                                                 } else {
-                                                    ViewUtil.sysSaveImage((View) v.getParent().getParent(), "小绵羊-小米", "小绵羊-小米账号");
+                                                    if(jsonObject1 != null)
+                                                        ViewUtil.sysSaveImage((View) v.getParent().getParent(), jsonObject1.getString("account")+"", jsonObject1.getString("password")+"");
                                                 }
                                                 G.showToast("已保存");
                                                 EventBus.getDefault().post(BigEvent.get().setEventTypes(EventTypes.REFRESH_XIAOMI_GAME_LIST));

+ 33 - 0
app/src/main/java/com/sheep/gamegroup/util/DeviceIDUtil.java

@@ -33,6 +33,7 @@ import java.util.UUID;
  * realicing@sina.com
  */
 public class DeviceIDUtil {
+    private static DeviceIDUtil deviceIDUtil;
 
     /*
      *
@@ -56,6 +57,11 @@ public class DeviceIDUtil {
     private static final String LOACL_FILENAME_KEY = "loacl_filename_key";
 
 
+    public static DeviceIDUtil newInstance(){
+        if (deviceIDUtil == null)
+            deviceIDUtil = new DeviceIDUtil();
+        return deviceIDUtil;
+    }
 
 
     //获取设备唯一id
@@ -399,5 +405,32 @@ public class DeviceIDUtil {
 
     }
 
+    /**
+     * 数字转换成万 千 百 十
+     */
+    public String numberCnvert(int number){
+        int wanWei = number / 10000;
+        int qianWei = number % 10000 /1000;
+        int baiWei = number % 1000 /100;
+        int shiWei = number % 100 /10;
+        int geWei = number % 10 ;
+
+        StringBuffer stringBuffer = new StringBuffer();
+        if(wanWei > 0){
+            stringBuffer.append(wanWei+"万");
+        }
+        if(qianWei > 0){
+            stringBuffer.append(qianWei+"千");
+        }
+        if(baiWei > 0){
+            stringBuffer.append(baiWei+"百");
+        }
+        if(shiWei > 0){
+            stringBuffer.append(shiWei+"十");
+        }
+        stringBuffer.append(geWei);
+
+        return stringBuffer.toString();
+    }
 
 }

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

@@ -35,6 +35,7 @@ import com.sheep.gamegroup.model.entity.FindTag;
 import com.sheep.gamegroup.model.entity.TaskReleaseEty;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.util.CommonUtil;
+import com.sheep.gamegroup.util.DeviceIDUtil;
 import com.sheep.gamegroup.util.GlideImageLoader;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.ListUtil;
@@ -154,8 +155,8 @@ public class ActXiaomiGame extends BaseActivity {
 
                 GlideImageLoader.setGameImage((ImageView) rootConvertView.findViewById(R.id.item_icon_iv), item.getIcon());
                 item_name_tv.setText(item.getName()+"");
-                item_num_tv.setText("角色扮演");
-                item_date_tv.setText("2万人在玩");
+                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());
 
                 if(item.getReceive_account() == 0){//未领取账号

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

@@ -36,7 +36,7 @@ public class XiaomiGameEntity implements Serializable,IDownload {
     private String package_id;//stringGameID
     private String package_name;//string应用包名称
 
-    private String package_sizes;//number($float)包大小(M)
+    private String package_size;//number($float)包大小(M)
 
     private int package_type;//integer($int64)出包类型:1:快发出包 2:腾讯出包 3:小米出包 4:其它
 
@@ -59,6 +59,30 @@ public class XiaomiGameEntity implements Serializable,IDownload {
     private long updated_at;//integer($int64)
     private long versions;//string版本号
 
+    private int download_count_increment;//下载数量的增量
+
+    private String type;//类型
+
+    public void setPackage_sizes(String package_sizes) {
+        this.package_size = package_sizes;
+    }
+
+    public int getDownload_count_increment() {
+        return download_count_increment;
+    }
+
+    public void setDownload_count_increment(int download_count_increment) {
+        this.download_count_increment = download_count_increment;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
     public int getId() {
         return Id;
     }
@@ -139,6 +163,11 @@ public class XiaomiGameEntity implements Serializable,IDownload {
         return icon;
     }
 
+    @Override
+    public String getPackage_size() {
+        return package_size;
+    }
+
     public void setIcon(String icon) {
         this.icon = icon;
     }
@@ -191,19 +220,11 @@ public class XiaomiGameEntity implements Serializable,IDownload {
         this.package_name = package_name;
     }
 
-    public String getPackage_size() {
-        return package_sizes;
-    }
-
     @Override
     public int getAcceptedTaskId() {
         return 0;
     }
 
-    public void setPackage_size(String package_size) {
-        this.package_sizes = package_size;
-    }
-
     public int getPackage_type() {
         return package_type;
     }