diff --git a/lib_country_code/src/main/java/com/sahooz/library/Country.java b/lib_country_code/src/main/java/com/sahooz/library/Country.java index a624744fb..002fb9360 100644 --- a/lib_country_code/src/main/java/com/sahooz/library/Country.java +++ b/lib_country_code/src/main/java/com/sahooz/library/Country.java @@ -22,15 +22,17 @@ import java.util.ArrayList; public class Country implements PyEntity { private static final String TAG = Country.class.getSimpleName(); public int code; - public String name, locale, pinyin; + public String name, locale, pinyin,chs,cht; public int flag; private static ArrayList countries = null; - public Country(int code, String name, String locale, int flag) { + public Country(int code, String name, String locale, int flag,String chs,String cht) { this.code = code; this.name = name; this.flag = flag; this.locale = locale; + this.chs=chs; + this.cht=cht; } @Override @@ -62,7 +64,7 @@ public class Country implements PyEntity { if(!TextUtils.isEmpty(locale)) { flag = ctx.getResources().getIdentifier("flag_" + locale.toLowerCase(), "drawable", ctx.getPackageName()); } - countries.add(new Country(jo.getInt("code"), jo.getString(key), locale, flag)); + countries.add(new Country(jo.getInt("code"), jo.getString(key), locale, flag,jo.getString("zh"),jo.getString("tw"))); } Log.i(TAG, countries.toString()); @@ -80,7 +82,7 @@ public class Country implements PyEntity { if(TextUtils.isEmpty(json)) return null; try { JSONObject jo = new JSONObject(json); - return new Country(jo.optInt("code") ,jo.optString("name"), jo.optString("locale"), jo.optInt("flag")); + return new Country(jo.optInt("code") ,jo.optString("name"), jo.optString("locale"), jo.optInt("flag"),jo.getString("zh"),jo.getString("tw")); } catch (JSONException e) { e.printStackTrace(); } diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveAnchorEditCallMeDialog.java b/live/src/main/java/com/yunbao/live/dialog/LiveAnchorEditCallMeDialog.java index db1a1bf88..8bebda8e4 100644 --- a/live/src/main/java/com/yunbao/live/dialog/LiveAnchorEditCallMeDialog.java +++ b/live/src/main/java/com/yunbao/live/dialog/LiveAnchorEditCallMeDialog.java @@ -151,7 +151,7 @@ public class LiveAnchorEditCallMeDialog extends AbsDialogPopupWindow { .setAnchorCallMe(mLiveUid, callMeModel, new HttpCallback() { @Override public void onSuccess(String data) { - ToastUtil.show(WordUtil.isZh() ? "成功" : "success"); + ToastUtil.showDebug(WordUtil.isZh() ? "成功" : "success"); } @Override 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 032abdc9d..17facc61b 100644 --- a/main/src/main/java/com/yunbao/main/activity/RegisterActivity.java +++ b/main/src/main/java/com/yunbao/main/activity/RegisterActivity.java @@ -194,10 +194,9 @@ public class RegisterActivity extends AbsActivity { //String ct = Locale.getDefault().getCountry(); String ct = IMLoginManager.get(mContext).getString("sys_user_area"); - ToastUtil.show("地区:"+ct); - ct = TextUtils.equals("CN", ct) ? "HK" : ct; + ct = TextUtils.equals("中国", ct) ? "HK" : ct; for (int i = 0; i < allCountries.size(); i++) { - if (allCountries.get(i).locale.equals(ct)) { + if (allCountries.get(i).chs.equals(ct)) { String countryName = allCountries.get(i).name; countryName = countryName.length() > 4 ? countryName.substring(0, 4) : countryName; mTvCountryCode.setText("+" + allCountries.get(i).code + " " + countryName);