Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/src/main/res/layout/title.xml

app/src/main/java/com/xingdata/zzdpos/ui/marketing/integral/IntegralActivity.java

@@ -80,12 +80,15 @@ public class IntegralActivity extends BaseActivity<IntegralPresenter, ActivityIn
                 }
                 break;
                 case R.id.rb_get: {
+                    mViewBinding.rbGet.getPaint().setFakeBoldText(true);
+                    mViewBinding.rbExchange.getPaint().setFakeBoldText(false);
                     showView(v.getId());
                     mPresenter.query(1, NORMAL_TYPE, null);
                 }
                 break;
                 case R.id.rb_exchange: {
-
+                    mViewBinding.rbGet.getPaint().setFakeBoldText(false);
+                    mViewBinding.rbExchange.getPaint().setFakeBoldText(true);
                     showView(v.getId());
                     LoadingDialog loadingDialog = new LoadingDialog();
                     loadingDialog.show(this);
@@ -265,13 +268,11 @@ public class IntegralActivity extends BaseActivity<IntegralPresenter, ActivityIn
     private void showView(int id) {
         switch (id) {
             case R.id.rb_get: {
-                mViewBinding.btnAdd.setVisibility(View.VISIBLE);
                 mViewBinding.llGet.setVisibility(View.VISIBLE);
                 mViewBinding.llExchange.setVisibility(View.GONE);
             }
             break;
             case R.id.rb_exchange: {
-                mViewBinding.btnAdd.setVisibility(View.INVISIBLE);
                 mViewBinding.llGet.setVisibility(View.GONE);
                 mViewBinding.llExchange.setVisibility(View.VISIBLE);
             }

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

@@ -75,8 +75,8 @@
                     android:id="@+id/rb_get"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="@dimen/all_padding"
-                    android:layout_marginRight="@dimen/all_padding"
+                    android:layout_marginLeft="@dimen/all_margin"
+                    android:layout_marginRight="@dimen/all_margin"
                     android:layout_weight="1"
                     android:background="@drawable/radio_select"
                     android:button="@null"
@@ -92,8 +92,8 @@
                     android:id="@+id/rb_exchange"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="@dimen/all_padding"
-                    android:layout_marginRight="@dimen/all_padding"
+                    android:layout_marginLeft="@dimen/all_margin"
+                    android:layout_marginRight="@dimen/all_margin"
                     android:layout_weight="1"
                     android:background="@drawable/radio_select"
                     android:button="@null"
@@ -114,8 +114,9 @@
             android:layout_width="0dp"
             android:layout_height="0dp"
             android:orientation="vertical"
-            android:padding="@dimen/all_margin_big"
+            android:padding="@dimen/padding_big"
             app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintHorizontal_bias="0.0"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toBottomOf="@id/ll_menu"
@@ -126,51 +127,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:background="@color/white"
-                android:orientation="vertical"
-                android:padding="@dimen/cl_padding"
-                >
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal">
-
-                    <TextView
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="3"
-                        android:text="适用会员"
-                        android:textSize="@dimen/et_textsize"/>
-
-                    <TextView
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="5"
-                        android:text="来源品类"
-                        android:textSize="@dimen/et_textsize"/>
-
-                    <TextView
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="3"
-                        android:text="获取规则"
-                        android:textSize="@dimen/et_textsize"/>
-
-                    <TextView
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="center"
-                        android:text="状态 "
-                        android:textSize="@dimen/et_textsize"/>
-                </LinearLayout>
-
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/view_line_height"
-                    android:layout_marginTop="@dimen/all_margin"
-                    android:background="@color/vip_line"
-                    android:paddingBottom="@dimen/all_padding"/>
+                android:orientation="vertical">
 
                 <android.support.v4.widget.SwipeRefreshLayout
                     android:id="@+id/srl_product"

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

@@ -5,7 +5,7 @@
 
         <variable
             name="onClickListener"
-            type="com.xingdata.zzdpos.util.OnClickListener" />
+            type="com.xingdata.zzdpos.util.OnClickListener"/>
 
 
     </data>
@@ -20,11 +20,11 @@
         <ImageView
             android:id="@+id/iv_back"
             android:layout_width="@dimen/title_height"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:gravity="center"
             android:onClick="@{onClickListener}"
-            android:padding="16dp"
-            android:src="@mipmap/back_black" />
+            android:padding="@dimen/all_margin"
+            android:src="@mipmap/back_black"/>
 
         <TextView
             android:id="@+id/tv_title"