Commit 4d1c5b77e1317322b83f9087136f797689ac47a3

Authored by 韩亚云
1 parent 7612afff

处理认证跳转逻辑

Showing 19 changed files with 1185 additions and 984 deletions
app/strike/src/main/java/com/cnlive/strike/imgutil/UgcActivity.java
@@ -6,6 +6,8 @@ import android.os.Bundle; @@ -6,6 +6,8 @@ import android.os.Bundle;
6 import com.cnlive.cloud.R; 6 import com.cnlive.cloud.R;
7 import com.cnlive.core.company_verfication.ui.activity.FillInCompanyDataActivity; 7 import com.cnlive.core.company_verfication.ui.activity.FillInCompanyDataActivity;
8 import com.cnlive.core.company_verfication.ui.activity.SelectCompanyDataActivity; 8 import com.cnlive.core.company_verfication.ui.activity.SelectCompanyDataActivity;
  9 +import com.cnlive.core.people_verfication.activity.CheckResultActivity;
  10 +import com.cnlive.core.people_verfication.activity.PersonCheckActivity;
9 import com.cnlive.core.people_verfication.activity.TakeIdentityPictureActivity; 11 import com.cnlive.core.people_verfication.activity.TakeIdentityPictureActivity;
10 12
11 import androidx.appcompat.app.AppCompatActivity; 13 import androidx.appcompat.app.AppCompatActivity;
@@ -16,8 +18,24 @@ public class UgcActivity extends AppCompatActivity { @@ -16,8 +18,24 @@ public class UgcActivity extends AppCompatActivity {
16 protected void onCreate(Bundle savedInstanceState) { 18 protected void onCreate(Bundle savedInstanceState) {
17 super.onCreate(savedInstanceState); 19 super.onCreate(savedInstanceState);
18 setContentView(R.layout.activity_ugc); 20 setContentView(R.layout.activity_ugc);
  21 +
19 findViewById(R.id.people_denty).setOnClickListener(view -> startActivity(new Intent(this, TakeIdentityPictureActivity.class))); 22 findViewById(R.id.people_denty).setOnClickListener(view -> startActivity(new Intent(this, TakeIdentityPictureActivity.class)));
20 findViewById(R.id.company_denty).setOnClickListener(view -> startActivity(new Intent(this, FillInCompanyDataActivity.class))); 23 findViewById(R.id.company_denty).setOnClickListener(view -> startActivity(new Intent(this, FillInCompanyDataActivity.class)));
21 findViewById(R.id.company_denty_list).setOnClickListener(view -> startActivity(new Intent(this, SelectCompanyDataActivity.class))); 24 findViewById(R.id.company_denty_list).setOnClickListener(view -> startActivity(new Intent(this, SelectCompanyDataActivity.class)));
  25 +
  26 + findViewById(R.id.btn1).setOnClickListener(view ->PersonCheckActivity.startActivity(this,"","-1"));
  27 + findViewById(R.id.btn2).setOnClickListener(view ->PersonCheckActivity.startActivity(this,"","0"));
  28 + findViewById(R.id.btn3).setOnClickListener(view ->PersonCheckActivity.startActivity(this,"","2"));
  29 + findViewById(R.id.btn4).setOnClickListener(view ->PersonCheckActivity.startActivity(this,"","1"));
  30 +
  31 + findViewById(R.id.btn01).setOnClickListener(view -> CheckResultActivity.startActivity(this,"","person","-1"));
  32 + findViewById(R.id.btn02).setOnClickListener(view ->CheckResultActivity.startActivity(this,"","person","0"));
  33 + findViewById(R.id.btn03).setOnClickListener(view ->CheckResultActivity.startActivity(this,"","person","2"));
  34 + findViewById(R.id.btn04).setOnClickListener(view ->CheckResultActivity.startActivity(this,"","person","1"));
  35 +
  36 + findViewById(R.id.btn11).setOnClickListener(view -> CheckResultActivity.startActivity(this,"","company","-1"));
  37 + findViewById(R.id.btn12).setOnClickListener(view ->CheckResultActivity.startActivity(this,"","company","0"));
  38 + findViewById(R.id.btn13).setOnClickListener(view ->CheckResultActivity.startActivity(this,"","company","2"));
  39 + findViewById(R.id.btn14).setOnClickListener(view ->CheckResultActivity.startActivity(this,"","company","1"));
22 } 40 }
23 } 41 }
app/strike/src/main/res/layout/activity_ugc.xml
@@ -14,6 +14,78 @@ @@ -14,6 +14,78 @@
14 android:layout_margin="@dimen/dp_10" 14 android:layout_margin="@dimen/dp_10"
15 android:text="个人认证" /> 15 android:text="个人认证" />
16 16
  17 + <TextView
  18 + android:layout_width="wrap_content"
  19 + android:layout_height="wrap_content"
  20 + android:text="身份校验" />
  21 +
  22 + <LinearLayout
  23 + android:layout_width="match_parent"
  24 + android:layout_height="wrap_content"
  25 + android:orientation="horizontal">
  26 +
  27 + <Button
  28 + android:id="@+id/btn1"
  29 + android:layout_width="wrap_content"
  30 + android:layout_height="wrap_content"
  31 + android:text="未校验" />
  32 +
  33 + <Button
  34 + android:id="@+id/btn2"
  35 + android:layout_width="wrap_content"
  36 + android:layout_height="wrap_content"
  37 + android:text="审核中" />
  38 +
  39 + <Button
  40 + android:id="@+id/btn3"
  41 + android:layout_width="wrap_content"
  42 + android:layout_height="wrap_content"
  43 + android:text="失败" />
  44 +
  45 + <Button
  46 + android:id="@+id/btn4"
  47 + android:layout_width="wrap_content"
  48 + android:layout_height="wrap_content"
  49 + android:text="成功" />
  50 + </LinearLayout>
  51 +
  52 + <TextView
  53 + android:layout_width="wrap_content"
  54 + android:layout_height="wrap_content"
  55 + android:text="个人认证" />
  56 +
  57 + <LinearLayout
  58 + android:layout_width="match_parent"
  59 + android:layout_height="wrap_content"
  60 + android:orientation="horizontal">
  61 +
  62 + <Button
  63 + android:id="@+id/btn01"
  64 + android:layout_width="wrap_content"
  65 + android:layout_height="wrap_content"
  66 + android:text="未认证" />
  67 +
  68 + <Button
  69 + android:id="@+id/btn02"
  70 + android:layout_width="wrap_content"
  71 + android:layout_height="wrap_content"
  72 + android:text="审核中" />
  73 +
  74 + <Button
  75 + android:id="@+id/btn03"
  76 + android:layout_width="wrap_content"
  77 + android:layout_height="wrap_content"
  78 + android:text="失败" />
  79 +
  80 + <Button
  81 + android:id="@+id/btn04"
  82 + android:layout_width="wrap_content"
  83 + android:layout_height="wrap_content"
  84 + android:text="成功" />
  85 + </LinearLayout>
  86 +
  87 +
  88 +
17 <Button 89 <Button
18 android:id="@+id/company_denty" 90 android:id="@+id/company_denty"
19 android:layout_width="match_parent" 91 android:layout_width="match_parent"
@@ -21,6 +93,41 @@ @@ -21,6 +93,41 @@
21 android:layout_margin="@dimen/dp_10" 93 android:layout_margin="@dimen/dp_10"
22 android:text="机构认证" /> 94 android:text="机构认证" />
23 95
  96 + <TextView
  97 + android:layout_width="wrap_content"
  98 + android:layout_height="wrap_content"
  99 + android:text="机构认证" />
  100 +
  101 + <LinearLayout
  102 + android:layout_width="match_parent"
  103 + android:layout_height="wrap_content"
  104 + android:orientation="horizontal">
  105 +
  106 + <Button
  107 + android:id="@+id/btn11"
  108 + android:layout_width="wrap_content"
  109 + android:layout_height="wrap_content"
  110 + android:text="未认证" />
  111 +
  112 + <Button
  113 + android:id="@+id/btn12"
  114 + android:layout_width="wrap_content"
  115 + android:layout_height="wrap_content"
  116 + android:text="审核中" />
  117 +
  118 + <Button
  119 + android:id="@+id/btn13"
  120 + android:layout_width="wrap_content"
  121 + android:layout_height="wrap_content"
  122 + android:text="失败" />
  123 +
  124 + <Button
  125 + android:id="@+id/btn14"
  126 + android:layout_width="wrap_content"
  127 + android:layout_height="wrap_content"
  128 + android:text="成功" />
  129 + </LinearLayout>
  130 +
24 <Button 131 <Button
25 android:id="@+id/company_denty_list" 132 android:id="@+id/company_denty_list"
26 android:layout_width="match_parent" 133 android:layout_width="match_parent"
core/dentity_verfication/src/main/java/com/cnlive/core/company_verfication/ui/fragment/FillInCompanyDataFragment.java
1 package com.cnlive.core.company_verfication.ui.fragment; 1 package com.cnlive.core.company_verfication.ui.fragment;
2 2
  3 +import android.os.Bundle;
3 import android.view.View; 4 import android.view.View;
4 5
5 import com.cnlive.core.libs.base.frame.fragment.BaseFragment; 6 import com.cnlive.core.libs.base.frame.fragment.BaseFragment;
@@ -14,6 +15,14 @@ import androidx.databinding.ViewDataBinding; @@ -14,6 +15,14 @@ import androidx.databinding.ViewDataBinding;
14 */public class FillInCompanyDataFragment extends BaseFragment { 15 */public class FillInCompanyDataFragment extends BaseFragment {
15 private FragmentFillInCompanyDataBinding binding; 16 private FragmentFillInCompanyDataBinding binding;
16 17
  18 + public static FillInCompanyDataFragment newInstance(String userId) {
  19 + FillInCompanyDataFragment fragment = new FillInCompanyDataFragment();
  20 + Bundle args = new Bundle();
  21 + args.putString("userId", userId);
  22 + fragment.setArguments(args);
  23 + return fragment;
  24 + }
  25 +
17 @Override 26 @Override
18 protected int getBindLayoutId() { 27 protected int getBindLayoutId() {
19 return R.layout.fragment_fill_in_company_data; 28 return R.layout.fragment_fill_in_company_data;
core/dentity_verfication/src/main/java/com/cnlive/core/people_verfication/activity/CheckResultActivity.java
1 package com.cnlive.core.people_verfication.activity; 1 package com.cnlive.core.people_verfication.activity;
2 2
3 -import android.os.Bundle; 3 +import android.content.Context;
  4 +import android.content.Intent;
4 5
5 -import com.cnlive.core.people_verfication.R; 6 +import com.cnlive.core.company_verfication.ui.fragment.FillInCompanyDataFragment;
  7 +import com.cnlive.core.libs.base.frame.activity.BaseActivity;
  8 +import com.cnlive.core.libs.base.frame.fragment.BaseFragment;
6 import com.cnlive.core.people_verfication.fragment.CheckResultFragment; 9 import com.cnlive.core.people_verfication.fragment.CheckResultFragment;
7 import com.cnlive.core.people_verfication.fragment.CompanyCheckSuccessFragment; 10 import com.cnlive.core.people_verfication.fragment.CompanyCheckSuccessFragment;
8 import com.cnlive.core.people_verfication.fragment.PersonCheckSuccessFragment; 11 import com.cnlive.core.people_verfication.fragment.PersonCheckSuccessFragment;
  12 +import com.cnlive.core.people_verfication.fragment.TakeIdentityPictureFragment;
9 13
10 -import androidx.appcompat.app.AppCompatActivity;  
11 -import androidx.fragment.app.Fragment;  
12 14
13 /** 15 /**
14 * 认证结果判断 16 * 认证结果判断
15 * @Author hanyayun 17 * @Author hanyayun
16 * @Date 2020/4/7 18 * @Date 2020/4/7
17 */ 19 */
18 -public class CheckResultActivity extends AppCompatActivity { 20 +public class CheckResultActivity extends BaseActivity {
19 21
20 private String userId,code,type; 22 private String userId,code,type;
21 - private Fragment fragment; 23 + private BaseFragment fragment;
  24 +
  25 + public static void startActivity(Context context,String userId,String type,String code){
  26 + Intent intent = new Intent(context,CheckResultActivity.class);
  27 + intent.putExtra("userId",userId);
  28 + intent.putExtra("type",type);//person 个人 company机构
  29 + intent.putExtra("code",code);//暂定-1 未认证 0 审核中 1 认证成功 2 认证失败
  30 + context.startActivity(intent);
  31 + }
  32 +
  33 +
22 @Override 34 @Override
23 - protected void onCreate(Bundle savedInstanceState) {  
24 - super.onCreate(savedInstanceState);  
25 - setContentView(R.layout.activity_check_result); 35 + protected void initView() {
  36 + showDefaultWhiteStatusBar();
26 userId = getIntent().getStringExtra("userId"); 37 userId = getIntent().getStringExtra("userId");
27 code = getIntent().getStringExtra("code"); 38 code = getIntent().getStringExtra("code");
28 type = getIntent().getStringExtra("type"); 39 type = getIntent().getStringExtra("type");
29 if(type.equals("person")){//个人 40 if(type.equals("person")){//个人
30 if(code.equals("-1")){//未认证 加载个人认证页面 41 if(code.equals("-1")){//未认证 加载个人认证页面
31 - 42 + fragment = TakeIdentityPictureFragment.newInstance(userId);
32 }else if(code.equals("0") || code.equals("2")){//审核中或者认证失败 43 }else if(code.equals("0") || code.equals("2")){//审核中或者认证失败
33 fragment = CheckResultFragment.newInstance(userId,code,type); 44 fragment = CheckResultFragment.newInstance(userId,code,type);
34 }else if(code.equals("1")){//认证成功 加载个人检测成功页面 45 }else if(code.equals("1")){//认证成功 加载个人检测成功页面
35 - fragment = new PersonCheckSuccessFragment(); 46 + fragment = PersonCheckSuccessFragment.newInstance(userId);
36 } 47 }
37 }else if(type.equals("company")){//机构 48 }else if(type.equals("company")){//机构
38 if(code.equals("-1")){//未认证加载机构认证fragment 49 if(code.equals("-1")){//未认证加载机构认证fragment
39 - 50 + fragment = FillInCompanyDataFragment.newInstance(userId);
40 }else if(code.equals("0") || code.equals("2")){//审核中或者认证失败 51 }else if(code.equals("0") || code.equals("2")){//审核中或者认证失败
41 fragment = CheckResultFragment.newInstance(userId,code,type); 52 fragment = CheckResultFragment.newInstance(userId,code,type);
42 }else if(code.equals("1")){//认证成功 加载机构检测成功页面 53 }else if(code.equals("1")){//认证成功 加载机构检测成功页面
43 - fragment = new CompanyCheckSuccessFragment(); 54 + fragment = CompanyCheckSuccessFragment.newInstance(userId);
44 } 55 }
45 } 56 }
46 - getSupportFragmentManager().beginTransaction().add(R.id.container, fragment).commit(); 57 + loadRootFragment(fragment);
47 } 58 }
48 } 59 }
core/dentity_verfication/src/main/java/com/cnlive/core/people_verfication/activity/PersonCheckActivity.java
1 package com.cnlive.core.people_verfication.activity; 1 package com.cnlive.core.people_verfication.activity;
2 2
3 -import android.os.Bundle; 3 +import android.content.Context;
  4 +import android.content.Intent;
4 5
5 -import com.cnlive.core.people_verfication.R; 6 +import com.cnlive.core.libs.base.frame.activity.BaseActivity;
  7 +import com.cnlive.core.people_verfication.fragment.PersonCheckFragment;
  8 +import com.cnlive.core.people_verfication.fragment.PersonCheckSuccessFragment;
6 9
7 -import androidx.appcompat.app.AppCompatActivity;  
8 /** 10 /**
9 * 个人认证结果页面 11 * 个人认证结果页面
10 * @Author hanyayun 12 * @Author hanyayun
11 * @Date 2020/4/7 13 * @Date 2020/4/7
12 */ 14 */
13 -public class PersonCheckActivity extends AppCompatActivity { 15 +public class PersonCheckActivity extends BaseActivity {
  16 +
  17 + private String code,userId;
  18 +
  19 + public static void startActivity(Context context, String userId,String code){
  20 + Intent intent = new Intent(context,PersonCheckActivity.class);
  21 + intent.putExtra("userId",userId);
  22 + intent.putExtra("code",code);//暂定-1 未认证 0 审核中 1 认证成功 2 认证失败
  23 + context.startActivity(intent);
  24 + }
14 25
15 - private String code;  
16 @Override 26 @Override
17 - protected void onCreate(Bundle savedInstanceState) {  
18 - super.onCreate(savedInstanceState);  
19 - setContentView(R.layout.activity_person_check); 27 + protected void initView() {
  28 + showDefaultWhiteStatusBar();
20 code = getIntent().getStringExtra("code"); 29 code = getIntent().getStringExtra("code");
  30 + userId = getIntent().getStringExtra("userId");
21 if(code.equals("1")){//认证成功--->跳转个人检测成功页面 31 if(code.equals("1")){//认证成功--->跳转个人检测成功页面
22 - 32 + loadRootFragment(PersonCheckSuccessFragment.newInstance(userId));
23 }else { 33 }else {
24 - //personCheckFragment页面 34 + loadRootFragment(PersonCheckFragment.newInstance(userId,code));
25 } 35 }
26 } 36 }
27 } 37 }
core/dentity_verfication/src/main/java/com/cnlive/core/people_verfication/activity/TakeIdentityPictureActivity.java
1 package com.cnlive.core.people_verfication.activity; 1 package com.cnlive.core.people_verfication.activity;
2 2
3 3
4 -import android.Manifest;  
5 -import android.app.Activity; 4 +
  5 +import android.content.Context;
6 import android.content.Intent; 6 import android.content.Intent;
7 -import android.text.TextUtils;  
8 -import android.view.View;  
9 7
10 -import com.baidu.ocr.sdk.model.IDCardParams;  
11 import com.cnlive.core.libs.base.frame.activity.BaseActivity; 8 import com.cnlive.core.libs.base.frame.activity.BaseActivity;
12 -import com.cnlive.core.libs.base.util.AlertUtil;  
13 -import com.cnlive.core.libs.base.util.FileUtils;  
14 -import com.cnlive.core.ocr.ui.camera.CameraActivity;  
15 -import com.cnlive.core.people_verfication.R;  
16 -import com.cnlive.core.people_verfication.databinding.ActivityTakePictureBinding;  
17 -import com.cnlive.core.people_verfication.presenter.TakeIdentityPicturePresenter;  
18 -import com.cnlive.core.people_verfication.view.ICertificatePhohosView;  
19 -import com.cnlive.core.people_verfication.view.TakeIdentityPictureView;  
20 -import com.cnlive.media.picker.PickerConfig;  
21 -import com.cnlive.media.picker.entity.Media;  
22 -import com.cnlive.media.picker.utils.PermissionChecker;  
23 -  
24 -import java.util.ArrayList;  
25 -  
26 -import androidx.annotation.NonNull;  
27 -import androidx.databinding.ViewDataBinding; 9 +import com.cnlive.core.people_verfication.fragment.TakeIdentityPictureFragment;
28 10
29 /** 11 /**
30 - * 拍摄照片 身份证件采集 12 + * 拍摄照片 身份证件采集
31 * @Author hanyayun 13 * @Author hanyayun
32 * @Date 2020/4/2 14 * @Date 2020/4/2
33 */ 15 */
34 -public class TakeIdentityPictureActivity extends BaseActivity<TakeIdentityPictureView, TakeIdentityPicturePresenter> { 16 +public class TakeIdentityPictureActivity extends BaseActivity {
35 17
36 - public ActivityTakePictureBinding binding;  
37 - //上一个被点击过的btn的点击时间  
38 - private long preViewClickTime = 0;  
39 - //上一个被点击过的btn的id  
40 - private int preViewClickId = 0;  
41 - private static int CAMERA_WRITE_FR_PERMISSION = 1001;  
42 - private static int CAMERA_WRITE_BA_PERMISSION = 1002;  
43 - private static int CAMERA_WRITE_PI_PERMISSION = 1003;  
44 18
45 - @Override  
46 - protected int getBindLayoutId() {  
47 - return R.layout.activity_take_picture;  
48 - }  
49 -  
50 - @Override  
51 - protected void initBindingLayoutData(ViewDataBinding baseBinding) {  
52 - binding = (ActivityTakePictureBinding) baseBinding; 19 + public static void startActivity(Context context, String userId){
  20 + Intent intent = new Intent(context,TakeIdentityPictureActivity.class);
  21 + intent.putExtra("userId",userId);
  22 + context.startActivity(intent);
53 } 23 }
54 24
55 @Override 25 @Override
56 protected void initView() { 26 protected void initView() {
57 - binding.topbar.setTitle("拍摄照片");  
58 - binding.topbar.setLeft(R.drawable.back);  
59 - binding.topbar.addLeftImageButton(R.drawable.top_back_black, R.id.fragment_back).setOnClickListener(v -> {  
60 - finish();  
61 - });  
62 - binding.setClick(v -> onClick(v.getId()));  
63 - }  
64 -  
65 - private void onClick(int id) {  
66 - long curClickTime = System.currentTimeMillis();  
67 - if (preViewClickId > 0 && preViewClickTime > 0) {  
68 - if (preViewClickId == id && curClickTime - preViewClickTime <= 2000) {  
69 - return;  
70 - }  
71 - }  
72 - preViewClickTime = curClickTime;  
73 - preViewClickId = id;  
74 - if (id == R.id.certificate_front_ry) {  
75 - if (hasCampermission(CAMERA_WRITE_FR_PERMISSION)) {//权限判断  
76 - getMvpView().takeIdCardPictures(this, ICertificatePhohosView.ID_CARD_SIDE_FRONT);  
77 - }  
78 - } else if (id == R.id.certificate_back_ry) {  
79 - if (hasCampermission(CAMERA_WRITE_BA_PERMISSION)) {//权限判断  
80 - getMvpView().takeIdCardPictures(this, ICertificatePhohosView.ID_CARD_SIDE_BACK);  
81 - }  
82 - } else if (id == R.id.take_picture_ry) {  
83 - if (hasCampermission(CAMERA_WRITE_PI_PERMISSION)) {  
84 - getMvpView().showDialog();  
85 - }  
86 - }else if(id == R.id.next){  
87 - if (binding.frontTx.getVisibility() == View.VISIBLE && binding.backTx.getVisibility() == View.VISIBLE  
88 - && binding.picTx.getVisibility() == View.VISIBLE) {  
89 -  
90 - }  
91 - }  
92 - }  
93 -  
94 - private boolean hasCampermission(int typeNum) {  
95 - boolean hasPermission = PermissionChecker.checkPermissions(this  
96 - , new String[]{Manifest.permission.CAMERA, Manifest.permission.RECORD_AUDIO, Manifest.permission.WRITE_EXTERNAL_STORAGE}  
97 - , typeNum, R.string.dialog_imagepicker_permission_camera_nerver_ask_message);  
98 - return hasPermission;  
99 - }  
100 -  
101 - @Override  
102 - public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {  
103 - super.onRequestPermissionsResult(requestCode, permissions, grantResults);  
104 - if (requestCode == CAMERA_WRITE_FR_PERMISSION) {  
105 - if (PermissionChecker.onRequestPermissionsResult(this, requestCode, permissions, grantResults, false, R.string.dialog_imagepicker_permission_sdcard_message)[0]) {  
106 - getMvpView().takeIdCardPictures(this, ICertificatePhohosView.ID_CARD_SIDE_FRONT);  
107 - }  
108 - } else if (requestCode == CAMERA_WRITE_BA_PERMISSION) {  
109 - if (PermissionChecker.onRequestPermissionsResult(this, requestCode, permissions, grantResults, false, R.string.dialog_imagepicker_permission_sdcard_message)[0]) {  
110 - getMvpView().takeIdCardPictures(this, ICertificatePhohosView.ID_CARD_SIDE_BACK);  
111 - }  
112 - } else if (requestCode == CAMERA_WRITE_PI_PERMISSION) {  
113 - if (PermissionChecker.onRequestPermissionsResult(this, requestCode, permissions, grantResults, false, R.string.dialog_imagepicker_permission_sdcard_message)[0]) {  
114 - getMvpView().showDialog();  
115 - }  
116 - }  
117 - }  
118 -  
119 - @Override  
120 - protected void onActivityResult(int requestCode, int resultCode, Intent data) {  
121 - super.onActivityResult(requestCode, resultCode, data);  
122 - if (requestCode == ICertificatePhohosView.REQUEST_CODE_CAMERA && resultCode == Activity.RESULT_OK) {  
123 - if (data != null) {  
124 - String contentType = data.getStringExtra(CameraActivity.KEY_CONTENT_TYPE);  
125 - if (!TextUtils.isEmpty(contentType)) {  
126 - if (CameraActivity.CONTENT_TYPE_ID_CARD_FRONT.equals(contentType)) {  
127 - String frontFilePath = FileUtils.getSaveFile(getApplicationContext(), ICertificatePhohosView.PIC_FRONT).getAbsolutePath();  
128 - if (getMvpView() == null) return;  
129 - getMvpView().recIDCard(IDCardParams.ID_CARD_SIDE_FRONT, frontFilePath);  
130 - } else if (CameraActivity.CONTENT_TYPE_ID_CARD_BACK.equals(contentType)) {  
131 - String backFilePath = FileUtils.getSaveFile(getApplicationContext(), ICertificatePhohosView.PIC_BACK).getAbsolutePath();  
132 - if (getMvpView() == null) return;  
133 - getMvpView().recIDCard(IDCardParams.ID_CARD_SIDE_BACK, backFilePath);  
134 - }else if(CameraActivity.CONTENT_TYPE_GENERAL.endsWith(contentType)){  
135 - String filePath = FileUtils.getSaveFile(getApplicationContext(), ICertificatePhohosView.PIC_GENERAL).getAbsolutePath();  
136 - if (getMvpView() == null) return;  
137 - if (!TextUtils.isEmpty(filePath))getMvpView().hasFace(filePath);  
138 - }  
139 - }  
140 - }  
141 - }else if (requestCode == 200 && resultCode == PickerConfig.DEFAULT_RESULT_CODE) {  
142 - ArrayList<Media> select = data.getParcelableArrayListExtra(PickerConfig.EXTRA_RESULT);  
143 - if (select != null && select.size() > 0) {  
144 - String path = select.get(0).path;  
145 - if (!TextUtils.isEmpty(path))getMvpView().hasFace(path);  
146 - } else {  
147 - AlertUtil.showDeftToast(this, "请选择图片");  
148 - }  
149 - }  
150 - }  
151 -  
152 - @Override  
153 - protected void onDestroy() {  
154 - super.onDestroy();  
155 -// if (getPresenter() != null) getPresenter().cancel(); 27 + showDefaultWhiteStatusBar();
  28 + loadRootFragment(TakeIdentityPictureFragment.newInstance(getIntent().getStringExtra("userId")));
156 } 29 }
157 } 30 }
core/dentity_verfication/src/main/java/com/cnlive/core/people_verfication/fragment/CheckResultFragment.java
1 package com.cnlive.core.people_verfication.fragment; 1 package com.cnlive.core.people_verfication.fragment;
2 2
3 import android.os.Bundle; 3 import android.os.Bundle;
4 -import android.view.LayoutInflater;  
5 import android.view.View; 4 import android.view.View;
6 -import android.view.ViewGroup;  
7 -import android.widget.ImageView;  
8 -import android.widget.TextView;  
9 5
  6 +import com.cnlive.core.libs.base.frame.fragment.BaseFragment;
10 import com.cnlive.core.people_verfication.R; 7 import com.cnlive.core.people_verfication.R;
  8 +import com.cnlive.core.people_verfication.activity.TakeIdentityPictureActivity;
  9 +import com.cnlive.core.people_verfication.databinding.FragmentCheckResultBinding;
11 10
12 -import androidx.annotation.NonNull;  
13 -import androidx.annotation.Nullable;  
14 -import androidx.fragment.app.Fragment; 11 +import androidx.databinding.ViewDataBinding;
15 12
16 /** 13 /**
17 * 认证审核结果页面 14 * 认证审核结果页面
  15 + *
18 * @Author hanyayun 16 * @Author hanyayun
19 * @Date 2020/4/7 17 * @Date 2020/4/7
20 */ 18 */
21 -public class CheckResultFragment extends Fragment { 19 +public class CheckResultFragment extends BaseFragment {
22 20
23 private String code; 21 private String code;
24 private String type; 22 private String type;
25 private String userId; 23 private String userId;
26 - private ImageView result_img;  
27 - private TextView result_tx;  
28 - private TextView result_btn;  
29 - public CheckResultFragment() {  
30 - // Required empty public constructor  
31 - }  
32 - public static CheckResultFragment newInstance(String userId,String code,String type) { 24 +
  25 + public FragmentCheckResultBinding binding;
  26 +
  27 + public static CheckResultFragment newInstance(String userId, String code, String type) {
33 CheckResultFragment fragment = new CheckResultFragment(); 28 CheckResultFragment fragment = new CheckResultFragment();
34 Bundle args = new Bundle(); 29 Bundle args = new Bundle();
35 args.putString("userId", userId); 30 args.putString("userId", userId);
@@ -39,43 +34,48 @@ public class CheckResultFragment extends Fragment { @@ -39,43 +34,48 @@ public class CheckResultFragment extends Fragment {
39 return fragment; 34 return fragment;
40 } 35 }
41 36
42 -  
43 @Override 37 @Override
44 - public View onCreateView(LayoutInflater inflater, ViewGroup container,  
45 - Bundle savedInstanceState) {  
46 - // Inflate the layout for this fragment  
47 - return inflater.inflate(R.layout.fragment_check_result, container, false); 38 + protected int getBindLayoutId() {
  39 + return R.layout.fragment_check_result;
48 } 40 }
49 41
50 @Override 42 @Override
51 - public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {  
52 - super.onViewCreated(view, savedInstanceState);  
53 - result_img = view.findViewById(R.id.result_img);  
54 - result_tx = view.findViewById(R.id.result_tx);  
55 - result_btn = view.findViewById(R.id.resule_btn); 43 + protected void initBindingLayoutData(ViewDataBinding baseBinding) {
  44 + super.initBindingLayoutData(baseBinding);
  45 + binding = (FragmentCheckResultBinding) baseBinding;
  46 + }
56 47
  48 + @Override
  49 + protected void initView() {
57 userId = getArguments().getString("userId"); 50 userId = getArguments().getString("userId");
58 code = getArguments().getString("code"); 51 code = getArguments().getString("code");
59 type = getArguments().getString("type"); 52 type = getArguments().getString("type");
60 - if(type.equals("company")){//0和2都是一个页面  
61 - result_img.setImageResource(R.drawable.check_icon);  
62 - result_tx.setText("您提交资料已完成,查询审核状态需登录PC端操作");  
63 - result_btn.setText("返回");  
64 - view.findViewById(R.id.company_ly).setVisibility(View.VISIBLE);  
65 - result_btn.setOnClickListener(view1 -> getActivity().finish());  
66 - }else if(type.equals("person")){  
67 - view.findViewById(R.id.company_ly).setVisibility(View.GONE);  
68 - if(code.equals("0")){//审核中  
69 - result_img.setImageResource(R.drawable.check_icon);  
70 - result_tx.setText(getString(R.string.checking));  
71 - result_btn.setText("返回");  
72 - result_btn.setOnClickListener(view1 -> getActivity().finish());  
73 - }else if(code.equals("2")){//审核失败  
74 - result_img.setImageResource(R.drawable.check_icon);  
75 - result_tx.setText("审核失败");  
76 - result_btn.setText("继续认证");  
77 - result_btn.setOnClickListener(view1 -> { 53 + binding.topbar.addLeftImageButton(R.drawable.top_back_black, R.id.fragment_back).setOnClickListener(v -> {
  54 + finish();
  55 + });
  56 +
  57 + if (type.equals("company")) {//0和2都是一个页面
  58 + binding.topbar.setTitle("机构认证");
  59 + binding.resultImg.setImageResource(R.drawable.check_icon);
  60 + binding.resultTx.setText("您提交资料已完成,查询审核状态需登录PC端操作");
  61 + binding.resuleBtn.setText("返回");
  62 + binding.companyLy.setVisibility(View.VISIBLE);
  63 + binding.resuleBtn.setOnClickListener(view1 -> getActivity().finish());
  64 + } else if (type.equals("person")) {
  65 + binding.topbar.setTitle("个人认证");
  66 + binding.companyLy.setVisibility(View.GONE);
  67 + if (code.equals("0")) {//审核中
  68 + binding.resultImg.setImageResource(R.drawable.check_icon);
  69 + binding.resultTx.setText(getString(R.string.checking));
  70 + binding.resuleBtn.setText("返回");
  71 + binding.resuleBtn.setOnClickListener(view1 -> getActivity().finish());
  72 + } else if (code.equals("2")) {//审核失败
  73 + binding.resultImg.setImageResource(R.drawable.check_icon);
  74 + binding.resultTx.setText("审核失败");
  75 + binding.resuleBtn.setText("继续认证");
  76 + binding.resuleBtn.setOnClickListener(view1 -> {
78 //跳转个人认证页面 77 //跳转个人认证页面
  78 + TakeIdentityPictureActivity.startActivity(getActivity(),userId);
79 }); 79 });
80 } 80 }
81 } 81 }
core/dentity_verfication/src/main/java/com/cnlive/core/people_verfication/fragment/CompanyCheckSuccessFragment.java
1 package com.cnlive.core.people_verfication.fragment; 1 package com.cnlive.core.people_verfication.fragment;
2 2
3 import android.os.Bundle; 3 import android.os.Bundle;
4 -import android.view.LayoutInflater;  
5 -import android.view.View;  
6 -import android.view.ViewGroup;  
7 4
  5 +import com.cnlive.core.libs.base.frame.fragment.BaseFragment;
8 import com.cnlive.core.people_verfication.R; 6 import com.cnlive.core.people_verfication.R;
  7 +import com.cnlive.core.people_verfication.databinding.FragmentCompanyCheckSuccessBinding;
9 8
10 -import androidx.fragment.app.Fragment; 9 +import androidx.databinding.ViewDataBinding;
11 10
12 /** 11 /**
13 * 结构认证成功页面 12 * 结构认证成功页面
14 * @Author hanyayun 13 * @Author hanyayun
15 * @Date 2020/4/7 14 * @Date 2020/4/7
16 */ 15 */
17 -public class CompanyCheckSuccessFragment extends Fragment { 16 +public class CompanyCheckSuccessFragment extends BaseFragment {
18 17
19 - public CompanyCheckSuccessFragment() {  
20 - // Required empty public constructor 18 + public FragmentCompanyCheckSuccessBinding binding;
  19 + public String userId;
  20 +
  21 +
  22 + public static CompanyCheckSuccessFragment newInstance(String userId) {
  23 + CompanyCheckSuccessFragment fragment = new CompanyCheckSuccessFragment();
  24 + Bundle args = new Bundle();
  25 + args.putString("userId", userId);
  26 + fragment.setArguments(args);
  27 + return fragment;
21 } 28 }
22 29
  30 + @Override
  31 + protected int getBindLayoutId() {
  32 + return R.layout.fragment_company_check_success;
  33 + }
  34 +
  35 + @Override
  36 + protected void initBindingLayoutData(ViewDataBinding baseBinding) {
  37 + super.initBindingLayoutData(baseBinding);
  38 + binding = (FragmentCompanyCheckSuccessBinding) baseBinding;
  39 + }
23 40
24 @Override 41 @Override
25 - public View onCreateView(LayoutInflater inflater, ViewGroup container,  
26 - Bundle savedInstanceState) {  
27 - // Inflate the layout for this fragment  
28 - return inflater.inflate(R.layout.fragment_company_check_success, container, false); 42 + protected void initView() {
  43 + userId = getArguments().getString("userId");
  44 + binding.topbar.setTitle("机构认证");
  45 + binding.topbar.addLeftImageButton(R.drawable.top_back_black, R.id.fragment_back).setOnClickListener(v -> {
  46 + finish();
  47 + });
29 } 48 }
30 } 49 }
core/dentity_verfication/src/main/java/com/cnlive/core/people_verfication/fragment/PersonCheckFragment.java
1 package com.cnlive.core.people_verfication.fragment; 1 package com.cnlive.core.people_verfication.fragment;
2 2
3 import android.os.Bundle; 3 import android.os.Bundle;
4 -import android.view.LayoutInflater;  
5 import android.view.View; 4 import android.view.View;
6 -import android.view.ViewGroup;  
7 -import android.widget.ImageView;  
8 -import android.widget.TextView;  
9 5
  6 +import com.cnlive.core.libs.base.frame.fragment.BaseFragment;
10 import com.cnlive.core.people_verfication.R; 7 import com.cnlive.core.people_verfication.R;
  8 +import com.cnlive.core.people_verfication.activity.TakeIdentityPictureActivity;
  9 +import com.cnlive.core.people_verfication.databinding.FragmentPersonCheckBinding;
11 10
12 import androidx.annotation.NonNull; 11 import androidx.annotation.NonNull;
13 import androidx.annotation.Nullable; 12 import androidx.annotation.Nullable;
14 -import androidx.fragment.app.Fragment; 13 +import androidx.databinding.ViewDataBinding;
15 14
16 /** 15 /**
17 - * 个人检测页面 16 + * 身份分校验
18 * @Author hanyayun 17 * @Author hanyayun
19 * @Date 2020/4/7 18 * @Date 2020/4/7
20 */ 19 */
21 -public class PersonCheckFragment extends Fragment { 20 +public class PersonCheckFragment extends BaseFragment {
22 21
23 - private String code;  
24 - private ImageView check_img;  
25 - private TextView check_tx,check_btn; 22 + private String code,userId;
  23 + public FragmentPersonCheckBinding binding;
26 24
27 - public PersonCheckFragment() {  
28 - // Required empty public constructor 25 + public static PersonCheckFragment newInstance(String userId, String code) {
  26 + PersonCheckFragment fragment = new PersonCheckFragment();
  27 + Bundle args = new Bundle();
  28 + args.putString("userId", userId);
  29 + args.putString("code", code);
  30 + fragment.setArguments(args);
  31 + return fragment;
29 } 32 }
30 33
  34 + @Override
  35 + protected int getBindLayoutId() {
  36 + return R.layout.fragment_person_check;
  37 + }
31 38
32 @Override 39 @Override
33 - public View onCreateView(LayoutInflater inflater, ViewGroup container,  
34 - Bundle savedInstanceState) {  
35 - // Inflate the layout for this fragment  
36 - return inflater.inflate(R.layout.fragment_person_check, container, false); 40 + protected void initBindingLayoutData(ViewDataBinding baseBinding) {
  41 + super.initBindingLayoutData(baseBinding);
  42 + binding = (FragmentPersonCheckBinding) baseBinding;
37 } 43 }
38 44
39 @Override 45 @Override
40 public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { 46 public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
41 super.onViewCreated(view, savedInstanceState); 47 super.onViewCreated(view, savedInstanceState);
42 - check_img = view.findViewById(R.id.check_img);  
43 - check_tx = view.findViewById(R.id.check_tx);  
44 - check_btn = view.findViewById(R.id.check_btn);  
45 48
  49 + }
  50 +
  51 + @Override
  52 + protected void initView() {
46 code = getArguments().getString("code"); 53 code = getArguments().getString("code");
  54 + userId = getArguments().getString("userId");
  55 + binding.topbar.setTitle("身份校验");
  56 + binding.topbar.addLeftImageButton(R.drawable.top_back_black, R.id.fragment_back).setOnClickListener(v -> {
  57 + finish();
  58 + });
  59 +
47 if(code.equals("-1")){//未认证 60 if(code.equals("-1")){//未认证
48 - check_img.setImageResource(R.drawable.p_icon);  
49 - check_tx.setText("亲,您未申请个人认证");  
50 - check_btn.setText("去认证");  
51 - check_btn.setOnClickListener(view1 -> {  
52 - //跳转个人认证页面 61 + binding.checkImg.setImageResource(R.drawable.p_icon);
  62 + binding.checkTx.setText("亲,您未申请个人认证");
  63 + binding.checkBtn.setText("去认证");
  64 + binding.checkBtn.setOnClickListener(view1 -> {
  65 + TakeIdentityPictureActivity.startActivity(getActivity(),userId);
53 }); 66 });
54 }else if(code.equals("0")){//审核中 67 }else if(code.equals("0")){//审核中
55 - check_img.setImageResource(R.drawable.check_icon);  
56 - check_tx.setText("请您耐心等待,后台正在提交审核中");  
57 - check_btn.setText("返回");  
58 - check_btn.setOnClickListener(view1 ->{ 68 + binding.checkImg.setImageResource(R.drawable.check_icon);
  69 + binding.checkTx.setText(getActivity().getString(R.string.checking));
  70 + binding.checkBtn.setText("返回");
  71 + binding.checkBtn.setOnClickListener(view1 ->{
59 getActivity().finish(); 72 getActivity().finish();
60 } ); 73 } );
  74 + }else if(code.endsWith("2")){//审核失败
  75 + binding.checkImg.setImageResource(R.drawable.check_icon);
  76 + binding.checkTx.setText("审核失败");
  77 + binding.checkBtn.setText("继续认证");
  78 + binding.checkBtn.setOnClickListener(view1 -> {
  79 + TakeIdentityPictureActivity.startActivity(getActivity(),userId);
  80 + });
61 } 81 }
62 } 82 }
63 } 83 }
core/dentity_verfication/src/main/java/com/cnlive/core/people_verfication/fragment/PersonCheckSuccessFragment.java
1 package com.cnlive.core.people_verfication.fragment; 1 package com.cnlive.core.people_verfication.fragment;
2 2
3 import android.os.Bundle; 3 import android.os.Bundle;
4 -import android.view.LayoutInflater;  
5 -import android.view.View;  
6 -import android.view.ViewGroup;  
7 4
  5 +import com.cnlive.core.libs.base.frame.fragment.BaseFragment;
8 import com.cnlive.core.people_verfication.R; 6 import com.cnlive.core.people_verfication.R;
9 -import com.qmuiteam.qmui.widget.QMUITopBar;  
10 -  
11 -import androidx.annotation.NonNull;  
12 -import androidx.annotation.Nullable;  
13 -import androidx.fragment.app.Fragment; 7 +import com.cnlive.core.people_verfication.databinding.FragmentPersonChechSuccessBinding;
  8 +import androidx.databinding.ViewDataBinding;
14 9
15 /** 10 /**
16 * 个人检测成功页面 11 * 个人检测成功页面
17 * @Author hanyayun 12 * @Author hanyayun
18 * @Date 2020/4/7 13 * @Date 2020/4/7
19 */ 14 */
20 -public class PersonCheckSuccessFragment extends Fragment { 15 +public class PersonCheckSuccessFragment extends BaseFragment {
21 16
22 - private QMUITopBar topBar;  
23 - public PersonCheckSuccessFragment() {  
24 - // Required empty public constructor  
25 - } 17 + public FragmentPersonChechSuccessBinding binding;
26 18
  19 + public static PersonCheckSuccessFragment newInstance(String userId) {
  20 + PersonCheckSuccessFragment fragment = new PersonCheckSuccessFragment();
  21 + Bundle args = new Bundle();
  22 + args.putString("userId", userId);
  23 + fragment.setArguments(args);
  24 + return fragment;
  25 + }
27 26
28 @Override 27 @Override
29 - public View onCreateView(LayoutInflater inflater, ViewGroup container,  
30 - Bundle savedInstanceState) {  
31 - // Inflate the layout for this fragment  
32 - return inflater.inflate(R.layout.fragment_person_chech_success, container, false); 28 + protected int getBindLayoutId() {
  29 + return R.layout.fragment_person_chech_success;
33 } 30 }
34 31
35 @Override 32 @Override
36 - public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {  
37 - super.onViewCreated(view, savedInstanceState);  
38 - topBar = view.findViewById(R.id.topbar);  
39 - topBar.setTitle("身份校验");  
40 - 33 + protected void initBindingLayoutData(ViewDataBinding baseBinding) {
  34 + super.initBindingLayoutData(baseBinding);
  35 + binding = (FragmentPersonChechSuccessBinding) baseBinding;
41 } 36 }
42 37
  38 +
  39 + @Override
  40 + protected void initView() {
  41 + binding.topbar.setTitle("身份校验");
  42 + binding.topbar.addLeftImageButton(R.drawable.top_back_black, R.id.fragment_back).setOnClickListener(v -> {
  43 + finish();
  44 + });
  45 + }
43 } 46 }
core/dentity_verfication/src/main/java/com/cnlive/core/people_verfication/fragment/TakeIdentityPictureFragment.java
1 package com.cnlive.core.people_verfication.fragment; 1 package com.cnlive.core.people_verfication.fragment;
2 2
  3 +import android.Manifest;
  4 +import android.app.Activity;
3 import android.os.Bundle; 5 import android.os.Bundle;
4 -import android.view.LayoutInflater; 6 +import android.text.TextUtils;
5 import android.view.View; 7 import android.view.View;
6 -import android.view.ViewGroup;  
7 8
  9 +import com.baidu.ocr.sdk.model.IDCardParams;
  10 +import com.cnlive.core.libs.base.frame.fragment.BaseFragment;
  11 +import com.cnlive.core.libs.base.util.AlertUtil;
  12 +import com.cnlive.core.libs.base.util.FileUtils;
  13 +import com.cnlive.core.ocr.ui.camera.CameraActivity;
8 import com.cnlive.core.people_verfication.R; 14 import com.cnlive.core.people_verfication.R;
  15 +import com.cnlive.core.people_verfication.databinding.FragmentTakeIdentityPictureBinding;
  16 +import com.cnlive.core.people_verfication.presenter.TakeIdentityPicturePresenter;
  17 +import com.cnlive.core.people_verfication.view.ICertificatePhohosView;
  18 +import com.cnlive.core.people_verfication.view.TakeIdentityPictureView;
  19 +import com.cnlive.media.picker.PickerConfig;
  20 +import com.cnlive.media.picker.entity.Media;
  21 +import com.cnlive.media.picker.utils.PermissionChecker;
9 22
10 -import androidx.fragment.app.Fragment; 23 +import java.util.ArrayList;
  24 +
  25 +import androidx.annotation.NonNull;
  26 +import androidx.databinding.ViewDataBinding;
11 27
12 /** 28 /**
13 * 身份采集页面 29 * 身份采集页面
14 * @Author hanyayun 30 * @Author hanyayun
15 * @Date 2020/4/7 31 * @Date 2020/4/7
16 */ 32 */
17 -public class TakeIdentityPictureFragment extends Fragment { 33 +public class TakeIdentityPictureFragment extends BaseFragment<TakeIdentityPictureView, TakeIdentityPicturePresenter> {
  34 +
  35 + public FragmentTakeIdentityPictureBinding binding;
  36 + //上一个被点击过的btn的点击时间
  37 + private long preViewClickTime = 0;
  38 + //上一个被点击过的btn的id
  39 + private int preViewClickId = 0;
  40 + private static int CAMERA_WRITE_FR_PERMISSION = 1001;
  41 + private static int CAMERA_WRITE_BA_PERMISSION = 1002;
  42 + private static int CAMERA_WRITE_PI_PERMISSION = 1003;
  43 +
  44 + public static TakeIdentityPictureFragment newInstance(String userId) {
  45 + TakeIdentityPictureFragment fragment = new TakeIdentityPictureFragment();
  46 + Bundle args = new Bundle();
  47 + args.putString("userId", userId);
  48 + fragment.setArguments(args);
  49 + return fragment;
  50 + }
  51 +
  52 + @Override
  53 + protected int getBindLayoutId() {
  54 + return R.layout.fragment_take_identity_picture;
  55 + }
  56 +
  57 + @Override
  58 + protected void initBindingLayoutData(ViewDataBinding baseBinding) {
  59 + binding = (FragmentTakeIdentityPictureBinding) baseBinding;
  60 + }
  61 +
  62 + @Override
  63 + protected void initView() {
  64 + showDefaultWhiteStatusBar();
  65 + binding.topbar.setTitle("拍摄照片");
  66 + binding.topbar.addLeftImageButton(R.drawable.top_back_black, R.id.fragment_back).setOnClickListener(v -> {
  67 + finish();
  68 + });
  69 + binding.setClick(v -> onClick(v.getId()));
  70 + }
  71 +
  72 +
  73 + private void onClick(int id) {
  74 + long curClickTime = System.currentTimeMillis();
  75 + if (preViewClickId > 0 && preViewClickTime > 0) {
  76 + if (preViewClickId == id && curClickTime - preViewClickTime <= 2000) {
  77 + return;
  78 + }
  79 + }
  80 + preViewClickTime = curClickTime;
  81 + preViewClickId = id;
  82 + if (id == R.id.certificate_front_ry) {
  83 + if (hasCampermission(CAMERA_WRITE_FR_PERMISSION)) {//权限判断
  84 + getMvpView().takeIdCardPictures(getActivity(), ICertificatePhohosView.ID_CARD_SIDE_FRONT);
  85 + }
  86 + } else if (id == R.id.certificate_back_ry) {
  87 + if (hasCampermission(CAMERA_WRITE_BA_PERMISSION)) {//权限判断
  88 + getMvpView().takeIdCardPictures(getActivity(), ICertificatePhohosView.ID_CARD_SIDE_BACK);
  89 + }
  90 + } else if (id == R.id.take_picture_ry) {
  91 + if (hasCampermission(CAMERA_WRITE_PI_PERMISSION)) {
  92 + getMvpView().showDialog();
  93 + }
  94 + }else if(id == R.id.next){
  95 + if (binding.frontTx.getVisibility() == View.VISIBLE && binding.backTx.getVisibility() == View.VISIBLE
  96 + && binding.picTx.getVisibility() == View.VISIBLE) {
  97 +
  98 + }
  99 + }
  100 + }
  101 +
  102 + private boolean hasCampermission(int typeNum) {
  103 + boolean hasPermission = PermissionChecker.checkPermissions(getActivity()
  104 + , new String[]{Manifest.permission.CAMERA, Manifest.permission.RECORD_AUDIO, Manifest.permission.WRITE_EXTERNAL_STORAGE}
  105 + , typeNum, R.string.dialog_imagepicker_permission_camera_nerver_ask_message);
  106 + return hasPermission;
  107 + }
  108 +
  109 + @Override
  110 + public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
  111 + super.onRequestPermissionsResult(requestCode, permissions, grantResults);
  112 + if (requestCode == CAMERA_WRITE_FR_PERMISSION) {
  113 + if (PermissionChecker.onRequestPermissionsResult(getActivity(), requestCode, permissions, grantResults, false, R.string.dialog_imagepicker_permission_sdcard_message)[0]) {
  114 + getMvpView().takeIdCardPictures(getActivity(), ICertificatePhohosView.ID_CARD_SIDE_FRONT);
  115 + }
  116 + } else if (requestCode == CAMERA_WRITE_BA_PERMISSION) {
  117 + if (PermissionChecker.onRequestPermissionsResult(getActivity(), requestCode, permissions, grantResults, false, R.string.dialog_imagepicker_permission_sdcard_message)[0]) {
  118 + getMvpView().takeIdCardPictures(getActivity(), ICertificatePhohosView.ID_CARD_SIDE_BACK);
  119 + }
  120 + } else if (requestCode == CAMERA_WRITE_PI_PERMISSION) {
  121 + if (PermissionChecker.onRequestPermissionsResult(getActivity(), requestCode, permissions, grantResults, false, R.string.dialog_imagepicker_permission_sdcard_message)[0]) {
  122 + getMvpView().showDialog();
  123 + }
  124 + }
  125 + }
18 126
19 - public TakeIdentityPictureFragment() {  
20 - // Required empty public constructor 127 + @Override
  128 + public void onFragmentResult(int requestCode, int resultCode, Bundle data) {
  129 + super.onFragmentResult(requestCode, resultCode, data);
  130 + if (requestCode == ICertificatePhohosView.REQUEST_CODE_CAMERA && resultCode == Activity.RESULT_OK) {
  131 + if (data != null) {
  132 + String contentType = data.getString(CameraActivity.KEY_CONTENT_TYPE);
  133 + if (!TextUtils.isEmpty(contentType)) {
  134 + if (CameraActivity.CONTENT_TYPE_ID_CARD_FRONT.equals(contentType)) {
  135 + String frontFilePath = FileUtils.getSaveFile(getActivity(), ICertificatePhohosView.PIC_FRONT).getAbsolutePath();
  136 + if (getMvpView() == null) return;
  137 + getMvpView().recIDCard(IDCardParams.ID_CARD_SIDE_FRONT, frontFilePath);
  138 + } else if (CameraActivity.CONTENT_TYPE_ID_CARD_BACK.equals(contentType)) {
  139 + String backFilePath = FileUtils.getSaveFile(getActivity(), ICertificatePhohosView.PIC_BACK).getAbsolutePath();
  140 + if (getMvpView() == null) return;
  141 + getMvpView().recIDCard(IDCardParams.ID_CARD_SIDE_BACK, backFilePath);
  142 + }else if(CameraActivity.CONTENT_TYPE_GENERAL.endsWith(contentType)){
  143 + String filePath = FileUtils.getSaveFile(getActivity(), ICertificatePhohosView.PIC_GENERAL).getAbsolutePath();
  144 + if (getMvpView() == null) return;
  145 + if (!TextUtils.isEmpty(filePath))getMvpView().hasFace(filePath);
  146 + }
  147 + }
  148 + }
  149 + }else if (requestCode == 200 && resultCode == PickerConfig.DEFAULT_RESULT_CODE) {
  150 + ArrayList<Media> select = data.getParcelableArrayList(PickerConfig.EXTRA_RESULT);
  151 + if (select != null && select.size() > 0) {
  152 + String path = select.get(0).path;
  153 + if (!TextUtils.isEmpty(path))getMvpView().hasFace(path);
  154 + } else {
  155 + AlertUtil.showDeftToast(getActivity(), "请选择图片");
  156 + }
  157 + }
21 } 158 }
22 159
23 160
24 @Override 161 @Override
25 - public View onCreateView(LayoutInflater inflater, ViewGroup container,  
26 - Bundle savedInstanceState) {  
27 - // Inflate the layout for this fragment  
28 - return inflater.inflate(R.layout.fragment_take_identity_picture, container, false); 162 + public void onDestroyView() {
  163 + super.onDestroyView();
29 } 164 }
  165 +
30 } 166 }
core/dentity_verfication/src/main/java/com/cnlive/core/people_verfication/view/TakeIdentityPictureView.java
@@ -36,7 +36,7 @@ import com.cnlive.core.ocr.RecognizeService; @@ -36,7 +36,7 @@ import com.cnlive.core.ocr.RecognizeService;
36 import com.cnlive.core.ocr.ui.camera.CameraActivity; 36 import com.cnlive.core.ocr.ui.camera.CameraActivity;
37 import com.cnlive.core.ocr.ui.util.ImageUtil; 37 import com.cnlive.core.ocr.ui.util.ImageUtil;
38 import com.cnlive.core.people_verfication.R; 38 import com.cnlive.core.people_verfication.R;
39 -import com.cnlive.core.people_verfication.activity.TakeIdentityPictureActivity; 39 +import com.cnlive.core.people_verfication.fragment.TakeIdentityPictureFragment;
40 import com.cnlive.media.picker.ImagePicker; 40 import com.cnlive.media.picker.ImagePicker;
41 import com.cnlive.media.picker.PickerConfig; 41 import com.cnlive.media.picker.PickerConfig;
42 import com.cnlive.media.picker.utils.ImagePickerComUtils; 42 import com.cnlive.media.picker.utils.ImagePickerComUtils;
@@ -51,7 +51,7 @@ import static com.cnlive.core.people_verfication.view.ICertificatePhohosView.PIC @@ -51,7 +51,7 @@ import static com.cnlive.core.people_verfication.view.ICertificatePhohosView.PIC
51 51
52 public class TakeIdentityPictureView extends BaseView { 52 public class TakeIdentityPictureView extends BaseView {
53 53
54 - public TakeIdentityPictureActivity activity; 54 + public TakeIdentityPictureFragment fragment;
55 //上一个被点击过的btn的点击时间 55 //上一个被点击过的btn的点击时间
56 private long preViewClickTime = 0; 56 private long preViewClickTime = 0;
57 private boolean isFrontEffective = false; 57 private boolean isFrontEffective = false;
@@ -60,16 +60,16 @@ public class TakeIdentityPictureView extends BaseView { @@ -60,16 +60,16 @@ public class TakeIdentityPictureView extends BaseView {
60 private String realName; 60 private String realName;
61 private Dialog dialog; 61 private Dialog dialog;
62 62
63 - public TakeIdentityPictureView(TakeIdentityPictureActivity activity) {  
64 - this.activity = activity; 63 + public TakeIdentityPictureView(TakeIdentityPictureFragment fragment) {
  64 + this.fragment = fragment;
65 } 65 }
66 66
67 private Activity getContext() { 67 private Activity getContext() {
68 - return activity == null ? null : activity; 68 + return fragment == null ? null : fragment.getActivity();
69 } 69 }
70 70
71 public void finish() { 71 public void finish() {
72 - activity.finish(); 72 + fragment.getActivity().finish();
73 } 73 }
74 74
75 public void takeIdCardPictures(Context context, final int idCardSide) { 75 public void takeIdCardPictures(Context context, final int idCardSide) {
@@ -197,13 +197,13 @@ public class TakeIdentityPictureView extends BaseView { @@ -197,13 +197,13 @@ public class TakeIdentityPictureView extends BaseView {
197 idCardNo = idCardResult.getIdNumber().toString(); 197 idCardNo = idCardResult.getIdNumber().toString();
198 realName = idCardResult.getName().toString(); 198 realName = idCardResult.getName().toString();
199 if (TextUtils.isEmpty(idCardNo) || TextUtils.isEmpty(realName)) { 199 if (TextUtils.isEmpty(idCardNo) || TextUtils.isEmpty(realName)) {
200 - activity.binding.next.setClickable(false); 200 + fragment.binding.next.setClickable(false);
201 AlertUtil.showDeftToast(getContext(), "身份证信息读取失败,请重新拍摄"); 201 AlertUtil.showDeftToast(getContext(), "身份证信息读取失败,请重新拍摄");
202 return; 202 return;
203 } 203 }
204 frontBitmap = bitmap; 204 frontBitmap = bitmap;
205 - activity.binding.frontTx.setVisibility(View.VISIBLE);  
206 - showIdCard(idCardSide, frontBitmap, activity.binding.certificateFront); 205 + fragment.binding.frontTx.setVisibility(View.VISIBLE);
  206 + showIdCard(idCardSide, frontBitmap, fragment.binding.certificateFront);
207 if (isBackEffective) { 207 if (isBackEffective) {
208 setNextShowColor(); 208 setNextShowColor();
209 } 209 }
@@ -227,9 +227,9 @@ public class TakeIdentityPictureView extends BaseView { @@ -227,9 +227,9 @@ public class TakeIdentityPictureView extends BaseView {
227 e.printStackTrace(); 227 e.printStackTrace();
228 } 228 }
229 229
230 - activity.binding.backTx.setVisibility(View.VISIBLE);  
231 - showIdCard(idCardSide, backBitmap, activity.binding.certificateBack);  
232 - activity.binding.certificateBack.setImageBitmap(bitmap); 230 + fragment.binding.backTx.setVisibility(View.VISIBLE);
  231 + showIdCard(idCardSide, backBitmap, fragment.binding.certificateBack);
  232 + fragment.binding.certificateBack.setImageBitmap(bitmap);
233 if (!TextUtils.isEmpty(idCardNo) && !TextUtils.isEmpty(realName)) { 233 if (!TextUtils.isEmpty(idCardNo) && !TextUtils.isEmpty(realName)) {
234 setNextShowColor(); 234 setNextShowColor();
235 } 235 }
@@ -275,8 +275,8 @@ public class TakeIdentityPictureView extends BaseView { @@ -275,8 +275,8 @@ public class TakeIdentityPictureView extends BaseView {
275 275
276 public void showDialog() { 276 public void showDialog() {
277 if (dialog == null) { 277 if (dialog == null) {
278 - dialog = new Dialog(activity, R.style.DialogStyle);  
279 - View view = View.inflate(activity, R.layout.dialog_takimg, null); 278 + dialog = new Dialog(fragment.getActivity(), R.style.DialogStyle);
  279 + View view = View.inflate(fragment.getActivity(), R.layout.dialog_takimg, null);
280 dialog.setContentView(view); 280 dialog.setContentView(view);
281 Window window = dialog.getWindow(); 281 Window window = dialog.getWindow();
282 window.setGravity(Gravity.BOTTOM); 282 window.setGravity(Gravity.BOTTOM);
@@ -288,7 +288,7 @@ public class TakeIdentityPictureView extends BaseView { @@ -288,7 +288,7 @@ public class TakeIdentityPictureView extends BaseView {
288 } 288 }
289 dialog.findViewById(R.id.take_photo).setOnClickListener(view -> { 289 dialog.findViewById(R.id.take_photo).setOnClickListener(view -> {
290 dialog.dismiss(); 290 dialog.dismiss();
291 - takeIdCardPictures(activity, ICertificatePhohosView.ID_CAMERA_GENETAL); 291 + takeIdCardPictures(fragment.getActivity(), ICertificatePhohosView.ID_CAMERA_GENETAL);
292 }); 292 });
293 dialog.findViewById(R.id.get_img).setOnClickListener(view -> { 293 dialog.findViewById(R.id.get_img).setOnClickListener(view -> {
294 dialog.dismiss(); 294 dialog.dismiss();
@@ -316,7 +316,7 @@ public class TakeIdentityPictureView extends BaseView { @@ -316,7 +316,7 @@ public class TakeIdentityPictureView extends BaseView {
316 .isSinglePick(true) 316 .isSinglePick(true)
317 .doCrop(1, 1, 200, 200) 317 .doCrop(1, 1, 200, 200)
318 .builder() 318 .builder()
319 - .start(activity, 200, PickerConfig.DEFAULT_RESULT_CODE); 319 + .start(fragment.getActivity(), 200, PickerConfig.DEFAULT_RESULT_CODE);
320 } 320 }
321 321
322 /** 322 /**
@@ -336,8 +336,8 @@ public class TakeIdentityPictureView extends BaseView { @@ -336,8 +336,8 @@ public class TakeIdentityPictureView extends BaseView {
336 int numberOfFaceDetected = myFaceDetect.findFaces(bitmap565, myFace); 336 int numberOfFaceDetected = myFaceDetect.findFaces(bitmap565, myFace);
337 if (numberOfFaceDetected == 1) { 337 if (numberOfFaceDetected == 1) {
338 setNextShowColor(); 338 setNextShowColor();
339 - activity.binding.picTx.setVisibility(View.VISIBLE);  
340 - GlideUtil.init(activity, path).error(R.drawable.upload).into(activity.binding.takePicture); 339 + fragment.binding.picTx.setVisibility(View.VISIBLE);
  340 + GlideUtil.init(fragment.getActivity(), path).error(R.drawable.upload).into(fragment.binding.takePicture);
341 setNextShowColor(); 341 setNextShowColor();
342 }else { 342 }else {
343 AlertUtil.showDeftToast(getContext(), "请确保肩部至头部清晰可见"); 343 AlertUtil.showDeftToast(getContext(), "请确保肩部至头部清晰可见");
@@ -350,13 +350,13 @@ public class TakeIdentityPictureView extends BaseView { @@ -350,13 +350,13 @@ public class TakeIdentityPictureView extends BaseView {
350 } 350 }
351 351
352 private void setNextShowColor() { 352 private void setNextShowColor() {
353 - if (activity.binding.frontTx.getVisibility() == View.VISIBLE && activity.binding.backTx.getVisibility() == View.VISIBLE  
354 - && activity.binding.picTx.getVisibility() == View.VISIBLE) {  
355 - activity.binding.next.setTextColor(activity.getResources().getColor(R.color.white));  
356 - activity.binding.next.setBackground(getContext().getResources().getDrawable(R.drawable.bg_apply_btn)); 353 + if (fragment.binding.frontTx.getVisibility() == View.VISIBLE && fragment.binding.backTx.getVisibility() == View.VISIBLE
  354 + && fragment.binding.picTx.getVisibility() == View.VISIBLE) {
  355 + fragment.binding.next.setTextColor(fragment.getActivity().getResources().getColor(R.color.white));
  356 + fragment.binding.next.setBackground(getContext().getResources().getDrawable(R.drawable.bg_apply_btn));
357 }else { 357 }else {
358 - activity.binding.next.setTextColor(activity.getResources().getColor(R.color.color_b4b4b4));  
359 - activity.binding.next.setBackground(getContext().getResources().getDrawable(R.drawable.bg_shape_gray)); 358 + fragment.binding.next.setTextColor(fragment.getActivity().getResources().getColor(R.color.color_b4b4b4));
  359 + fragment.binding.next.setBackground(getContext().getResources().getDrawable(R.drawable.bg_shape_gray));
360 } 360 }
361 } 361 }
362 } 362 }
core/dentity_verfication/src/main/res/layout/activity_person_check.xml deleted 100644 → 0
1 -<?xml version="1.0" encoding="utf-8"?>  
2 -<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"  
3 - xmlns:app="http://schemas.android.com/apk/res-auto"  
4 - xmlns:tools="http://schemas.android.com/tools"  
5 - android:layout_width="match_parent"  
6 - android:layout_height="match_parent"  
7 - tools:context=".activity.PersonCheckActivity">  
8 -  
9 -</androidx.constraintlayout.widget.ConstraintLayout>  
10 \ No newline at end of file 0 \ No newline at end of file
core/dentity_verfication/src/main/res/layout/activity_take_picture.xml deleted 100644 → 0
1 -<?xml version="1.0" encoding="utf-8"?>  
2 -<layout>  
3 -  
4 - <data>  
5 -  
6 - <variable  
7 - name="click"  
8 - type="android.view.View.OnClickListener" />  
9 - </data>  
10 -  
11 - <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"  
12 - xmlns:app="http://schemas.android.com/apk/res-auto"  
13 - xmlns:tools="http://schemas.android.com/tools"  
14 - android:layout_width="match_parent"  
15 - android:layout_height="match_parent"  
16 - android:background="@color/white"  
17 - android:orientation="vertical"  
18 - tools:context=".activity.TakeIdentityPictureActivity">  
19 -  
20 - <com.qmuiteam.qmui.widget.QMUITopBar  
21 - android:id="@+id/topbar"  
22 - android:layout_width="match_parent"  
23 - android:layout_height="?attr/qmui_topbar_height" />  
24 -  
25 - <ScrollView  
26 - android:layout_width="match_parent"  
27 - android:layout_height="match_parent">  
28 -  
29 - <LinearLayout  
30 - android:layout_width="match_parent"  
31 - android:layout_height="match_parent"  
32 - android:orientation="vertical">  
33 -  
34 - <LinearLayout  
35 - android:layout_width="wrap_content"  
36 - android:layout_height="wrap_content"  
37 - android:layout_gravity="center_horizontal"  
38 - android:orientation="vertical">  
39 -  
40 - <TextView  
41 - android:layout_width="wrap_content"  
42 - android:layout_height="wrap_content"  
43 - android:layout_marginTop="10dp"  
44 - android:text="@string/step_one"  
45 - android:textColor="#ff1a1a1a"  
46 - android:textSize="16sp" />  
47 -  
48 - <LinearLayout  
49 - android:layout_width="wrap_content"  
50 - android:layout_height="wrap_content"  
51 - android:layout_marginTop="10dp"  
52 - android:orientation="horizontal">  
53 -  
54 - <TextView  
55 - android:layout_width="wrap_content"  
56 - android:layout_height="wrap_content"  
57 - android:text="@string/please_get_yourself_card"  
58 - android:textColor="@color/color_9c9c9c"  
59 - android:textSize="12sp" />  
60 -  
61 - <TextView  
62 - android:layout_width="wrap_content"  
63 - android:layout_height="wrap_content"  
64 - android:text="@string/font"  
65 - android:textColor="@color/color_ff3b30"  
66 - android:textSize="12sp" />  
67 -  
68 - <TextView  
69 - android:layout_width="wrap_content"  
70 - android:layout_height="wrap_content"  
71 - android:text="@string/card_notice"  
72 - android:textColor="@color/color_9c9c9c"  
73 - android:textSize="12sp" />  
74 -  
75 - </LinearLayout>  
76 - </LinearLayout>  
77 -  
78 - <RelativeLayout  
79 - android:id="@+id/certificate_front_ry"  
80 - android:layout_width="wrap_content"  
81 - android:layout_height="wrap_content"  
82 - android:layout_gravity="center_horizontal"  
83 - android:layout_marginTop="10dp"  
84 - android:onClick="@{click}">  
85 -  
86 - <ImageView  
87 - android:id="@+id/certificate_front"  
88 - android:layout_width="280dp"  
89 - android:layout_height="wrap_content"  
90 - android:src="@drawable/observer_idcard_front" />  
91 -  
92 - <TextView  
93 - android:id="@+id/front_tx"  
94 - android:layout_width="280dp"  
95 - android:layout_height="30dp"  
96 - android:layout_alignParentBottom="true"  
97 - android:background="#66000000"  
98 - android:visibility="gone"  
99 - android:gravity="center"  
100 - android:text="@string/change"  
101 - android:textColor="@color/white"  
102 - android:textSize="14sp" />  
103 - </RelativeLayout>  
104 -  
105 - <LinearLayout  
106 - android:layout_width="wrap_content"  
107 - android:layout_height="wrap_content"  
108 - android:layout_gravity="center_horizontal"  
109 - android:layout_marginTop="30dp"  
110 - android:orientation="vertical">  
111 -  
112 - <TextView  
113 - android:layout_width="wrap_content"  
114 - android:layout_height="wrap_content"  
115 - android:layout_marginTop="11dp"  
116 - android:text="@string/step_tow"  
117 - android:textColor="#ff1a1a1a"  
118 - android:textSize="16sp" />  
119 -  
120 - <LinearLayout  
121 - android:layout_width="wrap_content"  
122 - android:layout_height="wrap_content"  
123 - android:layout_marginTop="10dp"  
124 - android:orientation="horizontal">  
125 -  
126 - <TextView  
127 - android:layout_width="wrap_content"  
128 - android:layout_height="wrap_content"  
129 - android:text="@string/please_get_yourself_card"  
130 - android:textColor="@color/color_9c9c9c"  
131 - android:textSize="12sp" />  
132 -  
133 - <TextView  
134 - android:layout_width="wrap_content"  
135 - android:layout_height="wrap_content"  
136 - android:text="@string/back"  
137 - android:textColor="@color/color_ff3b30"  
138 - android:textSize="12sp" />  
139 -  
140 - <TextView  
141 - android:layout_width="wrap_content"  
142 - android:layout_height="wrap_content"  
143 - android:text="@string/card_notice"  
144 - android:textColor="@color/color_9c9c9c"  
145 - android:textSize="12sp" />  
146 -  
147 - </LinearLayout>  
148 - </LinearLayout>  
149 -  
150 - <RelativeLayout  
151 - android:id="@+id/certificate_back_ry"  
152 - android:layout_width="wrap_content"  
153 - android:layout_height="wrap_content"  
154 - android:layout_gravity="center_horizontal"  
155 - android:layout_marginTop="10dp"  
156 - android:onClick="@{click}">  
157 -  
158 - <ImageView  
159 - android:id="@+id/certificate_back"  
160 - android:layout_width="280dp"  
161 - android:layout_height="wrap_content"  
162 - android:src="@drawable/observer_idcard_back" />  
163 -  
164 - <TextView  
165 - android:id="@+id/back_tx"  
166 - android:layout_width="280dp"  
167 - android:layout_height="30dp"  
168 - android:layout_alignParentBottom="true"  
169 - android:background="#66000000"  
170 - android:visibility="gone"  
171 - android:gravity="center"  
172 - android:text="@string/change"  
173 - android:textColor="@color/white"  
174 - android:textSize="14sp" />  
175 - </RelativeLayout>  
176 -  
177 - <LinearLayout  
178 - android:layout_width="wrap_content"  
179 - android:layout_height="wrap_content"  
180 - android:layout_gravity="center_horizontal"  
181 - android:layout_marginTop="30dp"  
182 - android:orientation="vertical">  
183 -  
184 - <TextView  
185 - android:layout_width="wrap_content"  
186 - android:layout_height="wrap_content"  
187 - android:layout_marginTop="11dp"  
188 - android:text="@string/step_third"  
189 - android:textColor="#ff1a1a1a"  
190 - android:textSize="16sp" />  
191 -  
192 - <TextView  
193 - android:layout_width="wrap_content"  
194 - android:layout_height="wrap_content"  
195 - android:layout_marginTop="10dp"  
196 - android:text="@string/take_photo_yourself"  
197 - android:textColor="@color/color_9c9c9c"  
198 - android:textSize="12sp" />  
199 -  
200 - </LinearLayout>  
201 -  
202 - <RelativeLayout  
203 - android:id="@+id/take_picture_ry"  
204 - android:layout_width="wrap_content"  
205 - android:layout_height="wrap_content"  
206 - android:layout_gravity="center_horizontal"  
207 - android:layout_marginTop="10dp"  
208 - android:onClick="@{click}">  
209 -  
210 - <ImageView  
211 - android:id="@+id/take_picture"  
212 - android:layout_width="130dp"  
213 - android:layout_height="wrap_content"  
214 - android:src="@drawable/upload" />  
215 -  
216 - <TextView  
217 - android:id="@+id/pic_tx"  
218 - android:layout_width="130dp"  
219 - android:layout_height="30dp"  
220 - android:layout_alignParentBottom="true"  
221 - android:visibility="gone"  
222 - android:background="#66000000"  
223 - android:gravity="center"  
224 - android:text="@string/change"  
225 - android:textColor="@color/white"  
226 - android:textSize="14sp" />  
227 - </RelativeLayout>  
228 -  
229 - <TextView  
230 - android:id="@+id/next"  
231 - android:layout_width="match_parent"  
232 - android:layout_height="45dp"  
233 - android:layout_margin="30dp"  
234 - android:background="@drawable/bg_shape_gray"  
235 - android:gravity="center"  
236 - android:text="@string/next"  
237 - android:textColor="@color/color_b4b4b4"  
238 - android:onClick="@{click}"  
239 - android:textSize="18sp" />  
240 - </LinearLayout>  
241 - </ScrollView>  
242 - </LinearLayout>  
243 -</layout>  
core/dentity_verfication/src/main/res/layout/fragment_check_result.xml
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"  
3 - xmlns:tools="http://schemas.android.com/tools"  
4 - android:layout_width="match_parent"  
5 - android:layout_height="match_parent"  
6 - tools:context=".fragment.CheckResultFragment">  
7 -  
8 - <com.qmuiteam.qmui.widget.QMUITopBar  
9 - android:id="@+id/topbar" 2 +<layout>
  3 + <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
  4 + xmlns:tools="http://schemas.android.com/tools"
10 android:layout_width="match_parent" 5 android:layout_width="match_parent"
11 - android:layout_height="?attr/qmui_topbar_height" /> 6 + android:layout_height="match_parent"
  7 + tools:context=".fragment.CheckResultFragment">
12 8
13 - <LinearLayout  
14 - android:layout_width="match_parent"  
15 - android:layout_height="wrap_content"  
16 - android:layout_centerInParent="true"  
17 - android:orientation="vertical">  
18 - <ImageView  
19 - android:id="@+id/result_img"  
20 - android:layout_width="wrap_content"  
21 - android:layout_height="wrap_content"  
22 - android:layout_gravity="center_horizontal"  
23 - android:src="@drawable/check_icon"/>  
24 -  
25 - <TextView  
26 - android:id="@+id/result_tx"  
27 - android:layout_width="wrap_content"  
28 - android:layout_height="wrap_content"  
29 - android:layout_gravity="center_horizontal"  
30 - android:layout_marginTop="20dp"  
31 - android:textColor="@color/color_999999"  
32 - android:textSize="15sp"  
33 - android:text="@string/checking"/> 9 + <com.qmuiteam.qmui.widget.QMUITopBar
  10 + android:id="@+id/topbar"
  11 + android:layout_width="match_parent"
  12 + android:layout_height="?attr/qmui_topbar_height" />
34 13
35 <LinearLayout 14 <LinearLayout
36 - android:id="@+id/company_ly"  
37 - android:layout_width="wrap_content" 15 + android:layout_width="match_parent"
38 android:layout_height="wrap_content" 16 android:layout_height="wrap_content"
39 - android:layout_marginTop="15dp"  
40 - android:orientation="vertical"  
41 - android:visibility="gone"  
42 - android:layout_gravity="center_horizontal"> 17 + android:layout_centerInParent="true"
  18 + android:orientation="vertical">
  19 + <ImageView
  20 + android:id="@+id/result_img"
  21 + android:layout_width="wrap_content"
  22 + android:layout_height="wrap_content"
  23 + android:layout_gravity="center_horizontal"
  24 + android:src="@drawable/check_icon"/>
43 25
44 - <LinearLayout 26 + <TextView
  27 + android:id="@+id/result_tx"
45 android:layout_width="wrap_content" 28 android:layout_width="wrap_content"
46 android:layout_height="wrap_content" 29 android:layout_height="wrap_content"
47 android:layout_gravity="center_horizontal" 30 android:layout_gravity="center_horizontal"
48 - android:orientation="horizontal"> 31 + android:layout_marginTop="20dp"
  32 + android:textColor="@color/color_999999"
  33 + android:textSize="15sp"
  34 + android:text="@string/checking"/>
  35 +
  36 + <LinearLayout
  37 + android:id="@+id/company_ly"
  38 + android:layout_width="wrap_content"
  39 + android:layout_height="wrap_content"
  40 + android:layout_marginTop="15dp"
  41 + android:orientation="vertical"
  42 + android:visibility="gone"
  43 + android:layout_gravity="center_horizontal">
  44 +
  45 + <LinearLayout
  46 + android:layout_width="wrap_content"
  47 + android:layout_height="wrap_content"
  48 + android:layout_gravity="center_horizontal"
  49 + android:orientation="horizontal">
  50 + <TextView
  51 + android:layout_width="wrap_content"
  52 + android:layout_height="wrap_content"
  53 + android:text="@string/please_copy"
  54 + android:textColor="@color/color_999999"
  55 + android:textSize="14sp"/>
  56 + <TextView
  57 + android:layout_width="wrap_content"
  58 + android:layout_height="wrap_content"
  59 + android:text="http://open.cnlive.com"
  60 + android:textColor="#4CAAFC"
  61 + android:textSize="14sp"/>
  62 + </LinearLayout>
  63 +
49 <TextView 64 <TextView
50 android:layout_width="wrap_content" 65 android:layout_width="wrap_content"
51 android:layout_height="wrap_content" 66 android:layout_height="wrap_content"
52 - android:text="@string/please_copy" 67 + android:layout_gravity="center_horizontal"
  68 + android:layout_marginTop="10dp"
  69 + android:text="@string/serch_pc"
53 android:textColor="@color/color_999999" 70 android:textColor="@color/color_999999"
54 android:textSize="14sp"/> 71 android:textSize="14sp"/>
  72 +
55 <TextView 73 <TextView
56 android:layout_width="wrap_content" 74 android:layout_width="wrap_content"
57 android:layout_height="wrap_content" 75 android:layout_height="wrap_content"
58 - android:text="http://open.cnlive.com"  
59 - android:textColor="#4CAAFC"  
60 - android:textSize="14sp"/>  
61 - </LinearLayout> 76 + android:lineHeight="20dp"
  77 + android:layout_gravity="center_horizontal"
  78 + android:gravity="center_horizontal"
  79 + android:layout_marginTop="90dp"
  80 + android:text="@string/n_pc_n"
  81 + android:textColor="@color/color_F56950"
  82 + android:textSize="12sp"/>
62 83
63 - <TextView  
64 - android:layout_width="wrap_content"  
65 - android:layout_height="wrap_content"  
66 - android:layout_gravity="center_horizontal"  
67 - android:layout_marginTop="10dp"  
68 - android:text="@string/serch_pc"  
69 - android:textColor="@color/color_999999"  
70 - android:textSize="14sp"/> 84 + </LinearLayout>
71 85
72 <TextView 86 <TextView
73 - android:layout_width="wrap_content"  
74 - android:layout_height="wrap_content"  
75 - android:lineHeight="20dp"  
76 - android:layout_gravity="center_horizontal"  
77 - android:gravity="center_horizontal"  
78 - android:layout_marginTop="90dp"  
79 - android:text="@string/n_pc_n"  
80 - android:textColor="@color/color_F56950"  
81 - android:textSize="12sp"/>  
82 - 87 + android:id="@+id/resule_btn"
  88 + android:layout_width="match_parent"
  89 + android:layout_height="45dp"
  90 + android:text="@string/backs"
  91 + android:layout_marginLeft="30dp"
  92 + android:layout_marginRight="30dp"
  93 + android:gravity="center"
  94 + android:textColor="@color/white"
  95 + android:textSize="18sp"
  96 + android:background="@drawable/bg_apply_btn"
  97 + android:layout_marginTop="40dp"/>
83 </LinearLayout> 98 </LinearLayout>
84 99
85 - <TextView  
86 - android:id="@+id/resule_btn"  
87 - android:layout_width="match_parent"  
88 - android:layout_height="45dp"  
89 - android:text="@string/backs"  
90 - android:layout_marginLeft="30dp"  
91 - android:layout_marginRight="30dp"  
92 - android:gravity="center"  
93 - android:textColor="@color/white"  
94 - android:textSize="18sp"  
95 - android:background="@drawable/bg_apply_btn"  
96 - android:layout_marginTop="40dp"/>  
97 - </LinearLayout>  
98 -  
99 -</RelativeLayout>  
100 \ No newline at end of file 100 \ No newline at end of file
  101 + </RelativeLayout>
  102 +</layout>
core/dentity_verfication/src/main/res/layout/fragment_company_check_success.xml
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"  
3 - xmlns:tools="http://schemas.android.com/tools"  
4 - android:layout_width="match_parent"  
5 - android:layout_height="match_parent"  
6 - tools:context=".fragment.CompanyCheckSuccessFragment">  
7 -  
8 - <!-- TODO: Update blank fragment layout -->  
9 - <TextView 2 +<layout>
  3 +
  4 + <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
  5 + xmlns:tools="http://schemas.android.com/tools"
10 android:layout_width="match_parent" 6 android:layout_width="match_parent"
11 android:layout_height="match_parent" 7 android:layout_height="match_parent"
12 - android:text="@string/hello_blank_fragment" /> 8 + android:orientation="vertical"
  9 + tools:context=".fragment.CompanyCheckSuccessFragment">
  10 +
  11 + <com.qmuiteam.qmui.widget.QMUITopBar
  12 + android:id="@+id/topbar"
  13 + android:layout_width="match_parent"
  14 + android:layout_height="?attr/qmui_topbar_height" />
  15 +
  16 + <ScrollView
  17 + android:layout_width="match_parent"
  18 + android:layout_height="match_parent">
  19 +
  20 + <LinearLayout
  21 + android:layout_width="match_parent"
  22 + android:layout_height="match_parent"
  23 + android:orientation="vertical">
  24 +
  25 + <RelativeLayout
  26 + android:layout_width="match_parent"
  27 + android:layout_height="wrap_content"
  28 + android:layout_margin="10dp">
  29 +
  30 + <LinearLayout
  31 + android:layout_width="wrap_content"
  32 + android:layout_height="wrap_content"
  33 + android:orientation="vertical">
  34 +
  35 + <TextView
  36 + android:layout_width="wrap_content"
  37 + android:layout_height="wrap_content"
  38 + android:drawableLeft="@drawable/xzjg"
  39 + android:drawablePadding="10dp"
  40 + android:text="@string/your_company_msg"
  41 + android:textColor="@color/color_1a1a1a"
  42 + android:textSize="16sp" />
  43 +
  44 + <LinearLayout
  45 + android:layout_width="wrap_content"
  46 + android:layout_height="wrap_content"
  47 + android:layout_marginTop="30dp"
  48 + android:orientation="horizontal">
  49 +
  50 + <TextView
  51 + android:layout_width="wrap_content"
  52 + android:layout_height="wrap_content"
  53 + android:text="@string/company_name"
  54 + android:textColor="@color/color_333333"
  55 + android:textSize="13sp" />
  56 +
  57 + <TextView
  58 + android:id="@+id/company_name"
  59 + android:layout_width="wrap_content"
  60 + android:layout_height="wrap_content"
  61 + android:text="北京中投视讯文化传媒股份有限公司"
  62 + android:textColor="@color/color_B9B9B9"
  63 + android:textSize="13sp" />
  64 + </LinearLayout>
  65 +
  66 + <LinearLayout
  67 + android:layout_width="wrap_content"
  68 + android:layout_height="wrap_content"
  69 + android:layout_marginTop="20dp"
  70 + android:orientation="horizontal">
  71 +
  72 + <TextView
  73 + android:layout_width="wrap_content"
  74 + android:layout_height="wrap_content"
  75 + android:text="@string/company_logo"
  76 + android:textColor="@color/color_333333"
  77 + android:textSize="13sp" />
  78 +
  79 + <ImageView
  80 + android:id="@+id/company_logo"
  81 + android:layout_width="60dp"
  82 + android:layout_height="60dp"
  83 + android:layout_marginLeft="10dp" />
  84 +
  85 + </LinearLayout>
  86 + </LinearLayout>
  87 +
  88 + <ImageView
  89 + android:layout_width="wrap_content"
  90 + android:layout_height="wrap_content"
  91 + android:layout_alignParentRight="true"
  92 + android:layout_margin="10dp"
  93 + android:src="@drawable/check_success" />
  94 + </RelativeLayout>
  95 +
  96 + <LinearLayout
  97 + android:layout_width="wrap_content"
  98 + android:layout_height="wrap_content"
  99 + android:layout_marginTop="30dp"
  100 + android:orientation="horizontal">
  101 +
  102 + <TextView
  103 + android:layout_width="wrap_content"
  104 + android:layout_height="wrap_content"
  105 + android:text="公司简称:"
  106 + android:textColor="@color/color_333333"
  107 + android:textSize="13sp" />
  108 +
  109 + <TextView
  110 + android:layout_width="wrap_content"
  111 + android:layout_height="wrap_content"
  112 + android:text="正在上演"
  113 + android:textColor="@color/color_B9B9B9"
  114 + android:textSize="13sp" />
  115 + </LinearLayout>
  116 +
  117 + <LinearLayout
  118 + android:layout_width="wrap_content"
  119 + android:layout_height="wrap_content"
  120 + android:layout_marginTop="30dp"
  121 + android:orientation="horizontal">
  122 +
  123 + <TextView
  124 + android:layout_width="wrap_content"
  125 + android:layout_height="wrap_content"
  126 + android:text="企业代码:"
  127 + android:textColor="@color/color_333333"
  128 + android:textSize="13sp" />
  129 +
  130 + <TextView
  131 + android:layout_width="wrap_content"
  132 + android:layout_height="wrap_content"
  133 + android:text="fbx654875121544"
  134 + android:textColor="@color/color_B9B9B9"
  135 + android:textSize="13sp" />
  136 + </LinearLayout>
  137 +
  138 + <LinearLayout
  139 + android:layout_width="wrap_content"
  140 + android:layout_height="wrap_content"
  141 + android:layout_marginTop="30dp"
  142 + android:orientation="horizontal">
  143 +
  144 + <TextView
  145 + android:layout_width="wrap_content"
  146 + android:layout_height="wrap_content"
  147 + android:text="企业简介:"
  148 + android:textColor="@color/color_333333"
  149 + android:textSize="13sp" />
  150 +
  151 + <TextView
  152 + android:layout_width="wrap_content"
  153 + android:layout_height="wrap_content"
  154 + android:text="正在上演专门传播影视文化内容"
  155 + android:textColor="@color/color_B9B9B9"
  156 + android:textSize="13sp" />
  157 + </LinearLayout>
  158 +
  159 + <LinearLayout
  160 + android:layout_width="wrap_content"
  161 + android:layout_height="wrap_content"
  162 + android:layout_marginTop="30dp"
  163 + android:orientation="horizontal">
  164 +
  165 + <TextView
  166 + android:layout_width="wrap_content"
  167 + android:layout_height="wrap_content"
  168 + android:text="企业地址:"
  169 + android:textColor="@color/color_333333"
  170 + android:textSize="13sp" />
  171 +
  172 + <TextView
  173 + android:layout_width="wrap_content"
  174 + android:layout_height="wrap_content"
  175 + android:textColor="@color/color_B9B9B9"
  176 + android:textSize="13sp" />
  177 + </LinearLayout>
  178 +
  179 + <LinearLayout
  180 + android:layout_width="wrap_content"
  181 + android:layout_height="wrap_content"
  182 + android:layout_marginTop="30dp"
  183 + android:orientation="horizontal">
  184 +
  185 + <TextView
  186 + android:layout_width="wrap_content"
  187 + android:layout_height="wrap_content"
  188 + android:text="企业类型:"
  189 + android:textColor="@color/color_333333"
  190 + android:textSize="13sp" />
  191 +
  192 + <TextView
  193 + android:layout_width="wrap_content"
  194 + android:layout_height="wrap_content"
  195 + android:textColor="@color/color_B9B9B9"
  196 + android:textSize="13sp" />
  197 + </LinearLayout>
  198 +
  199 + <LinearLayout
  200 + android:layout_width="wrap_content"
  201 + android:layout_height="wrap_content"
  202 + android:layout_marginTop="30dp"
  203 + android:orientation="horizontal">
  204 +
  205 + <TextView
  206 + android:layout_width="wrap_content"
  207 + android:layout_height="wrap_content"
  208 + android:text="企业网站:"
  209 + android:textColor="@color/color_333333"
  210 + android:textSize="13sp" />
  211 +
  212 + <TextView
  213 + android:layout_width="wrap_content"
  214 + android:layout_height="wrap_content"
  215 + android:textColor="@color/color_B9B9B9"
  216 + android:textSize="13sp" />
  217 + </LinearLayout>
  218 +
  219 + <LinearLayout
  220 + android:layout_width="wrap_content"
  221 + android:layout_height="wrap_content"
  222 + android:layout_marginTop="30dp"
  223 + android:orientation="horizontal">
  224 +
  225 + <TextView
  226 + android:layout_width="wrap_content"
  227 + android:layout_height="wrap_content"
  228 + android:text="企业法人:"
  229 + android:textColor="@color/color_333333"
  230 + android:textSize="13sp" />
  231 +
  232 + <TextView
  233 + android:layout_width="wrap_content"
  234 + android:layout_height="wrap_content"
  235 + android:textColor="@color/color_B9B9B9"
  236 + android:textSize="13sp" />
  237 + </LinearLayout>
  238 +
  239 + <LinearLayout
  240 + android:layout_width="wrap_content"
  241 + android:layout_height="wrap_content"
  242 + android:layout_marginTop="30dp"
  243 + android:orientation="horizontal">
  244 +
  245 + <TextView
  246 + android:layout_width="wrap_content"
  247 + android:layout_height="wrap_content"
  248 + android:text="联系人:"
  249 + android:textColor="@color/color_333333"
  250 + android:textSize="13sp" />
  251 +
  252 + <TextView
  253 + android:layout_width="wrap_content"
  254 + android:layout_height="wrap_content"
  255 + android:textColor="@color/color_B9B9B9"
  256 + android:textSize="13sp" />
  257 + </LinearLayout>
  258 +
  259 + <LinearLayout
  260 + android:layout_width="wrap_content"
  261 + android:layout_height="wrap_content"
  262 + android:layout_marginTop="30dp"
  263 + android:orientation="horizontal">
  264 +
  265 + <TextView
  266 + android:layout_width="wrap_content"
  267 + android:layout_height="wrap_content"
  268 + android:text="合同编号:"
  269 + android:textColor="@color/color_333333"
  270 + android:textSize="13sp" />
  271 +
  272 + <TextView
  273 + android:layout_width="wrap_content"
  274 + android:layout_height="wrap_content"
  275 + android:textColor="@color/color_B9B9B9"
  276 + android:textSize="13sp" />
  277 + </LinearLayout>
  278 +
  279 + <LinearLayout
  280 + android:layout_width="wrap_content"
  281 + android:layout_height="wrap_content"
  282 + android:layout_marginTop="30dp"
  283 + android:orientation="horizontal">
  284 +
  285 + <TextView
  286 + android:layout_width="wrap_content"
  287 + android:layout_height="wrap_content"
  288 + android:text="营业执照号:"
  289 + android:textColor="@color/color_333333"
  290 + android:textSize="13sp" />
  291 +
  292 + <TextView
  293 + android:layout_width="wrap_content"
  294 + android:layout_height="wrap_content"
  295 + android:textColor="@color/color_B9B9B9"
  296 + android:textSize="13sp" />
  297 + </LinearLayout>
  298 +
  299 + <LinearLayout
  300 + android:layout_width="wrap_content"
  301 + android:layout_height="wrap_content"
  302 + android:layout_marginTop="30dp"
  303 + android:orientation="horizontal">
  304 +
  305 + <TextView
  306 + android:layout_width="wrap_content"
  307 + android:layout_height="wrap_content"
  308 + android:text="营业执照:"
  309 + android:textColor="@color/color_333333"
  310 + android:textSize="13sp" />
13 311
14 -</FrameLayout>  
15 \ No newline at end of file 312 \ No newline at end of file
  313 + <ImageView
  314 + android:layout_width="100dp"
  315 + android:layout_height="150dp" />
  316 + </LinearLayout>
  317 + </LinearLayout>
  318 + </ScrollView>
  319 + </LinearLayout>
  320 +</layout>
core/dentity_verfication/src/main/res/layout/fragment_person_chech_success.xml
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"  
3 - xmlns:tools="http://schemas.android.com/tools"  
4 - android:layout_width="match_parent"  
5 - android:layout_height="match_parent"  
6 - android:orientation="vertical"  
7 - tools:context=".fragment.PersonCheckSuccessFragment">  
8 -  
9 -  
10 - <com.qmuiteam.qmui.widget.QMUITopBar  
11 - android:id="@+id/topbar" 2 +<layout>
  3 + <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
  4 + xmlns:tools="http://schemas.android.com/tools"
12 android:layout_width="match_parent" 5 android:layout_width="match_parent"
13 - android:layout_height="?attr/qmui_topbar_height" /> 6 + android:layout_height="match_parent"
  7 + android:orientation="vertical"
  8 + tools:context=".fragment.PersonCheckSuccessFragment">
14 9
15 - <ScrollView  
16 - android:layout_width="match_parent"  
17 - android:layout_height="match_parent">  
18 10
19 - <LinearLayout 11 + <com.qmuiteam.qmui.widget.QMUITopBar
  12 + android:id="@+id/topbar"
  13 + android:layout_width="match_parent"
  14 + android:layout_height="?attr/qmui_topbar_height" />
  15 +
  16 + <ScrollView
20 android:layout_width="match_parent" 17 android:layout_width="match_parent"
21 - android:layout_height="match_parent"  
22 - android:orientation="vertical"> 18 + android:layout_height="match_parent">
23 19
24 - <RelativeLayout 20 + <LinearLayout
25 android:layout_width="match_parent" 21 android:layout_width="match_parent"
26 - android:layout_height="wrap_content"  
27 - android:layout_margin="10dp"> 22 + android:layout_height="match_parent"
  23 + android:orientation="vertical">
28 24
29 - <LinearLayout  
30 - android:layout_width="wrap_content" 25 + <RelativeLayout
  26 + android:layout_width="match_parent"
31 android:layout_height="wrap_content" 27 android:layout_height="wrap_content"
32 - android:orientation="vertical"> 28 + android:layout_margin="10dp">
33 29
34 - <TextView  
35 - android:id="@+id/per_name" 30 + <LinearLayout
36 android:layout_width="wrap_content" 31 android:layout_width="wrap_content"
37 android:layout_height="wrap_content" 32 android:layout_height="wrap_content"
38 - android:layout_marginTop="10dp"  
39 - android:text="**琦"  
40 - android:textColor="@color/color_1a1a1a"  
41 - android:textSize="16sp" /> 33 + android:orientation="vertical">
42 34
43 - <TextView  
44 - android:id="@+id/per_num"  
45 - android:layout_width="wrap_content"  
46 - android:layout_height="wrap_content"  
47 - android:layout_marginTop="10dp"  
48 - android:text="1***** ******** ***0"  
49 - android:textColor="@color/color_9c9c9c"  
50 - android:textSize="12sp" /> 35 + <TextView
  36 + android:id="@+id/per_name"
  37 + android:layout_width="wrap_content"
  38 + android:layout_height="wrap_content"
  39 + android:layout_marginTop="10dp"
  40 + android:text="**琦"
  41 + android:textColor="@color/color_1a1a1a"
  42 + android:textSize="16sp" />
51 43
52 - <ImageView  
53 - android:id="@+id/per_img"  
54 - android:layout_width="100dp"  
55 - android:layout_height="150dp"  
56 - android:layout_marginTop="10dp"  
57 - android:src="@drawable/icon_verficat_company_license_add" />  
58 - </LinearLayout> 44 + <TextView
  45 + android:id="@+id/per_num"
  46 + android:layout_width="wrap_content"
  47 + android:layout_height="wrap_content"
  48 + android:layout_marginTop="10dp"
  49 + android:text="1***** ******** ***0"
  50 + android:textColor="@color/color_9c9c9c"
  51 + android:textSize="12sp" />
59 52
60 - <ImageView  
61 - android:layout_width="wrap_content"  
62 - android:layout_height="wrap_content"  
63 - android:layout_alignParentRight="true"  
64 - android:layout_margin="10dp"  
65 - android:src="@drawable/check_success" />  
66 - </RelativeLayout> 53 + <ImageView
  54 + android:id="@+id/per_img"
  55 + android:layout_width="100dp"
  56 + android:layout_height="150dp"
  57 + android:layout_marginTop="10dp"
  58 + android:src="@drawable/icon_verficat_company_license_add" />
  59 + </LinearLayout>
67 60
68 - <View  
69 - android:layout_width="match_parent"  
70 - android:layout_height="10dp"  
71 - android:background="#F2F2F2" /> 61 + <ImageView
  62 + android:layout_width="wrap_content"
  63 + android:layout_height="wrap_content"
  64 + android:layout_alignParentRight="true"
  65 + android:layout_margin="10dp"
  66 + android:src="@drawable/check_success" />
  67 + </RelativeLayout>
72 68
73 - <androidx.recyclerview.widget.RecyclerView  
74 - android:id="@+id/company_recy"  
75 - android:layout_width="match_parent"  
76 - android:layout_height="wrap_content" />  
77 - </LinearLayout>  
78 - </ScrollView>  
79 -</LinearLayout>  
80 \ No newline at end of file 69 \ No newline at end of file
  70 + <View
  71 + android:layout_width="match_parent"
  72 + android:layout_height="10dp"
  73 + android:background="#F2F2F2" />
  74 +
  75 + <androidx.recyclerview.widget.RecyclerView
  76 + android:id="@+id/company_recy"
  77 + android:layout_width="match_parent"
  78 + android:layout_height="wrap_content" />
  79 + </LinearLayout>
  80 + </ScrollView>
  81 + </LinearLayout>
  82 +</layout>
core/dentity_verfication/src/main/res/layout/fragment_person_check.xml
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"  
3 - xmlns:tools="http://schemas.android.com/tools"  
4 - android:layout_width="match_parent"  
5 - android:layout_height="match_parent"  
6 - tools:context=".fragment.PersonCheckFragment">  
7 -  
8 - <com.qmuiteam.qmui.widget.QMUITopBar  
9 - android:id="@+id/topbar" 2 +<layout>
  3 + <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
  4 + xmlns:tools="http://schemas.android.com/tools"
10 android:layout_width="match_parent" 5 android:layout_width="match_parent"
11 - android:layout_height="?attr/qmui_topbar_height" /> 6 + android:layout_height="match_parent"
  7 + tools:context=".fragment.PersonCheckFragment">
12 8
13 - <LinearLayout  
14 - android:id="@+id/check_ly"  
15 - android:layout_width="match_parent"  
16 - android:layout_height="wrap_content"  
17 - android:layout_centerInParent="true"  
18 - android:orientation="vertical">  
19 - <ImageView  
20 - android:id="@+id/check_img"  
21 - android:layout_width="wrap_content"  
22 - android:layout_height="wrap_content"  
23 - android:layout_gravity="center_horizontal"  
24 - android:src="@drawable/p_icon"/> 9 + <com.qmuiteam.qmui.widget.QMUITopBar
  10 + android:id="@+id/topbar"
  11 + android:layout_width="match_parent"
  12 + android:layout_height="?attr/qmui_topbar_height" />
25 13
26 - <TextView  
27 - android:id="@+id/check_tx"  
28 - android:layout_width="wrap_content" 14 + <LinearLayout
  15 + android:id="@+id/check_ly"
  16 + android:layout_width="match_parent"
29 android:layout_height="wrap_content" 17 android:layout_height="wrap_content"
30 - android:layout_gravity="center_horizontal"  
31 - android:layout_marginTop="20dp"  
32 - android:textColor="@color/color_999999"  
33 - android:textSize="15sp"  
34 - android:text="@string/no_check"/> 18 + android:layout_centerInParent="true"
  19 + android:orientation="vertical">
  20 + <ImageView
  21 + android:id="@+id/check_img"
  22 + android:layout_width="wrap_content"
  23 + android:layout_height="wrap_content"
  24 + android:layout_gravity="center_horizontal"
  25 + android:src="@drawable/p_icon"/>
35 26
36 - <TextView  
37 - android:id="@+id/check_btn"  
38 - android:layout_width="match_parent"  
39 - android:layout_height="45dp"  
40 - android:text="@string/to_check"  
41 - android:layout_marginLeft="30dp"  
42 - android:layout_marginRight="30dp"  
43 - android:gravity="center"  
44 - android:textColor="@color/white"  
45 - android:textSize="18sp"  
46 - android:background="@drawable/bg_apply_btn"  
47 - android:layout_marginTop="50dp"/>  
48 - </LinearLayout> 27 + <TextView
  28 + android:id="@+id/check_tx"
  29 + android:layout_width="wrap_content"
  30 + android:layout_height="wrap_content"
  31 + android:layout_gravity="center_horizontal"
  32 + android:layout_marginTop="20dp"
  33 + android:textColor="@color/color_999999"
  34 + android:textSize="15sp"
  35 + android:text="@string/no_check"/>
  36 +
  37 + <TextView
  38 + android:id="@+id/check_btn"
  39 + android:layout_width="match_parent"
  40 + android:layout_height="45dp"
  41 + android:text="@string/to_check"
  42 + android:layout_marginLeft="30dp"
  43 + android:layout_marginRight="30dp"
  44 + android:gravity="center"
  45 + android:textColor="@color/white"
  46 + android:textSize="18sp"
  47 + android:background="@drawable/bg_apply_btn"
  48 + android:layout_marginTop="50dp"/>
  49 + </LinearLayout>
49 50
50 -</RelativeLayout>  
51 \ No newline at end of file 51 \ No newline at end of file
  52 + </RelativeLayout>
  53 +</layout>
core/dentity_verfication/src/main/res/layout/fragment_take_identity_picture.xml
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"  
3 - xmlns:tools="http://schemas.android.com/tools"  
4 - android:layout_width="match_parent"  
5 - android:layout_height="match_parent"  
6 - android:orientation="vertical"  
7 - tools:context=".fragment.TakeIdentityPictureFragment">  
8 -  
9 - <com.qmuiteam.qmui.widget.QMUITopBar  
10 - android:id="@+id/topbar"  
11 - android:layout_width="match_parent"  
12 - android:layout_height="?attr/qmui_topbar_height" /> 2 +<layout>
  3 +
  4 + <data>
13 5
14 - <ScrollView 6 + <variable
  7 + name="click"
  8 + type="android.view.View.OnClickListener" />
  9 + </data>
  10 +
  11 + <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
  12 + xmlns:app="http://schemas.android.com/apk/res-auto"
  13 + xmlns:tools="http://schemas.android.com/tools"
15 android:layout_width="match_parent" 14 android:layout_width="match_parent"
16 - android:layout_height="match_parent"> 15 + android:layout_height="match_parent"
  16 + android:background="@color/white"
  17 + android:orientation="vertical"
  18 + tools:context=".fragment.TakeIdentityPictureFragment">
  19 +
  20 + <com.qmuiteam.qmui.widget.QMUITopBar
  21 + android:id="@+id/topbar"
  22 + android:layout_width="match_parent"
  23 + android:layout_height="?attr/qmui_topbar_height" />
17 24
18 - <LinearLayout 25 + <ScrollView
19 android:layout_width="match_parent" 26 android:layout_width="match_parent"
20 - android:layout_height="match_parent"  
21 - android:orientation="vertical"> 27 + android:layout_height="match_parent">
22 28
23 - <RelativeLayout 29 + <LinearLayout
24 android:layout_width="match_parent" 30 android:layout_width="match_parent"
25 - android:layout_height="wrap_content"  
26 - android:layout_margin="10dp"> 31 + android:layout_height="match_parent"
  32 + android:orientation="vertical">
27 33
28 <LinearLayout 34 <LinearLayout
29 android:layout_width="wrap_content" 35 android:layout_width="wrap_content"
30 android:layout_height="wrap_content" 36 android:layout_height="wrap_content"
  37 + android:layout_gravity="center_horizontal"
31 android:orientation="vertical"> 38 android:orientation="vertical">
32 39
33 <TextView 40 <TextView
34 android:layout_width="wrap_content" 41 android:layout_width="wrap_content"
35 android:layout_height="wrap_content" 42 android:layout_height="wrap_content"
36 - android:textColor="@color/color_1a1a1a"  
37 - android:drawablePadding="10dp"  
38 - android:drawableLeft="@drawable/xzjg"  
39 - android:text="@string/your_company_msg"  
40 - android:textSize="16sp"  
41 - /> 43 + android:layout_marginTop="10dp"
  44 + android:text="@string/step_one"
  45 + android:textColor="#ff1a1a1a"
  46 + android:textSize="16sp" />
42 47
43 <LinearLayout 48 <LinearLayout
44 android:layout_width="wrap_content" 49 android:layout_width="wrap_content"
45 android:layout_height="wrap_content" 50 android:layout_height="wrap_content"
46 - android:orientation="horizontal"  
47 - android:layout_marginTop="30dp"> 51 + android:layout_marginTop="10dp"
  52 + android:orientation="horizontal">
48 53
49 <TextView 54 <TextView
50 android:layout_width="wrap_content" 55 android:layout_width="wrap_content"
51 android:layout_height="wrap_content" 56 android:layout_height="wrap_content"
52 - android:textSize="13sp"  
53 - android:textColor="@color/color_333333"  
54 - android:text="@string/company_name"/> 57 + android:text="@string/please_get_yourself_card"
  58 + android:textColor="@color/color_9c9c9c"
  59 + android:textSize="12sp" />
55 60
56 <TextView 61 <TextView
57 - android:id="@+id/company_name"  
58 android:layout_width="wrap_content" 62 android:layout_width="wrap_content"
59 android:layout_height="wrap_content" 63 android:layout_height="wrap_content"
60 - android:textSize="13sp"  
61 - android:textColor="@color/color_B9B9B9"  
62 - android:text="北京中投视讯文化传媒股份有限公司"/>  
63 - </LinearLayout>  
64 -  
65 - <LinearLayout  
66 - android:layout_width="wrap_content"  
67 - android:layout_height="wrap_content"  
68 - android:orientation="horizontal"  
69 - android:layout_marginTop="20dp"> 64 + android:text="@string/font"
  65 + android:textColor="@color/color_ff3b30"
  66 + android:textSize="12sp" />
70 67
71 <TextView 68 <TextView
72 android:layout_width="wrap_content" 69 android:layout_width="wrap_content"
73 android:layout_height="wrap_content" 70 android:layout_height="wrap_content"
74 - android:textSize="13sp"  
75 - android:textColor="@color/color_333333"  
76 - android:text="@string/company_logo"/>  
77 -  
78 - <ImageView  
79 - android:id="@+id/company_logo"  
80 - android:layout_width="60dp"  
81 - android:layout_height="60dp"  
82 - android:layout_marginLeft="10dp"/> 71 + android:text="@string/card_notice"
  72 + android:textColor="@color/color_9c9c9c"
  73 + android:textSize="12sp" />
83 74
84 </LinearLayout> 75 </LinearLayout>
85 </LinearLayout> 76 </LinearLayout>
86 77
87 - <ImageView  
88 - android:layout_width="wrap_content"  
89 - android:layout_height="wrap_content"  
90 - android:layout_alignParentRight="true"  
91 - android:layout_margin="10dp"  
92 - android:src="@drawable/check_success" />  
93 - </RelativeLayout>  
94 -  
95 - <LinearLayout  
96 - android:layout_width="wrap_content"  
97 - android:layout_height="wrap_content"  
98 - android:orientation="horizontal"  
99 - android:layout_marginTop="30dp">  
100 -  
101 - <TextView  
102 - android:layout_width="wrap_content"  
103 - android:layout_height="wrap_content"  
104 - android:textSize="13sp"  
105 - android:textColor="@color/color_333333"  
106 - android:text="公司简称:"/>  
107 -  
108 - <TextView  
109 - android:layout_width="wrap_content"  
110 - android:layout_height="wrap_content"  
111 - android:textSize="13sp"  
112 - android:textColor="@color/color_B9B9B9"  
113 - android:text="正在上演"/>  
114 - </LinearLayout>  
115 - <LinearLayout  
116 - android:layout_width="wrap_content"  
117 - android:layout_height="wrap_content"  
118 - android:orientation="horizontal"  
119 - android:layout_marginTop="30dp">  
120 -  
121 - <TextView 78 + <RelativeLayout
  79 + android:id="@+id/certificate_front_ry"
122 android:layout_width="wrap_content" 80 android:layout_width="wrap_content"
123 android:layout_height="wrap_content" 81 android:layout_height="wrap_content"
124 - android:textSize="13sp"  
125 - android:textColor="@color/color_333333"  
126 - android:text="企业代码:"/> 82 + android:layout_gravity="center_horizontal"
  83 + android:layout_marginTop="10dp"
  84 + android:onClick="@{click}">
127 85
128 - <TextView  
129 - android:layout_width="wrap_content"  
130 - android:layout_height="wrap_content"  
131 - android:textSize="13sp"  
132 - android:textColor="@color/color_B9B9B9"  
133 - android:text="fbx654875121544"/>  
134 - </LinearLayout>  
135 - <LinearLayout  
136 - android:layout_width="wrap_content"  
137 - android:layout_height="wrap_content"  
138 - android:orientation="horizontal"  
139 - android:layout_marginTop="30dp"> 86 + <ImageView
  87 + android:id="@+id/certificate_front"
  88 + android:layout_width="280dp"
  89 + android:layout_height="wrap_content"
  90 + android:src="@drawable/observer_idcard_front" />
140 91
141 - <TextView  
142 - android:layout_width="wrap_content"  
143 - android:layout_height="wrap_content"  
144 - android:textSize="13sp"  
145 - android:textColor="@color/color_333333"  
146 - android:text="企业简介:"/> 92 + <TextView
  93 + android:id="@+id/front_tx"
  94 + android:layout_width="280dp"
  95 + android:layout_height="30dp"
  96 + android:layout_alignParentBottom="true"
  97 + android:background="#66000000"
  98 + android:visibility="gone"
  99 + android:gravity="center"
  100 + android:text="@string/change"
  101 + android:textColor="@color/white"
  102 + android:textSize="14sp" />
  103 + </RelativeLayout>
147 104
148 - <TextView 105 + <LinearLayout
149 android:layout_width="wrap_content" 106 android:layout_width="wrap_content"
150 android:layout_height="wrap_content" 107 android:layout_height="wrap_content"
151 - android:textSize="13sp"  
152 - android:textColor="@color/color_B9B9B9"  
153 - android:text="正在上演专门传播影视文化内容"/>  
154 - </LinearLayout>  
155 - <LinearLayout  
156 - android:layout_width="wrap_content"  
157 - android:layout_height="wrap_content"  
158 - android:orientation="horizontal"  
159 - android:layout_marginTop="30dp"> 108 + android:layout_gravity="center_horizontal"
  109 + android:layout_marginTop="30dp"
  110 + android:orientation="vertical">
160 111
161 - <TextView  
162 - android:layout_width="wrap_content"  
163 - android:layout_height="wrap_content"  
164 - android:textSize="13sp"  
165 - android:textColor="@color/color_333333"  
166 - android:text="企业地址:"/> 112 + <TextView
  113 + android:layout_width="wrap_content"
  114 + android:layout_height="wrap_content"
  115 + android:layout_marginTop="11dp"
  116 + android:text="@string/step_tow"
  117 + android:textColor="#ff1a1a1a"
  118 + android:textSize="16sp" />
167 119
168 - <TextView  
169 - android:layout_width="wrap_content"  
170 - android:layout_height="wrap_content"  
171 - android:textSize="13sp"  
172 - android:textColor="@color/color_B9B9B9"/>  
173 - </LinearLayout>  
174 - <LinearLayout  
175 - android:layout_width="wrap_content"  
176 - android:layout_height="wrap_content"  
177 - android:orientation="horizontal"  
178 - android:layout_marginTop="30dp"> 120 + <LinearLayout
  121 + android:layout_width="wrap_content"
  122 + android:layout_height="wrap_content"
  123 + android:layout_marginTop="10dp"
  124 + android:orientation="horizontal">
179 125
180 - <TextView  
181 - android:layout_width="wrap_content"  
182 - android:layout_height="wrap_content"  
183 - android:textSize="13sp"  
184 - android:textColor="@color/color_333333"  
185 - android:text="企业类型:"/> 126 + <TextView
  127 + android:layout_width="wrap_content"
  128 + android:layout_height="wrap_content"
  129 + android:text="@string/please_get_yourself_card"
  130 + android:textColor="@color/color_9c9c9c"
  131 + android:textSize="12sp" />
186 132
187 - <TextView  
188 - android:layout_width="wrap_content"  
189 - android:layout_height="wrap_content"  
190 - android:textSize="13sp"  
191 - android:textColor="@color/color_B9B9B9"/>  
192 - </LinearLayout>  
193 - <LinearLayout  
194 - android:layout_width="wrap_content"  
195 - android:layout_height="wrap_content"  
196 - android:orientation="horizontal"  
197 - android:layout_marginTop="30dp"> 133 + <TextView
  134 + android:layout_width="wrap_content"
  135 + android:layout_height="wrap_content"
  136 + android:text="@string/back"
  137 + android:textColor="@color/color_ff3b30"
  138 + android:textSize="12sp" />
198 139
199 - <TextView  
200 - android:layout_width="wrap_content"  
201 - android:layout_height="wrap_content"  
202 - android:textSize="13sp"  
203 - android:textColor="@color/color_333333"  
204 - android:text="企业网站:"/> 140 + <TextView
  141 + android:layout_width="wrap_content"
  142 + android:layout_height="wrap_content"
  143 + android:text="@string/card_notice"
  144 + android:textColor="@color/color_9c9c9c"
  145 + android:textSize="12sp" />
205 146
206 - <TextView  
207 - android:layout_width="wrap_content"  
208 - android:layout_height="wrap_content"  
209 - android:textSize="13sp"  
210 - android:textColor="@color/color_B9B9B9"/>  
211 - </LinearLayout>  
212 - <LinearLayout  
213 - android:layout_width="wrap_content"  
214 - android:layout_height="wrap_content"  
215 - android:orientation="horizontal"  
216 - android:layout_marginTop="30dp"> 147 + </LinearLayout>
  148 + </LinearLayout>
217 149
218 - <TextView 150 + <RelativeLayout
  151 + android:id="@+id/certificate_back_ry"
219 android:layout_width="wrap_content" 152 android:layout_width="wrap_content"
220 android:layout_height="wrap_content" 153 android:layout_height="wrap_content"
221 - android:textSize="13sp"  
222 - android:textColor="@color/color_333333"  
223 - android:text="企业法人:"/> 154 + android:layout_gravity="center_horizontal"
  155 + android:layout_marginTop="10dp"
  156 + android:onClick="@{click}">
224 157
225 - <TextView  
226 - android:layout_width="wrap_content"  
227 - android:layout_height="wrap_content"  
228 - android:textSize="13sp"  
229 - android:textColor="@color/color_B9B9B9"/>  
230 - </LinearLayout>  
231 - <LinearLayout  
232 - android:layout_width="wrap_content"  
233 - android:layout_height="wrap_content"  
234 - android:orientation="horizontal"  
235 - android:layout_marginTop="30dp"> 158 + <ImageView
  159 + android:id="@+id/certificate_back"
  160 + android:layout_width="280dp"
  161 + android:layout_height="wrap_content"
  162 + android:src="@drawable/observer_idcard_back" />
236 163
237 - <TextView  
238 - android:layout_width="wrap_content"  
239 - android:layout_height="wrap_content"  
240 - android:textSize="13sp"  
241 - android:textColor="@color/color_333333"  
242 - android:text="联系人:"/> 164 + <TextView
  165 + android:id="@+id/back_tx"
  166 + android:layout_width="280dp"
  167 + android:layout_height="30dp"
  168 + android:layout_alignParentBottom="true"
  169 + android:background="#66000000"
  170 + android:visibility="gone"
  171 + android:gravity="center"
  172 + android:text="@string/change"
  173 + android:textColor="@color/white"
  174 + android:textSize="14sp" />
  175 + </RelativeLayout>
243 176
244 - <TextView 177 + <LinearLayout
245 android:layout_width="wrap_content" 178 android:layout_width="wrap_content"
246 android:layout_height="wrap_content" 179 android:layout_height="wrap_content"
247 - android:textSize="13sp"  
248 - android:textColor="@color/color_B9B9B9"/>  
249 - </LinearLayout>  
250 - <LinearLayout  
251 - android:layout_width="wrap_content"  
252 - android:layout_height="wrap_content"  
253 - android:orientation="horizontal"  
254 - android:layout_marginTop="30dp"> 180 + android:layout_gravity="center_horizontal"
  181 + android:layout_marginTop="30dp"
  182 + android:orientation="vertical">
255 183
256 - <TextView  
257 - android:layout_width="wrap_content"  
258 - android:layout_height="wrap_content"  
259 - android:textSize="13sp"  
260 - android:textColor="@color/color_333333"  
261 - android:text="合同编号:"/> 184 + <TextView
  185 + android:layout_width="wrap_content"
  186 + android:layout_height="wrap_content"
  187 + android:layout_marginTop="11dp"
  188 + android:text="@string/step_third"
  189 + android:textColor="#ff1a1a1a"
  190 + android:textSize="16sp" />
262 191
263 - <TextView  
264 - android:layout_width="wrap_content"  
265 - android:layout_height="wrap_content"  
266 - android:textSize="13sp"  
267 - android:textColor="@color/color_B9B9B9"/>  
268 - </LinearLayout>  
269 - <LinearLayout  
270 - android:layout_width="wrap_content"  
271 - android:layout_height="wrap_content"  
272 - android:orientation="horizontal"  
273 - android:layout_marginTop="30dp"> 192 + <TextView
  193 + android:layout_width="wrap_content"
  194 + android:layout_height="wrap_content"
  195 + android:layout_marginTop="10dp"
  196 + android:text="@string/take_photo_yourself"
  197 + android:textColor="@color/color_9c9c9c"
  198 + android:textSize="12sp" />
274 199
275 - <TextView  
276 - android:layout_width="wrap_content"  
277 - android:layout_height="wrap_content"  
278 - android:textSize="13sp"  
279 - android:textColor="@color/color_333333"  
280 - android:text="营业执照号:"/> 200 + </LinearLayout>
281 201
282 - <TextView 202 + <RelativeLayout
  203 + android:id="@+id/take_picture_ry"
283 android:layout_width="wrap_content" 204 android:layout_width="wrap_content"
284 android:layout_height="wrap_content" 205 android:layout_height="wrap_content"
285 - android:textSize="13sp"  
286 - android:textColor="@color/color_B9B9B9"/>  
287 - </LinearLayout>  
288 - <LinearLayout  
289 - android:layout_width="wrap_content"  
290 - android:layout_height="wrap_content"  
291 - android:orientation="horizontal"  
292 - android:layout_marginTop="30dp"> 206 + android:layout_gravity="center_horizontal"
  207 + android:layout_marginTop="10dp"
  208 + android:onClick="@{click}">
293 209
294 - <TextView  
295 - android:layout_width="wrap_content"  
296 - android:layout_height="wrap_content"  
297 - android:textSize="13sp"  
298 - android:textColor="@color/color_333333"  
299 - android:text="营业执照:"/> 210 + <ImageView
  211 + android:id="@+id/take_picture"
  212 + android:layout_width="130dp"
  213 + android:layout_height="wrap_content"
  214 + android:src="@drawable/upload" />
300 215
301 - <ImageView  
302 - android:layout_width="100dp"  
303 - android:layout_height="150dp"/> 216 + <TextView
  217 + android:id="@+id/pic_tx"
  218 + android:layout_width="130dp"
  219 + android:layout_height="30dp"
  220 + android:layout_alignParentBottom="true"
  221 + android:visibility="gone"
  222 + android:background="#66000000"
  223 + android:gravity="center"
  224 + android:text="@string/change"
  225 + android:textColor="@color/white"
  226 + android:textSize="14sp" />
  227 + </RelativeLayout>
  228 +
  229 + <TextView
  230 + android:id="@+id/next"
  231 + android:layout_width="match_parent"
  232 + android:layout_height="45dp"
  233 + android:layout_margin="30dp"
  234 + android:background="@drawable/bg_shape_gray"
  235 + android:gravity="center"
  236 + android:text="@string/next"
  237 + android:textColor="@color/color_b4b4b4"
  238 + android:onClick="@{click}"
  239 + android:textSize="18sp" />
304 </LinearLayout> 240 </LinearLayout>
305 - </LinearLayout>  
306 - </ScrollView>  
307 -</LinearLayout>  
308 \ No newline at end of file 241 \ No newline at end of file
  242 + </ScrollView>
  243 + </LinearLayout>
  244 +</layout>