双语言修复

.idea/misc.xml

@@ -4,6 +4,7 @@
     <option name="filePathToZoomLevelMap">
       <map>
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/BaseLibrary/src/main/res/drawable/dingdian_seekbar_progress_drawable.xml" value="0.155" />
+        <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/BaseLibrary/src/main/res/drawable/selector_btn_gray_orange.xml" value="0.165" />
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/BaseLibrary/src/main/res/drawable/selector_language_bg.xml" value="0.1595" />
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/BaseLibrary/src/main/res/drawable/shape_btn_back.xml" value="0.141" />
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/BaseLibrary/src/main/res/drawable/shape_btn_login.xml" value="0.155" />
@@ -55,7 +56,7 @@
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/fragment_price.xml" value="0.2" />
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/fragment_service.xml" value="0.2484375" />
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/fragment_switch.xml" value="0.264" />
-        <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/fragment_technology_support.xml" value="0.176" />
+        <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/fragment_technology_support.xml" value="0.536" />
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/fragment_warnings.xml" value="0.24947916666666667" />
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/item_alarm_clock.xml" value="0.2" />
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/item_price.xml" value="0.264" />

BaseLibrary/src/main/java/com/hboxs/base_library/util/LanguageUtil.java

@@ -33,7 +33,8 @@ public class LanguageUtil {
             "ro", "no", "pt", "sv", "sk", "hu",
             "it", "ab", "ko", "pl", "uk", "hy",
             "ar", "th", "sq", "ka", "aa", "ba",
-            "tr", "lv", "ak", "et", "mn", "am", "kk"};
+            "tr", "lv", "ak", "et", "mn", "am", "kk",
+            "ms","lt"};
     public static final String CHINESE = language[0]; //中文
     public static final String ENGLISH = language[1]; //英文
     public static final String GERMAN = language[2]; //德语
@@ -45,7 +46,7 @@ public class LanguageUtil {
 //    public static final String DanMai = language[8];//丹麦
 //    public static final String FenLan = language[9];//芬兰
 //    public static final String HeLan = language[10];//荷兰
-//    public static final String JieKe = language[11];//捷克
+    public static final String JieKe = language[11];//捷克
     public static final String RouMaNiYa = language[12];//罗马尼亚
 //    public static final String NuoWei = language[13];//挪威
 //    public static final String PuTaoYa = language[14];//葡萄牙
@@ -72,6 +73,8 @@ public class LanguageUtil {
 //    public static final String mgy = language[34];//蒙古
 //    public static final String bosiyu = language[35];//波斯语
 //    public static final String hasakesitan = language[36];//哈萨克斯坦
+    public static final String malai = language[37];//马来西亚，马来语
+    public static final String litaowan = language[38];//立陶宛
 
 
     public static final String[] LANGUAGE_TEXT = {
@@ -88,26 +91,32 @@ public class LanguageUtil {
             "Românesc", "Norsk språk", "Português", "Svenska", "Slovenského", "Magyar",
             "Lingua italiana", "繁體中文", "한국어", "Polska", "Ukrainian", "Հայաստան",
             "عرب", "ไทย", "יִשׂרְאֵלִי", "Brazil", "საქართველოს", "Brazil",
-            "turkey", "Latvija", "Portugal", "Eesti", "Монгол", "فارسی", "қазақ"
+            "turkey", "Latvija", "Portugal", "Eesti", "Монгол", "فارسی", "қазақ","Melayu","lietuvių"
     };
 
     //第二语言：后台显示
     public static final String[] LANGUAGE2 = {
-            "请选择第二语言", "中文", "English(英语)", "Español(西班牙语)", "(阿拉伯语)عرب", "Français(法语)",
-            "Deutsch(德语)", "русский(俄语)", "日本語(日语)",
-            "България(保加利亚语)", "Dansk(丹麦语)", "Suomalainen(芬兰语)", "Nederlands(荷兰语)", "Česky(捷克语)",
-            "Românesc(罗马尼亚语)", "Norsk språk(挪威语)", "Português(葡萄牙语)", "Svenska(瑞典语)", "Slovenského(斯洛伐克语)", "Magyar(匈牙利语)",
-            "Lingua italiana(意大利语)", "繁體中文", "한국어(韩语)", "Polska(波兰语)", "Ukrainian(乌克兰语)", "Հայաստան(亚美尼亚语)",
-            "ไทย(泰语)", "(希伯来语)יִשׂרְאֵלִי", "Brazil-2DHR(巴西语)", "საქართველოს(格鲁吉亚语)", "Brazil-3(巴西语)", "turkey(土耳其语)", "Latvija(拉脱维亚语)", "Portugal-RA(葡萄牙语)", "Монгол(蒙古语)", "فارسی(波斯语)", "қазақ(哈萨克语)"
+            "请选择第二语言",
+            "中文", "English(英语)", "Español(西班牙语)", "(阿拉伯语)عرب", "Français(法语)",
+            "Deutsch(德语)", "русский(俄语)", "日本語(日语)", "България(保加利亚语)", "Dansk(丹麦语)",
+            "Suomalainen(芬兰语)", "Nederlands(荷兰语)", "Česky(捷克语)", "Românesc(罗马尼亚语)", "Norsk språk(挪威语)",
+            "Português(葡萄牙语)", "Svenska(瑞典语)", "Slovenského(斯洛伐克语)", "Magyar(匈牙利语)", "Lingua italiana(意大利语)",
+            "繁體中文", "한국어(韩语)", "Polska(波兰语)", "Ukrainian(乌克兰语)", "Հայաստան(亚美尼亚语)",
+            "ไทย(泰语)", "(希伯来语)יִשׂרְאֵלִי", "Brazil-2DHR(巴西语)", "საქართველოს(格鲁吉亚语)", "Brazil-3(巴西语)",
+            "turkey(土耳其语)", "Latvija(拉脱维亚语)", "Portugal-RA(葡萄牙语)", "Монгол(蒙古语)","eesti keel(爱沙尼亚语)", "فارسی(波斯语)",
+            "қазақ(哈萨克语)", "Melayu(马来语)","lietuvių(立陶宛语)"
     };
     //第二语言：前台显示
     public static final String[] LANGUAGE3 = {
-            "请选择第二语言", "中文", "English", "Español", "عرب", "Français",
-            "Deutsch", "русский", "日本語",
-            "България", "Dansk", "Suomalainen", "Nederlands", "Česky",
-            "Românesc", "Norsk språk", "Português", "Svenska", "Slovenského", "Magyar",
-            "Lingua italiana", "繁體中文", "한국어", "Polska", "Ukrainian", "Հայաստան",
-            "ไทย", "יִשׂרְאֵלִי", "Brazil-2DHR", "საქართველოს", "Brazil-3", "turkey", "Latvija", "Portugal-RA", "Eesti", "Монгол", "فارسی", "қазақ"
+            "请选择第二语言",
+            "中文", "English", "Español", "عرب", "Français",
+            "Deutsch", "русский", "日本語", "България", "Dansk",
+            "Suomalainen", "Nederlands", "Česky", "Românesc", "Norsk språk",
+            "Português", "Svenska", "Slovenského", "Magyar", "Lingua italiana",
+            "繁體中文", "한국어", "Polska", "Ukrainian", "Հայաստան",
+            "ไทย", "יִשׂרְאֵלִי", "Brazil-2DHR", "საქართველოს", "Brazil-3",
+            "turkey", "Latvija", "Portugal-RA", "Монгол", "eesti keel","فارسی",
+            "қазақ", "Melayu","lietuvių"
     };
 
     public static void setLanguage() {
@@ -137,7 +146,7 @@ public class LanguageUtil {
         } else if (languageType == 11) {
 //            changeAppLanguage(LanguageUtil.HeLan);
         } else if (languageType == 12) {
-//            changeAppLanguage(LanguageUtil.JieKe);
+            changeAppLanguage(LanguageUtil.JieKe);
         } else if (languageType == 13) {
             changeAppLanguage(LanguageUtil.RouMaNiYa);
         } else if (languageType == 14) {
@@ -188,6 +197,10 @@ public class LanguageUtil {
 //            changeAppLanguage(LanguageUtil.bosiyu);
         } else if (languageType == 37) {
 //            changeAppLanguage(LanguageUtil.hasakesitan);
+        }else if (languageType == 38) {
+            changeAppLanguage(LanguageUtil.malai);
+        }else if (languageType == 39) {
+            changeAppLanguage(LanguageUtil.litaowan);
         } else {
             changeAppLanguage(LanguageUtil.CHINESE);
             SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 1);

BaseLibrary/src/main/res/values-it/strings.xml

@@ -1087,6 +1087,6 @@
     <string name="inside_cabinet_high_heat">Temperatura ultra elevata all\'interno dell\'armadio</string>
     <string name="generator_work_temp">Temperatura di lavoro del generatore</string>
     <string name="generator_standby_temp">Temperatura di standby del generatore</string>
-
+    <string name="choose_language_type">Seleziona il tipo di valuta</string>
 </resources>
 <!--意大利-->

BaseLibrary/src/main/res/values-ms/strings.xml

@@ -17,6 +17,8 @@
     <string name="have_update_content1">Versi baharu ditemui v</string>
     <string name="hibernation">Teks Cina hibernasi tersuai</string>
     <string name="please_coin">Sila lengkapkan peletakan syiling dalam masa yang terhad dan ia akan dikosongkan secara automatik selepas kira detik</string>
-
+    <string name="automatically_upload_orders">Muat naik pesanan secara automatik</string>
+    <string name="language_2">Pilihan bahasa kedua:</string>
+    <string name="choose_language_type">Sila pilih jenis mata wang</string>
 </resources>
 <!--马来语-->

app/src/main/java/com/bgy/autosale/ui/consumer/IceCreamFragment.java

@@ -259,110 +259,8 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
         tvArab.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                switch (languageNumber) {
-                    case 1:
-                        SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 0);
-                        break;
-                    case 2:
-                        SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 2);
-                        break;
-                    case 3:
-                        SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 6);
-                        break;
-                    case 4:
-                        SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 25);
-                        break;
-                    case 5:
-                        SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 7);//法语
-                        break;
-                    case 6:
-                        SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 3);
-                        break;
-                    case 7:
-                        SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 4);
-                        break;
-                    case 8:
-                        SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 5);
-                        break;
-                    case 9:
-                        SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 8);
-                        break;
-                    case 10:
-                        SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 9);
-                        break;
-                    case 11:
-                        SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 10);
-                        break;
-                    case 12:
-                        SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 11);
-                        break;
-                    case 13:
-                        SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 12);
-                        break;
-                    case 14:
-                        SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 13);
-                        break;
-                    case 15:
-                        SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 14);
-                        break;
-                    case 16:
-                        SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 15);
-                        break;
-                    case 17:
-                        SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 16);
-                        break;
-                    case 18:
-                        SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 17);
-                        break;
-                    case 19:
-                        SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 18);
-                        break;
-                    case 20:
-                        SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 19);
-                        break;
-                    case 21:
-                        SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 20);
-                        break;
-                    case 22:
-                        SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 21);
-                        break;
-                    case 23:
-                        SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 22);
-                        break;
-                    case 24:
-                        SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 23);
-                        break;
-                    case 25:
-                        SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 24);
-                        break;
-
-                    case 26:
-                        SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 26);
-                        break;
-                    case 27:
-                        SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 27);
-                        break;
-                    case 28:
-                        SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 28);
-                        break;
-                    case 29:
-                        SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 29);
-                        break;
-                    case 30:
-                        SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 30);
-                        break;
-                    case 31:
-                        SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 31);
-                        break;
-                    case 32:
-                        SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 32);
-                        break;
-                }
-                Log.d(TAG, "onClick1: "+languageNumber);
+                setlanguege(languageNumber);
                 LanguageUtil.setLanguage();
-//                Intent intent = getActivity().getIntent(); // 获取当前 Activity 的 Intent
-//                getActivity().finish(); // 结束当前 Activity
-//                startActivity(intent); // 重新启动当前 Activity
                 showToast(getString(R.string.modified_success));
                 exit();
             }
@@ -2284,4 +2182,127 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
         String sd = sdf.format(new Date(Long.parseLong(String.valueOf(System.currentTimeMillis()))));
         return sd;
     }
+
+    private void setlanguege(int languageNumber) {
+        switch (languageNumber) {
+            case 1://中文
+                SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 1);
+                break;
+            case 2://英文
+                SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 2);
+                break;
+            case 3://西班牙
+                SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 6);
+                break;
+            case 4://阿拉伯
+                SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 25);
+                break;
+            case 5://法语
+                SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 7);//法语
+                break;
+            case 6://德语
+                SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 3);
+                break;
+            case 7://俄语
+                SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 4);
+                break;
+            case 8://日语
+                SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 5);
+                break;
+            case 9://保加利亚
+                SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 8);
+                break;
+            case 10://丹麦
+                SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 9);
+                break;
+            case 11://芬兰
+                SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 10);
+                break;
+            case 12://荷兰
+                SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 11);
+                break;
+            case 13://捷克
+                SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 12);
+                break;
+            case 14://罗马尼亚
+                SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 13);
+                break;
+            case 15://挪威
+                SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 14);
+                break;
+            case 16://葡萄牙
+                SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 15);
+                break;
+            case 17://瑞士
+                SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 16);
+                break;
+            case 18://斯洛伐克
+                SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 17);
+                break;
+            case 19://匈牙利
+                SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 18);
+                break;
+            case 20://意大利
+                SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 19);
+                break;
+            case 21://繁体
+                SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 20);
+                break;
+            case 22://韩语
+                SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 21);
+                break;
+            case 23://波兰
+                SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 22);
+                break;
+            case 24://乌克兰
+                SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 23);
+                break;
+            case 25://亚美尼亚
+                SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 24);
+                break;
+            case 26://泰语
+                SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 26);
+                break;
+            case 27://希伯来
+                SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 27);
+                break;
+            case 28://巴西
+                SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 28);
+                break;
+            case 29://格鲁吉亚
+                SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 29);
+                break;
+            case 30://巴西
+                SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 30);
+                break;
+            case 31://土耳其
+                SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 31);
+                break;
+            case 32://拉脱维亚
+                SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 32);
+                break;
+            case 33://葡萄牙
+                SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 33);
+                break;
+            case 34://爱沙尼亚
+                SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 34);
+                break;
+            case 35://蒙古
+                SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 35);
+                break;
+            case 36://波斯语
+                SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 36);
+                break;
+            case 37://哈萨克
+                SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 37);
+                break;
+            case 38://马来
+                SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 38);
+                break;
+            case 39://立陶宛
+                SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 39);
+                break;
+        }
+    }
+
 }

app/src/main/java/com/bgy/autosale/ui/operator/LanguageActivity.java

@@ -230,11 +230,8 @@ public class LanguageActivity extends StaticActivity implements View.OnClickList
 //            languageType = 11;
 //            languageValue = LanguageUtil.HeLan;
         } else if (checkedId == R.id.rb_jieke) {
-            showToast("未有此翻译,请联系添加。");
-            finish();
-            return;
-//            languageType = 12;
-//            languageValue = LanguageUtil.JieKe;
+            languageType = 12;
+            languageValue = LanguageUtil.JieKe;
         } else if (checkedId == R.id.rb_luomaniya) {
             languageType = 13;
             languageValue = LanguageUtil.RouMaNiYa;
@@ -364,6 +361,12 @@ public class LanguageActivity extends StaticActivity implements View.OnClickList
             return;
 //            languageType = 37;
 //            languageValue = LanguageUtil.hasakesitan;
+        } else if (checkedId == R.id.rb_mlxy) {
+            languageType = 38;
+            languageValue = LanguageUtil.malai;
+        }  else if (checkedId == R.id.rb_ltw) {
+            languageType = 39;
+            languageValue = LanguageUtil.litaowan;
         } else {
             languageType = 1;
             languageValue = LanguageUtil.CHINESE;
@@ -481,6 +484,8 @@ public class LanguageActivity extends StaticActivity implements View.OnClickList
             binding.rbBsy.setChecked(true);
         } else if (languageType == 37) {
             binding.rbHsky.setChecked(true);
+        } else if (languageType == 38) {
+            binding.rbMlxy.setChecked(true);
         }
     }
 

app/src/main/res/layout/activity_language.xml

@@ -473,7 +473,7 @@
                     android:gravity="center"
                     android:text="فارسی(波斯语)"
                     android:textSize="@dimen/dp_12" />
-               <RadioButton
+                <RadioButton
                     android:background="@drawable/selector_language_bg"
                     android:id="@+id/rb_hsky"
                     android:layout_width="@dimen/dp_68"
@@ -484,6 +484,30 @@
                     android:gravity="center"
                     android:text="қазақ(哈萨克语)"
                     android:textSize="@dimen/dp_12" />
+                <RadioButton
+                    android:background="@drawable/selector_language_bg"
+                    android:id="@+id/rb_mlxy"
+                    android:layout_width="@dimen/dp_68"
+                    android:layout_height="@dimen/dp_84"
+                    android:layout_marginLeft="@dimen/dp_18"
+                    android:layout_marginBottom="@dimen/dp_10"
+                    android:button="@null"
+                    android:gravity="center"
+                    android:text="Melayu(马来语)"
+                    android:textSize="@dimen/dp_12" />
+
+                <RadioButton
+                    android:background="@drawable/selector_language_bg"
+                    android:id="@+id/rb_ltw"
+                    android:layout_width="@dimen/dp_68"
+                    android:layout_height="@dimen/dp_84"
+                    android:layout_marginLeft="@dimen/dp_18"
+                    android:layout_marginBottom="@dimen/dp_10"
+                    android:button="@null"
+                    android:gravity="center"
+                    android:text="lietuvių(立陶宛语)"
+                    android:textSize="@dimen/dp_12" />
+
             </com.bgy.autosale.utils.FlowRadioGroup>
         </ScrollView>
 

config.gradle

@@ -5,7 +5,7 @@ ext {
             "minSdkVersion"                : 19,
             "targetSdkVersion"             : 28,
             "versionCode"                  : 110,
-            "versionName"                  : "1.0.40",//版本号修改
+            "versionName"                  : "1.0.42",//版本号修改
 
             "androidSupport"               : "28.0.0",
             "constraint-layout"            : "1.1.3",