Merge remote-tracking branch 'origin/sheep2.0' into sheep2.0

app/src/main/AndroidManifest.xml

@@ -151,7 +151,8 @@
         <activity
             android:name=".page.InputWXAccountActivity"
             android:screenOrientation="portrait"/>
-        <activity android:name=".page.GameDetailActivity"/>
+        <activity android:name=".page.GameDetailActivity"
+            android:screenOrientation="portrait"/>
 
         <activity
             android:name=".page.XDownLoadActivity"
@@ -189,31 +190,44 @@
         </activity>
 
         <!--2.0-->
-        <activity android:name="com.sheep.gamegroup.view.activity.LoginAct">
+        <activity android:name="com.sheep.gamegroup.view.activity.LoginAct"
+            android:screenOrientation="portrait">
 
             </activity>
 
-        <activity android:name="com.sheep.gamegroup.view.activity.SplashAct">
+        <activity android:name="com.sheep.gamegroup.view.activity.SplashAct"
+            android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
 
-        <activity android:name="com.sheep.gamegroup.view.activity.PhoneAct"/>
-        <activity android:name="com.sheep.gamegroup.view.activity.PersonalCenterAct"/>
-        <activity android:name="com.sheep.gamegroup.view.activity.WithdrawalAct"/>
-        <activity android:name="com.sheep.gamegroup.view.activity.WithdrawalResultAct"/>
-        <activity android:name="com.sheep.gamegroup.view.activity.BindOrChangeWeixinAct"/>
-        <activity android:name="com.sheep.gamegroup.view.activity.TryMakeMoneyact"/>
+        <activity android:name="com.sheep.gamegroup.view.activity.PhoneAct"
+            android:screenOrientation="portrait"/>
+        <activity android:name="com.sheep.gamegroup.view.activity.PersonalCenterAct"
+            android:screenOrientation="portrait"/>
+        <activity android:name="com.sheep.gamegroup.view.activity.WithdrawalAct"
+            android:screenOrientation="portrait"/>
+        <activity android:name="com.sheep.gamegroup.view.activity.WithdrawalResultAct"
+            android:screenOrientation="portrait"/>
+        <activity android:name="com.sheep.gamegroup.view.activity.BindOrChangeWeixinAct"
+            android:screenOrientation="portrait"/>
+        <activity android:name="com.sheep.gamegroup.view.activity.TryMakeMoneyact"
+            android:screenOrientation="portrait"/>
         <activity android:name="com.sheep.gamegroup.view.activity.LieMakeMoneyAct"
             android:launchMode="singleTask"/>
-        <activity android:name="com.sheep.gamegroup.view.activity.HomePageAct"/>
-        <activity android:name="com.sheep.gamegroup.view.activity.BindDataAct"/>
+        <activity android:name="com.sheep.gamegroup.view.activity.HomePageAct"
+            android:screenOrientation="portrait"/>
+        <activity android:name="com.sheep.gamegroup.view.activity.BindDataAct"
+            android:screenOrientation="portrait"/>
         <activity android:name="com.sheep.gamegroup.view.activity.DialogActivity"
-            android:theme="@style/MyDialogActivityTheme"/>
-        <activity android:name="com.sheep.gamegroup.view.activity.TaskListAct"/>
-        <activity android:name="com.sheep.gamegroup.view.activity.WithdrawalListAct"/>
+            android:theme="@style/MyDialogActivityTheme"
+            android:screenOrientation="portrait"/>
+        <activity android:name="com.sheep.gamegroup.view.activity.TaskListAct"
+            android:screenOrientation="portrait"/>
+        <activity android:name="com.sheep.gamegroup.view.activity.WithdrawalListAct"
+            android:screenOrientation="portrait"/>
 
         <service android:name=".service.TopService"
                  android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE"

app/src/main/res/drawable/shape_small_black_oval.xml

@@ -4,8 +4,8 @@
 
     <solid android:color="#949494" />
 
-    <corners android:radius="4dp" />
-    <size android:width= "8dp"
-        android:height= "8dp" />
+    <corners android:radius="3dp" />
+    <size android:width= "6dp"
+        android:height= "6dp" />
 
 </shape>

app/src/main/res/drawable/sp_bg_gradient_rectangle_yellow.xml

@@ -6,5 +6,5 @@
         android:startColor="@color/yellow_start"
         android:endColor="@color/yellow_end"/>
     <corners
-        android:radius="@dimen/radius_10"/>
+        android:radius="@dimen/radius_20"/>
 </shape>

app/src/main/res/drawable/x_shap_shadow_bg_rectgangle_white.xml

@@ -10,7 +10,7 @@
                 android:color="@color/white_ededed"
                 />
 
-            <corners android:radius="10dp" />
+            <corners android:radius="15dp" />
         </shape>
     </item>
     <!--第二层-->
@@ -26,7 +26,7 @@
                 android:width="0.33dp"
                 android:color="@color/white" />
 
-            <corners android:radius="10dp" />
+            <corners android:radius="15dp" />
         </shape>
     </item>
 

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

@@ -137,13 +137,8 @@
 
 
     <Button
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        style="@style/style_button"
         android:text="立即绑定"
-        android:textColor="@color/black_dark"
-        android:layout_margin="15dp"
-        android:background="@drawable/bg_corner_popup"
-        android:textSize="18sp"
         android:id="@+id/btn"
 
         />

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

@@ -34,9 +34,7 @@
 
     <TextView
         android:id="@+id/bindweixin_sure_text"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        style="@style/txt_big_btn_style"
+        style="@style/style_button"
         android:text="确 定"/>
 
     <TextView

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

@@ -38,11 +38,8 @@
                 android:layout_gravity="center"/>
             <TextView
                 android:id="@+id/sure_tv"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                style="@style/txt_big_btn_style"
-                android:text="立即绑定"
-                android:background="@drawable/selector_button_full_main"/>
+                style="@style/style_button"
+                android:text="立即绑定"/>
 
         </LinearLayout>
     </ScrollView>

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

@@ -12,47 +12,32 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:layout_margin="@dimen/content_padding_10"
-            android:padding="@dimen/content_padding_20"
+            android:padding="@dimen/content_padding_10"
             android:gravity="center"
             android:background="@drawable/x_shap_shadow_bg_rectgangle_white">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_margin="@dimen/content_padding_15"
+                android:layout_margin="@dimen/content_padding_30"
                 android:lineSpacingExtra="@dimen/content_padding_8"
                 android:text="根据国家相关法律规定，为保障线上交易活动得安全，参与互联网大额提现等资金活动时需要进行实名认证。完成实名认证后，提现将不需要再进行验证。"
                 android:textColor="#404040"
                 android:textSize="@dimen/text_size_12" />
 
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="40dp"
-                android:layout_marginTop="@dimen/content_padding_10"
-                android:orientation="horizontal">
-
                 <TextView
                     android:id="@+id/dialog_sure"
-                    android:layout_width="200dp"
-                    android:layout_height="40dp"
-                    android:background="@drawable/sp_bg_gradient_rectangle_yellow2"
-                    android:gravity="center"
-                    android:layout_gravity="center"
                     android:text="确定"
-                    android:textColor="#010101"
-                    android:textSize="@dimen/text_size_15" />
-            </LinearLayout>
+                    style="@style/style_button"
+                    android:layout_width="200dp"/>
 
         </LinearLayout>
 
         <ImageView
             android:id="@+id/dialog_close"
-            android:layout_width="22dp"
-            android:layout_height="22dp"
-            android:padding="2dp"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
             android:layout_alignParentEnd="true"
-            android:src="@mipmap/try_dialog_x"
-            android:background="@drawable/shape_black_ring"/>
+            android:src="@mipmap/try_dialog_x"/>
     </RelativeLayout>
 </FrameLayout>

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

@@ -23,7 +23,6 @@
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_margin="@dimen/content_padding_10"
                 android:padding="@dimen/content_padding_20"
                 android:background="@drawable/x_shap_shadow_bg_rectgangle_white">
 
@@ -113,19 +112,11 @@
                 <TextView
                     android:layout_below="@+id/listview"
                     android:id="@+id/start_task_tv"
+                    style="@style/style_button"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
                     android:layout_centerHorizontal="true"
-                    android:layout_marginLeft="@dimen/content_padding_40"
-                    android:layout_marginRight="@dimen/content_padding_40"
-                    android:layout_marginTop="@dimen/content_padding_small"
-                    android:background="@drawable/sp_bg_gradient_rectangle_yellow"
-                    android:gravity="center"
-                    android:minHeight="36dp"
                     android:minWidth="151dp"
                     android:text="开始任务"
-                    android:textSize="18sp"
-                    android:textColor="@color/txt_black"
                     android:visibility="visible"/>
 
                 <com.sheep.gamegroup.util.MyListview
@@ -144,7 +135,7 @@
                 <TextView
                     android:id="@+id/doalog_item_get_rewards_tv"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_height="40dp"
                     android:layout_below="@+id/start_layout"
                     android:layout_centerHorizontal="true"
                     android:layout_marginLeft="@dimen/content_padding_40"
@@ -152,23 +143,20 @@
                     android:layout_marginTop="@dimen/content_padding_small"
                     android:background="@drawable/sp_bg_gradient_rectangle_yellow"
                     android:gravity="center"
-                    android:minHeight="36dp"
                     android:minWidth="151dp"
                     android:text="领取奖励"
                     android:textSize="18sp"
-                    android:textColor="@color/txt_black"
+                    android:textColor="#ffffff"
                     android:visibility="gone"/>
 
             </RelativeLayout>
 
             <ImageView
                 android:id="@+id/dialog_item_x"
-                android:layout_width="25dp"
-                android:layout_height="25dp"
-                android:padding="2dp"
+                android:layout_width="30dp"
+                android:layout_height="30dp"
                 android:layout_alignParentEnd="true"
-                android:src="@mipmap/try_dialog_x"
-                android:background="@drawable/shape_black_ring"/>
+                android:src="@mipmap/try_dialog_x"/>
         </RelativeLayout>
     </ScrollView>
 </RelativeLayout>

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

@@ -15,8 +15,7 @@
         android:drawableLeft="?line_short"
         android:drawablePadding="@dimen/content_padding_default"
         android:gravity="center_vertical"
-        android:text="猜你喜欢"
-        android:textStyle="bold" />
+        android:text="猜你喜欢" />
 
     <ImageView
         android:id="@+id/img_fgt_main_guess_you_like"

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

@@ -16,8 +16,7 @@
         android:drawablePadding="@dimen/content_padding_default"
         android:gravity="center_vertical"
         android:layerType="software"
-        android:text="新游推荐"
-        android:textStyle="bold" />
+        android:text="新游推荐"/>
 
     <android.support.v7.widget.RecyclerView
         android:id="@+id/recy_fgt_main_new_game_invite"

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

@@ -73,7 +73,7 @@
                     <TextView
                         android:id="@+id/withdrawal"
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
+                        android:layout_height="30dp"
                         android:minWidth="100dp"
                         android:layout_alignParentRight="true"
                         android:layout_centerVertical="true"
@@ -81,8 +81,7 @@
                         android:textColor="@color/blue_34a6e7"
                         android:textSize="@dimen/text_size_4"
                         android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
-                        android:gravity="center"
-                        android:padding="5dp"/>
+                        android:gravity="center"/>
                     <TextView
                         android:id="@+id/my_property"
                         android:layout_width="wrap_content"
@@ -117,11 +116,8 @@
                 android:id="@+id/couple_red_packets_iv"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/content_padding_10"
-                android:layout_marginBottom="@dimen/content_padding_10"
-                android:layout_marginLeft="@dimen/content_padding_20"
-                android:layout_marginRight="@dimen/content_padding_20"
-                android:background="@mipmap/couple_red_packets"  />
+                android:padding="@dimen/content_padding_10"
+                android:src="@mipmap/couple_red_packets"  />
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -137,7 +133,7 @@
                     android:orientation="vertical"
                     android:gravity="center">
                     <ImageView
-                        android:layout_width="wrap_content"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:src="@mipmap/home_try_play_bg"/>
                     <TextView
@@ -174,7 +170,7 @@
                     android:orientation="vertical"
                     android:gravity="center">
                     <ImageView
-                        android:layout_width="wrap_content"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:src="@mipmap/home_lying_bg"/>
                     <TextView

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

@@ -47,7 +47,6 @@
             android:drawablePadding="@dimen/content_padding_3"
             android:drawableRight="@drawable/wx_on_hook_abnormal"
             app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintLeft_toLeftOf="parent"/>
         <TextView
             android:id="@+id/wx_is_open_tv"

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

@@ -4,7 +4,8 @@
     android:layout_height="wrap_content"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:padding="@dimen/content_padding_20"
-    android:layout_margin="@dimen/content_padding_10"
+    android:layout_marginLeft="@dimen/content_padding_10"
+    android:layout_marginRight="@dimen/content_padding_10"
     android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
     android:orientation="vertical">
     <include layout="@layout/lie_make_money_operation_item"/>

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

@@ -24,8 +24,7 @@
         android:layout_height="match_parent"
         android:layout_centerInParent="true"
         android:gravity="center"
-        android:text="@string/app_name"
-        android:textStyle="bold" />
+        android:text="@string/app_name" />
 
 
     <!--右边按钮-->

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

@@ -22,8 +22,7 @@
             android:drawableLeft="?line_short"
             android:drawablePadding="@dimen/content_padding_default"
             android:gravity="center_vertical"
-            android:text="分类名"
-            android:textStyle="bold" />
+            android:text="分类名"/>
 
         <ImageView
             android:id="@+id/txt_mainpage_game_list_more"

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

@@ -16,18 +16,12 @@
         android:padding="15dp">
         <TextView
             android:id="@+id/withdrawal"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:minWidth="100dp"
-
+            style="@style/style_button"
+            android:layout_height="30dp"
+            android:layout_width="100dp"
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
-            android:text="提 现"
-            android:textColor="@color/white"
-            android:textSize="20dp"
-            android:background="@drawable/sp_bg_gradient_rectangle_blue"
-            android:gravity="center"
-            android:padding="5dp"/>
+            android:text="提 现"/>
         <TextView
             android:id="@+id/my_property"
             android:layout_width="wrap_content"
@@ -80,8 +74,8 @@
             android:gravity="center">
             <ImageView
                 android:id="@+id/personalcenter_item_icon_iv"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_width="@dimen/content_padding_20"
+                android:layout_height="@dimen/content_padding_20"
                 android:src="@mipmap/x_ic_account_secuity"
                 android:layout_marginRight="12dp"
                 android:layout_centerVertical="true"/>
@@ -123,8 +117,8 @@
             android:layout_alignParentStart="true">
             <ImageView
                 android:id="@+id/tast_item_icon_iv"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_width="@dimen/content_padding_20"
+                android:layout_height="@dimen/content_padding_20"
                 android:src="@mipmap/x_ic_task_history"
                 android:layout_marginRight="12dp"
                 android:layout_centerVertical="true"/>
@@ -166,8 +160,8 @@
          >
             <ImageView
                 android:id="@+id/detail_item_icon_iv"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_width="@dimen/content_padding_20"
+                android:layout_height="@dimen/content_padding_20"
                 android:src="@mipmap/x_ic_withdrawal"
                 android:layout_marginRight="12dp"
                 android:layout_centerVertical="true"/>

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

@@ -23,8 +23,7 @@
         android:gravity="center"
         android:text="@string/app_name"
         android:textColor="@color/black_text_deep"
-        android:textSize="@dimen/text_size_4"
-        android:textStyle="bold"/>
+        android:textSize="@dimen/text_size_4"/>
 
     <!--右边按钮-->
     <Button

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

@@ -4,6 +4,7 @@
     android:layout_height="wrap_content"
     android:orientation="vertical"
     android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
+    android:layout_marginBottom="@dimen/content_padding_10"
     android:paddingRight="12dp"
     android:paddingTop="12dp"
     android:paddingLeft="20dp"

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

@@ -8,7 +8,7 @@
         android:id="@+id/withdrawal_notice_icon_iv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@mipmap/ic_launcher_round"
+        android:src="@mipmap/no_bind_img"
         android:layout_gravity="center"/>
 
     <TextView
@@ -22,10 +22,6 @@
 
     <TextView
         android:id="@+id/withdrawal_bind_weixin_tv"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        style="@style/txt_big_btn_style"
-        android:text="立即绑定"
-        android:gravity="center"
-        android:background="@drawable/sp_bg_gradient_rectangle_yellow"/>
+        style="@style/style_button"
+        android:text="立即绑定"/>
 </LinearLayout>

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

@@ -65,6 +65,7 @@
         android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
         android:layout_marginLeft="10dp"
         android:layout_marginRight="10dp"
+        android:layout_marginBottom="10dp"
         >
 
         <RelativeLayout
@@ -216,16 +217,6 @@
 
     <TextView
         android:id="@+id/tv_submit"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="40dp"
-        android:layout_marginLeft="20dp"
-        android:layout_marginRight="20dp"
-        android:background="@drawable/selector_button_full_main"
-        android:gravity="center"
-        android:padding="@dimen/content_padding_10"
         android:text="退出登录"
-        android:textColor="@color/txt_black_010101"
-        android:textSize="@dimen/text_size_18" />
+        style="@style/style_button"/>
 </LinearLayout>

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

@@ -21,7 +21,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
-        android:layout_margin="12dp"
+        android:layout_margin="@dimen/content_padding_10"
         android:orientation="vertical"
         >
 
@@ -210,7 +210,8 @@
         android:layout_width="match_parent"
         android:layout_height="100dp"
         android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
-        android:layout_margin="12dp"
+        android:layout_marginLeft="@dimen/content_padding_10"
+        android:layout_marginRight="@dimen/content_padding_10"
         android:orientation="horizontal"
         >
         <RelativeLayout
@@ -287,7 +288,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
-        android:layout_margin="12dp"
+        android:layout_margin="@dimen/content_padding_10"
         android:orientation="vertical"
         android:padding="15dp"
         >

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

@@ -2,164 +2,131 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
     android:background="@color/white_light"
-    >
-    <include
-        layout="@layout/title"/>
+    android:orientation="vertical">
 
+    <include layout="@layout/title" />
 
 
-<LinearLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
-    android:layout_marginLeft="10dp"
-    android:layout_marginRight="10dp"
-    >
-
-    <RelativeLayout
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="15dp"
-        android:id="@+id/rl_phone"
-        >
-
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="姓    名"
-            style="@style/txt_style_15"
-            android:layout_marginLeft="5dp"
-            android:layout_centerVertical="true"
-            />
-
-
-        <EditText
-            android:id="@+id/et_name"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="5dp"
-            android:layout_centerVertical="true"
-            android:layout_alignParentRight="true"
-            android:drawablePadding="10dp"
-            android:background="@null"
-            android:textSize="@dimen/text_size_2"
-            android:hint="请填写姓名"
-            android:textColor="@color/txt_black_9e9c9c"
-            />
-    </RelativeLayout>
-
-
-
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1px"
-        android:background="@color/white_bg_line"
-        android:layout_marginLeft="15dp"
-        android:layout_marginRight="15dp"
-        />
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="15dp"
-        >
-
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="身份证"
-            android:layout_toRightOf="@id/iv_phone"
-            style="@style/txt_style_15"
-            android:layout_marginLeft="5dp"
-            android:layout_centerVertical="true"
-            />
-
+        android:layout_margin="10dp"
+        android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
+        android:orientation="vertical">
 
-        <EditText
-            android:id="@+id/et_id_card"
-            android:layout_width="wrap_content"
+        <RelativeLayout
+            android:id="@+id/rl_phone"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="5dp"
-            android:layout_centerVertical="true"
-            android:layout_alignParentRight="true"
-            android:drawablePadding="10dp"
-            android:background="@null"
-            android:hint="请填写身份证号"
-            android:maxLength="18"
-            android:textSize="@dimen/text_size_2"
-            android:textColor="@color/txt_black_9e9c9c"
-            />
-    </RelativeLayout>
-
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1px"
-        android:background="@color/white_bg_line"
-        android:layout_marginLeft="15dp"
-        android:layout_marginRight="15dp"
-        />
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="15dp"
-        >
-
-
-        <TextView
-            android:layout_width="wrap_content"
+            android:padding="15dp">
+
+
+            <TextView
+                style="@style/txt_style_15"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="5dp"
+                android:text="姓    名" />
+
+
+            <EditText
+                android:id="@+id/et_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="5dp"
+                android:background="@null"
+                android:drawablePadding="10dp"
+                android:hint="请填写姓名"
+                android:textColor="@color/txt_black_9e9c9c"
+                android:textSize="@dimen/text_size_2" />
+        </RelativeLayout>
+
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1px"
+            android:layout_marginLeft="15dp"
+            android:layout_marginRight="15dp"
+            android:background="@color/white_bg_line" />
+
+        <RelativeLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="银行卡"
-            android:layout_toRightOf="@id/iv_phone"
-            style="@style/txt_style_15"
-            android:layout_marginLeft="5dp"
-            android:layout_centerVertical="true"
-            />
-
-
-        <EditText
-            android:id="@+id/et_bank"
-            android:layout_width="wrap_content"
+            android:padding="15dp">
+
+
+            <TextView
+                style="@style/txt_style_15"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="5dp"
+                android:layout_toRightOf="@id/iv_phone"
+                android:text="身份证" />
+
+
+            <EditText
+                android:id="@+id/et_id_card"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="5dp"
+                android:background="@null"
+                android:drawablePadding="10dp"
+                android:hint="请填写身份证号"
+                android:maxLength="18"
+                android:textColor="@color/txt_black_9e9c9c"
+                android:textSize="@dimen/text_size_2" />
+        </RelativeLayout>
+
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1px"
+            android:layout_marginLeft="15dp"
+            android:layout_marginRight="15dp"
+            android:background="@color/white_bg_line" />
+
+        <RelativeLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="5dp"
-            android:layout_centerVertical="true"
-            android:layout_alignParentRight="true"
-            android:drawablePadding="10dp"
-            android:background="@null"
-            android:inputType="number"
-            android:maxLength="19"
-            android:hint="请填写银行卡"
-            android:textSize="@dimen/text_size_2"
-            android:textColor="@color/txt_black_9e9c9c"
-            />
-    </RelativeLayout>
-
-
-
-
-
-</LinearLayout>
+            android:padding="15dp">
+
+            <TextView
+                style="@style/txt_style_15"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="5dp"
+                android:layout_toRightOf="@id/iv_phone"
+                android:text="银行卡" />
+
+            <EditText
+                android:id="@+id/et_bank"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="5dp"
+                android:background="@null"
+                android:drawablePadding="10dp"
+                android:hint="请填写银行卡"
+                android:inputType="number"
+                android:maxLength="19"
+                android:textColor="@color/txt_black_9e9c9c"
+                android:textSize="@dimen/text_size_2" />
+        </RelativeLayout>
+
+    </LinearLayout>
 
 
     <TextView
         android:id="@+id/tv_submit"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="40dp"
-        android:layout_marginLeft="20dp"
-        android:layout_marginRight="20dp"
-        android:background="@drawable/selector_button_full_main"
-        android:gravity="center"
-        android:padding="@dimen/content_padding_10"
-        android:text="提交"
-        android:textColor="@color/txt_black_010101"
-        android:textSize="@dimen/text_size_18" />
+        style="@style/style_button"
+        android:text="提交" />
 </LinearLayout>

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

@@ -7,8 +7,8 @@
     <color name="theme_app_mid">#34a5e7</color>
     <color name="theme_app_highlight">#29d6fd</color>
     <color name="theme_app_highlight_more">#34a5e7</color>
-    <color name="theme_app_highlight_transparent">#3329d6fd</color>
-    <color name="theme_app_highlight_more_transparent">#3334a5e7</color>
+    <color name="theme_app_highlight_transparent">#cc29d6fd</color>
+    <color name="theme_app_highlight_more_transparent">#cc34a5e7</color>
 
     <!--app theme info color-->
     <color name="theme_app_info">#42a4ff</color>