CNLive Android Team / newModuleStrike · Commits

Commit 14d6afb3745e465be4491a43860593346eef0768

Authored by YangShuai
1 parent 273f0cf5

1 填写机构资料页面技术储备

Inline Side-by-side
Showing 10 changed files with 399 additions and 7 deletions
app/strike/src/main/java/com/cnlive/strike/imgutil/UgcActivity.java
  View file @14d6afb
@@ -4,6 +4,7 @@ import android.content.Intent; @@ -4,6 +4,7 @@ import android.content.Intent;
4 import android.os.Bundle; 4 import android.os.Bundle;
5 5
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.people_verfication.activity.TakeIdentityPictureActivity; 8 import com.cnlive.core.people_verfication.activity.TakeIdentityPictureActivity;
8 9
9 import androidx.appcompat.app.AppCompatActivity; 10 import androidx.appcompat.app.AppCompatActivity;
@@ -15,5 +16,6 @@ public class UgcActivity extends AppCompatActivity { @@ -15,5 +16,6 @@ public class UgcActivity extends AppCompatActivity {
15 super.onCreate(savedInstanceState); 16 super.onCreate(savedInstanceState);
16 setContentView(R.layout.activity_ugc); 17 setContentView(R.layout.activity_ugc);
17 findViewById(R.id.people_denty).setOnClickListener(view -> startActivity(new Intent(this, TakeIdentityPictureActivity.class))); 18 findViewById(R.id.people_denty).setOnClickListener(view -> startActivity(new Intent(this, TakeIdentityPictureActivity.class)));
  19 + findViewById(R.id.company_denty).setOnClickListener(view -> startActivity(new Intent(this, FillInCompanyDataActivity.class)));
18 } 20 }
19 } 21 }
app/strike/src/main/res/layout/activity_ugc.xml
  View file @14d6afb
@@ -4,12 +4,20 @@ @@ -4,12 +4,20 @@
4 xmlns:tools="http://schemas.android.com/tools" 4 xmlns:tools="http://schemas.android.com/tools"
5 android:layout_width="match_parent" 5 android:layout_width="match_parent"
6 android:layout_height="match_parent" 6 android:layout_height="match_parent"
  7 + android:orientation="vertical"
7 tools:context="com.cnlive.strike.imgutil.UgcActivity"> 8 tools:context="com.cnlive.strike.imgutil.UgcActivity">
8 9
9 <Button 10 <Button
10 android:id="@+id/people_denty" 11 android:id="@+id/people_denty"
11 - android:layout_width="wrap_content" 12 + android:layout_width="match_parent"
12 android:layout_height="wrap_content" 13 android:layout_height="wrap_content"
13 - android:text="个人认证"  
14 - /> 14 + android:layout_margin="@dimen/dp_10"
  15 + android:text="个人认证" />
  16 +
  17 + <Button
  18 + android:id="@+id/company_denty"
  19 + android:layout_width="match_parent"
  20 + android:layout_height="wrap_content"
  21 + android:layout_margin="@dimen/dp_10"
  22 + android:text="机构认证" />
15 </LinearLayout> 23 </LinearLayout>
core/base/src/main/java/com/cnlive/core/libs/base/frame/activity/BaseActivity.java
  View file @14d6afb
@@ -116,7 +116,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V @@ -116,7 +116,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
116 116
117 117
118 @Override 118 @Override
119 - public void onCreate(@Nullable Bundle savedInstanceState) { 119 + protected void onCreate(@Nullable Bundle savedInstanceState) {
120 super.onCreate(savedInstanceState); 120 super.onCreate(savedInstanceState);
121 if (0 != getBindLayoutId()) { 121 if (0 != getBindLayoutId()) {
122 baseBinding = DataBindingUtil.setContentView(this, getBindLayoutId()); 122 baseBinding = DataBindingUtil.setContentView(this, getBindLayoutId());
core/dentity_verfication/src/main/AndroidManifest.xml
  View file @14d6afb
@@ -12,13 +12,14 @@ @@ -12,13 +12,14 @@
12 <uses-feature android:name="android.hardware.camera.autofocus" /> 12 <uses-feature android:name="android.hardware.camera.autofocus" />
13 13
14 <application> 14 <application>
15 - <activity android:name=".activity.TakeIdentityPictureActivity"></activity> 15 + <activity android:name="com.cnlive.core.company_verfication.ui.activity.FillInCompanyDataActivity"></activity>
  16 + <activity android:name=".activity.TakeIdentityPictureActivity" />
16 <activity 17 <activity
17 android:name="com.cnlive.core.ocr.ui.camera.CameraActivity" 18 android:name="com.cnlive.core.ocr.ui.camera.CameraActivity"
18 android:configChanges="screenSize|orientation" 19 android:configChanges="screenSize|orientation"
19 - android:theme="@android:style/Theme.Holo.NoActionBar.Fullscreen"  
20 android:launchMode="singleTop" 20 android:launchMode="singleTop"
21 - android:screenOrientation="portrait"/> 21 + android:screenOrientation="portrait"
  22 + android:theme="@android:style/Theme.Holo.NoActionBar.Fullscreen" />
22 </application> 23 </application>
23 24
24 </manifest> 25 </manifest>
25 \ No newline at end of file 26 \ No newline at end of file
core/dentity_verfication/src/main/java/com/cnlive/core/company_verfication/ui/activity/FillInCompanyDataActivity.java 0 → 100644
  View file @14d6afb
  1 +package com.cnlive.core.company_verfication.ui.activity;
  2 +
  3 +import androidx.annotation.Nullable;
  4 +import androidx.appcompat.app.AppCompatActivity;
  5 +import androidx.databinding.ViewDataBinding;
  6 +import androidx.recyclerview.widget.LinearLayoutManager;
  7 +
  8 +import android.os.Bundle;
  9 +import android.os.PersistableBundle;
  10 +
  11 +import com.cnlive.core.company_verfication.ui.adapter.CompanyDataAdapter;
  12 +import com.cnlive.core.libs.base.frame.activity.BaseActivity;
  13 +import com.cnlive.core.people_verfication.R;
  14 +import com.cnlive.core.people_verfication.databinding.FragmentFillInCompanyDataBinding;
  15 +
  16 +import java.util.ArrayList;
  17 +import java.util.List;
  18 +
  19 +public class FillInCompanyDataActivity extends BaseActivity {
  20 + private List<String> data = new ArrayList<>();
  21 + private FragmentFillInCompanyDataBinding binding;
  22 + private CompanyDataAdapter adapter;
  23 + @Override
  24 + protected int getBindLayoutId() {
  25 + return R.layout.fragment_fill_in_company_data;
  26 + }
  27 +
  28 + @Override
  29 + protected void initBindingLayoutData(ViewDataBinding baseBinding) {
  30 + super.initBindingLayoutData(baseBinding);
  31 + binding= (FragmentFillInCompanyDataBinding) baseBinding;
  32 + }
  33 +
  34 + @Override
  35 + protected void initView() {
  36 + data.add("测试");
  37 + adapter=new CompanyDataAdapter(me,data);
  38 + binding.recyclerView.setLayoutManager(new LinearLayoutManager(me));
  39 + binding.recyclerView.setAdapter(adapter);
  40 + }
  41 +}
core/dentity_verfication/src/main/java/com/cnlive/core/company_verfication/ui/adapter/CompanyDataAdapter.java 0 → 100644
  View file @14d6afb
  1 +package com.cnlive.core.company_verfication.ui.adapter;
  2 +
  3 +import android.content.Context;
  4 +import android.view.LayoutInflater;
  5 +import android.view.View;
  6 +import android.view.ViewGroup;
  7 +import android.widget.TextView;
  8 +
  9 +import androidx.annotation.NonNull;
  10 +import androidx.databinding.DataBindingUtil;
  11 +import androidx.recyclerview.widget.RecyclerView;
  12 +
  13 +import com.cnlive.core.people_verfication.R;
  14 +import com.cnlive.core.people_verfication.databinding.ItemCompanyDateBinding;
  15 +
  16 +import java.util.List;
  17 +
  18 +public class CompanyDataAdapter extends RecyclerView.Adapter {
  19 + private Context context;
  20 + private List<String> data;
  21 +
  22 + public CompanyDataAdapter(Context context, List<String> data) {
  23 + this.context = context;
  24 + this.data = data;
  25 + }
  26 +
  27 + @NonNull
  28 + @Override
  29 + public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
  30 + LayoutInflater inflater = LayoutInflater.from(context);
  31 + ItemCompanyDateBinding binding = DataBindingUtil.inflate(inflater, R.layout.item_company_date, parent, false);
  32 + return new MyViewHolder(binding);
  33 + }
  34 +
  35 + @Override
  36 + public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
  37 + ItemCompanyDateBinding binding = ((MyViewHolder) holder).binding;
  38 + binding.includeAccountChild.llRoot.getBaselineAlignedChildIndex();
  39 + binding.includeAccountChild.tvDelete.setVisibility(View.GONE);
  40 + }
  41 +
  42 + @Override
  43 + public int getItemCount() {
  44 + return data.size();
  45 + }
  46 +
  47 + private class MyViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
  48 + private ItemCompanyDateBinding binding;
  49 +
  50 + public MyViewHolder(@NonNull ItemCompanyDateBinding binding) {
  51 + super(binding.getRoot());
  52 + this.binding = binding;
  53 + binding.btnAddChildCircle.setOnClickListener(this);
  54 + binding.btnAddChildAccount.setOnClickListener(this);
  55 + }
  56 +
  57 +
  58 + @Override
  59 + public void onClick(View v) {
  60 + //添加圈子
  61 + if (v.getId() == R.id.btn_addChildCircle) {
  62 + View child = LayoutInflater.from(context).inflate(R.layout.item_company_date_include_circle_child, null);
  63 + binding.includeCircleChild.llRoot.addView(child);
  64 + }
  65 + //添加群组
  66 + else if (v.getId() == R.id.btn_addChildAccount) {
  67 + View child = LayoutInflater.from(context).inflate(R.layout.item_company_date_include_account_child, null);
  68 + int index=binding.includeAccountChild.llRoot.getChildCount() - 1;
  69 + binding.includeAccountChild.llRoot.addView(child, index);
  70 + TextView textView = child.findViewById(R.id.tv_delete);
  71 + textView.setVisibility(View.VISIBLE);
  72 + textView.setOnClickListener(this);
  73 + textView.setTag(child);
  74 +// textView.setOnClickListener(new View.OnClickListener() {
  75 +// @Override
  76 +// public void onClick(View v) {
  77 +// binding.includeAccountChild.llRoot.removeView(child);
  78 +// }
  79 +// });
  80 + } else if (v.getId() == R.id.tv_delete) {
  81 + if (null!=v&&null!=v.getTag()){
  82 + View child= (View) v.getTag();
  83 + //获取当前子类
  84 + binding.includeAccountChild.llRoot.removeView(child);
  85 + }
  86 +
  87 + }
  88 + }
  89 + }
  90 +}
core/dentity_verfication/src/main/res/layout/fragment_fill_in_company_data.xml 0 → 100644
  View file @14d6afb
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<layout>
  3 +
  4 + <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
  5 + xmlns:app="http://schemas.android.com/apk/res-auto"
  6 + xmlns:tools="http://schemas.android.com/tools"
  7 + android:layout_width="match_parent"
  8 + android:layout_height="match_parent"
  9 + tools:context="com.cnlive.core.company_verfication.ui.activity.FillInCompanyDataActivity">
  10 +
  11 + <androidx.recyclerview.widget.RecyclerView
  12 + android:id="@+id/recyclerView"
  13 + android:layout_width="match_parent"
  14 + android:layout_height="match_parent" />
  15 + </androidx.constraintlayout.widget.ConstraintLayout>
  16 +</layout>
core/dentity_verfication/src/main/res/layout/item_company_date.xml 0 → 100644
  View file @14d6afb
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<layout>
  3 +
  4 + <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
  5 + android:id="@+id/ll_root"
  6 + android:layout_width="match_parent"
  7 + android:layout_height="wrap_content"
  8 + android:orientation="vertical">
  9 +
  10 + <LinearLayout
  11 + android:layout_width="match_parent"
  12 + android:layout_height="wrap_content"
  13 + android:layout_marginLeft="10dp"
  14 + android:layout_marginRight="10dp"
  15 + android:gravity="center_vertical"
  16 + android:minHeight="40dp"
  17 + android:orientation="horizontal">
  18 +
  19 + <TextView
  20 + android:layout_width="wrap_content"
  21 + android:layout_height="wrap_content"
  22 + android:text="所属机构(主账号)" />
  23 +
  24 + <EditText
  25 + android:layout_width="match_parent"
  26 + android:layout_height="wrap_content"
  27 + android:hint="请选择属于您的机构" />
  28 +
  29 + </LinearLayout>
  30 +
  31 + <View
  32 + android:layout_width="match_parent"
  33 + android:layout_height="1dp"
  34 + android:layout_margin="10dp"
  35 + android:background="@color/my_dialog_line" />
  36 +
  37 + <include
  38 + android:id="@+id/include_circle_child"
  39 + layout="@layout/item_company_date_include_circle_child" />
  40 +
  41 + <RelativeLayout
  42 + android:layout_width="match_parent"
  43 + android:layout_height="wrap_content">
  44 +
  45 + <TextView
  46 + android:id="@+id/tv_add_circle_tip"
  47 + android:layout_width="wrap_content"
  48 + android:layout_height="wrap_content"
  49 + android:layout_centerHorizontal="true"
  50 + android:layout_centerVertical="true"
  51 + android:layout_marginRight="10dp"
  52 + android:text="如您有多个圈子,可点击添加" />
  53 +
  54 + <Button
  55 + android:id="@+id/btn_addChildCircle"
  56 + android:layout_width="wrap_content"
  57 + android:layout_height="wrap_content"
  58 + android:layout_centerVertical="true"
  59 + android:layout_toRightOf="@id/tv_add_circle_tip"
  60 + android:text="添加圈子" />
  61 + </RelativeLayout>
  62 +
  63 + <include
  64 + android:id="@+id/include_account_child"
  65 + layout="@layout/item_company_date_include_account_child" />
  66 +
  67 +
  68 + <RelativeLayout
  69 + android:layout_width="match_parent"
  70 + android:layout_height="wrap_content">
  71 +
  72 + <TextView
  73 + android:id="@+id/tv_add_account_tip"
  74 + android:layout_width="wrap_content"
  75 + android:layout_height="wrap_content"
  76 + android:layout_centerHorizontal="true"
  77 + android:layout_centerVertical="true"
  78 + android:layout_marginRight="10dp"
  79 + android:text="如您有多个圈子,可点击添加" />
  80 +
  81 + <Button
  82 + android:id="@+id/btn_addChildAccount"
  83 + android:layout_width="wrap_content"
  84 + android:layout_height="wrap_content"
  85 + android:layout_centerVertical="true"
  86 + android:layout_toRightOf="@id/tv_add_account_tip"
  87 + android:text="添加子账号" />
  88 + </RelativeLayout>
  89 + </LinearLayout>
  90 +</layout>
0 \ No newline at end of file 91 \ No newline at end of file
core/dentity_verfication/src/main/res/layout/item_company_date_include_account_child.xml 0 → 100644
  View file @14d6afb
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<layout>
  3 +
  4 + <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
  5 + android:id="@+id/ll_root"
  6 + android:layout_width="match_parent"
  7 + android:layout_height="wrap_content"
  8 + android:orientation="vertical">
  9 +
  10 + <LinearLayout
  11 + android:layout_width="match_parent"
  12 + android:layout_height="wrap_content"
  13 + android:gravity="center">
  14 +
  15 + <LinearLayout
  16 + android:layout_width="0dp"
  17 + android:layout_height="wrap_content"
  18 + android:layout_weight="1"
  19 + android:orientation="vertical">
  20 +
  21 + <LinearLayout
  22 + android:layout_width="match_parent"
  23 + android:layout_height="wrap_content"
  24 + android:layout_marginLeft="10dp"
  25 + android:layout_marginRight="10dp"
  26 + android:gravity="center_vertical"
  27 + android:minHeight="40dp"
  28 + android:orientation="horizontal">
  29 +
  30 + <TextView
  31 + android:layout_width="wrap_content"
  32 + android:layout_height="wrap_content"
  33 + android:text="相关账号(子账号)" />
  34 +
  35 + <EditText
  36 + android:layout_width="match_parent"
  37 + android:layout_height="wrap_content"
  38 + android:hint="请选择机构子账号"
  39 + android:textSize="15sp" />
  40 +
  41 + </LinearLayout>
  42 +
  43 + <!-- -->
  44 + <LinearLayout
  45 + android:layout_width="match_parent"
  46 + android:layout_height="wrap_content"
  47 + android:layout_marginLeft="10dp"
  48 + android:layout_marginRight="10dp"
  49 + android:gravity="center_vertical"
  50 + android:minHeight="40dp"
  51 + android:orientation="horizontal">
  52 +
  53 + <TextView
  54 + android:layout_width="wrap_content"
  55 + android:layout_height="wrap_content"
  56 + android:text="相关群组(子群组)" />
  57 +
  58 + <EditText
  59 + android:layout_width="match_parent"
  60 + android:layout_height="wrap_content"
  61 + android:hint="请选择子账号群组"
  62 + android:textSize="15sp" />
  63 +
  64 + </LinearLayout>
  65 + </LinearLayout>
  66 + <!-- 删除-->
  67 + <TextView
  68 + android:id="@+id/tv_delete"
  69 + android:layout_width="wrap_content"
  70 + android:layout_height="wrap_content"
  71 + android:layout_margin="10dp"
  72 + android:text="删除"
  73 + android:visibility="gone" />
  74 + </LinearLayout>
  75 +
  76 +
  77 + <View
  78 + android:layout_width="match_parent"
  79 + android:layout_height="1dp"
  80 + android:layout_marginTop="10dp"
  81 + android:background="@color/my_dialog_line" />
  82 + </LinearLayout>
  83 +</layout>
0 \ No newline at end of file 84 \ No newline at end of file
core/dentity_verfication/src/main/res/layout/item_company_date_include_circle_child.xml 0 → 100644
  View file @14d6afb
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<layout>
  3 +
  4 + <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
  5 + android:id="@+id/ll_root"
  6 + android:layout_width="match_parent"
  7 + android:layout_height="wrap_content"
  8 + android:orientation="vertical">
  9 +
  10 + <LinearLayout
  11 + android:layout_width="match_parent"
  12 + android:layout_height="wrap_content"
  13 + android:layout_marginLeft="10dp"
  14 + android:layout_marginRight="10dp"
  15 + android:gravity="center_vertical"
  16 + android:minHeight="40dp"
  17 + android:orientation="horizontal">
  18 +
  19 + <TextView
  20 + android:layout_width="wrap_content"
  21 + android:layout_height="wrap_content"
  22 + android:text="您的圈子(子账号)" />
  23 +
  24 + <EditText
  25 + android:layout_width="match_parent"
  26 + android:layout_height="wrap_content"
  27 + android:hint="请选择您的圈子"
  28 + android:textSize="15sp" />
  29 +
  30 + </LinearLayout>
  31 +
  32 + <!-- -->
  33 + <LinearLayout
  34 + android:layout_width="match_parent"
  35 + android:layout_height="wrap_content"
  36 + android:layout_marginLeft="10dp"
  37 + android:layout_marginRight="10dp"
  38 + android:gravity="center_vertical"
  39 + android:minHeight="40dp"
  40 + android:orientation="horizontal">
  41 +
  42 + <TextView
  43 + android:layout_width="wrap_content"
  44 + android:layout_height="wrap_content"
  45 + android:text="圈子群组(子群组)" />
  46 +
  47 + <EditText
  48 + android:layout_width="match_parent"
  49 + android:layout_height="wrap_content"
  50 + android:hint="请选择圈子群组"
  51 + android:textSize="15sp" />
  52 +
  53 + </LinearLayout>
  54 +
  55 + <View
  56 + android:layout_width="match_parent"
  57 + android:layout_height="1dp"
  58 + android:layout_marginTop="10dp"
  59 + android:background="@color/my_dialog_line" />
  60 + </LinearLayout>
  61 +</layout>
0 \ No newline at end of file 62 \ No newline at end of file