1
0

2 Revīzijas 177ceddac9 ... 1f2cd18894

Autors SHA1 Ziņojums Datums
  jixionghui 1f2cd18894 红包的修改 4 gadi atpakaļ
  jixionghui 4b3cb67f5a 会员中心模块的完成 4 gadi atpakaļ
64 mainītis faili ar 1142 papildinājumiem un 16 dzēšanām
  1. 4 1
      jixin/src/main/AndroidManifest.xml
  2. 1 1
      jixin/src/main/java/com/jixin/RetrofitUtil/RetrofitUtils.java
  3. 22 4
      jixin/src/main/java/com/jixin/im/fragment/BaseRedPacketFragment.java
  4. 4 2
      jixin/src/main/java/com/jixin/im/fragment/ExclusiveRedPacketFragment.java
  5. 7 0
      jixin/src/main/java/com/jixin/im/fragment/MeFragment2.java
  6. 1 0
      jixin/src/main/java/com/jixin/im/fragment/MucChatFragment.java
  7. 60 0
      jixin/src/main/java/com/jixin/im/ui/me/RenewalVipActivity.java
  8. 55 0
      jixin/src/main/java/com/jixin/im/ui/me/VipCenterActivity.java
  9. 45 0
      jixin/src/main/java/com/jixin/im/ui/me/VipSettingsActivity.java
  10. 12 7
      jixin/src/main/java/com/jixin/im/ui/me/redpacket/SendRedPacketActivity.java
  11. 28 0
      jixin/src/main/res/drawable/selector_bg_vip_gradle.xml
  12. 7 0
      jixin/src/main/res/drawable/shape_bg_vip_bottom.xml
  13. 6 0
      jixin/src/main/res/drawable/shape_buy_vip.xml
  14. 6 0
      jixin/src/main/res/drawable/shape_renewal_vip_bg_color_ffcda2_radius_12.xml
  15. 6 0
      jixin/src/main/res/drawable/shape_table_item_vip_bg.xml
  16. 6 0
      jixin/src/main/res/drawable/shape_vip_center_bg_top.xml
  17. 6 0
      jixin/src/main/res/drawable/shape_vip_gradle_bg.xml
  18. 305 0
      jixin/src/main/res/layout/activity_renewal_vip.xml
  19. 376 0
      jixin/src/main/res/layout/activity_vip_center.xml
  20. 114 0
      jixin/src/main/res/layout/activity_vip_settings.xml
  21. 28 1
      jixin/src/main/res/layout/head_for_my2.xml
  22. BIN
      jixin/src/main/res/mipmap-xhdpi/bg_vip_center.png
  23. BIN
      jixin/src/main/res/mipmap-xhdpi/icon_me_vip.png
  24. BIN
      jixin/src/main/res/mipmap-xhdpi/icon_vip_prerogative_b_1.png
  25. BIN
      jixin/src/main/res/mipmap-xhdpi/icon_vip_prerogative_b_10.png
  26. BIN
      jixin/src/main/res/mipmap-xhdpi/icon_vip_prerogative_b_11.png
  27. BIN
      jixin/src/main/res/mipmap-xhdpi/icon_vip_prerogative_b_2.png
  28. BIN
      jixin/src/main/res/mipmap-xhdpi/icon_vip_prerogative_b_3.png
  29. BIN
      jixin/src/main/res/mipmap-xhdpi/icon_vip_prerogative_b_4.png
  30. BIN
      jixin/src/main/res/mipmap-xhdpi/icon_vip_prerogative_b_5.png
  31. BIN
      jixin/src/main/res/mipmap-xhdpi/icon_vip_prerogative_b_6.png
  32. BIN
      jixin/src/main/res/mipmap-xhdpi/icon_vip_prerogative_b_7.png
  33. BIN
      jixin/src/main/res/mipmap-xhdpi/icon_vip_prerogative_b_8.png
  34. BIN
      jixin/src/main/res/mipmap-xhdpi/icon_vip_prerogative_b_9.png
  35. BIN
      jixin/src/main/res/mipmap-xhdpi/img_v.png
  36. BIN
      jixin/src/main/res/mipmap-xxhdpi/bg_vip_center.png
  37. BIN
      jixin/src/main/res/mipmap-xxhdpi/icon_me_vip.png
  38. BIN
      jixin/src/main/res/mipmap-xxhdpi/icon_vip_prerogative_b_1.png
  39. BIN
      jixin/src/main/res/mipmap-xxhdpi/icon_vip_prerogative_b_10.png
  40. BIN
      jixin/src/main/res/mipmap-xxhdpi/icon_vip_prerogative_b_11.png
  41. BIN
      jixin/src/main/res/mipmap-xxhdpi/icon_vip_prerogative_b_2.png
  42. BIN
      jixin/src/main/res/mipmap-xxhdpi/icon_vip_prerogative_b_3.png
  43. BIN
      jixin/src/main/res/mipmap-xxhdpi/icon_vip_prerogative_b_4.png
  44. BIN
      jixin/src/main/res/mipmap-xxhdpi/icon_vip_prerogative_b_5.png
  45. BIN
      jixin/src/main/res/mipmap-xxhdpi/icon_vip_prerogative_b_6.png
  46. BIN
      jixin/src/main/res/mipmap-xxhdpi/icon_vip_prerogative_b_7.png
  47. BIN
      jixin/src/main/res/mipmap-xxhdpi/icon_vip_prerogative_b_8.png
  48. BIN
      jixin/src/main/res/mipmap-xxhdpi/icon_vip_prerogative_b_9.png
  49. BIN
      jixin/src/main/res/mipmap-xxhdpi/img_v.png
  50. BIN
      jixin/src/main/res/mipmap-xxxhdpi/bg_vip_center.png
  51. BIN
      jixin/src/main/res/mipmap-xxxhdpi/icon_me_vip.png
  52. BIN
      jixin/src/main/res/mipmap-xxxhdpi/icon_vip_prerogative_b_1.png
  53. BIN
      jixin/src/main/res/mipmap-xxxhdpi/icon_vip_prerogative_b_10.png
  54. BIN
      jixin/src/main/res/mipmap-xxxhdpi/icon_vip_prerogative_b_11.png
  55. BIN
      jixin/src/main/res/mipmap-xxxhdpi/icon_vip_prerogative_b_2.png
  56. BIN
      jixin/src/main/res/mipmap-xxxhdpi/icon_vip_prerogative_b_3.png
  57. BIN
      jixin/src/main/res/mipmap-xxxhdpi/icon_vip_prerogative_b_4.png
  58. BIN
      jixin/src/main/res/mipmap-xxxhdpi/icon_vip_prerogative_b_5.png
  59. BIN
      jixin/src/main/res/mipmap-xxxhdpi/icon_vip_prerogative_b_6.png
  60. BIN
      jixin/src/main/res/mipmap-xxxhdpi/icon_vip_prerogative_b_7.png
  61. BIN
      jixin/src/main/res/mipmap-xxxhdpi/icon_vip_prerogative_b_8.png
  62. BIN
      jixin/src/main/res/mipmap-xxxhdpi/icon_vip_prerogative_b_9.png
  63. BIN
      jixin/src/main/res/mipmap-xxxhdpi/img_v.png
  64. 43 0
      jixin/src/main/res/values/styles.xml

+ 4 - 1
jixin/src/main/AndroidManifest.xml

@@ -93,7 +93,10 @@
         android:usesCleartextTraffic="true"
         tools:ignore="GoogleAppIndexingWarning"
         tools:replace="android:name, android:icon, android:roundIcon">
-        <activity android:name=".ui.account.AccountDetailsActivity"></activity>
+        <activity android:name=".ui.me.RenewalVipActivity"></activity>
+        <activity android:name=".ui.me.VipSettingsActivity" />
+        <activity android:name=".ui.me.VipCenterActivity" />
+        <activity android:name=".ui.account.AccountDetailsActivity" />
         <activity android:name=".ui.me.MyIncomeActivity" />
         <activity android:name=".ui.me.RealNameAuthActivity" />
         <activity android:name=".ui.me.JunYouCoinActivity" />

+ 1 - 1
jixin/src/main/java/com/jixin/RetrofitUtil/RetrofitUtils.java

@@ -58,7 +58,7 @@ public class RetrofitUtils {
                 .client(client)
 //                .baseUrl("http://47.57.16.13:8092")
 //                .baseUrl("http://47.57.8.204:8092")
-                .baseUrl("http://39.100.144.26:8092")
+                .baseUrl(AppConfig.HOST)
 //                .baseUrl("http://qdzcie.com:8092")
                 .addConverterFactory(CustomizeGsonConverterFactory.create())
                 .addCallAdapterFactory(RxJava2CallAdapterFactory.create())

+ 22 - 4
jixin/src/main/java/com/jixin/im/fragment/BaseRedPacketFragment.java

@@ -7,6 +7,7 @@ import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.util.ArrayMap;
+import android.util.Log;
 import android.view.View;
 import android.view.ViewStub;
 import android.widget.EditText;
@@ -56,6 +57,7 @@ public abstract class BaseRedPacketFragment extends EasyFragment {
     protected TextView tvSendRedPacket;
     protected TextView tvRedPacketType;
     private ImageView ivIconPin;
+    protected String mRoomId;
     protected LinearLayout lytRemark;
     protected String mRedPacketAcceptorId;    //红包接收对象id 可以是roomId,也可以是userId
 
@@ -78,10 +80,13 @@ public abstract class BaseRedPacketFragment extends EasyFragment {
     @Override
     protected void onActivityCreated(Bundle savedInstanceState, boolean createView) {
         if (createView) {
-            initView();
-            if (isGroupChatType() && getArguments()!=null){
-                mGroupMemberNumber = getArguments().getInt(SendRedPacketActivity.INTENT_GROUP_MEMBER_NUMBER);
+            Bundle bundle = getArguments();
+            if (isGroupChatType() && bundle!=null){
+                mRoomId =bundle.getString(SendRedPacketActivity.INTENT_ROOM_ID);
+                mGroupMemberNumber = bundle.getInt(SendRedPacketActivity.INTENT_GROUP_MEMBER_NUMBER);
             }
+            initView();
+
         }
     }
 
@@ -263,7 +268,12 @@ public abstract class BaseRedPacketFragment extends EasyFragment {
             return;
         }
         DialogHelper.showDefaulteMessageProgressDialog(getActivity());
-        HashMap<String, String> params = getSendRedPacketParameters();
+        HashMap<String, String> params;
+        if (isExclusiveType()){
+            params = new HashMap<>();
+        }else {
+            params = getSendRedPacketParameters();
+        }
         if (params==null){
             params = new HashMap<>();
         }
@@ -287,6 +297,10 @@ public abstract class BaseRedPacketFragment extends EasyFragment {
                     DialogHelper.dismissProgressDialog();
                     ToastUtil.showToast(getContext(), getActivity().getString(R.string.tip_pay_secure_place_holder, t.getMessage()));
                 }, (p, code) -> {
+                    if (isExclusiveType()){
+                        HashMap<String,String> hashMap = getSendRedPacketParameters();
+                        p.putAll(hashMap);
+                    }
                     HttpUtils.get().url(coreManager.getConfig().REDPACKET_SEND)
                             .params(p)
                             .build()
@@ -323,4 +337,8 @@ public abstract class BaseRedPacketFragment extends EasyFragment {
         );
     }
 
+    public boolean isExclusiveType(){
+        return mRedPacketType == 4;
+    }
+
 }

+ 4 - 2
jixin/src/main/java/com/jixin/im/fragment/ExclusiveRedPacketFragment.java

@@ -62,7 +62,7 @@ public class ExclusiveRedPacketFragment extends BaseRedPacketFragment {
         tvSelectExclusiveMember = rootView.findViewById(R.id.tv_select_exclusive_member);
         tvSelectExclusiveMember.setOnClickListener(v -> {
             Intent intent = new Intent(getContext(), GroupMoreFeaturesActivity.class);
-            intent.putExtra("roomId", mRedPacketAcceptorId);
+            intent.putExtra("roomId", mRoomId);
             intent.putExtra("isSelectReceiver", true);
             startActivityForResult(intent, CODE_REQUEST_SELECT_RECEIVER);
         });
@@ -109,7 +109,9 @@ public class ExclusiveRedPacketFragment extends BaseRedPacketFragment {
 
     @Override
     protected HashMap<String, String> getSendRedPacketParameters() {
-        return null;
+        HashMap<String,String> hashMap = new HashMap<>();
+        hashMap .put("assignUserIds",mReceiverId);
+        return hashMap;
     }
 
 

+ 7 - 0
jixin/src/main/java/com/jixin/im/fragment/MeFragment2.java

@@ -60,6 +60,7 @@ import com.jixin.im.ui.me.OfferApplyActivity;
 import com.jixin.im.ui.me.PullSurprisedActivity;
 import com.jixin.im.ui.me.SettingActivity;
 import com.jixin.im.ui.me.SettingActivityNew;
+import com.jixin.im.ui.me.VipCenterActivity;
 import com.jixin.im.ui.me.bubble.BubbleActivity;
 import com.jixin.im.ui.me.bubble.ComplaintActivityNew;
 import com.jixin.im.ui.me.bubble.HelpCenterActivity;
@@ -221,6 +222,7 @@ public class MeFragment2 extends EasyFragment implements View.OnClickListener {
         findViewById(R.id.tv_mytouzhujilu).setOnClickListener(this);
         findViewById(R.id.tv_myjiaoyijilu).setOnClickListener(this);
         findViewById(R.id.tv_kapianguanli).setOnClickListener(this);
+        findViewById(R.id.ll_my_vip).setOnClickListener(this);
         findViewById(R.id.ll_myprize).setOnClickListener(this);
         findViewById(R.id.ll_helpcenter).setOnClickListener(this);
         findViewById(R.id.ll_bikan).setOnClickListener(this);
@@ -228,6 +230,7 @@ public class MeFragment2 extends EasyFragment implements View.OnClickListener {
         findViewById(R.id.ll_dailijieshao).setOnClickListener(this);
         findViewById(R.id.ll_about_junyou).setOnClickListener(this);
 
+
         TextView versionTv = findViewById(R.id.tv_version_info);
         versionTv.setText("版本号: " + DeviceInfoUtil.getVersionName(getContext()));
 
@@ -400,6 +403,10 @@ public class MeFragment2 extends EasyFragment implements View.OnClickListener {
                 // 我的资料
                 startActivityForResult(new Intent(getActivity(), BasicInfoEditActivity.class), 1);
                 break;
+            case R.id.ll_my_vip:
+                //我的会员
+                startActivity(new Intent(getContext(), VipCenterActivity.class));
+                break;
             case R.id.meeting_rl:
                 // 视频会议
                 SelectContactsActivity.startQuicklyInitiateMeeting(requireContext());

+ 1 - 0
jixin/src/main/java/com/jixin/im/fragment/MucChatFragment.java

@@ -2413,6 +2413,7 @@ public class MucChatFragment extends EasyFragment implements
         Intent intent = new Intent(getContext(), SendRedPacketActivity.class);
 //        intent.putExtra(SendRedPacketActivity.INTENT_ACCEPTOR_ID,roomId);
         intent.putExtra(SendRedPacketActivity.INTENT_ACCEPTOR_ID,mUseId);
+        intent.putExtra(SendRedPacketActivity.INTENT_ROOM_ID,roomId);
         intent.putExtra(ChatType.INTENT_CHAT_TYPE,ChatType.CHAT_GROUP);
         intent.putExtra(INTENT_GROUP_MEMBER_NUMBER, mCurrentMemberNum);
         startActivityForResult(intent, ChatActivity.REQUEST_CODE_SEND_RED);

+ 60 - 0
jixin/src/main/java/com/jixin/im/ui/me/RenewalVipActivity.java

@@ -0,0 +1,60 @@
+package com.jixin.im.ui.me;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.widget.TextView;
+
+import com.jixin.im.R;
+import com.jixin.im.ui.base.BaseActivity;
+import com.makeramen.roundedimageview.RoundedImageView;
+
+/**
+ * 开通和续费会员
+ * Created by Harvey on 2020/09/25
+ */
+public class RenewalVipActivity extends BaseActivity {
+    private RoundedImageView mAvatarIv;
+    private TextView mNicknameTv,mVipGradleTv,mAccountTv,mVipDestTv,
+            mVipComboTitleTv, mVipBuyMouthTv,mVipBuyQuarterTv,mVipBuyHalfYearTv,mVipBuyYearTv,mPayAgreementTv;
+
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_renewal_vip);
+
+        initActionBar();
+        initView();
+
+    }
+    private void initActionBar() {
+        getSupportActionBar().hide();
+        findViewById(R.id.iv_title_left).setOnClickListener(v -> finish());
+        TextView tvTitle = (TextView) findViewById(R.id.tv_title_center);
+        tvTitle.setText("开通会员");
+
+    }
+
+    private void initView() {
+        mAvatarIv = findViewById(R.id.iv_avatar);
+
+
+        mNicknameTv = findViewById(R.id.tv_nickname);
+        mVipGradleTv = findViewById(R.id.tv_vip_gradle);
+        mAccountTv = findViewById(R.id.tv_account);
+        mVipDestTv = findViewById(R.id.tv_vip_validity);
+
+
+        mVipComboTitleTv = findViewById(R.id.tv_vip_combo_title);
+        mVipBuyMouthTv = findViewById(R.id.tv_buy_mouth_vip);
+        mVipBuyQuarterTv = findViewById(R.id.tv_buy_quarter_vip);
+        mVipBuyHalfYearTv = findViewById(R.id.tv_buy_half_year_vip);
+
+        mVipBuyYearTv = findViewById(R.id.tv_buy_year_vip);
+        mPayAgreementTv = findViewById(R.id.tv_pay_agreement);
+
+
+    }
+}

+ 55 - 0
jixin/src/main/java/com/jixin/im/ui/me/VipCenterActivity.java

@@ -0,0 +1,55 @@
+package com.jixin.im.ui.me;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.widget.TextView;
+
+import com.jixin.im.R;
+import com.jixin.im.ui.base.BaseActivity;
+import com.makeramen.roundedimageview.RoundedImageView;
+
+/**
+ * 会员中心
+ * Created by Harvey on 2020/09/25
+ */
+public class VipCenterActivity extends BaseActivity {
+    private RoundedImageView ivAvatar;
+    private TextView mNicknameTv,mAccountTv,mVipOpenTv,mVipGradleTv;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_vip_center);
+
+        initActionBar();
+        initView();
+
+    }
+    private void initActionBar() {
+        getSupportActionBar().hide();
+        findViewById(R.id.iv_title_left).setOnClickListener(v -> finish());
+        TextView tvTitle = (TextView) findViewById(R.id.tv_title_center);
+        tvTitle.setText("会员中心");
+        TextView tvTitleRight = (TextView) findViewById(R.id.tv_title_right);
+        tvTitleRight.setText(R.string.setting);
+        tvTitle.setOnClickListener(v -> {
+            startActivity(new Intent(this,VipSettingsActivity.class));
+            //todo 会员中心设置
+        });
+
+
+    }
+
+    private void initView() {
+        mAccountTv = findViewById(R.id.tv_user_account);
+        mNicknameTv = findViewById(R.id.tv_nickname);
+        mVipOpenTv = findViewById(R.id.tv_buy_vip);
+        mVipGradleTv = findViewById(R.id.tv_vip_gradle);
+        mVipOpenTv.setOnClickListener(v -> {
+            //Todo 开通会员
+            startActivity(new Intent(this,RenewalVipActivity.class));
+        });
+    }
+}

+ 45 - 0
jixin/src/main/java/com/jixin/im/ui/me/VipSettingsActivity.java

@@ -0,0 +1,45 @@
+package com.jixin.im.ui.me;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.os.Bundle;
+import android.widget.TextView;
+
+import com.jixin.im.R;
+import com.jixin.im.view.SwitchButton;
+
+/**
+ * VIP设置
+ * Created by Harvey on 2020/09/25
+ */
+public class VipSettingsActivity extends AppCompatActivity {
+    private SwitchButton mHideNetInfoSwitchBtn,mMsgReadStatusSwitchBtn,mMsgReadDeleteSwitchBtn,mClearChatRecordSwitchBtn,mADFilterSwitchBtn;
+
+
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_vip_settings);
+        initActionBar();
+        initView();
+    }
+
+    private void initActionBar() {
+        getSupportActionBar().hide();
+        findViewById(R.id.iv_title_left).setOnClickListener(v -> finish());
+        TextView tvTitle = (TextView) findViewById(R.id.tv_title_center);
+        tvTitle.setText("VIP设置");
+
+
+    }
+
+    private void initView() {
+        mHideNetInfoSwitchBtn = findViewById(R.id.switch_btn_hide_net_info);
+        mMsgReadStatusSwitchBtn = findViewById(R.id.switch_btn_change_msg_status);
+        mMsgReadDeleteSwitchBtn = findViewById(R.id.switch_btn_read_delete);
+        mClearChatRecordSwitchBtn = findViewById(R.id.switch_btn_clear_chat_record);
+        mADFilterSwitchBtn = findViewById(R.id.switch_btn_filter_ad);
+
+    }
+}

+ 12 - 7
jixin/src/main/java/com/jixin/im/ui/me/redpacket/SendRedPacketActivity.java

@@ -29,9 +29,12 @@ import java.util.List;
  */
 public class SendRedPacketActivity extends BaseActivity {
     public final static String  INTENT_ACCEPTOR_ID  = "redPacketAcceptorId";
+    public final static String INTENT_ROOM_ID = "roomId";
+
     public final static String  INTENT_GROUP_MEMBER_NUMBER  = "GroupMemberNumber";
     private  int mGroupMemberNumber;
     private String mChatType;
+    private String mRoomId;
 
     private TabLayout mTabRedPacket;
     private ViewPager viewPager;
@@ -60,6 +63,8 @@ public class SendRedPacketActivity extends BaseActivity {
         Intent intent = getIntent();
         if (intent != null) {
             mRedPacketAcceptorId = getIntent().getStringExtra(INTENT_ACCEPTOR_ID);
+
+            mRoomId = getIntent().getStringExtra(INTENT_ROOM_ID);
             mChatType = intent.getStringExtra(ChatType.INTENT_CHAT_TYPE);
             if (TextUtils.isEmpty(mChatType)) {
                 mChatType = ChatType.CHAT_PRIVATE;
@@ -70,24 +75,24 @@ public class SendRedPacketActivity extends BaseActivity {
 
         mFragmentList = new ArrayList<>();
         BaseRedPacketFragment normalFragment = new NormalRedPacketFragment(mChatType,mRedPacketAcceptorId);
-
         BaseRedPacketFragment passwordFragment = new PasswordRedPacketFragment(mChatType,mRedPacketAcceptorId);
-        mFragmentList.add(normalFragment);
-        mFragmentList.add(passwordFragment);
-        if (isGroupChatType()) {
+        BaseRedPacketFragment exclusiveFragment = new ExclusiveRedPacketFragment(mChatType,mRedPacketAcceptorId);
 
-            BaseRedPacketFragment exclusiveFragment = new ExclusiveRedPacketFragment(mChatType,mRedPacketAcceptorId);
-            mFragmentList.add(exclusiveFragment);
+        if (isGroupChatType()) {
             Bundle bundle = new Bundle();
+            bundle.putString(INTENT_ROOM_ID,mRoomId);
             bundle.putInt(INTENT_GROUP_MEMBER_NUMBER,mGroupMemberNumber);
             normalFragment.setArguments(bundle);
             passwordFragment.setArguments(bundle);
             exclusiveFragment.setArguments(bundle);
         }
+        mFragmentList.add(normalFragment);
+        mFragmentList.add(passwordFragment);
+        mFragmentList.add(exclusiveFragment);
 
+    }
 
 
-    }
 
     private boolean isGroupChatType() {
         return ChatType.isGroupChatType(mChatType);

+ 28 - 0
jixin/src/main/res/drawable/selector_bg_vip_gradle.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true" >
+        <shape>
+            <solid android:color="#FF8741"/>
+            <corners android:radius="8dp"/>
+        </shape>
+
+    </item>
+    <item android:state_checkable="true" >
+        <shape>
+            <solid android:color="#FF8741"/>
+            <corners android:radius="8dp"/>
+        </shape>
+
+    </item>
+
+    <item >
+        <shape>
+            <solid android:color="@color/transparent"/>
+            <stroke android:color="@color/white" android:width="1px"/>
+            <corners android:radius="8dp"/>
+        </shape>
+
+    </item>
+
+
+</selector>

+ 7 - 0
jixin/src/main/res/drawable/shape_bg_vip_bottom.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/white"/>
+    <corners android:topLeftRadius="16dp" android:topRightRadius="16dp"/>
+
+
+</shape>

+ 6 - 0
jixin/src/main/res/drawable/shape_buy_vip.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="16dp"/>
+    <solid android:color="#F0A86A"/>
+
+</shape>

+ 6 - 0
jixin/src/main/res/drawable/shape_renewal_vip_bg_color_ffcda2_radius_12.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="12dp"/>
+    <solid android:color="#ffcda2"/>
+
+</shape>

+ 6 - 0
jixin/src/main/res/drawable/shape_table_item_vip_bg.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="15dp"/>
+    <solid android:color="#FFE5CE"/>
+
+</shape>

+ 6 - 0
jixin/src/main/res/drawable/shape_vip_center_bg_top.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="8dp"/>
+    <gradient android:angle="0" android:startColor="#FFD3AC" android:centerColor="#EEA160" android:endColor="#E68D3F"/>
+
+</shape>

+ 6 - 0
jixin/src/main/res/drawable/shape_vip_gradle_bg.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+    <corners android:radius="6dp"/>
+    <solid android:color="#999999"/>
+
+</shape>

+ 305 - 0
jixin/src/main/res/layout/activity_renewal_vip.xml

@@ -0,0 +1,305 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+
+    tools:context=".ui.me.RenewalVipActivity">
+
+    <include layout="@layout/a_view_actionbar" />
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fillViewport="true"
+
+        android:background="@mipmap/bg_vip_center"
+        android:overScrollMode="never">
+        <LinearLayout
+            android:orientation="vertical"
+            android:gravity="center_horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+            <LinearLayout
+
+
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:gravity="center_horizontal"
+
+                android:orientation="vertical">
+
+                <LinearLayout
+
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:minHeight="62dp"
+                    android:paddingStart="24dp"
+                    android:paddingTop="12dp"
+                    android:paddingEnd="24dp"
+                    android:paddingBottom="12dp"
+                    android:weightSum="2">
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1">
+
+                        <com.makeramen.roundedimageview.RoundedImageView
+                            android:id="@+id/iv_avatar"
+                            android:layout_width="36dp"
+                            android:layout_height="36dp"
+                            android:layout_marginStart="12dp"
+                            android:src="#fff"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent"
+                            app:riv_oval="true" />
+
+
+                        <TextView
+                            android:id="@+id/tv_nickname"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="8dp"
+                            android:text="VIP会员"
+                            android:textColor="#ffffff"
+                            android:textSize="11sp"
+                            android:textStyle="bold"
+                            app:layout_constraintStart_toEndOf="@+id/iv_avatar"
+                            app:layout_constraintTop_toTopOf="parent" />
+
+                        <TextView
+                            android:id="@+id/tv_vip_gradle"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="8dp"
+                            android:background="@drawable/selector_bg_vip_gradle"
+                            android:paddingStart="6dp"
+                            android:paddingTop="2dp"
+                            android:paddingEnd="6dp"
+                            android:paddingBottom="2dp"
+                            android:text="VIP会员"
+                            android:textColor="#e4e4e4"
+
+                            android:textSize="8sp"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintStart_toEndOf="@+id/iv_avatar" />
+
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="0dp"
+                        android:layout_height="36dp"
+                        android:layout_weight="1">
+
+                        <TextView
+                            android:id="@+id/tv_account"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="账号:123456"
+                            android:textColor="#E4E4E4"
+                            android:textSize="8sp"
+
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+
+                        <TextView
+                            android:id="@+id/tv_vip_validity"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="账号:123456"
+                            android:textColor="#FFCDA2"
+                            android:textSize="9sp"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintStart_toStartOf="parent" />
+
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                </LinearLayout>
+
+                <TableLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@color/white"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:id="@+id/tv_vip_combo_title"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="15dp"
+                        android:text="选择会员套餐"
+                        android:textColor="#333333" />
+
+                    <TableRow
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+
+                        android:weightSum="2">
+
+                        <LinearLayout
+                            android:layout_width="0dp"
+                            android:gravity="center"
+                            android:orientation="vertical"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1">
+                            <LinearLayout
+                                android:background="@drawable/shape_renewal_vip_bg_color_ffcda2_radius_12"
+                                android:layout_width="138dp"
+                                android:orientation="vertical"
+                                android:gravity="center"
+                                android:layout_height="138dp">
+                                <TextView
+                                    style="@style/RenewalVipTextStyle"
+                                    android:layout_width="wrap_content"
+                                    android:text="月会员"
+                                    android:layout_height="wrap_content"/>
+                                <TextView
+                                    android:layout_marginTop="15dp"
+                                    android:text="¥10"
+                                    style="@style/RenewalVipTextStyle"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"/>
+
+
+                            </LinearLayout>
+                            <TextView
+                                android:id="@+id/tv_buy_mouth_vip"
+                                style="@style/buyVipTextStyle"/>
+                        </LinearLayout>
+                        <LinearLayout
+                            android:layout_width="0dp"
+                            android:gravity="center"
+                            android:orientation="vertical"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1">
+                            <LinearLayout
+                                android:background="@drawable/shape_renewal_vip_bg_color_ffcda2_radius_12"
+                                android:layout_width="138dp"
+                                android:orientation="vertical"
+                                android:gravity="center"
+                                android:layout_height="138dp">
+                                <TextView
+                                    style="@style/RenewalVipTextStyle"
+                                    android:layout_width="wrap_content"
+                                    android:text="季会员"
+                                    android:layout_height="wrap_content"/>
+                                <TextView
+                                    android:layout_marginTop="15dp"
+                                    android:text="¥30"
+                                    style="@style/RenewalVipTextStyle"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"/>
+
+
+                            </LinearLayout>
+                            <TextView
+
+                                android:id="@+id/tv_buy_quarter_vip"
+                                style="@style/buyVipTextStyle"/>
+                        </LinearLayout>
+
+                    </TableRow>
+                    <TableRow
+                        android:layout_marginTop="46dp"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+
+                        android:weightSum="2">
+
+                        <LinearLayout
+                            android:layout_width="0dp"
+                            android:gravity="center"
+                            android:orientation="vertical"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1">
+                            <LinearLayout
+                                android:background="@drawable/shape_renewal_vip_bg_color_ffcda2_radius_12"
+                                android:layout_width="138dp"
+                                android:orientation="vertical"
+                                android:gravity="center"
+                                android:layout_height="138dp">
+                                <TextView
+                                    style="@style/RenewalVipTextStyle"
+                                    android:layout_width="wrap_content"
+                                    android:text="半年会员"
+                                    android:layout_height="wrap_content"/>
+                                <TextView
+                                    android:layout_marginTop="15dp"
+                                    android:text="¥60"
+                                    style="@style/RenewalVipTextStyle"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"/>
+
+
+                            </LinearLayout>
+                            <TextView
+                                android:id="@+id/tv_buy_half_year_vip"
+                                style="@style/buyVipTextStyle"/>
+                        </LinearLayout>
+                        <LinearLayout
+                            android:layout_width="0dp"
+                            android:gravity="center"
+                            android:orientation="vertical"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1">
+                            <LinearLayout
+                                android:background="@drawable/shape_renewal_vip_bg_color_ffcda2_radius_12"
+                                android:layout_width="138dp"
+                                android:orientation="vertical"
+                                android:gravity="center"
+                                android:layout_height="138dp">
+                                <TextView
+                                    style="@style/RenewalVipTextStyle"
+                                    android:layout_width="wrap_content"
+                                    android:text="年会员"
+                                    android:layout_height="wrap_content"/>
+                                <TextView
+                                    android:layout_marginTop="15dp"
+                                    android:text="¥120"
+                                    style="@style/RenewalVipTextStyle"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"/>
+
+
+                            </LinearLayout>
+                            <TextView
+                                android:id="@+id/tv_buy_year_vip"
+                                style="@style/buyVipTextStyle"/>
+                        </LinearLayout>
+
+                    </TableRow>
+
+                </TableLayout>
+                <FrameLayout
+                    android:background="@color/white"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
+                    <TextView
+                        android:id="@+id/tv_pay_agreement"
+                        android:textColor="#666666"
+                        android:textSize="10sp"
+                        android:layout_gravity="center_horizontal"
+
+                        android:gravity="center"
+                        android:text="点击即表示您已同意《俊友钱包支付协议》。"
+                        android:layout_marginTop="60dp"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"/>
+                </FrameLayout>
+
+
+            </LinearLayout>
+
+
+        </LinearLayout>
+
+
+
+    </ScrollView>
+
+
+</LinearLayout>

+ 376 - 0
jixin/src/main/res/layout/activity_vip_center.xml

@@ -0,0 +1,376 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:background="@color/white"
+    tools:context=".ui.me.VipCenterActivity">
+
+    <include layout="@layout/a_view_actionbar" />
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:fillViewport="true"
+        android:background="@mipmap/bg_vip_center"
+        android:overScrollMode="never">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center_horizontal"
+            android:orientation="vertical">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="128dp"
+                android:layout_margin="15dp"
+                android:background="@drawable/shape_vip_center_bg_top">
+
+                <com.makeramen.roundedimageview.RoundedImageView
+                    android:id="@+id/iv_avatar"
+                    android:layout_width="56dp"
+                    android:layout_height="56dp"
+                    android:layout_marginStart="12dp"
+                    android:src="#333333"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:riv_oval="true" />
+
+                <TextView
+                    android:id="@+id/tv_nickname"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+
+                    android:layout_marginStart="12dp"
+                    android:text="上山"
+                    android:textColor="#333333"
+                    android:textSize="17sp"
+                    android:textStyle="bold"
+                    app:layout_constraintBottom_toTopOf="@+id/tv_user_account"
+                    app:layout_constraintStart_toEndOf="@+id/iv_avatar"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintVertical_chainStyle="packed" />
+
+                <TextView
+                    android:id="@+id/tv_vip_gradle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="4dp"
+                    android:background="@drawable/shape_vip_gradle_bg"
+                    android:gravity="center"
+                    android:paddingStart="6dp"
+                    android:paddingEnd="6dp"
+                    android:text="vip1"
+                    android:textColor="@color/white"
+                    android:textSize="10sp"
+
+                    app:layout_constraintBottom_toBottomOf="@id/tv_nickname"
+                    app:layout_constraintStart_toEndOf="@+id/tv_nickname"
+                    app:layout_constraintTop_toTopOf="@+id/tv_nickname" />
+
+                <TextView
+                    android:id="@+id/tv_user_account"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="12dp"
+                    android:layout_marginTop="4dp"
+                    android:text="账号:11244444"
+
+                    android:textColor="#333333"
+                    android:textSize="13sp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/iv_avatar"
+                    app:layout_constraintTop_toBottomOf="@+id/tv_nickname"
+                    app:layout_constraintVertical_chainStyle="packed" />
+
+                <ImageView
+                    android:id="@+id/iv_v"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="10dp"
+                    android:src="@mipmap/img_v"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <TextView
+                android:id="@+id/tv_buy_vip"
+                android:layout_width="176dp"
+                android:layout_height="32dp"
+                android:layout_marginTop="3dp"
+                android:background="@drawable/shape_buy_vip"
+                android:gravity="center"
+
+                android:text="立即开通"
+                android:textColor="#812800"
+                android:textSize="15sp" />
+
+            <TableLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginTop="16dp"
+
+                android:background="@drawable/shape_bg_vip_bottom"
+                android:gravity="center_horizontal"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_marginTop="26dp"
+                    android:gravity="center_horizontal"
+                    android:text="会员尊享11项特权"
+                    android:textColor="#333333"
+                    android:textSize="15sp"
+                    android:textStyle="bold" />
+
+                <TableRow
+                    android:layout_marginTop="32dp"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:weightSum="4">
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:orientation="vertical">
+
+                        <ImageView
+
+                            style="@style/vipPrerogativeStyle"
+                            android:src="@mipmap/icon_vip_prerogative_b_1"
+                     />
+
+                        <TextView
+                            style="@style/vipPrerogativeTextStyle"
+                            android:text="会员荣誉"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:orientation="vertical">
+
+                        <ImageView
+                            style="@style/vipPrerogativeStyle"
+                            android:src="@mipmap/icon_vip_prerogative_b_2" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            style="@style/vipPrerogativeTextStyle"
+                            android:text="昵称闪亮" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:orientation="vertical">
+
+                        <ImageView
+                            style="@style/vipPrerogativeStyle"
+                            android:src="@mipmap/icon_vip_prerogative_b_3" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            style="@style/vipPrerogativeTextStyle"
+                            android:text="等级加速"/>
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:orientation="vertical">
+
+                        <ImageView
+                            style="@style/vipPrerogativeStyle"
+                            android:src="@mipmap/icon_vip_prerogative_b_4" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            style="@style/vipPrerogativeTextStyle"
+                            android:text="广告拦截" />
+                    </LinearLayout>
+                </TableRow>
+                <View android:layout_width="match_parent"
+                    android:layout_marginTop="16dp"
+                    android:layout_height="1px"
+                    android:background="#999999"/>
+                <TableRow
+                    android:layout_marginTop="16dp"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:weightSum="4">
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:orientation="vertical">
+
+                        <ImageView
+
+                            android:src="@mipmap/icon_vip_prerogative_b_5"
+                            style="@style/vipPrerogativeStyle"
+                        />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            style="@style/vipPrerogativeTextStyle"
+                            android:text="进群特效" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:orientation="vertical">
+
+                        <ImageView
+                            android:src="@mipmap/icon_vip_prerogative_b_6"
+                            style="@style/vipPrerogativeStyle" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            style="@style/vipPrerogativeTextStyle"
+                            android:text="建群数量"/>
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:orientation="vertical">
+
+                        <ImageView
+
+                            android:src="@mipmap/icon_vip_prerogative_b_7"
+                            style="@style/vipPrerogativeStyle" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            style="@style/vipPrerogativeTextStyle"
+                            android:text="VIP高速通道"/>
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:orientation="vertical">
+
+                        <ImageView
+
+                            android:src="@mipmap/icon_vip_prerogative_b_8"
+                            style="@style/vipPrerogativeStyle" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            style="@style/vipPrerogativeTextStyle"
+                            android:text="5000人超级群呢"/>
+                    </LinearLayout>
+                </TableRow>
+                <View android:layout_width="match_parent"
+                    android:layout_marginTop="16dp"
+                    android:layout_height="1px"
+                    android:background="#999999"/>
+                <TableRow
+                    android:layout_marginTop="16dp"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:weightSum="4">
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:orientation="vertical">
+
+                        <ImageView
+
+                            android:src="@mipmap/icon_vip_prerogative_b_9"
+                            style="@style/vipPrerogativeStyle" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            style="@style/vipPrerogativeTextStyle"
+                            android:text="提高好友上限"/>
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:orientation="vertical">
+
+                        <ImageView
+
+                            android:src="@mipmap/icon_vip_prerogative_b_10"
+                            style="@style/vipPrerogativeStyle"/>
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            style="@style/vipPrerogativeTextStyle"
+                            android:text="优先人工客服"/>
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:orientation="vertical">
+
+                        <ImageView
+
+                            android:src="@mipmap/icon_vip_prerogative_b_11"
+                            style="@style/vipPrerogativeStyle" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            style="@style/vipPrerogativeTextStyle"
+                            android:text="每月赠送抽奖"/>
+                    </LinearLayout>
+
+                </TableRow>
+
+            </TableLayout>
+
+        </LinearLayout>
+    </ScrollView>
+
+
+</LinearLayout>

+ 114 - 0
jixin/src/main/res/layout/activity_vip_settings.xml

@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:orientation="vertical"
+    android:layout_height="match_parent"
+    tools:context=".ui.me.VipSettingsActivity">
+    <include layout="@layout/a_view_actionbar"/>
+
+
+
+    <RelativeLayout style="@style/IMTble_No_Line"
+        android:layout_marginTop="15dp">
+
+        <TextView
+           style="@style/vipSettingsVipTextStyle"
+            android:text="隐藏网络信息"/>
+
+        <com.jixin.im.view.SwitchButton
+            android:id="@+id/switch_btn_hide_net_info"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            app:sb_background="@color/app_white"
+            app:sb_checked_color="@color/main_color"
+            app:sb_effect_duration="100"
+            app:sb_shadow_radius="4dp"
+            app:sb_show_indicator="false" />
+
+    </RelativeLayout>
+    <RelativeLayout style="@style/IMTble_No_Line"
+        android:layout_marginTop="15dp">
+
+        <TextView
+            style="@style/vipSettingsVipTextStyle"
+            android:text="关闭信息已读"/>
+
+        <com.jixin.im.view.SwitchButton
+            android:id="@+id/switch_btn_change_msg_status"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
+            app:sb_background="@color/app_white"
+            app:sb_checked_color="@color/main_color"
+            app:sb_effect_duration="100"
+            app:sb_shadow_radius="4dp"
+            app:sb_show_indicator="false" />
+
+    </RelativeLayout>
+    <RelativeLayout style="@style/IMTble_No_Line"
+        android:layout_marginTop="15dp">
+
+        <TextView
+            style="@style/vipSettingsVipTextStyle"
+            android:text="开启阅后即焚"/>
+
+        <com.jixin.im.view.SwitchButton
+            android:id="@+id/switch_btn_read_delete"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            app:sb_background="@color/app_white"
+            app:sb_checked_color="@color/main_color"
+            app:sb_effect_duration="100"
+            app:sb_shadow_radius="4dp"
+            app:sb_show_indicator="false" />
+
+    </RelativeLayout>
+
+    <RelativeLayout style="@style/IMTble_No_Line"
+        android:layout_marginTop="15dp">
+
+        <TextView
+            style="@style/vipSettingsVipTextStyle"
+            android:text="清空双方聊天记录"/>
+
+        <com.jixin.im.view.SwitchButton
+            android:id="@+id/switch_btn_clear_chat_record"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            app:sb_background="@color/app_white"
+            app:sb_checked_color="@color/main_color"
+            app:sb_effect_duration="100"
+            app:sb_shadow_radius="4dp"
+            app:sb_show_indicator="false" />
+
+    </RelativeLayout>
+    <RelativeLayout style="@style/IMTble_No_Line"
+        android:layout_marginTop="15dp">
+
+        <TextView
+            style="@style/vipSettingsVipTextStyle"
+            android:text="广告过滤"/>
+
+        <com.jixin.im.view.SwitchButton
+            android:id="@+id/switch_btn_filter_ad"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
+            app:sb_background="@color/app_white"
+            app:sb_checked_color="@color/main_color"
+            app:sb_effect_duration="100"
+            app:sb_shadow_radius="4dp"
+            app:sb_show_indicator="false" />
+
+    </RelativeLayout>
+</LinearLayout>

+ 28 - 1
jixin/src/main/res/layout/head_for_my2.xml

@@ -250,7 +250,34 @@
                     android:textSize="16sp"
                     android:textStyle="bold"/>
             </LinearLayout>
-
+            <LinearLayout
+                android:id="@+id/ll_my_vip"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/white"
+                android:orientation="horizontal">
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:paddingTop="15dp"
+                    android:paddingBottom="15dp"
+                    android:paddingLeft="15dp"
+                    android:textColor="#351C1C"
+                    android:gravity="center"
+                    android:drawablePadding="17dp"
+                    android:text="我的会员"
+                    android:drawableLeft="@mipmap/icon_me_vip"/>
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_marginRight="15dp"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/gray"
+                    android:gravity="right"
+                    android:drawablePadding="17dp"
+                    android:text="会员福利"
+                    android:drawableRight="@drawable/my_right_1"/>
+            </LinearLayout>
             <LinearLayout
                 android:id="@+id/ll_bikan"
                 android:layout_width="match_parent"

BIN
jixin/src/main/res/mipmap-xhdpi/bg_vip_center.png


BIN
jixin/src/main/res/mipmap-xhdpi/icon_me_vip.png


BIN
jixin/src/main/res/mipmap-xhdpi/icon_vip_prerogative_b_1.png


BIN
jixin/src/main/res/mipmap-xhdpi/icon_vip_prerogative_b_10.png


BIN
jixin/src/main/res/mipmap-xhdpi/icon_vip_prerogative_b_11.png


BIN
jixin/src/main/res/mipmap-xhdpi/icon_vip_prerogative_b_2.png


BIN
jixin/src/main/res/mipmap-xhdpi/icon_vip_prerogative_b_3.png


BIN
jixin/src/main/res/mipmap-xhdpi/icon_vip_prerogative_b_4.png


BIN
jixin/src/main/res/mipmap-xhdpi/icon_vip_prerogative_b_5.png


BIN
jixin/src/main/res/mipmap-xhdpi/icon_vip_prerogative_b_6.png


BIN
jixin/src/main/res/mipmap-xhdpi/icon_vip_prerogative_b_7.png


BIN
jixin/src/main/res/mipmap-xhdpi/icon_vip_prerogative_b_8.png


BIN
jixin/src/main/res/mipmap-xhdpi/icon_vip_prerogative_b_9.png


BIN
jixin/src/main/res/mipmap-xhdpi/img_v.png


BIN
jixin/src/main/res/mipmap-xxhdpi/bg_vip_center.png


BIN
jixin/src/main/res/mipmap-xxhdpi/icon_me_vip.png


BIN
jixin/src/main/res/mipmap-xxhdpi/icon_vip_prerogative_b_1.png


BIN
jixin/src/main/res/mipmap-xxhdpi/icon_vip_prerogative_b_10.png


BIN
jixin/src/main/res/mipmap-xxhdpi/icon_vip_prerogative_b_11.png


BIN
jixin/src/main/res/mipmap-xxhdpi/icon_vip_prerogative_b_2.png


BIN
jixin/src/main/res/mipmap-xxhdpi/icon_vip_prerogative_b_3.png


BIN
jixin/src/main/res/mipmap-xxhdpi/icon_vip_prerogative_b_4.png


BIN
jixin/src/main/res/mipmap-xxhdpi/icon_vip_prerogative_b_5.png


BIN
jixin/src/main/res/mipmap-xxhdpi/icon_vip_prerogative_b_6.png


BIN
jixin/src/main/res/mipmap-xxhdpi/icon_vip_prerogative_b_7.png


BIN
jixin/src/main/res/mipmap-xxhdpi/icon_vip_prerogative_b_8.png


BIN
jixin/src/main/res/mipmap-xxhdpi/icon_vip_prerogative_b_9.png


BIN
jixin/src/main/res/mipmap-xxhdpi/img_v.png


BIN
jixin/src/main/res/mipmap-xxxhdpi/bg_vip_center.png


BIN
jixin/src/main/res/mipmap-xxxhdpi/icon_me_vip.png


BIN
jixin/src/main/res/mipmap-xxxhdpi/icon_vip_prerogative_b_1.png


BIN
jixin/src/main/res/mipmap-xxxhdpi/icon_vip_prerogative_b_10.png


BIN
jixin/src/main/res/mipmap-xxxhdpi/icon_vip_prerogative_b_11.png


BIN
jixin/src/main/res/mipmap-xxxhdpi/icon_vip_prerogative_b_2.png


BIN
jixin/src/main/res/mipmap-xxxhdpi/icon_vip_prerogative_b_3.png


BIN
jixin/src/main/res/mipmap-xxxhdpi/icon_vip_prerogative_b_4.png


BIN
jixin/src/main/res/mipmap-xxxhdpi/icon_vip_prerogative_b_5.png


BIN
jixin/src/main/res/mipmap-xxxhdpi/icon_vip_prerogative_b_6.png


BIN
jixin/src/main/res/mipmap-xxxhdpi/icon_vip_prerogative_b_7.png


BIN
jixin/src/main/res/mipmap-xxxhdpi/icon_vip_prerogative_b_8.png


BIN
jixin/src/main/res/mipmap-xxxhdpi/icon_vip_prerogative_b_9.png


BIN
jixin/src/main/res/mipmap-xxxhdpi/img_v.png


+ 43 - 0
jixin/src/main/res/values/styles.xml

@@ -740,5 +740,48 @@
         <item name="progress_reached_bar_heightn">1.5dp</item>
         <item name="progress_unreached_bar_heightn">0.75dp</item>
     </style>
+    <style name="vipPrerogativeStyle">
+        <item name="android:layout_width">55dp</item>
+        <item name="android:padding">3dp</item>
+        <item name="android:background">@drawable/shape_table_item_vip_bg</item>
+        <item name="android:layout_height">55dp</item>
+    </style>
+    <style name="vipPrerogativeTextStyle">
+        <item name="android:textSize">11sp</item>
+        <item name="android:layout_marginTop">6dp</item>
+        <item name="android:color">#333333</item>
+    </style>
+    <style name="vipSettingsVipTextStyle">
+
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_centerVertical">true</item>
+        <item name="android:textColor">#333333</item>
+        <item name="android:textSize">15sp</item>
+    </style>
 
+    <style name="vipSettingsVipSwitchBtnStyle">
+
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_centerVertical">true</item>
+        <item name="android:textColor">#333333</item>
+        <item name="android:textSize">15sp</item>
+    </style>
+    <style name="RenewalVipTextStyle">
+        <item name="android:textSize">21sp</item>
+        <item name="android:textColor">#333333</item>
+        <item name="android:textStyle">bold</item>
+    </style>
+    <style name="buyVipTextStyle">
+        <item name="android:textSize">13sp</item>
+        <item name="android:textColor">#812800</item>
+        <item name="android:layout_width">100dp</item>
+        <item name="android:layout_height">32dp</item>
+        <item name="android:gravity">center</item>
+        <item name="android:text">立即开通</item>
+        <item name="android:layout_marginTop">16dp</item>
+        <item name="android:background">@drawable/shape_buy_vip</item>
+
+    </style>
 </resources>