moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

区号逻辑修改

Browse Source
This commit is contained in:
wushaocheng
2022-12-01 01:56:21 +08:00
parent 90194803d7
commit a30bda4814
8 changed files with 233 additions and 426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/AndroidManifest.xml
View File

@@ -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" />
<activity
android:name=".ui.login.AuthorizationCodeActivity"
android:configChanges="screenSize|orientation|keyboardHidden|mcc|mnc|locale|touchscreen|screenLayout|keyboard|navigation|fontScale|uiMode|smallestScreenSize|layoutDirection"
android:exported="false"
android:screenOrientation="portrait" />
<activity
android:name=".ui.login.AreaCodeActivity"
android:configChanges="screenSize|orientation|keyboardHidden|mcc|mnc|locale|touchscreen|screenLayout|keyboard|navigation|fontScale|uiMode|smallestScreenSize|layoutDirection"

37
app/src/main/java/com/yizhuan/erban/ui/login/AreaCodeActivity.kt
View File

@@ -6,10 +6,14 @@ import android.view.View
import com.chad.library.adapter.base.BaseQuickAdapter
import com.chad.library.adapter.base.BaseViewHolder
import com.netease.nim.uikit.StatusBarUtil
import com.trello.rxlifecycle3.android.ActivityEvent
import com.yizhuan.erban.R
import com.yizhuan.erban.base.BaseViewBindingActivity
import com.yizhuan.erban.databinding.ActivityAreaCodeBinding
import com.yizhuan.erban.ui.login.bean.CountryBean
import com.yizhuan.xchat_android_core.auth.AuthModel
import com.yizhuan.xchat_android_core.auth.bean.AreaInfoBean
import com.yizhuan.xchat_android_core.utils.Logger
import com.yizhuan.xchat_android_core.utils.net.BeanObserver
/**
* 区号
@@ -18,7 +22,7 @@ import com.yizhuan.erban.ui.login.bean.CountryBean
*/
class AreaCodeActivity : BaseViewBindingActivity<ActivityAreaCodeBinding>() {
private val mCountries = ArrayList<CountryBean>()
private val mCountries = ArrayList<AreaInfoBean>()
companion object {
const val COUNTRY_NUMBER = "country_number"
@@ -45,28 +49,45 @@ class AreaCodeActivity : BaseViewBindingActivity<ActivityAreaCodeBinding>() {
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<CountryBean, BaseViewHolder>(R.layout.item_country, mCountries) {
override fun convert(helper: BaseViewHolder, item: CountryBean) {
BaseQuickAdapter<AreaInfoBean, BaseViewHolder>(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<List<AreaInfoBean>>() {
override fun onErrorMsg(error: String) {
Logger.error("areaCode", error)
}
override fun onSuccess(list: List<AreaInfoBean>) {
// mAdapter.setNewData(list)
}
})
}
override fun needSteepStateBar() = true

70
app/src/main/java/com/yizhuan/erban/ui/login/AuthorizationCodeActivity.kt
View File

@@ -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<ActivityAuthorizationCodeBinding>() {
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)
}
}

15
app/src/main/java/com/yizhuan/erban/ui/login/bean/CountryBean.java
View File

@@ -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;
}
}

85
app/src/main/res/layout/activity_authorization_code.xml
View File

@@ -1,85 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:background="@color/color_white"
android:layout_width="match_parent"
android:layout_height="match_parent">
<View
android:id="@+id/view_bg_top"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@drawable/bg_login"
app:layout_constraintDimensionRatio="750:666"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_slogan"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="30dp"
android:layout_marginTop="100dp"
android:fontFamily="sans-serif-medium"
android:text="@string/text_authorization_code"
android:textColor="@color/text_title_color"
android:textSize="40sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<LinearLayout
android:id="@+id/view_bg_bottom"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@drawable/shape_white_top_25dp"
android:gravity="center_horizontal"
android:orientation="vertical"
android:layout_marginTop="-20dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@+id/view_bg_top"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
<LinearLayout
android:layout_marginTop="30dp"
android:layout_marginStart="34dp"
android:layout_marginEnd="34dp"
android:gravity="center_vertical"
android:background="@drawable/shape_login_btn_bg"
android:layout_width="match_parent"
android:layout_height="64dp">
<EditText
android:id="@+id/etCode"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="match_parent"
android:background="@null"
android:gravity="center_vertical"
android:paddingStart="@dimen/dp_10"
android:paddingEnd="@dimen/dp_10"
android:inputType="number"
android:singleLine="true"
android:textColor="@color/text_title_color"
android:textSize="@dimen/dp_15"
tools:ignore="SpUsage" />
</LinearLayout>
<Button
android:id="@+id/btnNext"
android:layout_width="165dp"
android:layout_height="63dp"
android:layout_gravity="center_horizontal"
android:layout_marginTop="30dp"
android:background="@drawable/ic_login_next"
android:enabled="false"
android:gravity="center"
android:textColor="@color/white" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

411
app/src/main/res/values/arrays.xml
View File

@@ -65,252 +65,177 @@
<item>心动钻石CP位</item>
<item>CP头饰</item>
<item>梦幻花园CP位</item>
<item>永恒爱情城堡CP位\n+永恒CP头饰\n+永恒CP铭牌</item>
<item>永恒爱情城堡CP位\n永恒CP头饰\n永恒CP铭牌</item>
</string-array>
<string-array name="country_code_list_ch" translatable="false">
<item>Taiwan(TW)*+886</item>
<item>Hongkong(HK)*+852</item>
<item>Macao(MO)*+853</item>
<item>中国大陆(CN)*+86</item>
<item>Malaysia(MY)*+60</item>
<item>Singapore(SG) *+65</item>
<item>India(IN)*+91</item>
<item>Indonesia(ID)*+62</item>
<item>ไทย(TH)*+66</item>
<item>Việt,Nam(VN) *+84</item>
<item>日本(JP)*+81</item>
<item>United,States(US)*+1</item>
<item>New,Zealand(NZ)*+64</item>
<item>American,Samoa(AS)*+1</item>
<item>Andorra(AD)*+376</item>
<item>Angola(AO)*+244</item>
<item>Anguilla(AI)*+1</item>
<item>Antigua,and,Barbuda(AG)*+1</item>
<item>Argentina(AR)*+54</item>
<item>Aruba(AW)*+297</item>
<item>Ascension,Island(AC)*+247</item>
<item>Australia(AU)*+61</item>
<item>Azərbaycan(AZ)*+994</item>
<item>Åland(AX)*+358</item>
<item>Bahamas(BS)*+1</item>
<item>Barbados(BB)*+1</item>
<item>België(BE)*+32</item>
<item>Belize(BZ)*+501</item>
<item>Bermuda(BM)*+1</item>
<item>Bénin(BJ)*+229</item>
<item>Bolivia(BO)*+591</item>
<item>Bosna,i,Hercegovina(BA)*+387</item>
<item>Botswana(BW)*+267</item>
<item>Brasil(BR)*+55</item>
<item>British,Indian,Ocean,Territory(IO)*+246</item>
<item>British,Virgin,Islands(VG)*+1</item>
<item>Brunei(BN)*+673</item>
<item>Burkina,Faso(BF)*+226</item>
<item>Burundi(BI)*+257</item>
<item>Cameroon(CM)*+237</item>
<item>Canada(CA)*+1</item>
<item>Caribisch,Nederland(BQ)*+599</item>
<item>Cayman,Islands(KY)*+1</item>
<item>Chile(CL)*+56</item>
<item>Christmas,Island(CX)*+61</item>
<item>Città,del,Vaticano(VA)*+379</item>
<item>Colombia(CO)*+57</item>
<item>Congo-Brazzaville(CG)*+242</item>
<item>Congo-Kinshasa(CD)*+243</item>
<item>Cook,Islands(CK)*+682</item>
<item>Costa,Rica(CR)*+506</item>
<item>Côte,d’Ivoire(CI)*+225</item>
<item>Cuba(CU)*+53</item>
<item>Curaçao(CW)*+599</item>
<item>Česká,republika(CZ)*+420</item>
<item>Danmark(DK)*+45</item>
<item>Deutschland(DE)*+49</item>
<item>Djibouti(DJ)*+253</item>
<item>Dominica(DM)*+1</item>
<item>Ecuador(EC)*+593</item>
<item>Eesti(EE)*+372</item>
<item>El,Salvador(SV)*+503</item>
<item>Eretria(ER)*+291</item>
<item>España(ES)*+34</item>
<item>Falkland,Islands(FK)*+500</item>
<item>Fiji(FJ)*+679</item>
<item>France(FR)*+33</item>
<item>Føroyar(FO)*+298</item>
<item>Gabon(GA)*+241</item>
<item>Gambia(GM)*+220</item>
<item>Ghana(GH)*+233</item>
<item>Gibraltar(GI)*+350</item>
<item>Grenada(GD)*+1</item>
<item>Guadeloupe(GP)*+590</item>
<item>Guam(GU)*+1</item>
<item>Guatemala(GT)*+502</item>
<item>Guernsey(GG)*+44</item>
<item>Guinea,Ecuatorial(GQ)*+240</item>
<item>Guiné,Bissau(GW)*+245</item>
<item>Guinée(GN)*+224</item>
<item>Guyana(GY)*+592</item>
<item>Guyane,française(GF)*+594</item>
<item>Haïti(HT)*+509</item>
<item>Honduras(HN)*+504</item>
<item>Hrvatska(HR)*+385</item>
<item>India(IN)*+91</item>
<item>Ireland(IE)*+353</item>
<item>Isle,of,Man(IM)*+44</item>
<item>Italia(IT)*+39</item>
<item>Ísland(IS)*+354</item>
<item>Jamaica(JM)*+1</item>
<item>Jersey(JE)*+44</item>
<item>Kalaallit,Nunaat(GL)*+299</item>
<item>Kenya(KE)*+254</item>
<item>Kepulauan,Cocos,(Keeling)(CC)*+61</item>
<item>Kiribati(KI)*+686</item>
<item>La,Réunion(RE)*+262</item>
<item>Latvija(LV)*+371</item>
<item>Lesotho(LS)*+266</item>
<item>Liberia(LR)*+231</item>
<item>Liechtenstein(LI)*+423</item>
<item>Lietuva(LT)*+370</item>
<item>Luxemburg(LU)*+352</item>
<item>Madagascar(MG)*+261</item>
<item>Magyarország(HU)*+36</item>
<item>Malawi(MW)*+265</item>
<item>Maldives(MV)*+960</item>
<item>Mali(ML)*+223</item>
<item>Malta(MT)*+356</item>
<item>Marshall,Islands(MH)*+692</item>
<item>Martinique(MQ)*+596</item>
<item>Mauritius(MU)*+230</item>
<item>Mayotte(YT)*+262</item>
<item>México(MX)*+52</item>
<item>Micronesia(FM)*+691</item>
<item>Moçambique(MZ)*+258</item>
<item>Monaco(MC)*+377</item>
<item>Montserrat(MS)*+1</item>
<item>Namibia(NA)*+264</item>
<item>Nauru(NR)*+674</item>
<item>Nederland(NL)*+31</item>
<item>Nicaragua(NI)*+505</item>
<item>Niger(NE)*+227</item>
<item>Nigeria(NG)*+234</item>
<item>Niue(NU)*+683</item>
<item>Norfolk,Island(NF)*+672</item>
<item>Norge(NO)*+47</item>
<item>Northern,Mariana,Islands(MP)*+1</item>
<item>Nouvelle-Calédonie(NC)*+687</item>
<item>Oʻzbekiston(UZ)*+998</item>
<item>Österreich(AT)*+43</item>
<item>Palau(PW)*+680</item>
<item>Panamá(PA)*+507</item>
<item>Papua,New,Guinea(PG)*+675</item>
<item>Paraguay(PY)*+595</item>
<item>Perú(PE)*+51</item>
<item>Philippines(PH)*+63</item>
<item>Polska(PL)*+48</item>
<item>Polynésie,française(PF)*+689</item>
<item>Portugal(PT)*+351</item>
<item>Puerto,Rico(PR)*+1</item>
<item>Republica,Moldova(MD)*+373</item>
<item>República,Dominicana(DO)*+1</item>
<item>République,centrafricaine(CF)*+236</item>
<item>România(RO)*+40</item>
<item>Rwanda(RW)*+250</item>
<item>Saint,Helena(SH)*+290</item>
<item>Saint,Kitts,and,Nevis(KN)*+1</item>
<item>Saint,Lucia(LC)*+1</item>
<item>Saint-Barthélemy(BL)*+590</item>
<item>Saint-Martin,(partie,française)(MF) *+590</item>
<item>Saint-Pierre-et-Miquelon(PM)*+508</item>
<item>Samoa(WS)*+685</item>
<item>San,Marino(SM)*+378</item>
<item>São,Tomé,e,Príncipe(ST)*+239</item>
<item>Schweiz(CH) *+41</item>
<item>Seychelles(SC) *+248</item>
<item>Sénégal(SN) *+221</item>
<item>Shqipëri(AL) *+355</item>
<item>Sierra,Leone(SL) *+232</item>
<item>Sint-Maarten(SX) *+1</item>
<item>Slovenija(SI) *+386</item>
<item>Slovensko(SK) *+421</item>
<item>Solomon,Islands(SB) *+477</item>
<item>Soomaaliya(SO) *+252</item>
<item>South,Sudan(SS) *+211</item>
<item>St.,Vincent,Grenadines(VC) *+1</item>
<item>Suomi(FI) *+358</item>
<item>Suriname(SR) *+597</item>
<item>Sverige(SE)*+46</item>
<item>Swaziland(SZ) *+568</item>
<item>Tanzania(TZ) *+255</item>
<item>Tchad(TD) *+235</item>
<item>Timor-Leste(TL) *+670</item>
<item>Togo(TG) *+228</item>
<item>Tokelau(TK) *+690</item>
<item>Tonga(TO) *+676</item>
<item>Trinidad,and,Tobago(TT) *+1</item>
<item>Turks,and,Caicos,Islands(TC) *+1</item>
<item>Tuvalu(TV) *+688</item>
<item>Türkiye(TR) *+90</item>
<item>U.S.,Virgin,Islands(VI) *+1</item>
<item>Uganda(UG) *+256</item>
<item>United,Kingdom(GB)*+44</item>
<item>Uruguay(UY) *+598</item>
<item>Vanuatu(VU) *+678</item>
<item>Venezuela(VE) *+58</item>
<item>Wallis-et-Futuna(WF) *+681</item>
<item>Zambia(ZM) *+260</item>
<item>Zimbabwe(ZW) *+263</item>
<item>i-South,Africa(ZA)*+27</item>
<item>Ελλάδα(GR)*+30</item>
<item>Κύπρος(CY) *+357</item>
<item>Беларусь(BY) *+375</item>
<item>България(BG) *+359</item>
<item>Кыргызстан(KG) *+996</item>
<item>Македонија(MK) *+389</item>
<item>Монгол(MN) *+976</item>
<item>Россия(RU) *+7</item>
<item>Србија(RS) *+381</item>
<item>Тоҷикистон(TJ) *+992</item>
<item>Туркменистан(TM) *+993</item>
<item>Україна(UA) *+380</item>
<item>Црна,Гора(ME) *+382</item>
<item>Шпицберген,и,Ян-Майен(SJ)*+47</item>
<item>Қазақстан(KZ)*+7</item>
<item>Հայաստան(AM) *+374</item>
<item>ישראל(IL) *+972</item>
<item>افغانستان(AF) *+93</item>
<item>الأراضي,الفلسطينية(PS) *+970</item>
<item>الأردن(JO) *+962</item>
<item>الإمارات,العربية,المتحدة(AE) *+971</item>
<item>البحرين(BH) *+973</item>
<item>الجزائر(DZ) *+213</item>
<item>السودان(SD) *+249</item>
<item>العراق(IQ) *+964</item>
<item>الكويت(KW) *+965</item>
<item>المغرب(MA) *+212</item>
<item>المملكة,العربية,السعودية(SA) *+966</item>
<item>اليمن(YE) *+967</item>
<item>ایران(IR) *+98</item>
<item>تونس(TN) *+216</item>
<item>جزر,القمر(KM) *+269</item>
<item>سوريا(SY) *+963</item>
<item>عُمان(OM) *+968</item>
<item>قطر(QA) *+974</item>
<item>لبنان(LB) *+961</item>
<item>ليبيا(LY) *+218</item>
<item>مصر(EG) *+20</item>
<item>موريتانيا(MR) *+222</item>
<item>پاکستان(PK) *+92</item>
<item>नेपाल(NP) *+977</item>
<item>বাংলাদেশ(BD) *+880</item>
<item>ශ්‍රී,ලංකාව(LK) *+94</item>
<item>ລາວ(LA)*+856</item>
<item>འབྲུག(BT)*+975</item>
<item>Myanmar(MM)*+95</item>
<item>საქართველო(GE)*+995</item>
<item>대한민국(KR)*+82</item>
<item>조선,민주주의,인민,공화국(KP)*+850</item>
<item>Ethiopia(ET)*+251</item>
<item>កម្ពុជា(KH)*+855</item>
<item>Taiwan*886</item>
<item>Hongkong*852</item>
<item>Macao*853</item>
<item>Malaysia*60</item>
<item>Singapore*65</item>
<item>India*91</item>
<item>Indonesia*62</item>
<item>ישראל *972</item>
<item>الأردن *962</item>
<item>البحرين *973</item>
<item>الجزائر *213</item>
<item>العراق *964</item>
<item>الكويت *965</item>
<item>المغرب *212</item>
<item>المملكة,العربية,السعودية *966</item>
<item>پاکستان *92</item>
<item>عُمان *968</item>
<item>قطر *974</item>
<item>مصر *20</item>
<item>Brasil*55</item>
<item>Colombia*57</item>
<item>Philippines*63</item>
<item>افغانستان *93</item>
<item>Shqipëri*355</item>
<item>American samoa*1684</item>
<item>Andorra*376</item>
<item>Angola*244</item>
<item>Anguilla*1264</item>
<item>Antigua and Barbuda*1268</item>
<item>Argentina*54</item>
<item>Հայաստան*374</item>
<item>Aruba*297</item>
<item>Ascension,Island*247</item>
<item>Australia*61</item>
<item>Österreich*43</item>
<item>Azərbaycan*994</item>
<item>Bahamas*1242</item>
<item>বাংলাদেশ*880</item>
<item>Barbados*1246</item>
<item>Беларусь*375</item>
<item>België*32</item>
<item>Belize*501</item>
<item>Bénin*229</item>
<item>Bermuda Is.*1441</item>
<item>Bolivia*591</item>
<item>Botswana*267</item>
<item>Brunei*673</item>
<item>България*359</item>
<item>Burkina,Faso*226</item>
<item>Myanmar*95</item>
<item>Burundi*257</item>
<item>China*86</item>
<item>Cameroon*237</item>
<item>Canada*1</item>
<item>Kabu Verdi*238</item>
<item>Cayman Islands*1345</item>
<item>Central African Republic*236</item>
<item>Chad*235</item>
<item>Chile*56</item>
<item>Congo*242</item>
<item>Jamhuri ya Kidemokrasia ya Kongo*249</item>
<item>Cook Is.*682</item>
<item>Costa Rica*506</item>
<item>Hrvatska*385</item>
<item>Cuba*53</item>
<item>Curacao*599</item>
<item>Cyprus*357</item>
<item>Czech Republic*420</item>
<item>Denmark*45</item>
<item>Djibouti*253</item>
<item>Dominica*1767</item>
<item>Dominica Rep.*1809</item>
<item>Ecuador*593</item>
<item>EI Salvador*503</item>
<item>Guinea Ecuatorial*240</item>
<item>Estonia*372</item>
<item>Ethiopia*251</item>
<item>Fiji*679</item>
<item>Finland*358</item>
<item>France*33</item>
<item>French Guiana*594</item>
<item>French Polynesia*689</item>
<item>Gabon*241</item>
<item>Gambia*220</item>
<item>Georgia*995</item>
<item>Germany*49</item>
<item>Ghana*233</item>
<item>Gibraltar*350</item>
<item>Greece*30</item>
<item>Kalaallit Nunaat*299</item>
<item>Grenada*1473</item>
<item>Guam*1671</item>
<item>Guatemala*502</item>
<item>Guinea*224</item>
<item>Guyana*592</item>
<item>Haiti*509</item>
<item>Honduras*504</item>
<item>Hungary*36</item>
<item>Iceland*354</item>
<item>ایران *98</item>
<item>Ireland*353</item>
<item>Italy*39</item>
<item>Jamaica*1876</item>
<item>Japan*81</item>
<item>កម្ពុជា*855</item>
<item>Kazakstan*327</item>
<item>Kenya*254</item>
<item>Kiribati*686</item>
<item>Korea*82</item>
<item>Kazakstan*996</item>
<item>Laos*856</item>
<item>Latvia*371</item>
<item>لبنان *961</item>
<item>Lesotho*266</item>
<item>Liberia*231</item>
<item>ليبيا *218</item>
<item>Liechtenstein*423</item>
<item>Lithuania*370</item>
<item>Luxembourg*352</item>
<item>Madagascar*261</item>
<item>Malawi*265</item>
<item>Maldives*960</item>
<item>Mali*223</item>
<item>Malta*356</item>
<item>Mauritius*230</item>
<item>Mexico*52</item>
<item>Moldova, Republic of*373</item>
<item>Monaco*377</item>
<item>Mongolia*976</item>
<item>Mozambique*258</item>
<item>Namibia*264</item>
<item>Nepal*977</item>
<item>Netherlands*31</item>
<item>New Zealand*64</item>
<item>Nicaragua*505</item>
<item>Nijar*227</item>
<item>Nigeria*234</item>
<item>Norway*47</item>
<item>Panama*507</item>
<item>Papua New Cuinea*675</item>
<item>Paraguay*595</item>
<item>Peru*51</item>
<item>Poland*48</item>
<item>Portugal*351</item>
<item>Puerto Rico*1787</item>
<item>Romania*40</item>
<item>St.Lucia*1758</item>
<item>San Marino*378</item>
<item>Sao Tome and Principe*239</item>
<item>Senegal*221</item>
<item>Seychelles*248</item>
<item>Sierra Leone*232</item>
<item>Slovakia*421</item>
<item>Slovenia*386</item>
<item>Solomon Is*677</item>
<item>Somali*252</item>
<item>South Africa*27</item>
<item>Spain*34</item>
<item>Sri Lanka*94</item>
<item>Sudan*249</item>
<item>Suriname*597</item>
<item>Swaziland*268</item>
<item>Sweden*46</item>
<item>Switzerland*41</item>
<item>Syria*963</item>
<item>Vanuatu*678</item>
<item>British Virgin Islands*1284</item>
</string-array>
</resources>

21
core/src/main/java/com/yizhuan/xchat_android_core/auth/AuthModel.java
View File

@@ -20,6 +20,7 @@ import com.netease.nimlib.sdk.msg.MsgService;
import com.orhanobut.logger.Logger;
import com.yizhuan.xchat_android_core.DemoCache;
import com.yizhuan.xchat_android_core.R;
import com.yizhuan.xchat_android_core.auth.bean.AreaInfoBean;
import com.yizhuan.xchat_android_core.auth.entity.AccountInfo;
import com.yizhuan.xchat_android_core.auth.entity.ThirdUserInfo;
import com.yizhuan.xchat_android_core.auth.entity.TicketInfo;
@@ -56,6 +57,7 @@ import com.yizhuan.xchat_android_library.utils.json.JsonUtils;
import org.greenrobot.eventbus.EventBus;
import java.util.HashMap;
import java.util.List;
import cn.sharesdk.facebook.Facebook;
import cn.sharesdk.framework.Platform;
@@ -1040,6 +1042,17 @@ public class AuthModel extends BaseModel implements IAuthModel {
.compose(RxHelper.handleSchedulers());
}
/**
* 区号
*
* @return
*/
public Single<List<AreaInfoBean>> getAreaCodeList() {
return api.getAreaCodeList()
.compose(RxHelper.handleBeanData())
.compose(RxHelper.handleSchedulers());
}
/**
* 发送验证码
*
@@ -1334,6 +1347,14 @@ public class AuthModel extends BaseModel implements IAuthModel {
@POST("phone/auth/bound")
Single<ServiceResult<String>> boundAuthCode(@Field("phoneAreaCode") String phoneAreaCode);
/**
* 获取地区码
*
* @return
*/
@GET("areaInfo/list")
Single<ServiceResult<List<AreaInfoBean>>> getAreaCodeList();
/**
* 发送验证码
*

15
core/src/main/java/com/yizhuan/xchat_android_core/auth/bean/AreaInfoBean.kt Normal file
View File

@@ -0,0 +1,15 @@
package com.yizhuan.xchat_android_core.auth.bean
import lombok.Data
@Data
class AreaInfoBean(
val id: Long = 0L,
val name: String? = null,
val abbr: String? = null,
val phoneAreaCode: String? = null,
val seq: Int = 0,
val status: Int = 0,
val createTime: Long = 0L,
val updateTime: Long = 0L
)