vip 详情的修改

jixin/src/main/java/com/jixin/im/adapter/CardAdapter.java

@@ -35,7 +35,8 @@ public class CardAdapter extends RecyclerView.Adapter<CardAdapter.ViewHolder> {
     public void onBindViewHolder(final ViewHolder holder, final int position) {
         mCardAdapterHelper.onBindViewHolder(holder.itemView, position, getItemCount());
         holder.tv_vipname.setText(mList.get(position).getName());
-        holder.tv_chongzhi.setText(""+mList.get(position).getRechargeMoney());
+//        holder.tv_date.setText(""+mList.get(position).getRechargeMoney());
+        holder.tv_date.setText("10天");
         holder.tv_cvip.setText(""+(mList.get(position).getName().subSequence(3,mList.get(position).getName().length())));
         addGroupImageTop(holder.iv_vitem,mList.get(position).getName());
     }
@@ -47,14 +48,14 @@ public class CardAdapter extends RecyclerView.Adapter<CardAdapter.ViewHolder> {
 
     public class ViewHolder extends RecyclerView.ViewHolder {
         public final TextView tv_vipname;
-        public final TextView tv_chongzhi;
+        public final TextView tv_date;
         public final TextView tv_cvip;
         public final ImageView iv_vitem;
 
         public ViewHolder(final View itemView) {
             super(itemView);
             tv_vipname = (TextView) itemView.findViewById(R.id.tv_vipname);
-            tv_chongzhi = (TextView) itemView.findViewById(R.id.tv_chongzhi);
+            tv_date = (TextView) itemView.findViewById(R.id.tv_date);
             tv_cvip = (TextView) itemView.findViewById(R.id.tv_cvip);
             iv_vitem = (ImageView) itemView.findViewById(R.id.iv_vitem);
         }

jixin/src/main/java/com/jixin/im/ui/me/bubble/VipDetailsActivity.java

@@ -5,7 +5,6 @@ import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
@@ -54,14 +53,12 @@ import retrofit2.Response;
  * vip详情
  */
 public class VipDetailsActivity extends BaseActivity {
-    TextView phone_number_tv, tv_cuikuan, liushui;
-    TextView tv_vipcurrent, tv_vipnext;
-    LinearLayout ll_biaoq, ll_ship;
+    TextView phone_number_tv, tvJoinVipDate, liushui;
+    TextView tv_vipcurrent, tv_vipnext, tvSpecialsEmj, tvVideoService;
     int cVip;
     ImageView iv_class;
     ImageView iv_topv;
-    ImageView iv_dengjk;
-    TextView tv_vipname, tv_rechargemoney, tv_kuang, tv_hongbao, tv_biaoqin;
+    TextView tv_vipname;
     ProgressBar item_task_progressbar;
     List<VipDetailsBean.DataBean> mList;
     CardAdapter cardAdapter;
@@ -104,23 +101,20 @@ public class VipDetailsActivity extends BaseActivity {
     }
 
     private void initView() {
-        iv_dengjk = findViewById(R.id.iv_dengjk);
         iv_class = findViewById(R.id.iv_class);
         iv_topv = findViewById(R.id.iv_topv);
         tv_vipname = findViewById(R.id.tv_vipname);
-        tv_rechargemoney = findViewById(R.id.tv_rechargemoney);
-        tv_kuang = findViewById(R.id.tv_kuang);
-        tv_hongbao = findViewById(R.id.tv_hongbao);
-        tv_biaoqin = findViewById(R.id.tv_biaoqin);
+
         item_task_progressbar = findViewById(R.id.item_task_progressbar);
         tv_vipcurrent = findViewById(R.id.tv_vipcurrent);
         tv_vipnext = findViewById(R.id.tv_vipnext);
         phone_number_tv = findViewById(R.id.phone_number_tv);
-        ll_biaoq = findViewById(R.id.ll_biaoq);
-        ll_ship = findViewById(R.id.ll_ship);
+
+        tvVideoService = findViewById(R.id.tv_video_service);
+        tvSpecialsEmj = findViewById(R.id.tv_specials_emj);
 
 
-        tv_cuikuan = findViewById(R.id.tv_cuikuan);
+        tvJoinVipDate = findViewById(R.id.tv_join_vip_date);
         mList = new ArrayList<>();
         recyclerView = (RecyclerView) findViewById(R.id.rv_h);
         recyclerView1 = (RecyclerView) findViewById(R.id.rv_h1);
@@ -161,30 +155,13 @@ public class VipDetailsActivity extends BaseActivity {
                     if (findFirstCompletelyVisibleItemPosition > -1 && findFirstCompletelyVisibleItemPosition < mList.size()) {
                         VipDetailsBean.DataBean vipDetailsBean = mList.get(findFirstCompletelyVisibleItemPosition);
                         tv_vipname.setText("" + vipDetailsBean.getName() + "尊享");
-                        tv_rechargemoney.setText("" + vipDetailsBean.getUpgradeAward());
-//                        tv_kuang.setText(""+vipDetailsBean.getBubbleFontSet().size());
-//                        tv_biaoqin.setText("" + vipDetailsBean.getFaceSet().size());
-                        tv_kuang.setText("" + vipDetailsBean.getVipName());
-                        if (!TextUtils.isEmpty(vipDetailsBean.getVipUrl())) {
-                            Glide.with(mContext)
-                                    .load(vipDetailsBean.getVipUrl())
-                                    .into(iv_dengjk);
-                        } else {
-                            iv_dengjk.setImageResource(R.drawable.djbs);
-                        }
-                        if (findFirstCompletelyVisibleItemPosition > 6) {
-                            ll_biaoq.setVisibility(View.VISIBLE);
-                        } else {
-                            ll_biaoq.setVisibility(View.INVISIBLE);
-                        }
-                        if (findFirstCompletelyVisibleItemPosition > 5) {
-                            if (findFirstCompletelyVisibleItemPosition > 6) {
-                                ll_ship.setVisibility(View.VISIBLE);
-                            } else {
-                                ll_ship.setVisibility(View.INVISIBLE);
-                            }
-                        } else {
-                            ll_ship.setVisibility(View.INVISIBLE);
+
+                        if (findFirstCompletelyVisibleItemPosition>=4){
+                            tvSpecialsEmj.setVisibility(View.VISIBLE);
+                            tvVideoService.setVisibility(View.VISIBLE);
+                        }else {
+                            tvSpecialsEmj.setVisibility(View.GONE);
+                            tvVideoService.setVisibility(View.GONE);
                         }
                         recyclerView1.smoothScrollToPosition(findFirstCompletelyVisibleItemPosition);
                         fruitAdapter.setSelectedPosition(findFirstCompletelyVisibleItemPosition);
@@ -420,8 +397,9 @@ public class VipDetailsActivity extends BaseActivity {
                             phone_number_tv.setText("" + user.getMembershipAccount());
                             cVip = user.getVipInfo().getCurrent().getGradeIndex();
                             tv_vipcurrent.setText("" + user.getVipInfo().getCurrent().getName());
+                            tvJoinVipDate.setText(String.format(getString(R.string.join_vip_date),20));
 
-                            tv_cuikuan.setText("当前累计存款（元）: " + user.getTotalRecharge());
+//                            tvJoinVipDate.setText("当前累计存款（元）: " + user.getTotalRecharge());
                             addGroupImage(iv_class, user.getVipInfo().getCurrent().getGradeIndex());
                             addGroupImageTop(iv_topv, user.getVipInfo().getCurrent().getGradeIndex());
                             for (int i = 0; i < mList.size(); i++) {
@@ -431,31 +409,12 @@ public class VipDetailsActivity extends BaseActivity {
 
                                     VipDetailsBean.DataBean vipDetailsBean = mList.get(i);
                                     tv_vipname.setText("" + vipDetailsBean.getName() + "尊享");
-                                    tv_rechargemoney.setText("" + vipDetailsBean.getUpgradeAward());
-//                                tv_kuang.setText(""+vipDetailsBean.getBubbleFontSet().size());
-//                                    tv_biaoqin.setText("" + vipDetailsBean.getFaceSet().size());
-
-                                    tv_kuang.setText("" + vipDetailsBean.getVipName());
-                                    if (!TextUtils.isEmpty(vipDetailsBean.getVipUrl())) {
-                                        Glide.with(mContext)
-                                                .load(vipDetailsBean.getVipUrl())
-                                                .into(iv_dengjk);
-                                    } else {
-                                        iv_dengjk.setImageResource(R.drawable.djbs);
-                                    }
-                                    if (i > 6) {
-                                        ll_biaoq.setVisibility(View.VISIBLE);
-                                    } else {
-                                        ll_biaoq.setVisibility(View.INVISIBLE);
-                                    }
-                                    if (i > 5) {
-                                        if (i > 6) {
-                                            ll_ship.setVisibility(View.VISIBLE);
-                                        } else {
-                                            ll_ship.setVisibility(View.INVISIBLE);
-                                        }
-                                    } else {
-                                        ll_ship.setVisibility(View.INVISIBLE);
+                                    if (i>=4){
+                                        tvSpecialsEmj.setVisibility(View.VISIBLE);
+                                        tvVideoService.setVisibility(View.VISIBLE);
+                                    }else {
+                                        tvSpecialsEmj.setVisibility(View.GONE);
+                                        tvVideoService.setVisibility(View.GONE);
                                     }
                                     fruitAdapter.setSelectedPosition(i);
                                 }

jixin/src/main/res/layout/activity_vipdetails.xml

@@ -224,7 +224,7 @@
                     </LinearLayout>
 
                     <TextView
-                        android:id="@+id/tv_cuikuan"
+                        android:id="@+id/tv_join_vip_date"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="20dp"
@@ -252,7 +252,7 @@
                 android:layout_marginTop="25dp" />
 
             <com.jixin.im.util.RatioLayout
-                picratio="2.50"
+                picratio="2.2"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="20dp"
@@ -281,272 +281,74 @@
                     android:padding="25dp"
                     android:text="VIP1尊享"
                     android:textColor="#404654"
-                    android:textSize="18sp" />
-
-                <LinearLayout
+                    android:textSize="20sp" />
+                <TableLayout
+                    android:paddingStart="25dp"
+                    android:paddingEnd="25dp"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center"
-                    android:orientation="horizontal">
-
-                    <LinearLayout
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="center_vertical"
-                        android:orientation="horizontal">
-
-                        <ImageView
-                            android:layout_width="25dp"
-                            android:layout_height="25dp"
-                            android:layout_marginLeft="25dp"
-                            android:src="@drawable/sjlj" />
-
-                        <LinearLayout
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginLeft="5dp"
-                            android:orientation="vertical">
-
-                            <TextView
-                                android:id="@+id/tv_rechargemoney"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:text="500"
-                                android:textColor="#404654"
-                                android:textSize="12sp" />
-
-                            <TextView
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:text="晋级礼金（活动中心领取)"
-                                android:textColor="#9CA4C3"
-                                android:textSize="9sp" />
-
-
-                        </LinearLayout>
-
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="center_vertical"
-                        android:orientation="horizontal">
-
-                        <ImageView
-                            android:id="@+id/iv_dengjk"
-                            android:layout_width="25dp"
-                            android:layout_height="25dp"
-                            android:layout_marginLeft="25dp"
-                            android:src="@drawable/djbs" />
-
-                        <LinearLayout
-                            android:layout_width="wrap_content"
+                    android:layout_height="wrap_content">
+                    <TableRow android:layout_width="match_parent"
+                        android:weightSum="2"
+                        android:layout_height="wrap_content">
+                        <TextView android:layout_width="0dp"
+                            android:layout_weight="1"
                             android:layout_height="wrap_content"
-                            android:layout_marginLeft="5dp"
-                            android:orientation="vertical">
-
-                            <TextView
-                                android:id="@+id/tv_kuang"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:text="帝王"
-                                android:textColor="#404654"
-                                android:textSize="12sp" />
-
-                            <TextView
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:text="荣誉称号"
-                                android:textColor="#9CA4C3"
-                                android:textSize="9sp" />
-
-
-                        </LinearLayout>
-
-                    </LinearLayout>
-
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="20dp"
-                    android:gravity="center"
-                    android:orientation="horizontal">
-
-                    <LinearLayout
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="center_vertical"
-                        android:orientation="horizontal">
-
-                        <ImageView
-                            android:layout_width="25dp"
-                            android:layout_height="25dp"
-                            android:layout_marginLeft="25dp"
-                            android:src="@drawable/meirhb" />
-
-                        <LinearLayout
-                            android:layout_width="wrap_content"
+                            android:text="红色昵称"
+                            android:drawablePadding="4dp"
+                            android:gravity="center_vertical"
+                            android:textColor="#666666"
+                            android:textSize="16sp"
+                            android:drawableStart="@mipmap/icon_hs"/>
+                        <TextView android:layout_width="0dp"
+                            android:layout_weight="1"
                             android:layout_height="wrap_content"
-                            android:layout_marginLeft="5dp"
-                            android:orientation="vertical">
-
-                            <TextView
-                                android:id="@+id/tv_hongbao"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:text="1"
-                                android:textColor="#404654"
-                                android:textSize="12sp" />
-
-                            <TextView
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:text="准点红包（群聊专属)"
-                                android:textColor="#9CA4C3"
-                                android:textSize="9sp" />
-
-
-                        </LinearLayout>
-
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:id="@+id/ll_biaoq"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="center_vertical"
-                        android:orientation="horizontal"
-                        android:visibility="invisible">
-
-                        <ImageView
-                            android:layout_width="25dp"
-                            android:layout_height="25dp"
-                            android:layout_marginLeft="25dp"
-                            android:src="@drawable/bqb" />
-
-                        <LinearLayout
-                            android:layout_width="wrap_content"
+                            android:text="会员群红色昵称"
+                            android:drawablePadding="4dp"
+                            android:gravity="center_vertical"
+                            android:textColor="#666666"
+                            android:textSize="16sp"
+                            android:drawableStart="@mipmap/icon_huiyhs"/>
+                    </TableRow>
+                    <TableRow android:layout_width="match_parent"
+                        android:weightSum="2"
+                        android:layout_marginTop="20dp"
+                        android:layout_height="wrap_content">
+                        <TextView android:layout_width="0dp"
+                            android:layout_weight="1"
                             android:layout_height="wrap_content"
-                            android:layout_marginLeft="5dp"
-                            android:orientation="vertical">
-
-                            <TextView
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:text="特殊表情包"
-                                android:textColor="#404654"
-                                android:textSize="12sp" />
-
-                            <TextView
-                                android:id="@+id/tv_biaoqin"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:text="VIP8以上会员专享"
-                                android:textColor="#9CA4C3"
-                                android:textSize="9sp" />
-
-
-                        </LinearLayout>
-
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="center_vertical"
-                        android:orientation="horizontal"
-                        android:visibility="gone">
-
-                        <ImageView
-                            android:layout_width="25dp"
-                            android:layout_height="25dp"
-                            android:layout_marginLeft="25dp"
-                            android:src="@drawable/bqb" />
-
-                        <LinearLayout
-                            android:layout_width="wrap_content"
+                            android:text="附近的人"
+                            android:drawablePadding="4dp"
+                            android:gravity="center_vertical"
+                            android:textColor="#666666"
+                            android:textSize="16sp"
+                            android:drawableStart="@mipmap/icon_fjdr"/>
+                        <TextView android:layout_width="0dp"
+                            android:layout_weight="1"
+                            android:id="@+id/tv_specials_emj"
                             android:layout_height="wrap_content"
-                            android:layout_marginLeft="5dp"
-                            android:orientation="vertical">
-
-                            <TextView
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:text="特殊发言（紫色）"
-                                android:textColor="#404654"
-                                android:textSize="12sp" />
-
-                            <TextView
-
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:text="特殊发言（紫色）"
-                                android:textColor="#9CA4C3"
-                                android:textSize="9sp" />
-
-
-                        </LinearLayout>
-
-                    </LinearLayout>
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="20dp"
-                    android:gravity="center"
-                    android:orientation="horizontal">
-
-                    <LinearLayout
-                        android:id="@+id/ll_ship"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="center_vertical"
-                        android:orientation="horizontal"
-                        android:visibility="invisible">
-
-                        <ImageView
-                            android:layout_width="25dp"
-                            android:layout_height="25dp"
-                            android:layout_marginLeft="25dp"
-                            android:src="@drawable/bqb" />
-
-                        <LinearLayout
-                            android:layout_width="wrap_content"
+                            android:text="特殊表情包"
+                            android:drawablePadding="4dp"
+                            android:gravity="center_vertical"
+                            android:textColor="#666666"
+                            android:textSize="16sp"
+                            android:drawableStart="@mipmap/icon_bqb"/>
+                    </TableRow>
+                    <TableRow android:layout_width="match_parent"
+                        android:weightSum="2"
+                        android:layout_marginTop="20dp"
+                        android:layout_height="wrap_content">
+                        <TextView android:layout_width="0dp"
+                            android:layout_weight="1"
+                            android:id="@+id/tv_video_service"
                             android:layout_height="wrap_content"
-                            android:layout_marginLeft="5dp"
-                            android:orientation="vertical">
-
-                            <TextView
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:text="视频服务"
-                                android:textColor="#404654"
-                                android:textSize="12sp" />
-
-                            <TextView
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:text="美女客服1V1"
-                                android:textColor="#9CA4C3"
-                                android:textSize="9sp" />
-
-
-                        </LinearLayout>
-
-                    </LinearLayout>
-
-                </LinearLayout>
+                            android:text="视频客服"
+                            android:drawablePadding="4dp"
+                            android:gravity="center_vertical"
+                            android:textColor="#666666"
+                            android:textSize="16sp"
+                            android:drawableStart="@mipmap/icon_bqb"/>
+                    </TableRow>
+                </TableLayout>
 
             </LinearLayout>
 

jixin/src/main/res/layout/view_card_item.xml

@@ -3,7 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     app:cardCornerRadius="8dp"
     app:cardElevation="6dp"
     app:cardMaxElevation="12dp"
@@ -39,19 +39,19 @@
                 android:gravity="bottom"
                 android:orientation="vertical">
                 <TextView
-                    android:id="@+id/tv_chongzhi"
+                    android:id="@+id/tv_date"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:textColor="@color/white"
-                    android:textSize="14sp"
+                    android:textSize="21sp"
                     android:text="500"/>
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:paddingBottom="10dp"
-                    android:textSize="10sp"
+                    android:textSize="15sp"
                     android:textColor="@color/white"
-                    android:text="累计存款"/>
+                    android:text="升级会员所需的天数"/>
             </LinearLayout>
 
         </LinearLayout>

jixin/src/main/res/values/strings.xml

@@ -2273,6 +2273,7 @@
     <string name="set_success">设置成功</string>
     <string name="yinsizhengce">《隐私政策》</string>
     <string name="yonghuxieyi">《用户协议》</string>
+    <string name="join_vip_date">已加入会员%1$1d天</string>
     <string name="Rcode">扫一扫上面的二维码图案，添加我为好友</string>
     <string name="toShare">分享到：</string>
     <string name="busy_me">对方忙线中</string>