From a30bda4814a0fa2248f8aba3083ae2a55a936bcf Mon Sep 17 00:00:00 2001 From: wushaocheng <15876365887@163.com> Date: Thu, 1 Dec 2022 01:56:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=BA=E5=8F=B7=E9=80=BB=E8=BE=91=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 5 - .../erban/ui/login/AreaCodeActivity.kt | 37 +- .../ui/login/AuthorizationCodeActivity.kt | 70 --- .../erban/ui/login/bean/CountryBean.java | 15 - .../layout/activity_authorization_code.xml | 85 ---- app/src/main/res/values/arrays.xml | 411 +++++++----------- .../xchat_android_core/auth/AuthModel.java | 21 + .../auth/bean/AreaInfoBean.kt | 15 + 8 files changed, 233 insertions(+), 426 deletions(-) delete mode 100644 app/src/main/java/com/yizhuan/erban/ui/login/AuthorizationCodeActivity.kt delete mode 100644 app/src/main/java/com/yizhuan/erban/ui/login/bean/CountryBean.java delete mode 100644 app/src/main/res/layout/activity_authorization_code.xml create mode 100644 core/src/main/java/com/yizhuan/xchat_android_core/auth/bean/AreaInfoBean.kt diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 26cc83b16..a39656ac0 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -865,11 +865,6 @@ android:configChanges="screenSize|orientation|keyboardHidden|mcc|mnc|locale|touchscreen|screenLayout|keyboard|navigation|fontScale|uiMode|smallestScreenSize|layoutDirection" android:exported="false" android:screenOrientation="portrait" /> - () { - private val mCountries = ArrayList() + private val mCountries = ArrayList() companion object { const val COUNTRY_NUMBER = "country_number" @@ -45,28 +49,45 @@ class AreaCodeActivity : BaseViewBindingActivity() { val country = s.split("*").toTypedArray() val countryName = country[0] val countryNumber = country[1] - val c = CountryBean(countryName, countryNumber) + val c = AreaInfoBean( + name = countryName, + phoneAreaCode = countryNumber + ) mCountries.add(c) } } private fun initListView() { val mAdapter = object : - BaseQuickAdapter(R.layout.item_country, mCountries) { - override fun convert(helper: BaseViewHolder, item: CountryBean) { + BaseQuickAdapter(R.layout.item_country) { + override fun convert(helper: BaseViewHolder, item: AreaInfoBean) { helper.setText(R.id.tv_name, item.name) - helper.setText(R.id.tv_country_code, item.code) + helper.setText(R.id.tv_country_code, "+${item.phoneAreaCode}") } } binding.mRecyclerView.adapter = mAdapter + mAdapter.setNewData(mCountries) //返回国家 mAdapter.setOnItemClickListener { adapter: BaseQuickAdapter<*, *>?, view: View?, position: Int -> - val country = mCountries[position] + val country = mAdapter.data[position] val intent = Intent() - intent.putExtra(COUNTRY_NUMBER, country.code) + intent.putExtra(COUNTRY_NUMBER, "+${country.phoneAreaCode}") setResult(RESULT_OK, intent) finish() } + + AuthModel.get() + .areaCodeList + .compose(bindUntilEvent(ActivityEvent.DESTROY)) + .subscribe(object : BeanObserver>() { + override fun onErrorMsg(error: String) { + Logger.error("areaCode", error) + } + + override fun onSuccess(list: List) { +// mAdapter.setNewData(list) + } + }) } override fun needSteepStateBar() = true diff --git a/app/src/main/java/com/yizhuan/erban/ui/login/AuthorizationCodeActivity.kt b/app/src/main/java/com/yizhuan/erban/ui/login/AuthorizationCodeActivity.kt deleted file mode 100644 index c2826002e..000000000 --- a/app/src/main/java/com/yizhuan/erban/ui/login/AuthorizationCodeActivity.kt +++ /dev/null @@ -1,70 +0,0 @@ -package com.yizhuan.erban.ui.login - -import android.text.Editable -import android.text.TextWatcher -import android.view.MotionEvent -import android.view.WindowManager -import android.widget.EditText -import com.netease.nim.uikit.StatusBarUtil -import com.yizhuan.erban.base.BaseViewBindingActivity -import com.yizhuan.erban.databinding.ActivityAuthorizationCodeBinding - -/** - * 授权码页面 - * Created by wushaocheng - * Date: 2022/11/28 - */ -class AuthorizationCodeActivity : BaseViewBindingActivity() { - - override fun init() { - initData() - initListener() - } - - private fun initData() { - this.window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE) - } - - private fun initListener() { - binding.etCode.addTextChangedListener(object : TextWatcher { - override fun beforeTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) { - - } - - override fun onTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) { - - } - - override fun afterTextChanged(p0: Editable?) { - binding.btnNext.isEnabled = p0?.isEmpty() != true - } - - }) - binding.btnNext.setOnClickListener { - - } - } - - override fun onTouchEvent(event: MotionEvent): Boolean { - val view = currentFocus - var isPressEdit = false - if (view is EditText) { - if (event.rawX >= view.getX() && event.rawX <= view.getX() + view.getWidth() && event.rawY >= view.getY() && event.rawY <= view.getY() + view.getHeight()) { - isPressEdit = true - } - } - if (!isPressEdit) { - hideIME() - } - return super.onTouchEvent(event) - } - - override fun needSteepStateBar() = true - - override fun setStatusBar() { - super.setStatusBar() - StatusBarUtil.transparencyBar(this) - StatusBarUtil.StatusBarLightMode(this) - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/yizhuan/erban/ui/login/bean/CountryBean.java b/app/src/main/java/com/yizhuan/erban/ui/login/bean/CountryBean.java deleted file mode 100644 index 3cf9b8d6a..000000000 --- a/app/src/main/java/com/yizhuan/erban/ui/login/bean/CountryBean.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.yizhuan.erban.ui.login.bean; - -import lombok.Data; - -@Data -public class CountryBean { - public String name; - public String code; - - public CountryBean(String name, String code) { - this.name = name; - this.code = code; - } - -} diff --git a/app/src/main/res/layout/activity_authorization_code.xml b/app/src/main/res/layout/activity_authorization_code.xml deleted file mode 100644 index 0ad7f270f..000000000 --- a/app/src/main/res/layout/activity_authorization_code.xml +++ /dev/null @@ -1,85 +0,0 @@ - - - - - - - - - - - - - - - -