version:1.7

fix:
update:增加抢购，修复bug

app/src/main/java/com/uiuios/aios/bean/AppSelectBean.java

@@ -0,0 +1,44 @@
+package com.uiuios.aios.bean;
+
+import android.graphics.Bitmap;
+import android.graphics.drawable.Drawable;
+
+import java.io.Serializable;
+
+public class AppSelectBean implements Serializable {
+    private static final long serialVersionUID = 5054284058523960678L;
+
+    String appName;
+    String packageName;
+    Drawable icon;
+
+    public AppSelectBean(String appName, String packageName, Drawable icon) {
+        this.appName = appName;
+        this.packageName = packageName;
+        this.icon = icon;
+    }
+
+    public String getAppName() {
+        return appName;
+    }
+
+    public void setAppName(String appName) {
+        this.appName = appName;
+    }
+
+    public String getPackageName() {
+        return packageName;
+    }
+
+    public void setPackageName(String packageName) {
+        this.packageName = packageName;
+    }
+
+    public Drawable getIcon() {
+        return icon;
+    }
+
+    public void setIcon(Drawable icon) {
+        this.icon = icon;
+    }
+}

app/src/main/java/com/uiuios/aios/bean/DesktopIcon.java

@@ -1,23 +1,24 @@
 package com.uiuios.aios.bean;
 
 import android.content.Context;
-import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
 import android.graphics.drawable.Drawable;
 import android.os.Parcel;
 import android.os.Parcelable;
 
 import java.io.Serializable;
 
-public class DesktopIcon implements Serializable , Parcelable {
+public class DesktopIcon implements Serializable, Parcelable {
     private static final long serialVersionUID = 3358230413497783708L;
 
     String packageName;
+    String className;
     Drawable icon;
     String lable;
     int position;
 
-    private DesktopIcon() {
+    public DesktopIcon() {
 
     }
 
@@ -59,6 +60,14 @@ public class DesktopIcon implements Serializable , Parcelable {
         this.packageName = packageName;
     }
 
+    public String getClassName() {
+        return className;
+    }
+
+    public void setClassName(String className) {
+        this.className = className;
+    }
+
     public Drawable getIcon() {
         return icon;
     }
@@ -83,22 +92,24 @@ public class DesktopIcon implements Serializable , Parcelable {
         this.position = position;
     }
 
-    public static DesktopIcon creatDesktopIcon(Context context, ApplicationInfo applicationInfo) {
+    public static DesktopIcon creatDesktopIcon(Context context, ResolveInfo resolveInfo) {
         PackageManager pm = context.getPackageManager();
         DesktopIcon desktopIcon = new DesktopIcon();
-        desktopIcon.setPackageName(applicationInfo.packageName);
-        desktopIcon.setIcon(applicationInfo.loadIcon(pm));
-        desktopIcon.setLable(applicationInfo.loadLabel(pm).toString());
+        desktopIcon.setPackageName(resolveInfo.activityInfo.packageName);
+        desktopIcon.setClassName(resolveInfo.activityInfo.name);
+        desktopIcon.setIcon(resolveInfo.loadIcon(pm));
+        desktopIcon.setLable(resolveInfo.loadLabel(pm).toString());
         desktopIcon.setPosition(0);
         return desktopIcon;
     }
 
-    public static DesktopIcon creatDesktopIcon(Context context, ApplicationInfo applicationInfo, int position) {
+    public static DesktopIcon creatDesktopIcon(Context context, ResolveInfo resolveInfo, int position) {
         PackageManager pm = context.getPackageManager();
         DesktopIcon desktopIcon = new DesktopIcon();
-        desktopIcon.setPackageName(applicationInfo.packageName);
-        desktopIcon.setIcon(applicationInfo.loadIcon(pm));
-        desktopIcon.setLable(applicationInfo.loadLabel(pm).toString());
+        desktopIcon.setPackageName(resolveInfo.activityInfo.packageName);
+        desktopIcon.setClassName(resolveInfo.activityInfo.name);
+        desktopIcon.setIcon(resolveInfo.loadIcon(pm));
+        desktopIcon.setLable(resolveInfo.loadLabel(pm).toString());
         desktopIcon.setPosition(position);
         return desktopIcon;
     }

app/src/main/java/com/uiuios/aios/bean/GoodsInfo.java

@@ -1,5 +1,7 @@
 package com.uiuios.aios.bean;
 
+import com.google.gson.annotations.SerializedName;
+
 import java.io.Serializable;
 
 public class GoodsInfo implements Serializable {
@@ -23,6 +25,13 @@ public class GoodsInfo implements Serializable {
     int stock;
     /*跳转链接*/
     String jump_url;
+    String insure;
+    String deliver_goods;
+    String after_sales;
+    String ensure;
+    @SerializedName("class")
+    String type;
+
 
 
     public int getId() {
@@ -104,4 +113,44 @@ public class GoodsInfo implements Serializable {
     public void setJump_url(String jump_url) {
         this.jump_url = jump_url;
     }
+
+    public String getInsure() {
+        return insure;
+    }
+
+    public void setInsure(String insure) {
+        this.insure = insure;
+    }
+
+    public String getDeliver_goods() {
+        return deliver_goods;
+    }
+
+    public void setDeliver_goods(String deliver_goods) {
+        this.deliver_goods = deliver_goods;
+    }
+
+    public String getAfter_sales() {
+        return after_sales;
+    }
+
+    public void setAfter_sales(String after_sales) {
+        this.after_sales = after_sales;
+    }
+
+    public String getEnsure() {
+        return ensure;
+    }
+
+    public void setEnsure(String ensure) {
+        this.ensure = ensure;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
 }