From 34d785da53e10c293266d9efc087a2fadd7b7e1b Mon Sep 17 00:00:00 2001 From: wangbing Date: Sun, 9 Jun 2019 22:59:20 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81android=20zip?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../javafx/ctrl/OptionAndroidController.java | 30 - .../manger/callable/AndroidCallable.java | 187 +------ .../dbtool/javafx/po/AndroidOption.java | 3 - .../xyz/wbsite/dbtool/javafx/tool/Dialog.java | 3 - src/main/resources/fxml/androidOption.fxml | 82 ++- .../modules/Android/app/build.gradles | 51 -- .../modules/Android/app/proguard-rules.pro | 21 - .../Android/app/src/main/AndroidManifest.xml | 39 -- .../app/src/main/java/WBUIApplication.java | 201 ------- .../app/src/main/java/WBUIMainActivity.java | 40 -- .../app/src/main/java/base/BaseActivity.java | 28 - .../app/src/main/java/base/BaseFragment.java | 37 -- .../src/main/java/base/BaseSPAActivity.java | 67 --- .../src/main/java/base/BaseSPAFragment.java | 135 ----- .../java/base/BaseSPATakePhotoFragment.java | 178 ------ .../src/main/java/base/IActivityResult.java | 8 - .../base/activity/FilePickerActivity.java | 38 -- .../java/base/activity/QRcodeActivity.java | 46 -- .../base/activity/QRcodeScanActivity.java | 69 --- .../java/base/activity/TakePhotoActivity.java | 72 --- .../java/base/service/RestartService.java | 61 --- .../main/java/base/ui/WBUICustomDialog.java | 123 ----- .../src/main/java/base/ui/WBUIGridView.java | 51 -- .../src/main/java/base/ui/WBUITextView.java | 53 -- .../main/java/base/ui/WBUITipTextView.java | 41 -- .../main/java/base/ui/button/WbButton.java | 85 --- .../java/base/ui/button/WbImageButton.java | 48 -- .../base/ui/button/WbMultiToggleButton.java | 114 ---- .../java/base/ui/button/WbRadioButton.java | 64 --- .../java/base/ui/button/WbToggleButton.java | 114 ---- .../java/base/ui/dialog/ConfirmDialog.java | 70 --- .../java/base/ui/dialog/CustomDialog.java | 123 ----- .../java/base/ui/dialog/MessageDialog.java | 113 ---- .../main/java/base/ui/dialog/WBUIDialog.java | 22 - .../java/base/ui/dialog/WbConfirmDialog.java | 155 ------ .../java/base/ui/image/AnimationView.java | 168 ------ .../main/java/base/ui/image/BlurImage.java | 31 -- .../java/base/ui/image/CircleImageView.java | 158 ------ .../java/base/ui/image/RoundImageView.java | 55 -- .../base/ui/image/WBUISquareImageView.java | 55 -- .../java/base/ui/image/WbRoundImageView.java | 48 -- .../base/ui/layout/WBUIPaternalLayout.java | 515 ------------------ .../java/base/ui/layout/WBUISquareLayout.java | 90 --- .../main/java/base/ui/layout/WbViewPager.java | 104 ---- .../main/java/base/ui/list/BoundListView.java | 144 ----- .../java/base/ui/list/NoScrollListView.java | 33 -- .../java/base/ui/list/OverScrollView.java | 178 ------ .../src/main/java/base/ui/list/OverView.java | 92 ---- .../base/ui/other/LoadingProgressBar.java | 142 ----- .../main/java/base/ui/other/LoadingView.java | 114 ---- .../main/java/base/ui/other/LoadingView1.java | 113 ---- .../main/java/base/ui/other/LoadingView2.java | 63 --- .../main/java/base/ui/other/RefreshView.java | 347 ------------ .../java/base/ui/other/WBUIKeyboardView.java | 101 ---- .../main/java/base/ui/spinner/WbSpinner.java | 97 ---- .../base/ui/textview/AverageTextView.java | 59 -- .../java/base/ui/textview/TipTextView.java | 46 -- .../java/base/ui/textview/WbEditText.java | 68 --- .../java/base/ui/textview/WbTextView.java | 57 -- .../java/base/ui/textview/WbTextView1.java | 64 --- .../java/base/ui/textview/WbTextView2.java | 55 -- .../main/java/base/ui/toast/MessageToast.java | 55 -- .../main/java/base/util/AnimationUtil.java | 134 ----- .../app/src/main/java/base/util/ApkUtil.java | 191 ------- .../src/main/java/base/util/Base64Util.java | 507 ----------------- .../src/main/java/base/util/BitmapUtil.java | 135 ----- .../main/java/base/util/BluetoothUtil.java | 124 ----- .../app/src/main/java/base/util/Consant.java | 21 - .../app/src/main/java/base/util/DESUtil.java | 45 -- .../src/main/java/base/util/DataBaseUtil.java | 433 --------------- .../src/main/java/base/util/DensityUtil.java | 59 -- .../src/main/java/base/util/DialogUtil.java | 71 --- .../app/src/main/java/base/util/FastBlur.java | 217 -------- .../app/src/main/java/base/util/FileUtil.java | 112 ---- .../app/src/main/java/base/util/GPSUtil.java | 319 ----------- .../src/main/java/base/util/IdCardUtil.java | 144 ----- .../app/src/main/java/base/util/Logger.java | 104 ---- .../app/src/main/java/base/util/NetUtil.java | 85 --- .../app/src/main/java/base/util/RSAUtil.java | 156 ------ .../app/src/main/java/base/util/SPUtil.java | 166 ------ .../src/main/java/base/util/ScreenUtil.java | 106 ---- .../app/src/main/java/base/util/SizeUtil.java | 58 -- .../src/main/java/base/util/StorageUtil.java | 231 -------- .../src/main/java/base/util/StreamUtil.java | 29 - .../app/src/main/java/base/util/Tasker.java | 51 -- .../app/src/main/java/base/util/Toaster.java | 33 -- .../app/src/main/java/base/util/UriUtil.java | 154 ------ .../src/main/java/fragment/MainFragment.java | 22 - .../main/java/fragment/WebViewFragment.java | 254 --------- .../app/src/main/res/drawable/background.xml | 4 - .../main/res/layout/activity_qrcode_scan.xml | 60 -- .../app/src/main/res/layout/fragment_main.xml | 34 -- .../src/main/res/layout/fragment_webview.xml | 18 - .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin 3056 -> 0 bytes .../res/mipmap-hdpi/ic_launcher_round.png | Bin 5024 -> 0 bytes .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin 2096 -> 0 bytes .../res/mipmap-mdpi/ic_launcher_round.png | Bin 2858 -> 0 bytes .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 4569 -> 0 bytes .../res/mipmap-xhdpi/ic_launcher_round.png | Bin 7098 -> 0 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 6464 -> 0 bytes .../res/mipmap-xxhdpi/ic_launcher_round.png | Bin 10676 -> 0 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 9250 -> 0 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.png | Bin 15523 -> 0 bytes .../Android/app/src/main/res/values/attrs.xml | 7 - .../app/src/main/res/values/colors.xml | 43 -- .../app/src/main/res/values/dimens.xml | 29 - .../Android/app/src/main/res/values/ids.xml | 4 - .../app/src/main/res/values/strings.xml | 3 - .../app/src/main/res/values/styles.xml | 69 --- .../resources/modules/Android/build.gradles | 28 - .../modules/Android/settings.gradles | 1 - src/main/resources/modules/Android/wbui.zip | Bin 0 -> 2542429 bytes 112 files changed, 55 insertions(+), 9830 deletions(-) delete mode 100644 src/main/resources/modules/Android/app/build.gradles delete mode 100644 src/main/resources/modules/Android/app/proguard-rules.pro delete mode 100644 src/main/resources/modules/Android/app/src/main/AndroidManifest.xml delete mode 100644 src/main/resources/modules/Android/app/src/main/java/WBUIApplication.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/WBUIMainActivity.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/BaseActivity.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/BaseFragment.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/BaseSPAActivity.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/BaseSPAFragment.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/BaseSPATakePhotoFragment.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/IActivityResult.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/activity/FilePickerActivity.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/activity/QRcodeActivity.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/activity/QRcodeScanActivity.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/activity/TakePhotoActivity.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/service/RestartService.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/ui/WBUICustomDialog.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/ui/WBUIGridView.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/ui/WBUITextView.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/ui/WBUITipTextView.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/ui/button/WbButton.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/ui/button/WbImageButton.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/ui/button/WbMultiToggleButton.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/ui/button/WbRadioButton.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/ui/button/WbToggleButton.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/ui/dialog/ConfirmDialog.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/ui/dialog/CustomDialog.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/ui/dialog/MessageDialog.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/ui/dialog/WBUIDialog.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/ui/dialog/WbConfirmDialog.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/ui/image/AnimationView.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/ui/image/BlurImage.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/ui/image/CircleImageView.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/ui/image/RoundImageView.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/ui/image/WBUISquareImageView.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/ui/image/WbRoundImageView.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/ui/layout/WBUIPaternalLayout.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/ui/layout/WBUISquareLayout.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/ui/layout/WbViewPager.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/ui/list/BoundListView.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/ui/list/NoScrollListView.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/ui/list/OverScrollView.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/ui/list/OverView.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/ui/other/LoadingProgressBar.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/ui/other/LoadingView.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/ui/other/LoadingView1.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/ui/other/LoadingView2.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/ui/other/RefreshView.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/ui/other/WBUIKeyboardView.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/ui/spinner/WbSpinner.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/ui/textview/AverageTextView.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/ui/textview/TipTextView.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/ui/textview/WbEditText.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/ui/textview/WbTextView.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/ui/textview/WbTextView1.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/ui/textview/WbTextView2.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/ui/toast/MessageToast.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/util/AnimationUtil.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/util/ApkUtil.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/util/Base64Util.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/util/BitmapUtil.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/util/BluetoothUtil.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/util/Consant.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/util/DESUtil.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/util/DataBaseUtil.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/util/DensityUtil.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/util/DialogUtil.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/util/FastBlur.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/util/FileUtil.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/util/GPSUtil.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/util/IdCardUtil.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/util/Logger.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/util/NetUtil.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/util/RSAUtil.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/util/SPUtil.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/util/ScreenUtil.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/util/SizeUtil.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/util/StorageUtil.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/util/StreamUtil.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/util/Tasker.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/util/Toaster.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/base/util/UriUtil.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/fragment/MainFragment.java delete mode 100644 src/main/resources/modules/Android/app/src/main/java/fragment/WebViewFragment.java delete mode 100644 src/main/resources/modules/Android/app/src/main/res/drawable/background.xml delete mode 100644 src/main/resources/modules/Android/app/src/main/res/layout/activity_qrcode_scan.xml delete mode 100644 src/main/resources/modules/Android/app/src/main/res/layout/fragment_main.xml delete mode 100644 src/main/resources/modules/Android/app/src/main/res/layout/fragment_webview.xml delete mode 100644 src/main/resources/modules/Android/app/src/main/res/mipmap-hdpi/ic_launcher.png delete mode 100644 src/main/resources/modules/Android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png delete mode 100644 src/main/resources/modules/Android/app/src/main/res/mipmap-mdpi/ic_launcher.png delete mode 100644 src/main/resources/modules/Android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png delete mode 100644 src/main/resources/modules/Android/app/src/main/res/mipmap-xhdpi/ic_launcher.png delete mode 100644 src/main/resources/modules/Android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png delete mode 100644 src/main/resources/modules/Android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png delete mode 100644 src/main/resources/modules/Android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png delete mode 100644 src/main/resources/modules/Android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png delete mode 100644 src/main/resources/modules/Android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png delete mode 100644 src/main/resources/modules/Android/app/src/main/res/values/attrs.xml delete mode 100644 src/main/resources/modules/Android/app/src/main/res/values/colors.xml delete mode 100644 src/main/resources/modules/Android/app/src/main/res/values/dimens.xml delete mode 100644 src/main/resources/modules/Android/app/src/main/res/values/ids.xml delete mode 100644 src/main/resources/modules/Android/app/src/main/res/values/strings.xml delete mode 100644 src/main/resources/modules/Android/app/src/main/res/values/styles.xml delete mode 100644 src/main/resources/modules/Android/build.gradles delete mode 100644 src/main/resources/modules/Android/settings.gradles create mode 100644 src/main/resources/modules/Android/wbui.zip diff --git a/src/main/java/xyz/wbsite/dbtool/javafx/ctrl/OptionAndroidController.java b/src/main/java/xyz/wbsite/dbtool/javafx/ctrl/OptionAndroidController.java index 407dae7d..a2c0509d 100644 --- a/src/main/java/xyz/wbsite/dbtool/javafx/ctrl/OptionAndroidController.java +++ b/src/main/java/xyz/wbsite/dbtool/javafx/ctrl/OptionAndroidController.java @@ -14,12 +14,6 @@ public class OptionAndroidController { @FXML private TextField domain; @FXML - private CheckBox webview; - @FXML - private CheckBox fileselect; - @FXML - private CheckBox qrcode; - @FXML private Button ok; @FXML private Button cancel; @@ -63,28 +57,4 @@ public class OptionAndroidController { public void setDomain(TextField domain) { this.domain = domain; } - - public CheckBox getWebview() { - return webview; - } - - public void setWebview(CheckBox webview) { - this.webview = webview; - } - - public CheckBox getFileselect() { - return fileselect; - } - - public void setFileselect(CheckBox fileselect) { - this.fileselect = fileselect; - } - - public CheckBox getQrcode() { - return qrcode; - } - - public void setQrcode(CheckBox qrcode) { - this.qrcode = qrcode; - } } diff --git a/src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/AndroidCallable.java b/src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/AndroidCallable.java index f383e71f..56b3faeb 100644 --- a/src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/AndroidCallable.java +++ b/src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/AndroidCallable.java @@ -6,6 +6,7 @@ import xyz.wbsite.dbtool.javafx.manger.ProjectManager; import xyz.wbsite.dbtool.javafx.po.AbstractDBmapper; import xyz.wbsite.dbtool.javafx.po.AndroidOption; import xyz.wbsite.dbtool.javafx.tool.Tool; +import xyz.wbsite.dbtool.javafx.tool.ZipUtil; import javax.validation.constraints.NotNull; import java.io.File; @@ -30,178 +31,20 @@ public class AndroidCallable implements Callable { private AbstractDBmapper dBmapper; public Boolean call() throws Exception { - File project = new File(path, option.projectName); - if (!project.exists()) { - project.mkdirs(); - } else { - Tool.clear(project); - } - - dBmapper = ProjectManager.dBmapper; - - // 目录生成 - File app = new File(project, "app"); - app.mkdirs(); - File src = new File(app, "src"); - src.mkdirs(); - File main = new File(src, "main"); - main.mkdirs(); - File java = new File(main, "java"); - java.mkdirs(); - File res = new File(main, "res"); - res.mkdirs(); - File domain = new File(java.getAbsolutePath() + File.separator + option.domain.replaceAll("\\.", Matcher.quoteReplacement(File.separator))); - domain.mkdirs(); - File base = new File(domain, "base"); - base.mkdirs(); - File activity = new File(base, "activity"); - activity.mkdirs(); - File service = new File(base, "service"); - service.mkdirs(); - File util = new File(base, "util"); - util.mkdirs(); - File fragment = new File(domain, "fragment"); - fragment.mkdirs(); - File drawable = new File(res, "drawable"); - drawable.mkdirs(); - File layout = new File(res, "layout"); - layout.mkdirs(); - File mipmap_hdpi = new File(res, "mipmap-hdpi"); - mipmap_hdpi.mkdirs(); - File mipmap_mdpi = new File(res, "mipmap-mdpi"); - mipmap_mdpi.mkdirs(); - File mipmap_xhdpi = new File(res, "mipmap-xhdpi"); - mipmap_xhdpi.mkdirs(); - File mipmap_xxhdpi = new File(res, "mipmap-xxhdpi"); - mipmap_xxhdpi.mkdirs(); - File mipmap_xxxhdpi = new File(res, "mipmap-xxxhdpi"); - mipmap_xxxhdpi.mkdirs(); - File values = new File(res, "values"); - values.mkdirs(); - - { - Tool.outputResource("Android/build.gradles", new File(project, "build.gradle")); - Tool.outputResource("Android/settings.gradles", new File(project, "settings.gradle")); - } - - { - HashMap ctx = new HashMap(); - ctx.put("package", option.packages); - ctx.put("qrcode", option.qrcode); - ctx.put("fileselect", option.fileselect); - freeMarkerManager.outputTemp(new File(app, "build.gradle"), "Android/app/build.gradles", ctx); - Tool.outputResource("Android/app/proguard-rules.pro", new File(app, "proguard-rules.pro")); - } - - { - HashMap ctx = new HashMap(); - ctx.put("package", option.packages); - ctx.put("domain", option.domain); - ctx.put("qrcode", option.qrcode); - ctx.put("fileselect", option.fileselect); - freeMarkerManager.outputTemp(new File(main, "AndroidManifest.xml"), "Android/app/src/main/AndroidManifest.xml", ctx); - } - - { - HashMap ctx = new HashMap(); - ctx.put("package", option.packages); - ctx.put("domain", option.domain); - freeMarkerManager.outputTemp(new File(base, "BaseActivity.java"), "Android/app/src/main/java/base/BaseActivity.java", ctx); - freeMarkerManager.outputTemp(new File(base, "BaseFragment.java"), "Android/app/src/main/java/base/BaseFragment.java", ctx); - freeMarkerManager.outputTemp(new File(base, "BaseSPAActivity.java"), "Android/app/src/main/java/base/BaseSPAActivity.java", ctx); - freeMarkerManager.outputTemp(new File(base, "BaseSPAFragment.java"), "Android/app/src/main/java/base/BaseSPAFragment.java", ctx); - freeMarkerManager.outputTemp(new File(base, "BaseSPATakePhotoFragment.java"), "Android/app/src/main/java/base/BaseSPATakePhotoFragment.java", ctx); - freeMarkerManager.outputTemp(new File(base, "IActivityResult.java"), "Android/app/src/main/java/base/IActivityResult.java", ctx); - - freeMarkerManager.outputTemp(new File(activity, "TakePhotoActivity.java"), "Android/app/src/main/java/base/activity/TakePhotoActivity.java", ctx); - if (option.fileselect) { - freeMarkerManager.outputTemp(new File(activity, "FilePickerActivity.java"), "Android/app/src/main/java/base/activity/FilePickerActivity.java", ctx); - } - if (option.qrcode) { - freeMarkerManager.outputTemp(new File(activity, "QRcodeActivity.java"), "Android/app/src/main/java/base/activity/QRcodeActivity.java", ctx); - freeMarkerManager.outputTemp(new File(activity, "QRcodeScanActivity.java"), "Android/app/src/main/java/base/activity/QRcodeScanActivity.java", ctx); - } - - freeMarkerManager.outputTemp(new File(service, "RestartService.java"), "Android/app/src/main/java/base/service/RestartService.java", ctx); - - freeMarkerManager.outputTemp(new File(util, "AnimationUtil.java"), "Android/app/src/main/java/base/util/AnimationUtil.java", ctx); - freeMarkerManager.outputTemp(new File(util, "ApkUtil.java"), "Android/app/src/main/java/base/util/ApkUtil.java", ctx); - freeMarkerManager.outputTemp(new File(util, "Base64Util.java"), "Android/app/src/main/java/base/util/Base64Util.java", ctx); - freeMarkerManager.outputTemp(new File(util, "BitmapUtil.java"), "Android/app/src/main/java/base/util/BitmapUtil.java", ctx); - freeMarkerManager.outputTemp(new File(util, "BluetoothUtil.java"), "Android/app/src/main/java/base/util/BluetoothUtil.java", ctx); - freeMarkerManager.outputTemp(new File(util, "Consant.java"), "Android/app/src/main/java/base/util/Consant.java", ctx); - freeMarkerManager.outputTemp(new File(util, "DataBaseUtil.java"), "Android/app/src/main/java/base/util/DataBaseUtil.java", ctx); - freeMarkerManager.outputTemp(new File(util, "DensityUtil.java"), "Android/app/src/main/java/base/util/DensityUtil.java", ctx); - freeMarkerManager.outputTemp(new File(util, "DESUtil.java"), "Android/app/src/main/java/base/util/DESUtil.java", ctx); - freeMarkerManager.outputTemp(new File(util, "DialogUtil.java"), "Android/app/src/main/java/base/util/DialogUtil.java", ctx); - freeMarkerManager.outputTemp(new File(util, "FastBlur.java"), "Android/app/src/main/java/base/util/FastBlur.java", ctx); - freeMarkerManager.outputTemp(new File(util, "FileUtil.java"), "Android/app/src/main/java/base/util/FileUtil.java", ctx); - freeMarkerManager.outputTemp(new File(util, "GPSUtil.java"), "Android/app/src/main/java/base/util/GPSUtil.java", ctx); - freeMarkerManager.outputTemp(new File(util, "IdCardUtil.java"), "Android/app/src/main/java/base/util/IdCardUtil.java", ctx); - freeMarkerManager.outputTemp(new File(util, "Logger.java"), "Android/app/src/main/java/base/util/Logger.java", ctx); - freeMarkerManager.outputTemp(new File(util, "NetUtil.java"), "Android/app/src/main/java/base/util/NetUtil.java", ctx); - freeMarkerManager.outputTemp(new File(util, "RSAUtil.java"), "Android/app/src/main/java/base/util/RSAUtil.java", ctx); - freeMarkerManager.outputTemp(new File(util, "SizeUtil.java"), "Android/app/src/main/java/base/util/SizeUtil.java", ctx); - freeMarkerManager.outputTemp(new File(util, "SPUtil.java"), "Android/app/src/main/java/base/util/SPUtil.java", ctx); - freeMarkerManager.outputTemp(new File(util, "StorageUtil.java"), "Android/app/src/main/java/base/util/StorageUtil.java", ctx); - freeMarkerManager.outputTemp(new File(util, "StreamUtil.java"), "Android/app/src/main/java/base/util/StreamUtil.java", ctx); - freeMarkerManager.outputTemp(new File(util, "Tasker.java"), "Android/app/src/main/java/base/util/Tasker.java", ctx); - freeMarkerManager.outputTemp(new File(util, "Toaster.java"), "Android/app/src/main/java/base/util/Toaster.java", ctx); - freeMarkerManager.outputTemp(new File(util, "UriUtil.java"), "Android/app/src/main/java/base/util/UriUtil.java", ctx); - } - - { - HashMap ctx = new HashMap(); - ctx.put("package", option.packages); - ctx.put("domain", option.domain); - ctx.put("webview", option.webview); - freeMarkerManager.outputTemp(new File(domain, "WBUIApplication.java"), "Android/app/src/main/java/WBUIApplication.java", ctx); - freeMarkerManager.outputTemp(new File(domain, "WBUIMainActivity.java"), "Android/app/src/main/java/WBUIMainActivity.java", ctx); - } - - { - HashMap ctx = new HashMap(); - ctx.put("package", option.packages); - ctx.put("domain", option.domain); - if (option.webview) { - freeMarkerManager.outputTemp(new File(fragment, "WebViewFragment.java"), "Android/app/src/main/java/fragment/WebViewFragment.java", ctx); - } else { - freeMarkerManager.outputTemp(new File(fragment, "MainFragment.java"), "Android/app/src/main/java/fragment/MainFragment.java", ctx); - } - } - - { - Tool.outputResource("Android/app/src/main/res/drawable/background.xml", new File(drawable, "background.xml")); - - if (option.qrcode) { - Tool.outputResource("Android/app/src/main/res/layout/activity_qrcode_scan.xml", new File(layout, "activity_qrcode_scan.xml")); - } - if (option.webview) { - Tool.outputResource("Android/app/src/main/res/layout/fragment_webview.xml", new File(layout, "fragment_webview.xml")); - } else { - Tool.outputResource("Android/app/src/main/res/layout/fragment_main.xml", new File(layout, "fragment_main.xml")); - } - - Tool.outputResource("Android/app/src/main/res/mipmap-mdpi/ic_launcher.png", new File(mipmap_mdpi, "ic_launcher.png")); - Tool.outputResource("Android/app/src/main/res/mipmap-mdpi/ic_launcher.png", new File(mipmap_mdpi, "ic_launcher_round.png")); - Tool.outputResource("Android/app/src/main/res/mipmap-hdpi/ic_launcher.png", new File(mipmap_hdpi, "ic_launcher.png")); - Tool.outputResource("Android/app/src/main/res/mipmap-hdpi/ic_launcher.png", new File(mipmap_hdpi, "ic_launcher_round.png")); - Tool.outputResource("Android/app/src/main/res/mipmap-xhdpi/ic_launcher.png", new File(mipmap_xhdpi, "ic_launcher.png")); - Tool.outputResource("Android/app/src/main/res/mipmap-xhdpi/ic_launcher.png", new File(mipmap_xhdpi, "ic_launcher_round.png")); - Tool.outputResource("Android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png", new File(mipmap_xxhdpi, "ic_launcher.png")); - Tool.outputResource("Android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png", new File(mipmap_xxhdpi, "ic_launcher_round.png")); - Tool.outputResource("Android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png", new File(mipmap_xxxhdpi, "ic_launcher.png")); - Tool.outputResource("Android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png", new File(mipmap_xxxhdpi, "ic_launcher_round.png")); - - Tool.outputResource("Android/app/src/main/res/values/attrs.xml", new File(values, "attrs.xml")); - Tool.outputResource("Android/app/src/main/res/values/colors.xml", new File(values, "colors.xml")); - Tool.outputResource("Android/app/src/main/res/values/dimens.xml", new File(values, "dimens.xml")); - Tool.outputResource("Android/app/src/main/res/values/ids.xml", new File(values, "ids.xml")); - Tool.outputResource("Android/app/src/main/res/values/strings.xml", new File(values, "strings.xml")); - Tool.outputResource("Android/app/src/main/res/values/styles.xml", new File(values, "styles.xml")); - } - - System.out.println("finish"); + // 文件输出文件 + File zipFile = new File(path, "wbui.zip"); + // 文件输出目录 + File dir = new File(path, "wbui"); + // 清空输出目录 + Tool.clear(dir); + System.out.println("清空文件" + dir.getAbsolutePath()); + // 输出文件 + Tool.outputResource("Android/wbui.zip", zipFile); + // 解压文件 + new ZipUtil().unZip(zipFile, new File(path)); + // 删除文件 + zipFile.delete(); + System.out.println("删除文件" + zipFile.getAbsolutePath()); return true; } } diff --git a/src/main/java/xyz/wbsite/dbtool/javafx/po/AndroidOption.java b/src/main/java/xyz/wbsite/dbtool/javafx/po/AndroidOption.java index 62509a60..326a3f60 100644 --- a/src/main/java/xyz/wbsite/dbtool/javafx/po/AndroidOption.java +++ b/src/main/java/xyz/wbsite/dbtool/javafx/po/AndroidOption.java @@ -4,7 +4,4 @@ public class AndroidOption { public String projectName; public String packages; public String domain; - public boolean webview; - public boolean fileselect; - public boolean qrcode; } diff --git a/src/main/java/xyz/wbsite/dbtool/javafx/tool/Dialog.java b/src/main/java/xyz/wbsite/dbtool/javafx/tool/Dialog.java index 7365dfe6..c15abdb5 100644 --- a/src/main/java/xyz/wbsite/dbtool/javafx/tool/Dialog.java +++ b/src/main/java/xyz/wbsite/dbtool/javafx/tool/Dialog.java @@ -581,9 +581,6 @@ public class Dialog { androidOption.projectName = controller.getName().getText(); androidOption.packages = controller.getPackages().getText(); androidOption.domain = controller.getDomain().getText(); - androidOption.webview = controller.getWebview().isSelected(); - androidOption.qrcode = controller.getQrcode().isSelected(); - androidOption.fileselect = controller.getFileselect().isSelected(); dBmanger.generate(file.getAbsolutePath(), androidOption); Platform.runLater(new Runnable() { diff --git a/src/main/resources/fxml/androidOption.fxml b/src/main/resources/fxml/androidOption.fxml index 5e474769..8f8e3357 100644 --- a/src/main/resources/fxml/androidOption.fxml +++ b/src/main/resources/fxml/androidOption.fxml @@ -1,55 +1,53 @@ - + + - -
- - - - - - - - - - - - -