Domů Procházet Nápověda
Registrovat se Přihlásit se
xmy_android
/
small_sheep_android
Sledovat 3
Oblíbit 0
Rozštěpit 0
Soubory Úkoly 0 Pull Requesty 0 Wiki
Procházet zdrojové kódy

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

zengjiebin před 8 roky
rodič
2b761e9420 82e31f416d
revize
0f9c20b207
10 změnil soubory, kde provedl 544 přidání a 7 odebrání
Rozdělené zobrazení Ukázat statistiku rozdílových dat
  1. 9 0
      app/src/main/java/com/sheep/gamegroup/model/entity/TaskEty.java
  2. 3 1
      app/src/main/java/com/sheep/gamegroup/model/util/AddPuplicParameIntercept.java
  3. 22 5
      app/src/main/java/com/sheep/gamegroup/view/activity/TaskDetailAct.java
  4. 2 0
      app/src/main/java/com/sheep/gamegroup/view/adapter/TryMakeMoneyAdp.java
  5. 171 0
      app/src/main/java/com/sheep/groups/creditcard/fragment/CiticStepThreeFragment.java
  6. 15 0
      app/src/main/res/drawable/btn_citic_commit_background.xml
  7. 282 0
      app/src/main/res/layout/fragment_citic_third_step.xml
  8. 13 0
      app/src/main/res/layout/spinner_citic_text_item.xml
  9. 14 0
      app/src/main/res/values/gx_strings.xml
  10. 13 1
      app/src/main/res/values/styles.xml

+ 9 - 0
app/src/main/java/com/sheep/gamegroup/model/entity/TaskEty.java
Zobrazit soubor 

@@ -22,9 +22,18 @@ public class TaskEty implements Serializable{
 
     private String icon;
 
     private String package_size;
 
     private int release_task_id;
 
+    private int acceptedTaskId;//接受任务id
 
     private String bonus;// 0,
 
     private String desc;// 任务详情介绍
 
 
+    public int getAcceptedTaskId() {
 
+        return acceptedTaskId;
 
+    }
 
+
 
+    public void setAcceptedTaskId(int acceptedTaskId) {
 
+        this.acceptedTaskId = acceptedTaskId;
 
+    }
 
+
 
     public String getDesc() {
 
         return desc;
 
     }

+ 3 - 1
app/src/main/java/com/sheep/gamegroup/model/util/AddPuplicParameIntercept.java
Zobrazit soubor 

@@ -43,13 +43,15 @@ public class AddPuplicParameIntercept implements Interceptor {
 
 
     /**
 
      * 添加公共参数
 
+     * 增加同步锁，防止多个HTTP同时请求时，加密出现异常bug
 
+     *
 
      .setQueryParameter("test3","test3")
 
      .addQueryParameter("test","test")
 
      .setEncodedQueryParameter("test2","test2")
 
      * @param oldRequest
 
      * @return
 
      */
 
-    private Request addParam(Request oldRequest) {
 
+    synchronized private Request addParam(Request oldRequest) {
 
         HttpUrl.Builder b = oldRequest.url()
 
                 .newBuilder();
 
         String method = oldRequest.method();

+ 22 - 5
app/src/main/java/com/sheep/gamegroup/view/activity/TaskDetailAct.java
Zobrazit soubor 

@@ -145,7 +145,13 @@ public class TaskDetailAct extends BaseActivity implements TaskDetailContract.Vi
 
 
         });
 
         webText.getSettings().setJavaScriptEnabled(true);
 
-        webText.getSettings().setLayoutAlgorithm(WebSettings.LayoutAlgorithm.SINGLE_COLUMN);//适应屏幕，内容将自动缩放
 
+
 
+// 1、LayoutAlgorithm.NARROW_COLUMNS ： 适应内容大小
 
+// 2、LayoutAlgorithm.SINGLE_COLUMN:适应屏幕，内容将自动缩放
 
+//        webText.getSettings().setUseWideViewPort(true);
 
+//        webText.getSettings().setLoadWithOverviewMode(true);
 
+//        webText.getSettings().setLayoutAlgorithm(WebSettings.LayoutAlgorithm.SINGLE_COLUMN);
 
+//        webText.setInitialScale(80);
 
         webText.setWebViewClient(new WebViewClient(){
 
             @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
 
             @Override
 
@@ -154,7 +160,12 @@ public class TaskDetailAct extends BaseActivity implements TaskDetailContract.Vi
 
                 return true;
 
             }
 
         });
 
-        webText.loadDataWithBaseURL(null,taskEty.getDesc(), "text/html", "utf-8", null);
 
+        //封装头文件
 
+        String sHead=   "<html><head><meta name=\"viewport\" content=\"width=device-width, " +
 
+                "initial-scale=1.0, minimum-scale=0.5, maximum-scale=2.0, user-scalable=yes\" />"+
 
+                "<style>img{max-width:100% !important;height:auto !important;}</style>"
 
+                +"<style>body{max-width:100% !important;}</style>"+"</head><body>";
 
+        webText.loadDataWithBaseURL(null,sHead + taskEty.getDesc() + "</body></html>", "text/html", "utf-8", null);
 
         nameTv.setText(taskEty.getName()+"");
 
         priceTv.setText("+"+ taskEty.getBonus() +"元");
 
         dateTv.setText(TimeUtil.getDate(TimeUtil.FORMAT, Long.valueOf(taskEty.getUpdate_time()))+"");
 
@@ -169,6 +180,9 @@ public class TaskDetailAct extends BaseActivity implements TaskDetailContract.Vi
 
             bottom_btn_layout.setVisibility(View.VISIBLE);
 
 
         }
 
+        if(taskEty.getTask_type() == 2){
 
+            btnTaskItem.setText("信用卡注册");
 
+        }else
 
         if (PackageUtil.isAppInstalled(SheepApp.mContext, taskEty.getPackage_names())) {
 
             btnTaskItem.setText("开始游戏");
 
         }else if(!TextUtils.isEmpty(PackageUtil.isExistsFile(activity, taskEty.getPackage_names(), ""))){
 
@@ -230,7 +244,9 @@ public class TaskDetailAct extends BaseActivity implements TaskDetailContract.Vi
 
             int thisRun = taskEty.getRunTask();
 
             if (thisRun == 1) {//接受了任务
 
                 llInfos.addView(getStep("领取任务", "已完成", 0));
 
-                if (PackageUtil.isAppInstalled(SheepApp.mContext, taskEty.getPackage_names())) {
 
+                if(taskEty.getTask_type() == 2){//信用卡
 
+                    llInfos.addView(getStep("信用卡注册", "待完成", 0));
 
+                }else if (PackageUtil.isAppInstalled(SheepApp.mContext, taskEty.getPackage_names())) {
 
                     llInfos.addView(getStep("下载游戏", "已完成", 0));
 
                     llInfos.addView(getStep("完成任务", "进行中", 1));
 
                 } else {
 
@@ -303,6 +319,7 @@ public class TaskDetailAct extends BaseActivity implements TaskDetailContract.Vi
 
         dialogShowLoading.getTextView().setText("完成");
 
 //                            onGetNetImageUrl(data);
 
         dialogShowLoading.getAlertDialog().dismiss();
 
+        G.showToast("提交成功，等待审核!");
 
         EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.ONFRESH_TRYMAKEMANY_PAGE));
 
         UMConfigUtils.finishTask();
 
         finish();
 
@@ -337,9 +354,9 @@ public class TaskDetailAct extends BaseActivity implements TaskDetailContract.Vi
 
         UploadResult uploadResult = JSON.parseObject(json, UploadResult.class);
 
         if (uploadResult != null) {
 
             final String data = uploadResult.getData().getUrl();
 
-            dialogShowLoading.getTextView().setText("更新中");
 
+            dialogShowLoading.getTextView().setText("提交中");
 
             JSONObject jsonObject = new JSONObject();
 
-            jsonObject.put("id", taskEty.getRelease_task_id());
 
+            jsonObject.put("id", taskEty.getAcceptedTaskId());
 
             jsonObject.put("screenshots",data+"");
 
             jsonObject.put("remark",taskEty.getRemarks()+"");
 
             jsonObject.put("package_name",taskEty.getPackage_names()+"");

+ 2 - 0
app/src/main/java/com/sheep/gamegroup/view/adapter/TryMakeMoneyAdp.java
Zobrazit soubor 

@@ -208,6 +208,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
 
                 taskEty.setRunTask(1);
 
                 taskEty.setBonus(acceptedEty.getRelease_task().getBonus());
 
                 taskEty.setRelease_task_id(acceptedEty.getRelease_task().getId());
 
+                taskEty.setAcceptedTaskId(acceptedEty.getId());
 
                 taskEty.setName(acceptedEty.getRelease_task().getName());
 
                 Jump2View.getInstance().goTaskDetailView(context, taskEty);
 
                 UMConfigUtils.onEvent(UMConfigUtils.Event.TASK_DETAIL);
 
@@ -220,6 +221,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
 
                 taskEty.setRunTask(1);
 
                 taskEty.setRelease_task_id(acceptedEty.getRelease_task().getId());
 
                 taskEty.setName(acceptedEty.getRelease_task().getName());
 
+                taskEty.setAcceptedTaskId(acceptedEty.getId());
 
                 Jump2View.getInstance().goDialogActivityView(context, taskEty);
 
             }
 
         });

+ 171 - 0
app/src/main/java/com/sheep/groups/creditcard/fragment/CiticStepThreeFragment.java
Zobrazit soubor 

@@ -0,0 +1,171 @@
 
+package com.sheep.groups.creditcard.fragment;
 
+
 
+import android.os.Bundle;
 
+import android.support.v7.widget.AppCompatSpinner;
 
+import android.text.TextUtils;
 
+import android.view.LayoutInflater;
 
+import android.view.View;
 
+import android.view.ViewGroup;
 
+import android.widget.AdapterView;
 
+import android.widget.ArrayAdapter;
 
+import android.widget.Toast;
 
+
 
+import com.kfzs.duanduan.BaseCompatFragment;
 
+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 zhanghai on 2018/4/4.
 
+ */
 
+
 
+public class CiticStepThreeFragment extends BaseCompatFragment {
 
+
 
+
 
+    @BindView(R.id.edt_citic_family_name)
 
+    CompleteCommitEditText edtCiticFamilyName;
 
+    @BindView(R.id.spinner_family_relation)
 
+    AppCompatSpinner spinnerFamilyRelation;
 
+    @BindView(R.id.edt_citic_family_mobile)
 
+    CompleteCommitEditText edtCiticFamilyMobile;
 
+    @BindView(R.id.edt_citic_family_zone_code)
 
+    CompleteCommitEditText edtCiticFamilyZoneCode;
 
+    @BindView(R.id.edt_citic_family_tel)
 
+    CompleteCommitEditText edtCiticFamilyTel;
 
+    @BindView(R.id.edt_citic_urgent_name)
 
+    CompleteCommitEditText edtCiticUrgentName;
 
+    @BindView(R.id.spinner_urgent_relation)
 
+    AppCompatSpinner spinnerUrgentRelation;
 
+    @BindView(R.id.edt_citic_urgent_mobile)
 
+    CompleteCommitEditText edtCiticUrgentMobile;
 
+    @BindView(R.id.edt_citic_urgent_zone_code)
 
+    CompleteCommitEditText edtCiticUrgentZoneCode;
 
+    @BindView(R.id.edt_citic_urgent_tel)
 
+    CompleteCommitEditText edtCiticUrgentTel;
 
+    @BindView(R.id.btn_citic_commit)
 
+    AlphaButton btnCiticCommit;
 
+    Unbinder unbinder;
 
+
 
+
 
+
 
+    private ArrayAdapter<CharSequence> adapterFamilyRelatives;
 
+    private ArrayAdapter<CharSequence> adapterUrgentOther;
 
+
 
+    //直系亲属关系和紧急联系人关系
 
+    private String strFamily, strUrgent;
 
+
 
+    @Override
 
+    protected void initView(Bundle savedInstanceState) {
 
+        setContentView(R.layout.fragment_citic_third_step);
 
+
 
+    }
 
+
 
+
 
+    @Override
 
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 
+        View rootView = super.onCreateView(inflater, container, savedInstanceState);
 
+        unbinder = ButterKnife.bind(this, rootView);
 
+
 
+        initSpinner();
 
+
 
+        return rootView;
 
+    }
 
+
 
+    @Override
 
+    public void onDestroyView() {
 
+        super.onDestroyView();
 
+        unbinder.unbind();
 
+    }
 
+
 
+    @OnClick(R.id.btn_citic_commit)
 
+    public void onViewClicked() {
 
+        //直系亲属姓名
 
+        String familyName = edtCiticFamilyName.getText().toString();
 
+        if(TextUtils.isEmpty(familyName)){
 
+            showToast("请填写直系亲属姓名");
 
+            return;
 
+        }
 
+        if(TextUtils.isEmpty(strFamily) || strFamily.equals("请选择")){
 
+            showToast("请选择直系亲属关系");
 
+            return;
 
+        }
 
+        //直系亲属手机号
 
+        String familyMobile = edtCiticFamilyMobile.getText().toString();
 
+        if(TextUtils.isEmpty(familyMobile)){
 
+            showToast("请输入直系亲属手机号");
 
+            return;
 
+        }
 
+        //区号
 
+        String familyZoneCode = edtCiticFamilyZoneCode.getText().toString();
 
+        //电话
 
+        String familyTel = edtCiticFamilyTel.getText().toString();
 
+
 
+        //紧急联系人
 
+        String urgentName = edtCiticUrgentName.getText().toString();
 
+        if(TextUtils.isEmpty(urgentName)){
 
+            showToast("请填写紧急联系人姓名");
 
+            return;
 
+        }
 
+        if(TextUtils.isEmpty(strUrgent) || strUrgent.equals("请选择")){
 
+            showToast("请选择紧急联系人关系");
 
+            return;
 
+        }
 
+        //紧急联系人手机号
 
+        String urgentMobile = edtCiticUrgentMobile.getText().toString();
 
+        if(TextUtils.isEmpty(urgentMobile)){
 
+            showToast("请输入紧急联系人手机号");
 
+            return;
 
+        }
 
+        //区号
 
+        String urgentZoneCode = edtCiticUrgentZoneCode.getText().toString();
 
+        //电话
 
+        String urgentTel = edtCiticUrgentTel.getText().toString();
 
+
 
+
 
+
 
+
 
+    }
 
+
 
+    /**
 
+     * Spinner 下拉框初始化
 
+     */
 
+    private void initSpinner() {
 
+        adapterFamilyRelatives = ArrayAdapter.createFromResource(getActivity(), R.array.credit_card_citic_family_relation, R.layout.spinner_citic_text_item);
 
+        spinnerFamilyRelation.setAdapter(adapterFamilyRelatives);
 
+
 
+        adapterUrgentOther = ArrayAdapter.createFromResource(getActivity(), R.array.credit_card_citic_urgent_relation, R.layout.spinner_citic_text_item);
 
+        spinnerUrgentRelation.setAdapter(adapterUrgentOther);
 
+
 
+        spinnerFamilyRelation.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
 
+            @Override
 
+            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
 
+                strFamily = adapterFamilyRelatives.getItem(position).toString();
 
+            }
 
+
 
+            @Override
 
+            public void onNothingSelected(AdapterView<?> parent) {
 
+
 
+            }
 
+        });
 
+
 
+
 
+        //c_o_relation
 
+        spinnerUrgentRelation.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
 
+            @Override
 
+            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
 
+                strUrgent = adapterUrgentOther.getItem(position).toString();
 
+            }
 
+
 
+            @Override
 
+            public void onNothingSelected(AdapterView<?> parent) {
 
+
 
+            }
 
+        });
 
+
 
+    }
 
+}

+ 15 - 0
app/src/main/res/drawable/btn_citic_commit_background.xml
Zobrazit soubor 

@@ -0,0 +1,15 @@
 
+<?xml version="1.0" encoding="utf-8"?>
 
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
 
+
 
+    <item android:state_pressed="false">
 
+        <shape >
 
+            <solid android:color="#34a5e6"/>
 
+        </shape>
 
+    </item>
 
+
 
+    <item android:state_pressed="true">
 
+        <shape>
 
+            <solid android:color="#29d6fe"/>
 
+        </shape>
 
+    </item>
 
+</selector>

+ 282 - 0
app/src/main/res/layout/fragment_citic_third_step.xml
Zobrazit soubor 

@@ -0,0 +1,282 @@
 
+<?xml version="1.0" encoding="utf-8"?>
 
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
 
+    android:layout_width="match_parent"
 
+    android:layout_height="match_parent"
 
+    android:background="#f3f3f3"
 
+    android:orientation="vertical">
 
+<LinearLayout
 
+    android:layout_width="match_parent"
 
+    android:layout_height="match_parent"
 
+    android:orientation="vertical">
 
+    <LinearLayout
 
+        android:layout_width="match_parent"
 
+        android:layout_height="wrap_content"
 
+        android:orientation="vertical"
 
+        android:layout_margin="10dp"
 
+        android:background="@color/white">
 
+        <LinearLayout
 
+            android:layout_width="match_parent"
 
+            android:layout_height="50dp"
 
+            android:paddingLeft="10dp"
 
+            android:paddingRight="10dp"
 
+            android:orientation="horizontal"
 
+            android:gravity="center_vertical">
 
+            <TextView
 
+                android:layout_width="wrap_content"
 
+                android:layout_height="wrap_content"
 
+                android:text="*"
 
+                android:textColor="@color/red"/>
 
+            <TextView
 
+                android:layout_width="wrap_content"
 
+                android:layout_height="wrap_content"
 
+                android:layout_marginLeft="2dp"
 
+                android:text="直系亲属联系人姓名："
 
+                android:textColor="@color/gray_4"/>
 
+            <com.kfzs.libs.widget.CompleteCommitEditText
 
+                android:id="@+id/edt_citic_family_name"
 
+                android:layout_width="150dp"
 
+                android:layout_height="wrap_content"
 
+                android:hint="直系亲属姓名"
 
+                style="@style/citic_creditCardFontStyle"/>
 
+        </LinearLayout>
 
+        <View
 
+            android:layout_width="match_parent"
 
+            android:layout_height="1dp"
 
+            android:background="@color/gray"/>
 
+        <LinearLayout
 
+            android:layout_width="match_parent"
 
+            android:layout_height="50dp"
 
+            android:paddingLeft="10dp"
 
+            android:paddingRight="10dp"
 
+            android:orientation="horizontal"
 
+            android:gravity="center_vertical">
 
+            <TextView
 
+                android:layout_width="wrap_content"
 
+                android:layout_height="wrap_content"
 
+                android:text="*"
 
+                android:textColor="@color/red"/>
 
+            <TextView
 
+                android:layout_width="wrap_content"
 
+                android:layout_height="wrap_content"
 
+                android:layout_marginLeft="2dp"
 
+                android:text="直系亲属联系人关系："
 
+                android:textColor="@color/gray_4"/>
 
+
 
+            <android.support.v7.widget.AppCompatSpinner
 
+                android:id="@+id/spinner_family_relation"
 
+                android:layout_width="100dp"
 
+                android:layout_height="30dp"
 
+                android:background="@null"
 
+                style="@style/citic_creditCardFontStyle"
 
+                android:dropDownVerticalOffset="30dp"
 
+                android:singleLine="true"/>
 
+        </LinearLayout>
 
+        <View
 
+            android:layout_width="match_parent"
 
+            android:layout_height="1dp"
 
+            android:background="@color/gray"/>
 
+        <LinearLayout
 
+            android:layout_width="match_parent"
 
+            android:layout_height="50dp"
 
+            android:paddingLeft="10dp"
 
+            android:paddingRight="10dp"
 
+            android:orientation="horizontal"
 
+            android:gravity="center_vertical">
 
+            <TextView
 
+                android:layout_width="wrap_content"
 
+                android:layout_height="wrap_content"
 
+                android:text="*"
 
+                android:textColor="@color/red"/>
 
+            <TextView
 
+                android:layout_width="wrap_content"
 
+                android:layout_height="wrap_content"
 
+                android:layout_marginLeft="2dp"
 
+                android:text="手机号码："
 
+                android:textColor="@color/gray_4"/>
 
+            <com.kfzs.libs.widget.CompleteCommitEditText
 
+                android:id="@+id/edt_citic_family_mobile"
 
+                android:layout_width="150dp"
 
+                android:layout_height="wrap_content"
 
+                style="@style/citic_creditCardFontStyle"
 
+                android:inputType="phone"/>
 
+        </LinearLayout>
 
+
 
+        <View
 
+            android:layout_width="match_parent"
 
+            android:layout_height="1dp"
 
+            android:background="@color/gray"/>
 
+        <LinearLayout
 
+            android:layout_width="match_parent"
 
+            android:layout_height="50dp"
 
+            android:paddingLeft="10dp"
 
+            android:paddingRight="10dp"
 
+            android:orientation="horizontal"
 
+            android:gravity="center_vertical">
 
+            <TextView
 
+                android:layout_width="wrap_content"
 
+                android:layout_height="wrap_content"
 
+                android:layout_marginLeft="2dp"
 
+                android:text="住宅电话："
 
+                android:textColor="@color/gray_4"/>
 
+            <com.kfzs.libs.widget.CompleteCommitEditText
 
+                android:id="@+id/edt_citic_family_zone_code"
 
+                android:layout_width="80dp"
 
+                android:layout_height="wrap_content"
 
+                android:inputType="number"
 
+                style="@style/citic_creditCardFontStyle"
 
+                android:gravity="center"
 
+                android:hint="区号"/>
 
+            <View
 
+                android:layout_width="2dp"
 
+                android:layout_height="20dp"
 
+                android:background="@color/gray"/>
 
+            <com.kfzs.libs.widget.CompleteCommitEditText
 
+                android:id="@+id/edt_citic_family_tel"
 
+                android:layout_width="150dp"
 
+                android:layout_height="wrap_content"
 
+                style="@style/citic_creditCardFontStyle"
 
+                android:gravity="center"
 
+                android:inputType="number"
 
+                android:hint="电话"/>
 
+        </LinearLayout>
 
+    </LinearLayout>
 
+    <LinearLayout
 
+        android:layout_width="match_parent"
 
+        android:layout_height="wrap_content"
 
+        android:orientation="vertical"
 
+        android:layout_marginLeft="10dp"
 
+        android:layout_marginRight="10dp"
 
+        android:background="@color/white">
 
+        <LinearLayout
 
+            android:layout_width="match_parent"
 
+            android:layout_height="50dp"
 
+            android:paddingLeft="10dp"
 
+            android:paddingRight="10dp"
 
+            android:orientation="horizontal"
 
+            android:gravity="center_vertical">
 
+            <TextView
 
+                android:layout_width="wrap_content"
 
+                android:layout_height="wrap_content"
 
+                android:text="*"
 
+                android:textColor="@color/red"/>
 
+            <TextView
 
+                android:layout_width="wrap_content"
 
+                android:layout_height="wrap_content"
 
+                android:layout_marginLeft="2dp"
 
+                android:text="紧急联系人姓名："
 
+                android:textColor="@color/gray_4"/>
 
+            <com.kfzs.libs.widget.CompleteCommitEditText
 
+                android:id="@+id/edt_citic_urgent_name"
 
+                android:layout_width="150dp"
 
+                android:layout_height="wrap_content"
 
+                style="@style/citic_creditCardFontStyle"/>
 
+        </LinearLayout>
 
+        <View
 
+            android:layout_width="match_parent"
 
+            android:layout_height="1dp"
 
+            android:background="@color/gray"/>
 
+        <LinearLayout
 
+            android:layout_width="match_parent"
 
+            android:layout_height="50dp"
 
+            android:paddingLeft="10dp"
 
+            android:paddingRight="10dp"
 
+            android:orientation="horizontal"
 
+            android:gravity="center_vertical">
 
+            <TextView
 
+                android:layout_width="wrap_content"
 
+                android:layout_height="wrap_content"
 
+                android:text="*"
 
+                android:textColor="@color/red"/>
 
+            <TextView
 
+                android:layout_width="wrap_content"
 
+                android:layout_height="wrap_content"
 
+                android:layout_marginLeft="2dp"
 
+                android:text="紧急联系人关系："
 
+                android:textColor="@color/gray_4"/>
 
+            <android.support.v7.widget.AppCompatSpinner
 
+                android:id="@+id/spinner_urgent_relation"
 
+                android:layout_width="100dp"
 
+                android:layout_height="30dp"
 
+                android:background="@null"
 
+                android:dropDownVerticalOffset="30dp"
 
+                android:singleLine="true"
 
+                style="@style/citic_creditCardFontStyle"/>
 
+
 
+        </LinearLayout>
 
+        <View
 
+            android:layout_width="match_parent"
 
+            android:layout_height="1dp"
 
+            android:background="@color/gray"/>
 
+        <LinearLayout
 
+            android:layout_width="match_parent"
 
+            android:layout_height="50dp"
 
+            android:paddingLeft="10dp"
 
+            android:paddingRight="10dp"
 
+            android:orientation="horizontal"
 
+            android:gravity="center_vertical">
 
+            <TextView
 
+                android:layout_width="wrap_content"
 
+                android:layout_height="wrap_content"
 
+                android:text="*"
 
+                android:textColor="@color/red"/>
 
+            <TextView
 
+                android:layout_width="wrap_content"
 
+                android:layout_height="wrap_content"
 
+                android:layout_marginLeft="2dp"
 
+                android:text="手机号码："
 
+                android:textColor="@color/gray_4"/>
 
+            <com.kfzs.libs.widget.CompleteCommitEditText
 
+                android:id="@+id/edt_citic_urgent_mobile"
 
+                android:layout_width="150dp"
 
+                android:layout_height="wrap_content"
 
+                style="@style/citic_creditCardFontStyle"
 
+                android:inputType="phone"/>
 
+        </LinearLayout>
 
+        <View
 
+            android:layout_width="match_parent"
 
+            android:layout_height="1dp"
 
+            android:background="@color/gray"/>
 
+        <LinearLayout
 
+            android:layout_width="match_parent"
 
+            android:layout_height="50dp"
 
+            android:paddingLeft="10dp"
 
+            android:paddingRight="10dp"
 
+            android:orientation="horizontal"
 
+            android:gravity="center_vertical">
 
+            <TextView
 
+                android:layout_width="wrap_content"
 
+                android:layout_height="wrap_content"
 
+                android:layout_marginLeft="2dp"
 
+                android:text="住宅电话："
 
+                android:textColor="@color/gray_4"/>
 
+            <com.kfzs.libs.widget.CompleteCommitEditText
 
+                android:id="@+id/edt_citic_urgent_zone_code"
 
+                android:layout_width="80dp"
 
+                android:layout_height="wrap_content"
 
+                style="@style/citic_creditCardFontStyle"
 
+                android:inputType="number"
 
+                android:gravity="center"
 
+                android:hint="区号"/>
 
+            <View
 
+                android:layout_width="2dp"
 
+                android:layout_height="20dp"
 
+                android:background="@color/gray"/>
 
+            <com.kfzs.libs.widget.CompleteCommitEditText
 
+                android:id="@+id/edt_citic_urgent_tel"
 
+                android:layout_width="150dp"
 
+                android:layout_height="wrap_content"
 
+                style="@style/citic_creditCardFontStyle"
 
+                android:gravity="center"
 
+                android:inputType="number"
 
+                android:hint="电话"/>
 
+        </LinearLayout>
 
+    </LinearLayout>
 
+
 
+
 
+    <com.kfzs.libs.widget.alpha.AlphaButton
 
+        android:id="@+id/btn_citic_commit"
 
+        style="@style/citic_creditCardBtnGradientStyle"
 
+        android:text="提交>" />
 
+</LinearLayout>
 
+
 
+</ScrollView>

+ 13 - 0
app/src/main/res/layout/spinner_citic_text_item.xml
Zobrazit soubor 

@@ -0,0 +1,13 @@
 
+<?xml version="1.0" encoding="utf-8"?>
 
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
 
+    android:id="@android:id/text1"
 
+    style="?android:attr/spinnerItemStyle"
 
+    android:singleLine="true"
 
+    android:layout_width="match_parent"
 
+    android:layout_height="wrap_content"
 
+    android:ellipsize="marquee"
 
+    android:textSize="13sp"
 
+    android:textColor="@android:color/black"
 
+    android:minHeight="30dp"
 
+    android:gravity="center_vertical"
 
+    android:textAlignment="inherit"/>

+ 14 - 0
app/src/main/res/values/gx_strings.xml
Zobrazit soubor 

@@ -23,5 +23,19 @@
 
         <item>其他</item>
 
     </string-array>
 
 
+    <string-array name="credit_card_citic_family_relation">
 
+        <item>请选择</item>
 
+        <item>配偶关系</item>
 
+        <item>子女关系</item>
 
+        <item>父母关系</item>
 
+        <item>兄弟关系</item>
 
+    </string-array>
 
+    <string-array name="credit_card_citic_urgent_relation">
 
+        <item>请选择</item>
 
+        <item>朋友关系</item>
 
+        <item>同事关系</item>
 
+        <item>其他关系</item>
 
+    </string-array>
 
+
 
     <color name="credit_blue_color">#0089ee</color>
 
 </resources>

+ 13 - 1
app/src/main/res/values/styles.xml
Zobrazit soubor 

@@ -211,7 +211,14 @@
 
         <item name="android:textColor">@android:color/white</item>
 
         <item name="android:layout_marginTop">22dp</item>
 
     </style>
 
-
 
+    <style name="citic_creditCardBtnGradientStyle" parent="Base.Widget.AppCompat.Button.Borderless">
 
+        <item name="android:layout_width">match_parent</item>
 
+        <item name="android:layout_height">55dp</item>
 
+        <item name="android:background">@drawable/btn_citic_commit_background</item>
 
+        <item name="android:textSize">18sp</item>
 
+        <item name="android:textColor">@android:color/white</item>
 
+        <item name="android:layout_marginTop">22dp</item>
 
+    </style>
 
     <style name="creditCardInputItemRadiogroupStyle">
 
         <item name="android:layout_width">0dp</item>
 
         <item name="android:layout_height">wrap_content</item>
 
@@ -257,5 +264,10 @@
 
         <item name="android:layout_marginBottom">15dp</item>
 
     </style>
 
 
+    <style name="citic_creditCardFontStyle">
 
+        <item name="android:textColor">@android:color/black</item>
 
+        <item name="android:textColorHint">#b5b5b5</item>
 
+        <item name="android:textSize">13sp</item>
 
+    </style>
 
 
 </resources>