增加信用卡信息确认UI逻辑

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

@@ -1,18 +1,84 @@
 package com.sheep.groups.creditcard;
 
+import android.content.Context;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.CheckBox;
 
 import com.kfzs.libs.DaggerFragment;
 import com.kfzs.libs.IPresenter;
 import com.kfzs.libs.IView;
+import com.kfzs.libs.widget.CompleteCommitEditText;
+import com.kfzs.libs.widget.alpha.AlphaButton;
 import com.sheep.jiuyan.samllsheep.R;
 
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+import butterknife.Unbinder;
+
 /**
  * Created by guoxin on 2018/4/2.
  */
 
-public class ApplyForCreditCardCommitFragment extends DaggerFragment{
+public class ApplyForCreditCardCommitFragment extends DaggerFragment implements DetailsContact.View{
+
+
+    @BindView(R.id.edit_card_time)
+    CompleteCommitEditText editCardTime;
+    @BindView(R.id.edit_address_origin)
+    CompleteCommitEditText editAddressOrigin;
+    @BindView(R.id.edit_address_now)
+    CompleteCommitEditText editAddressNow;
+    @BindView(R.id.edit_email)
+    CompleteCommitEditText editEmail;
+    @BindView(R.id.edit_edu_info)
+    CompleteCommitEditText editEduInfo;
+    @BindView(R.id.edit_company_name)
+    CompleteCommitEditText editCompanyName;
+    @BindView(R.id.edit_company_city)
+    CompleteCommitEditText editCompanyCity;
+    @BindView(R.id.edit_company_address)
+    CompleteCommitEditText editCompanyAddress;
+    @BindView(R.id.edit_company_tel)
+    CompleteCommitEditText editCompanyTel;
+    @BindView(R.id.edit_work_life)
+    CompleteCommitEditText editWorkLife;
+    @BindView(R.id.edit_family_name)
+    CompleteCommitEditText editFamilyName;
+    @BindView(R.id.edit_relationship)
+    CompleteCommitEditText editRelationship;
+    @BindView(R.id.edit_family_tel)
+    CompleteCommitEditText editFamilyTel;
+    @BindView(R.id.edit_relationship_other)
+    CompleteCommitEditText editRelationshipOther;
+    @BindView(R.id.btn_commit_info)
+    AlphaButton btnCommitInfo;
+    @BindView(R.id.btn_modify_infos)
+    AlphaButton btnModifyInfos;
+    @BindView(R.id.cbx_marry_yes)
+    CheckBox cbxMarryYes;
+    @BindView(R.id.cbx_marry_no)
+    CheckBox cbxMarryNo;
+
+
+    private Unbinder unbinder;
+
+    private OnNextStepCallback onNextStepCallback;
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        try {
+            onNextStepCallback = (OnNextStepCallback) context;
+        }
+        catch (ClassCastException e){
+        }
+    }
+
     @Override
     public void setupDaggerComponent() {
 
@@ -36,5 +102,87 @@ public class ApplyForCreditCardCommitFragment extends DaggerFragment{
     @Override
     public void setupViews(@Nullable Bundle savedInstanceState) {
 
+        //身份证日期
+        editCardTime.setText(CreditCardInfosManager.getInstance().c_id_expire);
+
+        editAddressOrigin.setText(CreditCardInfosManager.getInstance().p_city);
+        editAddressNow.setText(CreditCardInfosManager.getInstance().p_address);
+        editEmail.setText(CreditCardInfosManager.getInstance().p_email);
+        //婚姻
+        cbxMarryYes.setChecked(false);
+        cbxMarryNo.setChecked(false);
+        String marray = CreditCardInfosManager.getInstance().p_marray;
+        ///TODO : 此处条件等marray值确定后，需要重新修改
+        if(true){
+            cbxMarryYes.setChecked(true);
+        }else {
+            cbxMarryNo.setChecked(true);
+        }
+
+        //教育
+        editEduInfo.setText(CreditCardInfosManager.getInstance().p_edu);
+        //公司信息
+        editCompanyName.setText(CreditCardInfosManager.getInstance().w_name);
+        editCompanyCity.setText(CreditCardInfosManager.getInstance().w_city);
+        editCompanyAddress.setText(CreditCardInfosManager.getInstance().w_address);
+        editCompanyTel.setText(CreditCardInfosManager.getInstance().w_tel);
+        editWorkLife.setText(CreditCardInfosManager.getInstance().w_age);
+
+        //亲属
+        editFamilyName.setText(CreditCardInfosManager.getInstance().c_d_name);
+        editRelationship.setText(CreditCardInfosManager.getInstance().c_d_relation);
+        editFamilyTel.setText(CreditCardInfosManager.getInstance().c_d_mobile);
+
+        StringBuilder sb = new StringBuilder(CreditCardInfosManager.getInstance().c_o_name);
+        sb.append(" ");
+        sb.append(CreditCardInfosManager.getInstance().c_o_relation);
+        sb.append(" ");
+        sb.append(CreditCardInfosManager.getInstance().c_o_mobile);
+        editRelationshipOther.setText(sb.toString());
+
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        // TODO: inflate a fragment view
+        View rootView = super.onCreateView(inflater, container, savedInstanceState);
+        unbinder = ButterKnife.bind(this, rootView);
+        return rootView;
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        unbinder.unbind();
+    }
+
+    @OnClick({R.id.btn_modify_infos,R.id.btn_commit_info})
+    public void onClick(View view){
+        switch (view.getId()){
+            case R.id.btn_commit_info:
+
+                //todo 将数据提交到服务器接口
+
+
+                break;
+            case R.id.btn_modify_infos:
+                goNext();
+                break;
+        }
+    }
+
+    @Override
+    public boolean isViewActive() {
+        return isAdded();
+    }
+
+    @Override
+    public void showProgress(String msg) {
+
+    }
+
+    @Override
+    public void goNext() {
+        onNextStepCallback.onNextStep(ApplyForCreditCardActivity.STEP_DETAILS);
     }
 }

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

@@ -31,8 +31,10 @@
                         android:text="证件有效期" />
 
                     <com.kfzs.libs.widget.CompleteCommitEditText
+                        android:id="@+id/edit_card_time"
                         style="@style/creditCardInputItemEtStyle"
-                        android:hint="重要信息，请正确填写" />
+                        android:hint="重要信息，请正确填写"
+                        android:enabled="false"/>
 
                 </LinearLayout>
 
@@ -43,10 +45,12 @@
                         android:text="所在地" />
 
                     <com.kfzs.libs.widget.CompleteCommitEditText
+                        android:id="@+id/edit_address_origin"
                         style="@style/creditCardInputItemEtStyle"
                         android:hint="请选择"
                         android:inputType="number"
-                        android:maxLength="11" />
+                        android:maxLength="11"
+                        android:enabled="false"/>
 
                 </LinearLayout>
                 <LinearLayout style="@style/creditCardInputItemStyle">
@@ -56,10 +60,12 @@
                         android:text="住在地址" />
 
                     <com.kfzs.libs.widget.CompleteCommitEditText
+                        android:id="@+id/edit_address_now"
                         style="@style/creditCardInputItemEtStyle"
                         android:hint="请选择"
                         android:inputType="number"
-                        android:maxLength="11" />
+                        android:maxLength="11"
+                        android:enabled="false"/>
 
                 </LinearLayout>
                 <LinearLayout style="@style/creditCardInputItemStyle">
@@ -70,9 +76,11 @@
 
                     <com.kfzs.libs.widget.CompleteCommitEditText
                         style="@style/creditCardInputItemEtStyle"
+                        android:id="@+id/edit_email"
                         android:hint="请填写"
                         android:inputType="number"
-                        android:maxLength="11" />
+                        android:maxLength="11"
+                        android:enabled="false"/>
 
                 </LinearLayout>
                 <LinearLayout style="@style/creditCardInputItemStyle">
@@ -81,7 +89,16 @@
                         style="@style/creditCardInputItemTitleStyle"
                         android:text="婚姻状况" />
 
-
+                    <CheckBox
+                        android:id="@+id/cbx_marry_yes"
+                        style="@style/checkbox_creditcard_marry_style"
+                        android:text="是"/>
+                    <CheckBox
+                        android:id="@+id/cbx_marry_no"
+                        style="@style/checkbox_creditcard_marry_style"
+                        android:text="否"
+                        android:layout_marginLeft="30dp"
+                        />
 
                 </LinearLayout>
                 <LinearLayout style="@style/creditCardInputItemStyle">
@@ -91,10 +108,12 @@
                         android:text="教育程度" />
 
                     <com.kfzs.libs.widget.CompleteCommitEditText
+                        android:id="@+id/edit_edu_info"
                         style="@style/creditCardInputItemEtStyle"
                         android:hint="请填写"
                         android:inputType="number"
-                        android:maxLength="11" />
+                        android:maxLength="11"
+                        android:enabled="false"/>
 
                 </LinearLayout>
                 <LinearLayout style="@style/creditCardInputItemStyle">
@@ -104,10 +123,12 @@
                         android:text="单位名称" />
 
                     <com.kfzs.libs.widget.CompleteCommitEditText
+                        android:id="@+id/edit_company_name"
                         style="@style/creditCardInputItemEtStyle"
                         android:hint="请填写"
                         android:inputType="number"
-                        android:maxLength="11" />
+                        android:maxLength="11"
+                        android:enabled="false"/>
 
                 </LinearLayout>
                 <LinearLayout style="@style/creditCardInputItemStyle">
@@ -117,10 +138,12 @@
                         android:text="单位城市" />
 
                     <com.kfzs.libs.widget.CompleteCommitEditText
+                        android:id="@+id/edit_company_city"
                         style="@style/creditCardInputItemEtStyle"
                         android:hint="请填写"
                         android:inputType="number"
-                        android:maxLength="11" />
+                        android:maxLength="11"
+                        android:enabled="false"/>
 
                 </LinearLayout>
                 <LinearLayout style="@style/creditCardInputItemStyle">
@@ -130,10 +153,12 @@
                         android:text="单位地址" />
 
                     <com.kfzs.libs.widget.CompleteCommitEditText
+                        android:id="@+id/edit_company_address"
                         style="@style/creditCardInputItemEtStyle"
                         android:hint="请填写"
                         android:inputType="number"
-                        android:maxLength="11" />
+                        android:maxLength="11"
+                        android:enabled="false"/>
 
                 </LinearLayout>
                 <LinearLayout style="@style/creditCardInputItemStyle">
@@ -143,10 +168,12 @@
                         android:text="单位电话" />
 
                     <com.kfzs.libs.widget.CompleteCommitEditText
+                        android:id="@+id/edit_company_tel"
                         style="@style/creditCardInputItemEtStyle"
                         android:hint="请填写"
                         android:inputType="number"
-                        android:maxLength="11" />
+                        android:maxLength="11"
+                        android:enabled="false"/>
 
                 </LinearLayout>
                 <LinearLayout style="@style/creditCardInputItemStyle">
@@ -156,10 +183,12 @@
                         android:text="工作年限" />
 
                     <com.kfzs.libs.widget.CompleteCommitEditText
+                        android:id="@+id/edit_work_life"
                         style="@style/creditCardInputItemEtStyle"
                         android:hint="请填写"
                         android:inputType="number"
-                        android:maxLength="11" />
+                        android:maxLength="11"
+                        android:enabled="false"/>
 
                 </LinearLayout>
 
@@ -173,10 +202,12 @@
                             style="@style/creditCardInputItemTitleStyle"
                             android:text="直属亲属名字" />
                         <com.kfzs.libs.widget.CompleteCommitEditText
+                            android:id="@+id/edit_family_name"
                             style="@style/creditCardInputItemEtStyle"
                             android:hint="请填写"
                             android:inputType="number"
-                            android:maxLength="11" />
+                            android:maxLength="11"
+                            android:enabled="false"/>
                     </LinearLayout>
 
                     <LinearLayout
@@ -190,10 +221,12 @@
                             android:paddingRight="4dp"
                             android:text="关系" />
                         <com.kfzs.libs.widget.CompleteCommitEditText
+                            android:id="@+id/edit_relationship"
                             style="@style/creditCardInputItemEtStyle"
                             android:hint="请填写"
                             android:inputType="number"
-                            android:maxLength="11" />
+                            android:maxLength="11"
+                            android:enabled="false"/>
                     </LinearLayout>
                     <LinearLayout
                         android:layout_width="0dp"
@@ -206,10 +239,12 @@
                             android:paddingRight="4dp"
                             android:text="电话" />
                         <com.kfzs.libs.widget.CompleteCommitEditText
+                            android:id="@+id/edit_family_tel"
                             style="@style/creditCardInputItemEtStyle"
                             android:hint="186****4624"
                             android:inputType="number"
-                            android:maxLength="11" />
+                            android:maxLength="11"
+                            android:enabled="false"/>
                     </LinearLayout>
 
 
@@ -222,10 +257,12 @@
                         android:text="其他联系人" />
 
                     <com.kfzs.libs.widget.CompleteCommitEditText
+                        android:id="@+id/edit_relationship_other"
                         style="@style/creditCardInputItemEtStyle"
                         android:hint="请填写"
                         android:inputType="number"
-                        android:maxLength="11" />
+                        android:maxLength="11"
+                        android:enabled="false"/>
 
                 </LinearLayout>
 
@@ -245,13 +282,13 @@
             android:layout_marginTop="12dp"
             />
         <com.kfzs.libs.widget.alpha.AlphaButton
-            android:id="@+id/btn_next"
+            android:id="@+id/btn_commit_info"
             style="@style/creditCardBtnGradientStyle"
             android:layout_marginTop="12dp"
-            android:text="下一步" />
+            android:text="提交信息" />
 
         <com.kfzs.libs.widget.alpha.AlphaButton
-            android:id="@+id/btn_fix_infos"
+            android:id="@+id/btn_modify_infos"
             style="@style/creditCardBtnGradientStyle"
             android:layout_marginTop="12dp"
             android:text="修改提交信息" />

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

@@ -171,6 +171,14 @@
         <item name="android:singleLine">true</item>
     </style>
 
+    <style name="checkbox_creditcard_marry_style">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textSize">11sp</item>
+        <item name="android:textColor">#b5b5b5</item>
+        <item name="android:enabled">false</item>
+    </style>
+
     <style name="creditCardInputItemSpinnerStyle">
         <item name="android:layout_width">0dp</item>
         <item name="android:layout_height">wrap_content</item>