Skip to content

S
ShenghuoquanBusiness
Commit fc0c6f73 authored by zhenghongbin's avatar zhenghongbin
Browse files
Options

Merge branch 'dev' of https://git.yidian-inc.com:8021/bp/ShenghuoquanBusiness into dev 

* 'dev' of https://git.yidian-inc.com:8021/bp/ShenghuoquanBusiness:
  update：个人认证成功页面UI设计实现
  update 身份证OCR测试页面
parents 8cb8e9f1 1c3b187d
Hide whitespace changes
Inline Side-by-side
Showing with 287 additions and 6 deletions
Components/newscontent/src/main/AndroidManifest.xml
View file @ fc0c6f73
......@@ -85,6 +85,9 @@
<activity
android:name=".ui.EnterpriseCertificationActivity"
android:theme="@style/Transparent" />
<activity
android:name=".ui.PersonalAuthenticationActivity"
android:theme="@style/Transparent" />
<activity
android:name=".ui.idcard.IDCardResultActivity"
......
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/EnterpriseCertificationActivity.kt
View file @ fc0c6f73
package com.yidian.shenghuoquan.newscontent.ui
import android.content.Intent
import android.os.Bundle
import com.yidian.common.base.BaseActivity
import com.yidian.shenghuoquan.newscontent.R
......@@ -23,5 +24,9 @@ class EnterpriseCertificationActivity : BaseActivity<ActivityEnterpriseCertifica
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
viewBind.root.title.text = resources.getString(R.string.enterprise_certification)
viewBind.createLifeNumber.setOnClickListener {
startActivity(Intent(this@EnterpriseCertificationActivity, PersonalAuthenticationActivity::class.java))
}
}
}
\ No newline at end of file
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/PersonalAuthenticationActivity.kt 0 → 100644
View file @ fc0c6f73
package com.yidian.shenghuoquan.newscontent.ui
import android.os.Bundle
import com.yidian.common.base.BaseActivity
import com.yidian.shenghuoquan.newscontent.R
import com.yidian.shenghuoquan.newscontent.databinding.ActivityPersonalAuthenticationBinding
import kotlinx.android.synthetic.main.top_bar.view.*
/**
* Author: houzhenpu
* Date: 2021/5/26 15:44 PM
* Describe: activity_enterprise_certification 个人认证成功页面 activity_personal_authentication
*/
class PersonalAuthenticationActivity : BaseActivity<ActivityPersonalAuthenticationBinding>() {
override fun createViewBinding(): ActivityPersonalAuthenticationBinding {
return ActivityPersonalAuthenticationBinding.inflate(layoutInflater)
}
override fun getXPageName(): String {
return ""
}
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
viewBind.root.title.text = resources.getString(R.string.personal_authentication)
}
}
\ No newline at end of file
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/idcard/IDCardTestActivity.kt
View file @ fc0c6f73
......@@ -34,8 +34,8 @@ class IDCardTestActivity : BaseActivity<ActivityIdcardBinding>() {
private lateinit var mIdCardLicenseManager: IDCardQualityLicenseManager
private val INTO_IDCARDSCAN_PAGE = 100
private lateinit var idCardFront: Bitmap
private lateinit var idCardBack: Bitmap
private var idCardFront: Bitmap? = null
private var idCardBack: Bitmap? = null
private lateinit var idCardFrontObjectKey: String
private lateinit var idCardBackObjectKey: String
......@@ -56,6 +56,9 @@ class IDCardTestActivity : BaseActivity<ActivityIdcardBinding>() {
startGetLicense()
}
viewBind.btnOcr.setOnClickListener {
if (idCardFront == null || idCardBack == null) {
return@setOnClickListener
}
val frontFile = File(externalCacheDir?.absolutePath + "/ocr/idCardFront.jpg")
if (frontFile.exists()) {
frontFile.delete()
......@@ -70,8 +73,8 @@ class IDCardTestActivity : BaseActivity<ActivityIdcardBinding>() {
backFile.parentFile?.mkdirs()
backFile.createNewFile()
}
idCardFront.compress(Bitmap.CompressFormat.JPEG, 100, FileOutputStream(frontFile))
idCardBack.compress(Bitmap.CompressFormat.JPEG, 100, FileOutputStream(backFile))
idCardFront?.compress(Bitmap.CompressFormat.JPEG, 100, FileOutputStream(frontFile))
idCardBack?.compress(Bitmap.CompressFormat.JPEG, 100, FileOutputStream(backFile))
KS3Core.INSTANCE.uploadObject(frontFile, object : KS3Core.OnKS3TaskListener {
override fun onTaskStart() {
......
Components/newscontent/src/main/res/layout/activity_enterprise_certification.xml
View file @ fc0c6f73
......@@ -131,6 +131,7 @@
<TextView
android:id="@+id/create_life_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/create_a_life_number"
......
Components/newscontent/src/main/res/layout/activity_idcard.xml
View file @ fc0c6f73
......@@ -33,7 +33,8 @@
android:layout_height="wrap_content"
android:layout_marginTop="100dp"
android:layout_weight="1"
android:paddingLeft="50dp">
android:paddingLeft="50dp"
android:visibility="gone">
<RadioButton
android:id="@+id/rb_v"
......
Components/newscontent/src/main/res/layout/activity_personal_authentication.xml 0 → 100644
View file @ fc0c6f73
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
android:background="@color/white">
<include
android:id="@+id/top"
layout="@layout/top_bar" />
<LinearLayout
android:id="@+id/created_successfully_root"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_centerHorizontal="true"
android:layout_below="@id/top"
android:gravity="center_horizontal"
android:background="@mipmap/icon_fireworks">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="38dp"
android:gravity="center"
android:text="@string/created_successfully"
android:drawablePadding="6dp"
android:drawableStart="@mipmap/success_icon"
android:textColor="#FFF26E3D"
android:textSize="24sp" />
<TextView
android:layout_width="240dp"
android:layout_height="wrap_content"
android:text="@string/activate_a_personal_life_account"
android:textSize="16sp"
android:textColor="#FF999999"
android:layout_marginTop="4dp"
android:gravity="center" />
</LinearLayout>
<View
android:id="@+id/icon_shop_root"
android:layout_below="@id/created_successfully_root"
android:layout_width="wrap_content"
android:layout_height="56dp"
android:layout_centerHorizontal="true"
android:layout_marginTop="25dp"
android:layout_marginStart="20dp"
android:layout_marginEnd="20dp"
android:background="@mipmap/icon_shop"/>
<RelativeLayout
android:id="@+id/information"
android:layout_below="@id/icon_shop_root"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="25dp"
android:layout_marginStart="25dp"
android:paddingStart="30dp"
android:paddingBottom="45dp"
android:layout_centerHorizontal="true"
android:background="@drawable/personal_authentication_bg">
<TextView
android:id="@+id/personal_shop"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/personal_shop"
android:textSize="16sp"
android:layout_marginStart="20dp"
android:layout_marginTop="25dp"
android:textColor="#FF333333"
android:layout_marginRight="10dp"
android:gravity="left" />
<LinearLayout
android:id="@+id/column_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_below="@id/personal_shop"
android:layout_marginTop="23dp"
android:layout_marginEnd="12dp"
android:orientation="vertical">
<TextView
android:id="@+id/occupation_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/occupation_label"
android:textSize="16sp"
android:textColor="#FF999999"
android:gravity="left" />
<TextView
android:id="@+id/actual_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/actual_name"
android:layout_marginTop="20dp"
android:textSize="16sp"
android:textColor="#FF999999"
android:gravity="left" />
<TextView
android:id="@+id/id_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/id_number"
android:layout_marginTop="20dp"
android:textSize="16sp"
android:textColor="#FF999999"
android:gravity="left" />
<TextView
android:id="@+id/phone_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/phone_number"
android:layout_marginTop="20dp"
android:textSize="16sp"
android:textColor="#FF999999"
android:gravity="left" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_below="@id/personal_shop"
android:layout_toRightOf="@id/column_name"
android:layout_marginTop="23dp"
android:layout_marginEnd="12dp"
android:orientation="vertical">
<TextView
android:id="@+id/occupation_label_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/occupation_label"
android:textSize="16sp"
android:textColor="#333333"
android:gravity="left" />
<TextView
android:id="@+id/actual_name_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/occupation_label"
android:layout_marginTop="20dp"
android:textSize="16sp"
android:textColor="#333333"
android:gravity="left" />
<TextView
android:id="@+id/id_number_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/id_number"
android:layout_marginTop="20dp"
android:textSize="16sp"
android:textColor="#333333"
android:gravity="left" />
<TextView
android:id="@+id/phone_number_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/phone_number"
android:layout_marginTop="20dp"
android:textSize="16sp"
android:textColor="#333333"
android:gravity="left" />
</LinearLayout>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:layout_alignParentEnd="true"
android:src="@mipmap/icon_seal"/>
</RelativeLayout>
<TextView
android:layout_below="@id/information"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/to_experience"
android:textSize="16sp"
android:paddingLeft="20dp"
android:paddingRight="20dp"
android:paddingBottom="7dp"
android:layout_marginTop="10dp"
android:layout_centerHorizontal="true"
android:textColor="#1852F1"
android:background="@drawable/shape_stroke2_radius18_skin_primary_1852f1"
android:gravity="center" />
<TextView
android:id="@+id/turn_on_enterprise_certification"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/turn_on_enterprise_certification"
android:layout_alignParentBottom="true"
android:textSize="16sp"
android:paddingLeft="20dp"
android:paddingRight="20dp"
android:paddingTop="7dp"
android:paddingBottom="7dp"
android:layout_marginTop="30dp"
android:layout_centerHorizontal="true"
android:textColor="#1852F1"
android:layout_marginBottom="34dp"
android:background="@drawable/shape_stroke2_radius18_skin_primary_1852f1"
android:gravity="center" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_above="@id/turn_on_enterprise_certification"
android:text="@string/personal_authentication_tips"
android:layout_marginLeft="30dp"
android:layout_marginRight="30dp"
android:textSize="12sp"
android:textColor="#FF999999"
android:gravity="left" />
</RelativeLayout>
\ No newline at end of file
Components/newscontent/src/main/res/values/strings.xml
View file @ fc0c6f73
......@@ -64,7 +64,17 @@
<string name="credit_code">统一社会信用代码</string>
<string name="operator_information">经营者信息</string>
<string name="create_a_life_number">创建生活号</string>
<string name="personal_authentication">个人认证</string>
<string name="created_successfully">创建成功</string>
<string name="activate_a_personal_life_account">恭喜成功开通个人生活号</string>
<string name="personal_shop">个人小店</string>
<string name="occupation_label">职业标签</string>
<string name="actual_name">真实姓名</string>
<string name="id_number">证件号码</string>
<string name="phone_number">手机号</string>
<string name="to_experience">去体验</string>
<string name="personal_authentication_tips">当前你已完成个人生活号认证，拥有生活号个人小店相关权益，如有个体工商户或企业需求，可通过下放入口升级企业，升级后可点亮V标，同时可进行多个子账号管理，拥有更多企业级权益。</string>
<string name="turn_on_enterprise_certification">升级为企业认证</string>
</resources>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment