Merge remote-tracking branch 'origin/新改版_poyo' into 新改版_poyo

# Conflicts:
#	config.gradle

common/src/main/java/com/yunbao/common/server/DownloadService.java

@@ -188,10 +188,8 @@ public class DownloadService extends Service {
         if (downloadFile == null || !downloadFile.exists()) return false;
         try {
             PackageManager pm = mContext.getPackageManager();
-            PackageInfo packageInfo = pm.getPackageInfo(getPackageName(), Context.MODE_PRIVATE);
             PackageInfo info = pm.getPackageArchiveInfo(downloadFile.getAbsolutePath(), PackageManager.GET_ACTIVITIES);
             if (info == null) return false;
-            if(info.versionCode == packageInfo.versionCode) return false;
         } catch (Exception e) {
             e.printStackTrace();
         }

live/src/main/java/com/yunbao/live/bean/LivePkBean.java

@@ -22,7 +22,27 @@ public class LivePkBean {
     private int levelAnchor;
     private int sex;
     private String attention;
+    private String pk_avatar_thumb;
+    private String is_shengwang;
 
+    public String getPk_avatar_thumb() {
+        if (pk_avatar_thumb == null) {
+            pk_avatar_thumb = "0";
+        }
+        return pk_avatar_thumb;
+    }
+
+    public String getIs_shengwang() {
+        return is_shengwang;
+    }
+
+    public void setIs_shengwang(String is_shengwang) {
+        this.is_shengwang = is_shengwang;
+    }
+
+    public void setPk_avatar_thumb(String pk_avatar_thumb) {
+        this.pk_avatar_thumb = pk_avatar_thumb;
+    }
     @JSONField(name = "isattention")
     public String getAttention() {
         if(StringUtil.isEmpty(attention)){

live/src/main/java/com/yunbao/live/dialog/FreePkDialogFragment.java

@@ -343,13 +343,15 @@ public class FreePkDialogFragment extends AbsDialogFragment implements View.OnCl
                 userBean.setId(bean.getUid());
                 userBean.setUserNiceName(bean.getUserNiceName());
                 userBean.setAvatar(bean.getAvatar());
-                if(bean.getPkUid().equals("0")||bean.getDrpkStatus().equals("0")){
+                if(bean.getPk_avatar_thumb().equals("0")&&bean.getDrpkStatus().equals("0")){
                     userBean.setPk(0);
                 }else{
                     userBean.setPk(1);
                 }
                 userBean.setAttention("1");
-                list.add(userBean);
+                if("1".equals(bean.getIs_shengwang())){
+                    list.add(userBean);
+                }
             }
             return list;
         }