中信银行填写用户信息1合并3

app/src/main/AndroidManifest.xml

@@ -176,6 +176,10 @@
             android:name=".page.SplashActivity"
             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.AskRewardAct"
@@ -389,10 +393,6 @@
         </activity>
         <activity android:name="com.sheep.groups.creditcard.CITICBackOtherInfoActivity"
             android:screenOrientation="portrait">
-        <intent-filter>
-            <action android:name="android.intent.action.MAIN"/>
-            <category android:name="android.intent.category.LAUNCHER"/>
-        </intent-filter>
         </activity>
 
         <!--友盟start-->

app/src/main/java/com/sheep/groups/creditcard/CITICBackOtherInfoActivity.java

@@ -9,6 +9,7 @@ import android.widget.TextView;
 
 import com.kfzs.duanduan.utils.dlg.ViewFindUtils;
 import com.sheep.gamegroup.absBase.BaseActivity;
+import com.sheep.groups.creditcard.fragment.CiticStepThreeFragment;
 import com.sheep.jiuyan.samllsheep.R;
 
 import java.util.Locale;
@@ -38,7 +39,7 @@ public class CITICBackOtherInfoActivity extends BaseActivity {
 
     }
     private FragmentTabHost mFragmentTabHost;
-    private Class tabFragmentContentArray[] = {CITICBackOtherInfoFragment1.class, CITICBackOtherInfoFragment1.class, CITICBackOtherInfoFragment1.class};
+    private Class tabFragmentContentArray[] = {CITICBackOtherInfoFragment1.class, CITICBackOtherInfoFragment1.class, CiticStepThreeFragment.class};
     /**
      * 初始化的FragmentTabHost
      */

app/src/main/res/layout-sw550dp-large/activity_citic_bank_contact_information.xml

@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true">
+
+    <LinearLayout
+        android:id="@+id/other_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginBottom="@dimen/bottom_height"
+        android:clipToPadding="true"
+        android:fitsSystemWindows="true"
+        android:orientation="vertical">
+
+        <com.kfzs.duanduan.view.NoScrollViewPager
+            android:id="@+id/view_pager_container"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"/>
+
+    </LinearLayout>
+
+    <include
+        android:id="@+id/layout_main_activity_toolbar"
+        layout="@layout/toolbar_main_activity"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/app_nav_toolbar_height"
+        android:layout_alignParentTop="true"
+        android:visibility="gone"/>
+
+    <RelativeLayout
+        android:id="@+id/layout_bottom"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:background="@color/white">
+
+        <LinearLayout
+            android:id="@+id/tab_container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingTop="4dp"
+            android:orientation="horizontal">
+            <View android:layout_weight="1"
+                android:layout_width="0dp"
+                android:layout_height="@dimen/tab_height"/>
+            <TextView
+                android:layout_width="@dimen/tab_width"
+                android:layout_height="@dimen/tab_height"
+                android:drawableTop="@drawable/drawable_selector_game"
+                android:textSize="12sp"
+                android:gravity="center"
+                android:textColor="@color/selector_color_main_tab"
+                android:text="@string/tab_viewpager_gamestore"/>
+            <View android:layout_weight="2"
+                android:layout_width="0dp"
+                android:layout_height="@dimen/tab_height"/>
+            <TextView
+                android:layout_width="@dimen/tab_width"
+                android:layout_height="@dimen/tab_height"
+                android:drawableTop="@drawable/drawable_selector_class"
+                android:textSize="12sp"
+                android:gravity="center"
+                android:textColor="@color/selector_color_main_tab"
+                android:text="@string/tab_viewpager_classification"/>
+            <View android:layout_weight="2"
+                android:layout_width="0dp"
+                android:layout_height="@dimen/tab_height"/>
+            <TextView
+                android:layout_width="@dimen/tab_width"
+                android:layout_height="@dimen/tab_height"
+                android:drawableTop="@drawable/drawable_selector_task"
+                android:textSize="12sp"
+                android:gravity="center"
+                android:textColor="@color/selector_color_main_tab"
+                android:text="@string/mine_hoggerel"/>
+            <View android:layout_weight="2"
+                android:layout_width="0dp"
+                android:layout_height="@dimen/tab_height"/>
+            <!--<TextView
+                android:layout_width="@dimen/tab_width"
+                android:layout_height="@dimen/tab_height"
+                android:drawableTop="@drawable/drawable_selector_bp"
+                android:textSize="12sp"
+                android:gravity="center"
+                android:textColor="@color/selector_color_main_tab"
+                android:text="@string/tab_viewpager_borrowplay"/>
+            <View android:layout_weight="2"
+                android:layout_width="0dp"
+                android:layout_height="@dimen/tab_height"/>-->
+            <TextView
+                android:layout_width="@dimen/tab_width"
+                android:layout_height="@dimen/tab_height"
+                android:drawableTop="@drawable/drawable_selector_credit"
+                android:textSize="12sp"
+                android:gravity="center"
+                android:textColor="@color/selector_color_main_tab"
+                android:text="@string/tab_viewpager_credit_card"/>
+            <View android:layout_weight="1"
+                android:layout_width="0dp"
+                android:layout_height="@dimen/tab_height"/>
+        </LinearLayout>
+
+        <View
+            android:id="@+id/tab_line"
+            android:layout_width="match_parent"
+            android:layout_height="1px"
+            android:background="@color/divider_gray" />
+    </RelativeLayout>
+</RelativeLayout>

app/src/main/res/layout-sw550dp-large/activity_citic_bank_other_info_tab.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+    <include layout="@layout/title"/>
+
+    <android.support.v4.app.FragmentTabHost
+        android:id="@android:id/tabhost"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/white">
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:background="@color/gray" />
+
+        <FrameLayout
+            android:id="@android:id/tabcontent"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_weight="0" />
+    </android.support.v4.app.FragmentTabHost>
+
+    <FrameLayout
+        android:id="@+id/realtabcontent"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1" />
+</LinearLayout>

app/src/main/res/layout-sw550dp-large/fragment_citic_bank_other_info1.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:gravity="center"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/activity_citic_bank_other_info_tab_tv"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1" />
+</LinearLayout>

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

@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#F0F0F0"
+    android:background="#f3f3f3"
     android:orientation="vertical">
     <include layout="@layout/title"/>
 

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

@@ -208,11 +208,9 @@
 
     </android.support.constraint.ConstraintLayout>
 
-    <TextView
-        android:id="@+id/citic_next"
-        style="@style/style_button"
-        android:layout_width="match_parent"
-        android:layout_height="40dp"
+    <com.kfzs.libs.widget.alpha.AlphaButton
+        android:id="@+id/btn_citic_commit"
+        style="@style/citic_creditCardBtnGradientStyle"
         android:text="下一步 >"/>
 
     <TextView

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

@@ -6,8 +6,18 @@
     android:orientation="vertical">
 <LinearLayout
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     android:orientation="vertical">
+    <TextView
+        android:id="@+id/citic_first"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingTop="@dimen/content_padding_10"
+        android:paddingLeft="@dimen/content_padding_10"
+        android:paddingRight="@dimen/content_padding_10"
+        android:text="带'*'为必填项，其他为非必填项"
+        android:textColor="#FA7200"
+        android:textSize="12sp" />
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"