添加个人中心vip相关界面

app/src/main/java/com/sheep/gamegroup/model/entity/Release_task.java

@@ -19,6 +19,7 @@ import java.util.Locale;
 
 public class Release_task implements Serializable {
     private float bonus;// 0,
+    private float vip_bonus;// 0,
     private String create_time;// 0,
     private String deadline;// 0,
     private String duration;// 0,
@@ -124,6 +125,14 @@ public class Release_task implements Serializable {
         return bonus;
     }
 
+    public float getVip_bonus() {
+        return vip_bonus;
+    }
+
+    public void setVip_bonus(float vip_bonus) {
+        this.vip_bonus = vip_bonus;
+    }
+
     public String getCreate_time() {
         return create_time;
     }
@@ -373,7 +382,7 @@ public class Release_task implements Serializable {
 
     //所有的奖励金额展示内容
     public CharSequence getVipBonusText() {
-        return String.format(Locale.CHINA, "会员：+%s元", NumberFormatUtils.retainMost2(bonus+0.1));
+        return String.format(Locale.CHINA, "会员：+%s元", NumberFormatUtils.retainMost2(vip_bonus));
 //        return new SpannableSb().append(String.format(Locale.CHINA, "会员：+%s元", NumberFormatUtils.retainMost2(bonus+0.1)), R.dimen.text_size_10).checkAndBr()
 //                .append(String.format(Locale.CHINA, "+%s元", NumberFormatUtils.retainMost2(bonus)), R.dimen.text_size_1)
 //                .getSsb();

app/src/main/java/com/sheep/gamegroup/model/entity/UserEntity.java

@@ -14,79 +14,44 @@ import java.io.Serializable;
 /**
  * Created by ljy on 2018/3/17.
  */
-@Table(name = "user")
 public class UserEntity implements Serializable {
 
-    @Column(name = "id", isId = true, autoGen = true)
     private int _id;//11,
-    @Column(name = "user_id")
     private String id;//11,
-    @Column(name = "mobile")
     private String mobile;//13688480841,
-    @Column(name = "nickname")
     private String nickname;//test332211,
-    @Column(name = "user_name")
     private String user_name;//test332211,
-    @Column(name = "set_password")
     private int set_password = 0;//test332211,
-    @Column(name = "balance")
     private String balance;//0,
-    @Column(name = "invitation_code")
     private String invitation_code;//032033476,
-    @Column(name = "parent_code")
     private String parent_code;//,
-    @Column(name = "total_asset")
     private String total_asset;//0,
-    @Column(name = "last_login_time")
     private String last_login_time;//1521254162,
-    @Column(name = "create_time")
     private String create_time;//1521254162,
-    @Column(name = "update_time")
     private String update_time;//1521254162,
-    @Column(name = "avatar")
     private String avatar;//,
-    @Column(name = "access_token")
     private String access_token;//_T6fiXabS5G_pQhLLP1qKA,
-    @Column(name = "refresh_token")
     private String refresh_token;//AiO5n79nT-6vjratlulxkg,
-    @Column(name = "open_id")
     private String open_id;//2804526,
-    @Column(name = "real_name")
     private String real_name;//,
-    @Column(name = "id_number")
     private String id_number;//,
-    @Column(name = "bank_card")
     private String bank_card;//,
-    @Column(name = "bank_card_mobile")
     private String bank_card_mobile;//,
-    @Column(name = "total_withdraw")
     private String total_withdraw;//0,
-    @Column(name = "wx_openid")
     private String wx_openid;//
-    @Column(name = "wx_nickname")
     private String wx_nickname;
-    @Column(name = "share_link")
     private String share_link;
-    @Column(name = "newbie_task_status")
     private int newbie_task_status;
-    @Column(name = "is_new")
     private int is_new;//1新用户 2老用户
-    @Column(name = "is_agent")
     private int is_agent;//0不是代理 1是代理
-    @Column(name = "certification_count")
     private int certification_count;//实名认证次数
-    @Column(name = "must_bind_mobile")
     private int must_bind_mobile;//是否必须绑定手机号 0不是 1是
-    @Column(name = "gender")
     private int gender;
-    @Column(name = "birthday")
     private String birthday;
-    @Column(name = "package_cate")//1官方包  2邀请包
     private int package_cate;
-    @Column(name = "create_time_line")
     private int create_time_line;//1:小绵羊3.0之前的用户（注：以后如果再次有这种区分之前用户的需求就陆续加一）
-    @Column(name = "bind_flag")
     private int bind_flag;//绑定表示 二进制形式 从低到高 第一位手机号 第二位QQ号 第三位微信
+    private int level;//用户等级 0：普通用户     1：VIP用户
 
     public int getPackage_cate() {
         return package_cate;
@@ -336,6 +301,14 @@ public class UserEntity implements Serializable {
         this.certification_count = certification_count;
     }
 
+    public int getLevel() {
+        return level;
+    }
+
+    public void setLevel(int level) {
+        this.level = level;
+    }
+
     public int getMust_bind_mobile() {
         return must_bind_mobile;
     }
@@ -427,4 +400,10 @@ public class UserEntity implements Serializable {
     public boolean alreadyExchangeCoupon() {
         return false;
     }
+    //用户等级 0：普通用户     1：VIP用户
+    public static final int LEVEL_VIP = 1;
+    //该用户是否是VIP用户
+    public boolean isVip(){
+        return level >= LEVEL_VIP;
+    }
 }

app/src/main/java/com/sheep/gamegroup/util/Jump2View.java

@@ -2491,4 +2491,12 @@ public class Jump2View {
         Intent intent = new Intent(activity, ActMediaChoose.class);
         activity.startActivity(DataUtil.putObject(intent, type));
     }
+
+    /**
+     * 跳转VIP介绍界面
+     * @param activity
+     */
+    public void goActVip(Activity activity) {
+
+    }
 }

app/src/main/java/com/sheep/gamegroup/util/TestUtil.java

@@ -860,7 +860,7 @@ public class TestUtil {
 
     //开启后可 测试充值与绑定微信和身份信息逻辑 等
     public static boolean isDev() {
-//        return BuildConfig.DEBUG;
-        return false;
+        return BuildConfig.DEBUG;
+//        return false;
     }
 }

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtPersonalCenter.java

@@ -66,6 +66,8 @@ import static com.sheep.gamegroup.util.ViewUtil.backgroundAlpha;
 public class FgtPersonalCenter extends BaseFragment {
     @BindView(R.id.icon_img_iv)
     ImageView iconImgIv;
+    @BindView(R.id.fgt_pc_item_top_vip_tv)
+    TextView fgt_pc_item_top_vip_tv;
     @BindView(R.id.name_tv)
     TextView nameTv;
     @BindView(R.id.sheep_num_tv)
@@ -108,6 +110,10 @@ public class FgtPersonalCenter extends BaseFragment {
     View fgt_person_center_my_focus_line;
     @BindView(R.id.fgt_person_center_my_focus)
     View fgt_person_center_my_focus;
+    @BindView(R.id.fgt_pc_item_vip_v)
+    View fgt_pc_item_vip_v;
+    @BindView(R.id.fgt_pc_item_vip_ll)
+    View fgt_pc_item_vip_ll;
 
     public UserEntity userEntity;
     private String faqUrl;
@@ -287,7 +293,9 @@ public class FgtPersonalCenter extends BaseFragment {
         ViewUtil.setText(nameTv, userEntity.getNickname());
         sheepNumTv.setText(String.format(Locale.CHINA, "绵羊号：%s", userEntity.getInvitation_code()));
         GlideImageLoader.setAvatar(iconImgIv, userEntity.getAvatar(), Color.argb(128, 255, 255, 255));
-
+        ViewUtil.setVisibility(fgt_pc_item_top_vip_tv, userEntity.isVip());
+        ViewUtil.setVisibility(fgt_pc_item_vip_v, userEntity.isVip());
+        ViewUtil.setVisibility(fgt_pc_item_vip_ll, userEntity.isVip());
     }
 
     /**
@@ -425,6 +433,9 @@ public class FgtPersonalCenter extends BaseFragment {
             case R.id.account_detail_layout://个人资料
                 Jump2View.getInstance().goPersionInfo(activity, null);
                 break;
+            case R.id.fgt_pc_item_vip_ll://VIP
+                Jump2View.getInstance().goActVip(activity);
+                break;
             case R.id.personalcenter_price_layout://我的资产
                 Jump2View.getInstance().goMyMoney(activity, null);
                 break;

app/src/main/res/layout/fgt_personacenter_item_top.xml

@@ -72,9 +72,10 @@
 
         <ImageView
             android:id="@+id/icon_img_iv"
-            android:layout_width="55dp"
+            android:layout_width="50dp"
             android:layout_height="55dp"
-            android:layout_marginTop="60dp"
+            android:paddingTop="5dp"
+            android:layout_marginTop="55dp"
             android:layout_marginBottom="@dimen/content_padding"
             android:layout_marginStart="@dimen/content_padding_15"
             android:src="@drawable/avatar"
@@ -82,29 +83,42 @@
             app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
+            android:id="@+id/fgt_pc_item_top_vip_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/content_padding_10"
+            android:drawableStart="@mipmap/ic_vip_1"
+            android:drawablePadding="5dp"
+            android:visibility="gone"
+            android:text="VIP"
+            android:textSize="12sp"
+            android:textColor="@color/white"
+            app:layout_constraintStart_toEndOf="@id/icon_img_iv"
+            app:layout_constraintTop_toTopOf="@id/icon_img_iv" />
+
+        <TextView
             android:id="@+id/name_tv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="@dimen/content_padding_small"
             android:layout_marginStart="@dimen/content_padding_10"
-            android:layout_marginTop="@dimen/content_padding_small"
+            android:layout_marginTop="5dp"
             android:text=""
             android:textColor="@color/txt_white"
-            android:textSize="@dimen/text_size_12"
-            app:layout_constraintStart_toEndOf="@+id/icon_img_iv"
-            app:layout_constraintTop_toTopOf="@+id/icon_img_iv" />
+            android:textSize="@dimen/text_size_15"
+            app:layout_constraintStart_toEndOf="@id/icon_img_iv"
+            app:layout_constraintTop_toBottomOf="@id/fgt_pc_item_top_vip_tv" />
 
         <TextView
             android:id="@+id/sheep_num_tv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/content_padding_small"
             android:layout_marginStart="@dimen/content_padding_10"
             android:text="绵羊号："
             android:textColor="@color/txt_white"
             android:textSize="@dimen/text_size_10"
-            app:layout_constraintBottom_toBottomOf="@+id/icon_img_iv"
-            app:layout_constraintStart_toEndOf="@+id/icon_img_iv" />
+            app:layout_constraintBottom_toBottomOf="@id/icon_img_iv"
+            app:layout_constraintStart_toEndOf="@id/icon_img_iv" />
     </android.support.constraint.ConstraintLayout>
 
     <LinearLayout

app/src/main/res/layout/fgt_personalcenter_item_center_one.xml

@@ -21,6 +21,27 @@
 
     </LinearLayout>
 
+    <View
+        android:id="@+id/fgt_pc_item_vip_v"
+        style="@style/style_item_line_new"
+        android:visibility="gone" />
+
+    <LinearLayout
+        android:id="@+id/fgt_pc_item_vip_ll"
+        style="@style/style_item_container"
+        android:visibility="gone">
+
+        <ImageView
+            style="@style/style_item_img"
+            android:src="@mipmap/ic_vip_pc_item" />
+
+        <TextView
+            style="@style/style_item_label"
+            android:text="VIP" />
+
+        <TextView style="@style/style_item_end_next" />
+
+    </LinearLayout>
     <View style="@style/style_item_line_new"
         android:visibility="gone" />