Skip to content

S
ShenghuoquanBusiness
Commit 67a13631 authored by yinjiacheng's avatar yinjiacheng
Browse files
Options

update 生活号创建成功页

parent 4f578020
Hide whitespace changes
Inline Side-by-side
Showing with 73 additions and 168 deletions
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/app/NewsContentApplication.kt
View file @ 67a13631
......@@ -15,6 +15,7 @@ import com.yidian.common.XRouterPathConstants.Companion.LIFE_ACCOUNT_IDENTITY
import com.yidian.common.XRouterPathConstants.Companion.LIFE_ACCOUNT_MODIFY_NAME
import com.yidian.common.XRouterPathConstants.Companion.LIFE_ACCOUNT_PERSONAL_AUTH
import com.yidian.common.XRouterPathConstants.Companion.LIFE_ACCOUNT_PERSONAL_AUTH_COMPLETE
import com.yidian.common.XRouterPathConstants.Companion.LIFE_NUMBER
import com.yidian.common.XRouterPathConstants.Companion.LOGIN_LIFE_CIRCLE
import com.yidian.common.XRouterPathConstants.Companion.MERCHANT_AUTH_INFO
import com.yidian.common.XRouterPathConstants.Companion.MERCHANT_CENTER
......@@ -211,6 +212,18 @@ class NewsContentApplication : YdBaseApplication() {
}
}),
XPageNode(LIFE_NUMBER, XPageNodePageType.NATIVE, object : XPageHandler {
override fun handler(params: Map<String, Any?>?) {
val intent = Intent()
if (params != null) {
intent.putExtra(XRouterPathConstants.ParamsKey, params as HashMap)
}
intent.setClass(context, LifeNumberActivity::class.java)
intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
context.startActivity(intent)
}
}),
XPageNode(NEWS_CONTENT, XPageNodePageType.NATIVE, object : XPageHandler {
override fun handler(params: Map<String, Any?>?) {
val intent = Intent()
......
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/auth/LifeAccountCreateActivity.kt
View file @ 67a13631
......@@ -132,7 +132,10 @@ class LifeAccountCreateActivity : BaseActivity<ActivityLifeAccountCreateBinding>
if (result) {
XPageManager.push(
XRouterPathConstants.LIFE_NUMBER,
hashMapOf(Pair(LifeNumberActivity.ACCOUNT_NAME, lifeAccountName))
hashMapOf(
Pair(LifeNumberActivity.EXTRA_LIFE_ACCOUNT_NAME, lifeAccountName),
Pair(LifeNumberActivity.EXTRA_LIFE_ACCOUNT_ID, lifeAccountId)
)
)
} else {
ToastUtil.showToast(this, "生活号创建失败")
......
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/auth/LifeAccountPersonalAuthCompleteActivity.kt
View file @ 67a13631
......@@ -54,10 +54,12 @@ class LifeAccountPersonalAuthCompleteActivity :
}
private fun initData() {
viewBind.occupationLabelValue.text = params[OCCUPATION] as String
viewBind.actualNameValue.text = params[REAL_NAME] as String
viewBind.idNumberValue.text = params[ID_CARD_NUM] as String
viewBind.phoneNumberValue.text = params[PHONE_NUM] as String
viewBind.ivPersonAuthInfo.fillAuthInfo(
params[OCCUPATION] as String,
params[REAL_NAME] as String,
params[ID_CARD_NUM] as String,
params[PHONE_NUM] as String
)
}
private fun initListener() {
......
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/auth/LifeNumberActivity.kt
View file @ 67a13631
package com.yidian.shenghuoquan.newscontent.ui.auth
import android.os.Bundle
import android.util.Log
import androidx.core.view.isVisible
import com.orhanobut.hawk.Hawk
import com.yidian.common.HawkConfig
import com.yidian.common.XRouterPathConstants
......@@ -9,7 +9,11 @@ import com.yidian.common.XRouterPathConstants.Companion.LIFE_NUMBER
import com.yidian.common.base.BaseActivity
import com.yidian.shenghuoquan.newscontent.R
import com.yidian.shenghuoquan.newscontent.databinding.ActivityLifeNumberBinding
import com.yidian.utils.ToastUtil
import com.yidian.shenghuoquan.newscontent.http.ApiService
import com.yidian.shenghuoquan.newscontent.http.callback.IGetLifeAccountListCallback
import com.yidian.shenghuoquan.newscontent.http.httpbean.LifeAccountItemBean
import com.yidian.shenghuoquan.newscontent.ui.center.MerchantCenterActivity
import com.yidian.xpage.XPageManager
import kotlinx.android.synthetic.main.top_bar.view.*
/**
......@@ -17,11 +21,12 @@ import kotlinx.android.synthetic.main.top_bar.view.*
* Date: 2021/5/26 15:44 PM
* Describe: activity_enterprise_certification 创建生活号
*/
class LifeNumberActivity : BaseActivity<ActivityLifeNumberBinding>() {
class LifeNumberActivity : BaseActivity<ActivityLifeNumberBinding>(), IGetLifeAccountListCallback {
companion object {
private const val TAG = "LifeNumberActivity"
const val ACCOUNT_NAME = "live_account_name"
const val EXTRA_LIFE_ACCOUNT_NAME = "live_account_name"
const val EXTRA_LIFE_ACCOUNT_ID = "life_account_id"
}
override fun createViewBinding(): ActivityLifeNumberBinding {
......@@ -32,35 +37,32 @@ class LifeNumberActivity : BaseActivity<ActivityLifeNumberBinding>() {
return LIFE_NUMBER
}
private var liveAccountName = "一点招聘生活号"
private var managerName = "微微微蓝"
private var managerName: String? = null
private var phoneNumber: String? = null
private var lifeAccountName: String? = null
private var lifeAccountId: String? = null
private var phoneNumber = "18210128848"
override fun init(savedInstanceState: Bundle?) {
super.init(savedInstanceState)
viewBind.root.title.text = resources.getString(R.string.create_a_life_number)
viewBind.root.back.isVisible = false
initListener()
initData()
}
private fun initData() {
liveAccountName = intent.getStringExtra(ACCOUNT_NAME) ?: ""
val params = intent.getSerializableExtra(XRouterPathConstants.ParamsKey)
if (params != null && params is HashMap<*, *>) {
try {
liveAccountName = params[ACCOUNT_NAME] as String? ?: ""
} catch (e: Exception) {
Log.e(TAG, "LifeNumberActivity: $e" )
}
}
val params = intent.getSerializableExtra(XRouterPathConstants.ParamsKey)?.let {
it as HashMap<*, *>
} ?: return
lifeAccountName = params[EXTRA_LIFE_ACCOUNT_NAME] as String? ?: ""
lifeAccountId = params[EXTRA_LIFE_ACCOUNT_ID] as String
managerName = Hawk.get<String>(HawkConfig.Nickname) ?: ""
phoneNumber = Hawk.get<String>(HawkConfig.Mobile) ?: ""
showData()
}
private fun showData() {
viewBind.personalShop.text = liveAccountName
viewBind.personalShop.text = lifeAccountName
viewBind.occupationLabelValue.text = managerName
viewBind.actualNameValue.text = phoneNumber
}
......@@ -69,10 +71,30 @@ class LifeNumberActivity : BaseActivity<ActivityLifeNumberBinding>() {
viewBind.root.back.setOnClickListener {
finish()
}
viewBind.information.setOnClickListener {
// TODO: 2021/5/27 去体验跳转
ToastUtil.showToast(this, "去体验跳转")
viewBind.tvEnterMerchantCenter.setOnClickListener {
// 跳转商户管理中心 先请求生活号列表 带参跳转
ApiService.getLifeAccountList(this)
}
}
override fun getLifeAccountListSuccess(result: ArrayList<LifeAccountItemBean.Response>?) {
// 生活号列表请求成功
result?.forEach {
if (it.life_account_id == lifeAccountId) {
XPageManager.push(
XRouterPathConstants.MERCHANT_CENTER,
hashMapOf(
Pair(MerchantCenterActivity.EXTRA_IS_MULTI, result.size > 1),
Pair(MerchantCenterActivity.EXTRA_LIFE_ACCOUNT_INFO, it)
)
)
finish()
}
}
}
override fun getLifeAccountListFailure(message: String?) {
}
}
\ No newline at end of file
Components/newscontent/src/main/res/layout/activity_life_account_personal_auth_complete.xml
View file @ 67a13631
......@@ -43,157 +43,21 @@
android:textSize="16sp" />
</LinearLayout>
<View
android:id="@+id/icon_shop_root"
<com.yidian.shenghuoquan.newscontent.widget.LifeAccountPersonalAuthInfoView
android:id="@+id/iv_person_auth_info"
android:layout_width="wrap_content"
android:layout_height="56dp"
android:layout_below="@id/created_successfully_root"
android:layout_centerHorizontal="true"
android:layout_marginStart="20dp"
android:layout_marginTop="25dp"
android:layout_marginEnd="20dp"
android:background="@mipmap/icon_shop" />
<RelativeLayout
android:id="@+id/rl_personal_auth_info"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/icon_shop_root"
android:layout_below="@id/created_successfully_root"
android:layout_centerHorizontal="true"
android:layout_marginStart="25dp"
android:layout_marginEnd="25dp"
android:background="@drawable/personal_authentication_bg"
android:paddingStart="30dp"
android:paddingBottom="45dp">
<TextView
android:id="@+id/personal_shop"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginTop="25dp"
android:layout_marginRight="10dp"
android:gravity="left"
android:text="@string/personal_shop"
android:textColor="#FF333333"
android:textSize="16sp" />
<LinearLayout
android:id="@+id/column_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/personal_shop"
android:layout_marginStart="20dp"
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:gravity="left"
android:text="@string/occupation_label"
android:textColor="#FF999999"
android:textSize="16sp" />
<TextView
android:id="@+id/actual_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:gravity="left"
android:text="@string/actual_name"
android:textColor="#FF999999"
android:textSize="16sp" />
<TextView
android:id="@+id/id_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:gravity="left"
android:text="@string/id_number"
android:textColor="#FF999999"
android:textSize="16sp" />
<TextView
android:id="@+id/phone_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:gravity="left"
android:text="@string/phone_number"
android:textColor="#FF999999"
android:textSize="16sp" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/personal_shop"
android:layout_marginStart="12dp"
android:layout_marginTop="23dp"
android:layout_marginEnd="12dp"
android:layout_toRightOf="@id/column_name"
android:orientation="vertical">
<TextView
android:id="@+id/occupation_label_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="left"
android:text="@string/occupation_label"
android:textColor="#333333"
android:textSize="16sp" />
<TextView
android:id="@+id/actual_name_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:gravity="left"
android:text="@string/occupation_label"
android:textColor="#333333"
android:textSize="16sp" />
<TextView
android:id="@+id/id_number_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:gravity="left"
android:text="@string/id_number"
android:textColor="#333333"
android:textSize="16sp" />
<TextView
android:id="@+id/phone_number_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:gravity="left"
android:text="@string/phone_number"
android:textColor="#333333"
android:textSize="16sp" />
</LinearLayout>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_marginTop="20dp"
android:src="@mipmap/icon_seal" />
</RelativeLayout>
android:layout_marginTop="@dimen/dp20" />
<TextView
android:id="@+id/tv_enter_merchant_center"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/rl_personal_auth_info"
android:layout_below="@id/iv_person_auth_info"
android:layout_centerHorizontal="true"
android:layout_marginTop="10dp"
android:layout_marginTop="@dimen/dp31"
android:background="@drawable/shape_stroke2_radius18_skin_primary_1852f1"
android:gravity="center"
android:paddingLeft="20dp"
......
Components/newscontent/src/main/res/layout/activity_life_number.xml
View file @ 67a13631
......@@ -147,6 +147,7 @@
</RelativeLayout>
<TextView
android:id="@+id/tv_enter_merchant_center"
android:layout_below="@id/information"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......
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