Merge remote-tracking branch 'origin/master'

app/src/main/java/com/xingdata/zzdpos/ui/vip/VipActivity.java

@@ -59,7 +59,10 @@ public class VipActivity extends BaseActivity<VipPresenter, ActivityVipBinding>
 
     @Override
     public void updateVipSus(Vip vip) {
-        mPresenter.vipInfoFragment.addVipSus(vip);
+//        mPresenter.vipInfoFragment.addVipSus(vip);
+
+        mPresenter.vipInfoFragment.pop();
+        mPresenter.vipListFragment.onRefresh();
 
     }
 

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

@@ -74,7 +74,7 @@ public class VipInfoFragment extends BaseFragment<VipPresenter, FragmentVipInfoB
 
     public void addVipSus(Vip vip) {
         mVip = vip;
-        mPresenter.vipInfoEditFragment.pop();
+//        mPresenter.vipInfoEditFragment.pop();
         mViewBinding.Totalpamt.setText(String.valueOf(vip.getVipTotalpamt()));
         mViewBinding.BoundCbal.setText(String.valueOf(vip.getBoundCbal()));
         mViewBinding.AcctCbal.setText(String.valueOf(vip.getAcctCbal()));

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

@@ -89,7 +89,6 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:gravity="right"
-                    android:autoLink="phone"
                     android:padding="@dimen/all_padding"
                     android:text="@string/help_phone" />
             </LinearLayout>
@@ -136,7 +135,6 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:gravity="right"
-                    android:autoLink="web"
                     android:padding="@dimen/all_padding"
                     android:text="@string/help_web" />
             </LinearLayout>

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

@@ -53,7 +53,7 @@
             android:layout_height="wrap_content"
             android:gravity="center"
             android:singleLine="true"
-            android:text="￥9999"
+            android:text=""
             android:textColor="@color/black_baozheng"
             android:textSize="@dimen/handover_amt_size"
             android:textStyle="bold"

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

@@ -52,7 +52,7 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:gravity="right"
-                        android:text="50元"
+                        android:text=""
                         android:textSize="@dimen/all_text_size_small"/>
                 </LinearLayout>
 
@@ -76,7 +76,7 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:gravity="right"
-                        android:text="全部会员"
+                        android:text=""
                         android:textSize="@dimen/all_text_size_small"/>
                 </LinearLayout>
 
@@ -100,7 +100,7 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:gravity="right"
-                        android:text="5张"
+                        android:text=""
                         android:textSize="@dimen/all_text_size_small"/>
                 </LinearLayout>
             </LinearLayout>

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

@@ -50,7 +50,7 @@
                         android:layout_height="@dimen/counter_input_height"
                         android:layout_marginLeft="@dimen/all_margin_left"
                         android:gravity="center|left"
-                        android:text="北京浙星信息技术有限公司"
+                        android:text=""
                         android:textColor="@color/black_baozheng"
                         android:textSize="@dimen/text_three_title"
                         android:textStyle="bold"/>
@@ -74,7 +74,7 @@
                         android:layout_height="@dimen/counter_input_height"
                         android:layout_marginLeft="@dimen/all_margin_left"
                         android:gravity="center|left"
-                        android:text="丰台万达店"
+                        android:text=""
                         android:textColor="@color/black_baozheng"
                         android:textSize="@dimen/text_three_title"
                         android:textStyle="bold"/>
@@ -98,7 +98,7 @@
                         android:layout_height="@dimen/counter_input_height"
                         android:layout_marginLeft="@dimen/all_margin_left"
                         android:gravity="center_vertical"
-                        android:text="北京市丰台区万达广场一区"
+                        android:text=""
                         android:textColor="@color/black_baozheng"
                         android:textSize="@dimen/text_three_title"
                         android:textStyle="bold"/>

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

@@ -47,7 +47,7 @@
                         android:layout_height="@dimen/counter_input_height"
                         android:layout_marginLeft="@dimen/all_margin_left"
                         android:gravity="center_vertical"
-                        android:text="北京浙星信息技术有限公司"
+                        android:text=""
                         android:textColor="@color/black_baozheng"
                         android:textSize="@dimen/et_textsize"
                         android:textStyle="bold"/>

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

@@ -49,7 +49,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:gravity="right"
-                        android:text="111111"
+                        android:text=""
                         android:textColor="@color/black_likui" />
                 </LinearLayout>
 
@@ -72,7 +72,7 @@
                         android:layout_height="wrap_content"
                         android:background="@null"
                         android:gravity="right"
-                        android:text="111111"
+                        android:text=""
                         android:textColor="@color/black_likui" />
 
                 </LinearLayout>

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

@@ -63,7 +63,7 @@
                     style="@style/default_blacktext_no_margin_smallstyle"
                     android:layout_width="match_parent"
                     android:gravity="right"
-                    android:text="111111"
+                    android:text=""
                     android:textColor="@color/black_likui" />
             </LinearLayout>
 
@@ -84,7 +84,7 @@
                     style="@style/default_blacktext_no_margin_smallstyle"
                     android:layout_width="match_parent"
                     android:gravity="right"
-                    android:text="111111"
+                    android:text=""
                     android:textColor="@color/black_likui" />
             </LinearLayout>
 

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

@@ -222,7 +222,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/all_margin_left"
                 android:layout_marginRight="@dimen/all_margin_left"
-                android:text="1111111111"
+                android:text=""
                 android:textColor="@color/deep_red"
                 android:textSize="@dimen/sbig_text_size" />
         </LinearLayout>

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

@@ -91,7 +91,7 @@
                     android:id="@+id/tv_barNo"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="8531651233213"
+                    android:text=""
                     android:textColor="@color/black_likui"
                     android:textSize="@dimen/all_text_size_low"/>
             </LinearLayout>

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

@@ -50,7 +50,7 @@
             style="@style/other_select_smallstyle"
             android:layout_width="wrap_content"
             android:layout_height="0dp"
-            android:text="12783163981789"
+            android:text=""
             app:layout_constraintBottom_toBottomOf="@id/tv_no_hint"
             app:layout_constraintStart_toEndOf="@id/tv_no_hint"
             app:layout_constraintTop_toTopOf="@id/tv_no_hint"/>
@@ -76,7 +76,7 @@
             android:id="@+id/tv_money"
             android:layout_width="@dimen/all_et_money_width"
             android:layout_height="wrap_content"
-            android:text="999"
+            android:text=""
             android:textColor="@color/store_product_price"
             android:textSize="@dimen/big_text_size"
             android:textStyle="bold"

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

@@ -76,7 +76,7 @@
                     style="@style/other_select_smallstyle"
                     android:layout_width="140dp"
                     android:layout_height="wrap_content"
-                    android:text="8531651233213"/>
+                    android:text=""/>
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -119,7 +119,7 @@
                     android:id="@+id/tv_money"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="￥ 120.00"
+                    android:text=""
                     android:textColor="@color/red"
                     android:textSize="@dimen/big_text_size"
                     android:textStyle="bold"/>

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

@@ -122,7 +122,7 @@
             android:paddingBottom="@dimen/all_padding"
             android:paddingEnd="@dimen/all_margin"
             android:paddingTop="@dimen/all_padding"
-            android:text="不相符"
+            android:text=""
             android:textColor="@color/black"
             android:textSize="@dimen/all_text_size_low"
             app:layout_constraintEnd_toEndOf="parent"
@@ -136,7 +136,7 @@
             android:paddingBottom="@dimen/all_padding"
             android:paddingEnd="@dimen/all_bounced_padding"
             android:paddingTop="@dimen/all_padding"
-            android:text="2017-10-01 12:25"
+            android:text=""
             android:textColor="@color/black_baozheng"
             android:textSize="@dimen/all_text_size_low"
             app:layout_constraintEnd_toEndOf="parent"

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

@@ -84,7 +84,7 @@
             android:id="@+id/tv_goods_price"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="999"
+            android:text=""
             android:textColor="@color/store_product_price"
             android:textSize="@dimen/big_text_size"
             android:textStyle="bold"
@@ -179,7 +179,7 @@
             style="@style/other_select_smallstyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="0个"
+            android:text=""
             android:textStyle="bold"
             app:layout_constraintBottom_toBottomOf="@id/tv_stock_hint"
             app:layout_constraintStart_toEndOf="@id/tv_stock_hint"

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

@@ -67,7 +67,7 @@
             android:id="@+id/tv_goods_code"
             android:layout_width="wrap_content"
             android:layout_height="0dp"
-            android:text="12783163981789"
+            android:text=""
             android:textSize="@dimen/all_text_size_small"
             app:layout_constraintBottom_toBottomOf="@id/tv_goods_code_hint"
             app:layout_constraintStart_toEndOf="@id/tv_goods_code_hint"

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

@@ -50,7 +50,7 @@
             android:layout_width="wrap_content"
             android:layout_height="0dp"
             android:padding="0dp"
-            android:text="12783163981789"
+            android:text=""
             app:layout_constraintBottom_toBottomOf="@id/tv_goods_code_hint"
             app:layout_constraintStart_toEndOf="@id/tv_goods_code_hint"
             app:layout_constraintTop_toTopOf="@id/tv_goods_code_hint" />
@@ -75,7 +75,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="2dp"
-            android:text="999"
+            android:text=""
             android:textColor="@color/store_product_price"
             android:textSize="@dimen/big_text_size"
             android:textStyle="bold"

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

@@ -50,7 +50,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:gravity="center"
-                        android:text="123.3"
+                        android:text=""
                         android:textColor="@color/white"
                         android:textSize="@dimen/text_primary_title_smile"
                         android:textStyle="bold"/>

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

@@ -56,7 +56,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:gravity="center"
-                        android:text="123.3"
+                        android:text=""
                         android:textColor="@color/white"
                         android:textSize="@dimen/text_primary_title_smile"
                         android:textStyle="bold" />

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

@@ -48,7 +48,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/all_bounced_padding"
             android:paddingEnd="@dimen/all_padding"
-            android:text="1231231244124124"
+            android:text=""
             android:textColor="@color/black_baozheng"
             android:singleLine="true"
             android:ellipsize = "end"
@@ -62,7 +62,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/all_margin"
-            android:text="11-15    15：23"
+            android:text=""
             android:textSize="@dimen/all_text_size_small_small"
             app:layout_constraintBottom_toBottomOf="@id/img_left"
             app:layout_constraintStart_toEndOf="@id/img_left" />

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

@@ -12,7 +12,7 @@
             android:gravity="center_vertical|center_horizontal"
             android:padding="@dimen/vicescreen_shoppingcart_pandding"
             android:singleLine="true"
-            android:text="北京店"
+            android:text=""
             android:textColor="@color/black"
             android:textSize="@dimen/all_text_size_low" />
 

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

@@ -17,7 +17,7 @@
             android:paddingStart="@dimen/all_bounced_padding"
             android:paddingTop="@dimen/all_padding"
             android:singleLine="true"
-            android:text="北京店"
+            android:text=""
             android:textColor="@color/black"
             android:textSize="14sp"
             app:layout_constraintEnd_toEndOf="parent"

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

@@ -39,14 +39,14 @@
                         style="@style/default_blacktext_nopadding_smallstyle"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="13311556556" />
+                        android:text="" />
 
                     <TextView
                         android:id="@+id/user_name"
                         style="@style/default_blacktext_nopadding_smallstyle"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="张小萌"
+                        android:text=""
                         android:textSize="@dimen/all_text_size_small" />
 
 

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

@@ -34,7 +34,7 @@
                     style="@style/default_blacktext_no_margin_smallstyle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="会员充值" />
+                    android:text="" />
 
                 <TextView
                     android:id="@+id/expense_time"
@@ -42,7 +42,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="10dp"
-                    android:text="08-09 10:10"
+                    android:text=""
                     android:textColor="@color/black_likui"
                     android:textSize="@dimen/all_text_size_small_small" />
             </LinearLayout>

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

@@ -30,7 +30,7 @@
                     style="@style/default_blacktext_nopadding_smallstyle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="张小萌" />
+                    android:text="" />
 
                 <TextView
                     android:id="@+id/vip_mobile"
@@ -38,7 +38,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:textSize="@dimen/small_text_size"
-                    android:text="13311556556" />
+                    android:text="" />
             </LinearLayout>
 
             <TextView
@@ -46,7 +46,7 @@
                 style="@style/default_blacktext_smallstyle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="85折" />
+                android:text="" />
         </LinearLayout>
 
         <include layout="@layout/line_layout_margin_left"></include>

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

@@ -46,7 +46,7 @@
                         style="@style/default_bartext_style"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="50元优惠券" />
+                        android:text="" />
                 </LinearLayout>
 
                 <TextView
@@ -74,7 +74,7 @@
                     style="@style/default_bartext_style"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="￥50" />
+                    android:text="" />
 
                 <View
                     android:layout_width="wrap_content"
@@ -89,7 +89,7 @@
                     style="@style/default_bartext_style"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="满500使用"
+                    android:text=""
                     android:textSize="@dimen/detail_textview_size" />
 
             </LinearLayout>

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

@@ -82,7 +82,7 @@
                     android:layout_height="wrap_content"
                     android:gravity="center"
                     android:singleLine="true"
-                    android:text="￥9999"
+                    android:text=""
                     android:textColor="@color/black_baozheng"
                     android:textSize="@dimen/handover_amt_size"
                     android:textStyle="bold" />

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

@@ -37,7 +37,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:gravity="end"
-                android:text="12"
+                android:text=""
                 android:textColor="@color/black_baozheng"
                 android:textSize="@dimen/all_text_size" />
 
@@ -46,7 +46,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="4"
                 android:gravity="end"
-                android:text="$40.0"
+                android:text=""
                 android:textColor="@color/black_baozheng"
                 android:textSize="@dimen/all_text_size" />
 

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

@@ -59,7 +59,7 @@
                     android:layout_height="wrap_content"
                     android:gravity="center"
                     android:singleLine="true"
-                    android:text="￥9999"
+                    android:text=""
                     android:textColor="@color/black_baozheng"
                     android:textSize="@dimen/handover_amt_size"
                     android:textStyle="bold"

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

@@ -66,7 +66,7 @@
                     android:layout_height="wrap_content"
                     android:gravity="center"
                     android:singleLine="true"
-                    android:text="￥9999"
+                    android:text=""
                     android:textColor="@color/black_baozheng"
                     android:textSize="@dimen/handover_amt_size"
                     android:textStyle="bold"

app/src/main/res/values/styles.xml

@@ -320,6 +320,7 @@
         <item name="android:layout_height">@dimen/button3_height</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:textColor">@color/white</item>
+        <item name="android:textSize">@dimen/all_text_size</item>
         <item name="android:gravity">center</item>
         <item name="android:focusable">false</item>
         <item name="android:layout_marginLeft">@dimen/all_margin_left</item>
@@ -332,6 +333,7 @@
         <item name="android:layout_height">@dimen/button3_height</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:textColor">@color/deep_red</item>
+        <item name="android:textSize">@dimen/all_text_size</item>
         <item name="android:gravity">center</item>
         <item name="android:focusable">false</item>
         <item name="android:layout_marginLeft">@dimen/all_margin_left</item>