diff --git a/common/src/main/res/values-en/strings.xml b/common/src/main/res/values-en/strings.xml index 2bcde64f0..4b0d7b828 100644 --- a/common/src/main/res/values-en/strings.xml +++ b/common/src/main/res/values-en/strings.xml @@ -1002,4 +1002,5 @@ Limited ride And limited avatar frame There is no choice, the anchor is not turned on FHD live. There is no choice, the anchor is not turned on HD live. Sorry, this feature is on hold. + phone diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index f3b7113f3..bcfe413f2 100644 --- a/common/src/main/res/values/strings.xml +++ b/common/src/main/res/values/strings.xml @@ -1022,4 +1022,5 @@ 無法選擇,該主播未開啟超高清直播。 無法選擇,該主播未開啟高清直播。 抱歉,該功能暫停使用中。 + 手機號 diff --git a/main/src/main/java/com/yunbao/main/activity/RegisterActivity.java b/main/src/main/java/com/yunbao/main/activity/RegisterActivity.java index 916ace264..a56ccfc9f 100644 --- a/main/src/main/java/com/yunbao/main/activity/RegisterActivity.java +++ b/main/src/main/java/com/yunbao/main/activity/RegisterActivity.java @@ -190,9 +190,12 @@ public class RegisterActivity extends AbsActivity { allCountries.addAll(Country.getAll(mContext, null)); String ct = Locale.getDefault().getCountry(); + ct = TextUtils.equals("CN", ct) ? "HK" : ct; for (int i = 0; i < allCountries.size(); i++) { if (allCountries.get(i).locale.equals(ct)) { - mTvCountryCode.setText("+" + allCountries.get(i).code); + String countryName = allCountries.get(i).name; + countryName = countryName.length() > 4 ? countryName.substring(0, 4) : countryName; + mTvCountryCode.setText("+" + allCountries.get(i).code + " " + countryName); mCountryCode = allCountries.get(i).code; return; } @@ -260,7 +263,9 @@ public class RegisterActivity extends AbsActivity { CountryPicker.newInstance(null, new OnPick() { @Override public void onPick(Country country) { - mTvCountryCode.setText("+" + country.code); + String countryName = country.name; + countryName = countryName.length() > 4 ? countryName.substring(0, 4) + "..." : countryName; + mTvCountryCode.setText(" +" + country.code + " " + countryName); mCountryCode = country.code; } }).show(getSupportFragmentManager(), "country"); @@ -506,7 +511,7 @@ public class RegisterActivity extends AbsActivity { new LiveRoomCheckLivePresenter(mContext, liveBean.getUid(), liveBean.getStream(), new LiveRoomCheckLivePresenter.NewActionListener() { @Override public void onLiveRoomChanged(String liveUid, String stream, int liveType, String liveTypeVal, String liveSdk) { - RouteUtil.forwardLiveAudienceActivity(liveBean, liveType, Integer.parseInt(liveSdk), Integer.parseInt(liveTypeVal)); + RouteUtil.forwardLiveAudienceActivity(liveBean, liveType, Integer.parseInt(liveSdk), Integer.parseInt(liveTypeVal)); NoviceInstructorManager.get(mContext).setFrist(false); } diff --git a/main/src/main/res/layout/activity_register.xml b/main/src/main/res/layout/activity_register.xml index fa2fc5da6..a0db7a625 100644 --- a/main/src/main/res/layout/activity_register.xml +++ b/main/src/main/res/layout/activity_register.xml @@ -96,7 +96,7 @@ android:layout_height="match_parent" android:layout_marginLeft="15dp" android:background="@null" - android:hint="@string/reg_input_phone" + android:hint="@string/phone_number" android:inputType="number" android:maxLength="11" android:textColor="@color/textColor"