Skip to content

S
ShenghuoquanBusiness
Commit 0f34baca authored by shiyl's avatar shiyl
Browse files
Options

Merge branch 'dev_commodity' into feature/dev_order 

# Conflicts:
#	.gitignore
#	CommonLib/BCommon/src/main/java/com/yidian/bcommon/constant/AppConfig.kt
#	Components/BXBridBusiness/src/main/assets/www
parents d5a7efc8 899b602f
Hide whitespace changes
Inline Side-by-side
Showing with 123 additions and 79 deletions
.gitignore
View file @ 0f34baca
......@@ -22,3 +22,13 @@ Components/xbirdbusiness/build
/Components/commodity/build/
/Components/userinfo/build/
/CommonLib/Common/build/
/CommonLib/BCommon/build/
/Components/BDemo/build/
/Components/BGeneralBusiness/build/
/Components/BGoods/build/
/Components/BMediator/build/
/Components/BOrder/build/
/Components/BRoot/build/
/Components/BSetting/build/
/Components/BXBridBusiness/build/
CommonLib/BCommon/src/main/java/com/yidian/bcommon/constant/AppConfig.kt
View file @ 0f34baca
......@@ -69,10 +69,15 @@ class AppConfig {
// 用户协议
const val userProtocol = "http://merchant.jwshq.cn/home/agreement"
<<<<<<< HEAD:CommonLib/BCommon/src/main/java/com/yidian/bcommon/constant/AppConfig.kt
// 隐私政策
const val privacyPolicy = "http://merchant.jwshq.cn/home/policy"
=======
// 隐私政策
const val privacyPolicyStatement = "http://merchant.jwshq.cn/home/policy"
>>>>>>> dev_commodity:CommonLib/Common/src/main/java/com/yidian/common/AppConfig.kt
// 我的钱包 - 常见问题
const val commonProblem = "https://www.appgc.cn/plugins/privacy/content?type=privacy&appId=1080334&ver=210601"
......
CommonLib/BCommon/src/main/java/com/yidian/bcommon/webview/PublicWebViewActivity.kt
View file @ 0f34baca
......@@ -34,8 +34,8 @@ class PublicWebViewActivity : BaseMvvmActivity<ActivityPublicWebViewBinding, Pub
// 允许使用js
javaScriptEnabled = true
// 支持屏幕缩放
setSupportZoom(true)
builtInZoomControls = true
// setSupportZoom(true)
// builtInZoomControls = true
// 缓存模式，不使用缓存
cacheMode = WebSettings.LOAD_NO_CACHE
// 支持混合模式
......
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/auth/LifeAccountAuthActivity.kt
View file @ 0f34baca
......@@ -31,6 +31,20 @@ class LifeAccountAuthActivity : BaseActivity<ActivityLifeAccountAuthBinding>(),
const val EXTRA_PAGE_FROM = "from"
const val FROM_AUTH = "auth"
// 生活号id
const val EXTRA_LIFE_ACCOUNT_ID = "life_account_id"
}
/**
* 生活号id
*/
private val lifeAccountId by lazy {
intent.getSerializableExtra(XRouterPathConstants.ParamsKey)?.let { params ->
(params as HashMap<*, *>)[EXTRA_LIFE_ACCOUNT_ID]?.let {
it as String
}
}
}
override fun createViewBinding(): ActivityLifeAccountAuthBinding {
......@@ -88,7 +102,7 @@ class LifeAccountAuthActivity : BaseActivity<ActivityLifeAccountAuthBinding>(),
}
R.id.view_enterprise_auth -> {
// 请求企业认证信息 用于回显已填入的信息
ApiService.authMerchantCheck(this, hashMapOf())
ApiService.authMerchantCheck(this, lifeAccountId?.let { hashMapOf(Pair(EXTRA_LIFE_ACCOUNT_ID, it)) } ?: hashMapOf())
}
R.id.btn_logout -> {
// 退出登录
......@@ -113,7 +127,10 @@ class LifeAccountAuthActivity : BaseActivity<ActivityLifeAccountAuthBinding>(),
// 跳转个人认证页
XPageManager.push(
XRouterPathConstants.LIFE_ACCOUNT_PERSONAL_AUTH,
hashMapOf(Pair(LifeAccountPersonalAuthActivity.EXTRA_AUTH_DATA, result))
hashMapOf(
Pair(LifeAccountPersonalAuthActivity.EXTRA_AUTH_DATA, result),
Pair(LifeAccountPersonalAuthActivity.EXTRA_LIFE_ACCOUNT_ID, lifeAccountId)
)
)
}
......@@ -127,7 +144,10 @@ class LifeAccountAuthActivity : BaseActivity<ActivityLifeAccountAuthBinding>(),
// 跳转企业认证页
XPageManager.push(
XRouterPathConstants.LIFE_ACCOUNT_ENTERPRISE_AUTH,
hashMapOf(Pair(LifeAccountEnterpriseAuthActivity.EXTRA_AUTH_DATA, result))
hashMapOf(
Pair(LifeAccountEnterpriseAuthActivity.EXTRA_AUTH_DATA, result),
Pair(LifeAccountEnterpriseAuthActivity.EXTRA_LIFE_ACCOUNT_ID, lifeAccountId)
)
)
}
......
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/auth/LifeAccountBusinessLicenseAuthFragmentV2.kt
View file @ 0f34baca
......@@ -3,6 +3,7 @@ package com.yidian.shenghuoquan.newscontent.ui.auth
import android.Manifest
import android.app.Activity
import android.content.Intent
import android.graphics.Bitmap
import android.net.Uri
import android.os.Build
import android.os.Bundle
......@@ -35,7 +36,9 @@ import com.yidian.shenghuoquan.newscontent.utils.FileUtil
import com.yidian.shenghuoquan.newscontent.utils.InputFilterUtil
import com.yidian.shenghuoquan.newscontent.widget.LifeAccountAuthBusinessInfoEditView
import com.yidian.utils.ToastUtil
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import java.io.File
/**
......@@ -193,22 +196,25 @@ class LifeAccountBusinessLicenseAuthFragmentV2 :
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
super.onActivityResult(requestCode, resultCode, data)
if (resultCode == Activity.RESULT_OK) {
val uri = if (requestCode == Constant.REQUEST_CODE_OPEN_ALBUM) data?.data else photoUri
val bitmap =
BitmapUtil.generateBitmapFromUri(activity, uri, viewBinding.ivBusinessLicense)
viewBinding.ivBusinessLicense.setImageBitmap(bitmap)
FileUtil.generateFileFromUri(
activity, uri,
commonPath + Constant.FILE_PATH_BUSINESS_LICENSE
)
// 删除从相机拍摄的照片
if (requestCode == Constant.REQUEST_CODE_OPEN_CAMERA) File(commonPath + Constant.FILE_PATH_BUSINESS_LICENSE_CAMERA).delete()
// 显示清除按钮
viewBinding.ivClear.visibility = View.VISIBLE
// 上传区域不可点击
viewBinding.clBusinessLicenseUpload.isEnabled = false
// 执行营业执照OCR
startBusinessLicenseOCR()
lifecycleScope.launch(Dispatchers.Main) {
val uri = if (requestCode == Constant.REQUEST_CODE_OPEN_ALBUM) data?.data else photoUri
var bitmap: Bitmap?
withContext(Dispatchers.IO) {
bitmap = BitmapUtil.generateBitmapFromUri(activity, uri, viewBinding.ivBusinessLicense)
}
viewBinding.ivBusinessLicense.setImageBitmap(bitmap)
// 显示清除按钮
viewBinding.ivClear.visibility = View.VISIBLE
// 上传区域不可点击
viewBinding.clBusinessLicenseUpload.isEnabled = false
withContext(Dispatchers.IO) {
FileUtil.generateFileFromUri(activity, uri, commonPath + Constant.FILE_PATH_BUSINESS_LICENSE)
}
// 删除从相机拍摄的照片
if (requestCode == Constant.REQUEST_CODE_OPEN_CAMERA) File(commonPath + Constant.FILE_PATH_BUSINESS_LICENSE_CAMERA).delete()
// 执行营业执照OCR
startBusinessLicenseOCR()
}
}
}
......
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/auth/LifeAccountIDCardAuthFragmentV2.kt
View file @ 0f34baca
......@@ -3,6 +3,7 @@ package com.yidian.shenghuoquan.newscontent.ui.auth
import android.Manifest
import android.app.Activity
import android.content.Intent
import android.graphics.Bitmap
import android.graphics.BitmapFactory
import android.os.Bundle
import android.provider.MediaStore
......@@ -284,64 +285,54 @@ class LifeAccountIDCardAuthFragmentV2 : BaseFragment<FragmentLifeAccountIdCardAu
if (resultCode == Activity.RESULT_OK) {
when (requestCode) {
Constant.REQUEST_CODE_OPEN_ALBUM -> {
if (curFace == Constant.ID_CARD_PORTRAIT_FACE) {
val bitmap = BitmapUtil.generateBitmapFromUri(
activity,
data?.data,
viewBinding.ivIdCardPortraitFace
)
viewBinding.ivIdCardPortraitFace.addImage(bitmap)
FileUtil.generateFileFromUri(
activity,
data?.data,
cachePath + Constant.FILE_PATH_ID_CARD_PORTRAIT_FACE
)
startIDCardVerify(Constant.ID_CARD_PORTRAIT_FACE)
} else {
val bitmap = BitmapUtil.generateBitmapFromUri(
activity,
data?.data,
viewBinding.ivIdCardNationalEmblemFace
)
viewBinding.ivIdCardNationalEmblemFace.addImage(bitmap)
FileUtil.generateFileFromUri(
activity,
data?.data,
cachePath + Constant.FILE_PATH_ID_CARD_NATIONAL_EMBLEM_FACE
)
startIDCardVerify(Constant.ID_CARD_NATIONAL_EMBLEM_FACE)
lifecycleScope.launch(Dispatchers.Main) {
var bitmap: Bitmap?
if (curFace == Constant.ID_CARD_PORTRAIT_FACE) {
withContext(Dispatchers.IO) {
bitmap = BitmapUtil.generateBitmapFromUri(activity, data?.data, viewBinding.ivIdCardPortraitFace)
}
viewBinding.ivIdCardPortraitFace.addImage(bitmap)
withContext(Dispatchers.IO) {
FileUtil.generateFileFromUri(activity, data?.data, cachePath + Constant.FILE_PATH_ID_CARD_PORTRAIT_FACE)
}
startIDCardVerify(Constant.ID_CARD_PORTRAIT_FACE)
} else {
withContext(Dispatchers.IO) {
bitmap = BitmapUtil.generateBitmapFromUri(activity, data?.data, viewBinding.ivIdCardNationalEmblemFace)
}
viewBinding.ivIdCardNationalEmblemFace.addImage(bitmap)
withContext(Dispatchers.IO) {
FileUtil.generateFileFromUri(activity, data?.data, cachePath + Constant.FILE_PATH_ID_CARD_NATIONAL_EMBLEM_FACE)
}
startIDCardVerify(Constant.ID_CARD_NATIONAL_EMBLEM_FACE)
}
}
}
Constant.REQUEST_CODE_ID_CARD_CAPTURE -> {
val bytes = data?.getByteArrayExtra(EXTRA_NAME_ID_CARD_IMAGE)
if (curFace == Constant.ID_CARD_PORTRAIT_FACE) {
val bitmap = bytes?.size?.let {
BitmapFactory.decodeByteArray(
bytes, 0,
it
)
}
viewBinding.ivIdCardPortraitFace.addImage(bitmap)
BitmapUtil.generateFileFromBitmap(
bitmap,
100,
cachePath + Constant.FILE_PATH_ID_CARD_PORTRAIT_FACE
)
startIDCardVerify(Constant.ID_CARD_PORTRAIT_FACE)
} else {
val bitmap = bytes?.size?.let {
BitmapFactory.decodeByteArray(
bytes, 0,
it
)
lifecycleScope.launch(Dispatchers.Main) {
var bitmap: Bitmap?
val bytes = data?.getByteArrayExtra(EXTRA_NAME_ID_CARD_IMAGE)
if (curFace == Constant.ID_CARD_PORTRAIT_FACE) {
withContext(Dispatchers.IO) {
bitmap = bytes?.size?.let { BitmapFactory.decodeByteArray(bytes, 0, it) }
}
viewBinding.ivIdCardPortraitFace.addImage(bitmap)
withContext(Dispatchers.IO) {
BitmapUtil.generateFileFromBitmap(bitmap, 100, cachePath + Constant.FILE_PATH_ID_CARD_PORTRAIT_FACE)
}
startIDCardVerify(Constant.ID_CARD_PORTRAIT_FACE)
} else {
withContext(Dispatchers.IO) {
bitmap = bytes?.size?.let {
BitmapFactory.decodeByteArray(bytes, 0, it)
}
}
viewBinding.ivIdCardNationalEmblemFace.addImage(bitmap)
withContext(Dispatchers.IO) {
BitmapUtil.generateFileFromBitmap(bitmap, 100, cachePath + Constant.FILE_PATH_ID_CARD_NATIONAL_EMBLEM_FACE)
}
startIDCardVerify(Constant.ID_CARD_NATIONAL_EMBLEM_FACE)
}
viewBinding.ivIdCardNationalEmblemFace.addImage(bitmap)
BitmapUtil.generateFileFromBitmap(
bitmap,
100,
cachePath + Constant.FILE_PATH_ID_CARD_NATIONAL_EMBLEM_FACE
)
startIDCardVerify(Constant.ID_CARD_NATIONAL_EMBLEM_FACE)
}
}
}
......
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/center/MerchantAuthManagementActivity.kt
View file @ 0f34baca
......@@ -55,7 +55,10 @@ class MerchantAuthManagementActivity : Activity(), XPageViewProtocol, IGetLifeAc
// 未认证跳转认证首页
XPageManager.push(
XRouterPathConstants.LIFE_ACCOUNT_AUTH,
hashMapOf(Pair(LifeAccountAuthActivity.EXTRA_PAGE_FROM, LifeAccountAuthActivity.FROM_AUTH))
hashMapOf(
Pair(LifeAccountAuthActivity.EXTRA_PAGE_FROM, LifeAccountAuthActivity.FROM_AUTH),
Pair(LifeAccountAuthActivity.EXTRA_LIFE_ACCOUNT_ID, lifeAccountId)
)
)
finish()
}
......
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/center/MerchantCenterActivity.kt
View file @ 0f34baca
......@@ -402,7 +402,10 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(), Me
// 由未认证升级认证 跳转认证首页
XPageManager.push(
XRouterPathConstants.LIFE_ACCOUNT_AUTH,
hashMapOf(Pair(LifeAccountAuthActivity.EXTRA_PAGE_FROM, LifeAccountAuthActivity.FROM_AUTH))
hashMapOf(
Pair(LifeAccountAuthActivity.EXTRA_PAGE_FROM, LifeAccountAuthActivity.FROM_AUTH),
Pair(LifeAccountAuthActivity.EXTRA_LIFE_ACCOUNT_ID, curLifeAccount.life_account_id)
)
)
}
......@@ -484,7 +487,10 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(), Me
// 进行认证
XPageManager.push(
XRouterPathConstants.LIFE_ACCOUNT_AUTH,
hashMapOf(Pair(LifeAccountAuthActivity.EXTRA_PAGE_FROM, LifeAccountAuthActivity.FROM_AUTH))
hashMapOf(
Pair(LifeAccountAuthActivity.EXTRA_PAGE_FROM, LifeAccountAuthActivity.FROM_AUTH),
Pair(LifeAccountAuthActivity.EXTRA_LIFE_ACCOUNT_ID, curLifeAccount.life_account_id)
)
)
}
......
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/center/MerchantInfoActivity.kt
View file @ 0f34baca
......@@ -165,7 +165,10 @@ class MerchantInfoActivity : BaseActivity<ActivityMerchantInfoBinding>(), Mercha
// 未认证 进入认证流程首页 此处需要传参from控制认证流程首页返回按钮显示
XPageManager.push(
XRouterPathConstants.LIFE_ACCOUNT_AUTH,
hashMapOf(Pair(LifeAccountAuthActivity.EXTRA_PAGE_FROM, LifeAccountAuthActivity.FROM_AUTH))
hashMapOf(
Pair(LifeAccountAuthActivity.EXTRA_PAGE_FROM, LifeAccountAuthActivity.FROM_AUTH),
Pair(LifeAccountAuthActivity.EXTRA_LIFE_ACCOUNT_ID, lifeAccountInfo?.life_account_id)
)
)
} else if (lifeAccountInfo?.audit_status == Constant.STATUS_AUDIT_REJECT) {
// 认证驳回 请求企业认证信息 此处为升级认证情况 需要传入生活号id
......
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