Commit c883149d by 郭倩芳

widget_v1.3.0

parent 4530a62b
...@@ -12,7 +12,7 @@ task androidSourcesJar(type: Jar) { ...@@ -12,7 +12,7 @@ task androidSourcesJar(type: Jar) {
ext { ext {
PUBLISH_GROUP_ID = "com.sobot.library" //项目包名 PUBLISH_GROUP_ID = "com.sobot.library" //项目包名
PUBLISH_ARTIFACT_ID = 'widget_x' //项目名 PUBLISH_ARTIFACT_ID = 'widget_x' //项目名
PUBLISH_VERSION = '1.2.9' //版本号 PUBLISH_VERSION = '1.3.0' //版本号
} }
......
...@@ -179,7 +179,13 @@ public abstract class SobotBaseActivity extends FragmentActivity { ...@@ -179,7 +179,13 @@ public abstract class SobotBaseActivity extends FragmentActivity {
public void changeAppLanguage() { public void changeAppLanguage() {
try { try {
Locale locale = (Locale) SobotSharedPreferencesUtil.getInstance(getSobotBaseActivity()).get("SobotLanguage", Locale.class); String lang =SobotSharedPreferencesUtil.getInstance(getSobotBaseContext()).get("SobotLanguageStr","");
Locale locale;
if (lang.equals("zh-Hant")) {
locale = new Locale("zh", "TW");
} else {
locale = new Locale(lang);
}
if (locale == null) { if (locale == null) {
//获取系统语言 //获取系统语言
locale = getSysPreferredLocale(); locale = getSysPreferredLocale();
...@@ -271,7 +277,6 @@ public abstract class SobotBaseActivity extends FragmentActivity { ...@@ -271,7 +277,6 @@ public abstract class SobotBaseActivity extends FragmentActivity {
protected TextView getRightMenu() { protected TextView getRightMenu() {
return findViewById(getResId("sobot_tv_right")); return findViewById(getResId("sobot_tv_right"));
} }
protected ImageView getRightIcon() { protected ImageView getRightIcon() {
return findViewById(getResId("call_icon")); return findViewById(getResId("call_icon"));
} }
...@@ -636,7 +641,6 @@ public abstract class SobotBaseActivity extends FragmentActivity { ...@@ -636,7 +641,6 @@ public abstract class SobotBaseActivity extends FragmentActivity {
intent.putExtra("selectType", selectType); intent.putExtra("selectType", selectType);
startActivityForResult(intent, SobotBaseConstant.REQUEST_CODE_PICTURE); startActivityForResult(intent, SobotBaseConstant.REQUEST_CODE_PICTURE);
} }
/** /**
* 检查存储权限 * 检查存储权限
* *
......
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