Merge remote-tracking branch 'origin/master'

app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipInfoFragment.java

@@ -40,9 +40,9 @@ public class VipInfoFragment extends BaseFragment<VipPresenter, FragmentVipInfoB
             dialog.show((BaseActivity) getActivity());
         });
         if (mVip != null) {
-            mViewBinding.Totalpamt.setText(ConvertUtil.fenToYuanNoZero(mVip.getVipTotalpamt()));
+            mViewBinding.Totalpamt.setText("￥"+ConvertUtil.fenToYuanNoZero(mVip.getVipTotalpamt()));
             mViewBinding.BoundCbal.setText(String.valueOf(mVip.getBoundCbal()));
-            mViewBinding.AcctCbal.setText(ConvertUtil.fenToYuanNoZero(mVip.getAcctCbal()));
+            mViewBinding.AcctCbal.setText("￥"+ConvertUtil.fenToYuanNoZero(mVip.getAcctCbal()));
             if (String.valueOf(mVip.getVipTag()).equals("1")){
                 mViewBinding.vipLevel.setText("超级会员");
             }else {

app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipRechargeFragment.java

@@ -79,6 +79,10 @@ public class VipRechargeFragment extends BaseFragment<VipPresenter, FragmentVipR
                 ToastUtils.showShort("请选择充值金额");
                 return;
             }
+            if (position!=0){
+                ToastUtils.showShort("暂未开通该支付方式");
+                return;
+            }
             mPresenter.fullVip(mVip, ConvertUtil.yuanToFen(mViewBinding.rechargAMT.getText().toString()), ConvertUtil.yuanToFen(mViewBinding.sendAmt.getText().toString()));
 
         });
@@ -129,7 +133,7 @@ public class VipRechargeFragment extends BaseFragment<VipPresenter, FragmentVipR
         mscards.clear();
         mscards.addAll(mscardPager.getList());
         layoutParams = new RadioGroup.LayoutParams(inWight / 4, LinearLayout.LayoutParams.MATCH_PARENT,1);
-        layoutParams.setMargins(3,10, 3, 10);
+        layoutParams.setMargins(12,10, 12, 10);
         int mscardLength = 0;
         if (mscards.size() <= 3) {
             mscardLength = mscards.size();

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

@@ -12,10 +12,10 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:background="@mipmap/bg_grade01"
-            android:orientation="horizontal">
+            android:orientation="vertical">
 
             <LinearLayout
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/all_margin"
                 android:layout_marginTop="25dp"
@@ -33,9 +33,16 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/all_margin_left"
-                    android:text="钻石会员"
                     android:textColor="@color/white" />
 
+                <TextView
+                    android:id="@+id/level_Discount"
+                    style="@style/textView_title"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="@dimen/all_margin_left"
+                    android:gravity="right"
+                    android:textColor="@color/white" />
             </LinearLayout>
 
             <LinearLayout
@@ -45,25 +52,13 @@
                 android:layout_marginRight="@dimen/dtail_width_20"
                 android:layout_marginTop="25dp"
                 android:layout_weight="1"
-                android:gravity="left"
+                android:gravity="right"
                 android:orientation="vertical">
 
                 <LinearLayout
-
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="horizontal">
-
-                    <TextView
-                        android:id="@+id/level_Discount"
-                        style="@style/textView_title"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="right"
-                        android:text="8折"
-                        android:textColor="@color/white" />
-                </LinearLayout>
-
+                    android:orientation="horizontal"></LinearLayout>
 
                 <TextView
                     android:id="@+id/level_condition"