添加安卓新标准目录

Author: yizhaorong

src/main/java/org/yzr/poi/controller/SettingController.java

@@ -34,6 +34,8 @@ public class SettingController extends VBox {
 
     @FXML private CheckBox fixAndroidIdLanguage;
 
+    @FXML private CheckBox useNewAndroid;
+
     @FXML private CheckBox useDefault;
 
     @FXML private TextField defaultValue;
@@ -61,11 +63,6 @@ public void init() {
 
         closeButton.setImage("/images/close_normal.png", ButtonState.Normal);
 
-//        ignoreChinese.setOnAction(event -> {
-//            PropertiesManager.setProperty(Constant.IGNORE_CHINESE, ignoreChinese.isSelected() ? Constant.TRUE : Constant.FALSE);
-//        });
-//        ignoreChinese.setSelected(new Boolean(PropertiesManager.getProperty(Constant.IGNORE_CHINESE)));
-
         ignoreAndroidEnglish.setOnAction(event -> {
             PropertiesManager.setProperty(Constant.IGNORE_ENGLISH_SUFFIX, ignoreAndroidEnglish.isSelected() ? Constant.TRUE : Constant.FALSE);
         });
@@ -76,27 +73,15 @@ public void init() {
         });
         fixAndroidIdLanguage.setSelected(new Boolean(PropertiesManager.getProperty(Constant.FIX_ID_LANGUAGE)));
 
+        useNewAndroid.setOnAction(event -> {
+            PropertiesManager.setProperty(Constant.USE_NEW_ANDROID, useNewAndroid.isSelected() ? Constant.TRUE : Constant.FALSE);
+        });
+        useNewAndroid.setSelected(new Boolean(PropertiesManager.getProperty(Constant.USE_NEW_ANDROID)));
+
         useDefault.setOnAction(event -> {
             PropertiesManager.setProperty(Constant.USE_DEFAULT_VALUE, useDefault.isSelected() ? Constant.TRUE : Constant.FALSE);
-//            defaultValue.setDisable(!useDefault.isSelected());
         });
         useDefault.setSelected(new Boolean(PropertiesManager.getProperty(Constant.USE_DEFAULT_VALUE)));
-
-//        defaultValue.setDisable(!useDefault.isSelected());
-//        defaultValue.setText(PropertiesManager.getProperty(Constant.DEFAULT_VALUE));
-//        defaultValue.focusedProperty().addListener(new ChangeListener<Boolean>() {
-//            @Override
-//            public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
-//                if (!newValue) {
-//                    String text = defaultValue.getText();
-//                    if (text.trim().length() < 1) {
-//                        text = "##我是没有翻译的##";
-//                    }
-//                    PropertiesManager.setProperty(Constant.DEFAULT_VALUE, text);
-//                }
-//            }
-//        });
-
     }
 
     @FXML

src/main/java/org/yzr/poi/utils/Constant.java

@@ -24,6 +24,7 @@ public class Constant {
     public static final String IGNORE_ENGLISH_SUFFIX = "ignoreEnglishSuffix";
     public static final String IGNORE_CHINESE = "ignoreChinese";
     public static final String FIX_ID_LANGUAGE = "fixIdLanguage";
+    public static final String USE_NEW_ANDROID = "useNewAndroid";
 
     public static final String IOS_SWITCH = "iOSOpen";
     public static final String ANDROID_SWITCH = "AndroidOpen";

src/main/java/org/yzr/poi/utils/ExcelUtils.java

@@ -358,9 +358,14 @@ private static void createLocalizeFile(String language, String code, List<Locali
                     }
                 }
 
+                Boolean useNewAndroid = new Boolean(PropertiesManager.getProperty(Constant.USE_NEW_ANDROID));
                 String values = "values-";
                 if (language.length() < 1) {
                     values = "values";
+                } else {
+                    if (useNewAndroid) {
+                        values = "values" + File.separator + "values-b-";
+                    }
                 }
                 filePath = basePath + values + language + File.separator + PropertiesManager.getProperty(code+"FileName");
 

src/main/resources/config/config.properties

@@ -14,6 +14,7 @@ JAVAFileName = i18n_
 ignoreEnglishSuffix = true
 ignoreChinese = true
 fixIdLanguage = true
+useNewAndroid = true
 
 useDefaultValue = true
 defaultValue = ##NO VALUE##

src/main/resources/layout/setting_stage.fxml

@@ -30,7 +30,8 @@
             <!--<CheckBox fx:id="ignoreChinese" layoutX="10" layoutY="10" text="忽略中文备注文案" />-->
             <CheckBox fx:id="ignoreAndroidEnglish" layoutX="10" layoutY="10" text="忽略Android英文文件夹后缀" />
             <CheckBox fx:id="fixAndroidIdLanguage" layoutX="10" layoutY="35" text="修复Android印尼语key" />
-            <CheckBox fx:id="useDefault" layoutX="10" layoutY="60" text="缺失文案填充默认值" />
+            <CheckBox fx:id="useNewAndroid" layoutX="10" layoutY="60" text="使用安卓新标准" />
+            <CheckBox fx:id="useDefault" layoutX="10" layoutY="85" text="缺失文案填充默认值" />
             <!--<Label layoutX="10" layoutY="90.0" prefWidth="60" text="默认文案:" />-->
             <!--<TextField fx:id="defaultValue" layoutX="70.0" layoutY="85.0" />-->
         </Pane>