android

src/main/java/xyz/wbsite/dbtool/javafx/ctrl/AndroidOptionController.java

@@ -6,10 +6,6 @@ import javafx.scene.control.TextField;
 
 public class AndroidOptionController {
 
-    @FXML
-    private TextField path;
-    @FXML
-    private Button selectPath;
     @FXML
     private TextField name;
     @FXML
@@ -37,22 +33,6 @@ public class AndroidOptionController {
         this.cancel = cancel;
     }
 
-    public TextField getPath() {
-        return path;
-    }
-
-    public void setPath(TextField path) {
-        this.path = path;
-    }
-
-    public Button getSelectPath() {
-        return selectPath;
-    }
-
-    public void setSelectPath(Button selectPath) {
-        this.selectPath = selectPath;
-    }
-
     public TextField getName() {
         return name;
     }

src/main/java/xyz/wbsite/dbtool/javafx/manger/ProjectManager.java

@@ -1,6 +1,5 @@
 package xyz.wbsite.dbtool.javafx.manger;
 
-import com.sun.org.apache.xpath.internal.operations.And;
 import org.springframework.boot.system.ApplicationHome;
 import xyz.wbsite.dbtool.javafx.enumeration.DataBase;
 import xyz.wbsite.dbtool.javafx.enumeration.FieldType;
@@ -282,9 +281,12 @@ public class ProjectManager {
         }.start();
     }
 
-
     public void generateApi(File module, File sdk, List<Api> apis) {
         if (module.exists()) {
+            Dialog.showProgress("生成中...");
+            new Thread() {
+                @Override
+                public void run() {
                     boolean mkdirs = sdk.mkdirs();
                     File reqList = new File(module.getAbsolutePath() + File.separator + "req");
                     File rspList = new File(module.getAbsolutePath() + File.separator + "rsp");
@@ -303,11 +305,18 @@ public class ProjectManager {
                         e.printStackTrace();
                     }
 
+                    Dialog.stopPopup();
                     Dialog.showSuccess("Api生成完成.");
                 }
+            }.start();
+        }
     }
 
     public void generateAndroid(final String path, AndroidOption option) {
+        Dialog.showProgress("生成中...");
+        new Thread() {
+            @Override
+            public void run() {
                 AndroidCallable androidCallable = new AndroidCallable(path, option);
                 Future submit = service.submit(androidCallable);
                 try {
@@ -321,8 +330,11 @@ public class ProjectManager {
                     e.printStackTrace();
                 }
 
+                Dialog.stopPopup();
                 Dialog.showSuccess("Android生成完成.");
             }
+        }.start();
+    }
 
     public void invalidate() {
         project = xmlService.inflate(path);

src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/AndroidCallable.java

@@ -50,7 +50,7 @@ public class AndroidCallable implements Callable {
         main.mkdirs();
         File java = new File(main, "java");
         java.mkdirs();
-        File res = new File(src, "res");
+        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();
@@ -64,6 +64,22 @@ public class AndroidCallable implements Callable {
         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/.gitignore", new File(project, ".gitignore"));
@@ -75,7 +91,7 @@ public class AndroidCallable implements Callable {
             HashMap<String, Object> ctx = new HashMap<String, Object>();
             ctx.put("package", option.packages);
             freeMarkerManager.outputTemp(new File(app, "build.gradle"), "Android/app/build.gradles", ctx);
-            Tool.outputResource("Android/app/proguard-rules.pro", new File(app, "build.gradle"));
+            Tool.outputResource("Android/app/proguard-rules.pro", new File(app, "proguard-rules.pro"));
         }
 
         {
@@ -85,7 +101,6 @@ public class AndroidCallable implements Callable {
             freeMarkerManager.outputTemp(new File(main, "AndroidManifest.xml"), "Android/app/src/main/AndroidManifest.xml", ctx);
         }
 
-
         {
             HashMap<String, Object> ctx = new HashMap<String, Object>();
             ctx.put("package", option.packages);
@@ -139,10 +154,37 @@ public class AndroidCallable implements Callable {
             HashMap<String, Object> ctx = new HashMap<String, Object>();
             ctx.put("package", option.packages);
             ctx.put("domain", option.domain);
-            freeMarkerManager.outputTemp(new File(fragment, "LoginFragment.java"), "Android/app/src/main/java/fragment/LoginFragment.java", ctx);
             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"));
+            Tool.outputResource("Android/app/src/main/res/drawable/icon_logo.png", new File(drawable, "icon_logo.png"));
+            Tool.outputResource("Android/app/src/main/res/drawable/icon_password.png", new File(drawable, "icon_password.png"));
+            Tool.outputResource("Android/app/src/main/res/drawable/icon_username.png", new File(drawable, "icon_username.png"));
+
+            Tool.outputResource("Android/app/src/main/res/layout/activity_qrcode.xml", new File(layout, "activity_qrcode.xml"));
+            Tool.outputResource("Android/app/src/main/res/layout/fragment.xml", new File(layout, "fragment.xml"));
+            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");
         return true;

src/main/java/xyz/wbsite/dbtool/javafx/tool/Dialog.java

@@ -557,8 +557,8 @@ public class Dialog {
                 androidOption.projectName = controller.getName().getText();
                 androidOption.packages = controller.getPackages().getText();
                 androidOption.domain = controller.getDomain().getText();
+
                 dBmanger.generateAndroid(file.getAbsolutePath(), androidOption);
-                Dialog.stopPopup();
                 Platform.runLater(new Runnable() {
                     @Override
                     public void run() {
@@ -567,25 +567,6 @@ public class Dialog {
                 });
             }
         });
-        TextField path = controller.getPath();
-        controller.getSelectPath().setOnAction(new EventHandler<ActionEvent>() {
-            @Override
-            public void handle(ActionEvent event) {
-                DirectoryChooser directoryChooser = new DirectoryChooser();
-                Stage stage = new Stage();
-                File file = directoryChooser.showDialog(stage);
-
-                if (file == null) {
-                    return;
-                }
-
-                path.setText(file.getAbsolutePath());
-                System.out.println(file.getAbsolutePath());
-            }
-        });
-
-        ProjectManager dBmanger = ManagerFactory.getdBManager();
-        path.setText(dBmanger.getPath());
 
         popup = new Stage();
         popup.initModality(Modality.APPLICATION_MODAL);

src/main/resources/fxml/androidOption.fxml

@@ -2,35 +2,29 @@
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<BorderPane fx:controller="xyz.wbsite.dbtool.javafx.ctrl.AndroidOptionController" prefHeight="250.0" prefWidth="600.0"
+<BorderPane fx:controller="xyz.wbsite.dbtool.javafx.ctrl.AndroidOptionController" prefHeight="250.0" prefWidth="500.0"
             xmlns="http://javafx.com/javafx/8.0.65" xmlns:fx="http://javafx.com/fxml/1">
     <center>
-        <GridPane prefHeight="210.0" prefWidth="600.0" BorderPane.alignment="CENTER">
+        <GridPane prefHeight="210.0" prefWidth="500.0" BorderPane.alignment="CENTER">
             <columnConstraints>
-                <ColumnConstraints hgrow="SOMETIMES" maxWidth="295.0" minWidth="10.0" prefWidth="90.0"/>
+                <ColumnConstraints hgrow="SOMETIMES" maxWidth="295.0" minWidth="10.0" prefWidth="100.0"/>
-                <ColumnConstraints hgrow="SOMETIMES" maxWidth="496.0" minWidth="10.0" prefWidth="425.0"/>
+                <ColumnConstraints hgrow="SOMETIMES" maxWidth="496.0" minWidth="10.0" prefWidth="400.0"/>
-                <ColumnConstraints hgrow="SOMETIMES" maxWidth="496.0" minWidth="10.0" prefWidth="88.0"/>
             </columnConstraints>
             <rowConstraints>
                 <RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES"/>
                 <RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES"/>
                 <RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES"/>
-                <RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES"/>
             </rowConstraints>
             <children>
-                <Label text="生成路径" GridPane.halignment="CENTER" GridPane.rowIndex="0" GridPane.valignment="CENTER"/>
+                <Label text="项目名称" GridPane.halignment="CENTER" GridPane.rowIndex="0"
-                <TextField GridPane.columnIndex="1" fx:id="path" GridPane.rowIndex="0"/>
+                       GridPane.valignment="CENTER"/>
-                <Button mnemonicParsing="false" fx:id="selectPath" text="选择路径" GridPane.columnIndex="2" GridPane.halignment="CENTER"
+                <TextField fx:id="name" text="Example-android" GridPane.rowIndex="0" GridPane.columnIndex="1"/>
-                        GridPane.rowIndex="0" GridPane.valignment="CENTER"/>
-
-                <Label text="项目名称" GridPane.halignment="CENTER" GridPane.rowIndex="1" GridPane.valignment="CENTER"/>
-                <TextField GridPane.columnIndex="1" fx:id="name" text="Example-android" GridPane.rowIndex="1"/>
 
-                <Label text="package" GridPane.halignment="CENTER" GridPane.rowIndex="2" GridPane.valignment="CENTER"/>
+                <Label text="package" GridPane.halignment="CENTER" GridPane.rowIndex="1" GridPane.valignment="CENTER"/>
-                <TextField GridPane.columnIndex="1" fx:id="packages" text="com.example.android" GridPane.rowIndex="2"/>
+                <TextField GridPane.columnIndex="1" fx:id="packages" text="com.example.android" GridPane.rowIndex="1"/>
 
-                <Label text="domain" GridPane.halignment="CENTER" GridPane.rowIndex="3" GridPane.valignment="CENTER"/>
+                <Label text="domain" GridPane.halignment="CENTER" GridPane.rowIndex="2" GridPane.valignment="CENTER"/>
-                <TextField GridPane.columnIndex="1" fx:id="domain" text="com.example" GridPane.rowIndex="3"/>
+                <TextField GridPane.columnIndex="1" fx:id="domain" text="com.example" GridPane.rowIndex="2"/>
             </children>
             <opaqueInsets>
                 <Insets/>

src/main/resources/modules/Android/app/src/main/java/WBUIApplication.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.webclient;
+package ${domain};
 
 import android.app.Activity;
 import android.app.Application;
@@ -23,7 +23,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import xyz.wbsite.wbui.base.utils.DataBaseUtil;
+import ${domain}.base.util.DataBaseUtil;
 
 
 /**

src/main/resources/modules/Android/app/src/main/java/WBUIMainActivity.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.webclient;
+package ${domain};
 
 import android.Manifest;
 import android.content.Intent;
@@ -12,10 +12,11 @@ import com.yanzhenjie.permission.Action;
 import com.yanzhenjie.permission.AndPermission;
 
 import java.util.List;
+import ${package}.R;
+import ${domain}.base.BaseSPAActivity;
+import ${domain}.base.Consant;
+import ${domain}.fragment.MainFragment;
 
-import xyz.wbsite.wbui.base.BaseSPAActivity;
-import xyz.wbsite.wbui.base.Consant;
-import xyz.wbsite.webclient.fragment.LoginFragment;
 
 public class WBUIMainActivity extends BaseSPAActivity {
     private static final String KEY_FRAGMENT = "key_fragment";
@@ -34,12 +35,12 @@ public class WBUIMainActivity extends BaseSPAActivity {
         AndPermission.with(this).runtime().permission(Manifest.permission.READ_EXTERNAL_STORAGE).onGranted(new Action<List<String>>() {
             @Override
             public void onAction(List<String> data) {
-                startFirstFragment(new LoginFragment());
+                startFirstFragment(new MainFragment());
             }
         }).onDenied(new Action<List<String>>() {
             @Override
             public void onAction(List<String> data) {
-                startFirstFragment(new LoginFragment());
+                startFirstFragment(new MainFragment());
             }
         }).start();
     }

src/main/resources/modules/Android/app/src/main/java/base/BaseActivity.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.wbui.base;
+package ${domain}.base;
 
 import android.app.Activity;
 import android.content.Intent;

src/main/resources/modules/Android/app/src/main/java/base/BaseFragment.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.wbui.base;
+package ${domain}.base;
 
 import android.os.Bundle;
 import android.os.Handler;

src/main/resources/modules/Android/app/src/main/java/base/BaseSPAActivity.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.wbui.base;
+package ${domain}.base;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -8,12 +8,8 @@ import com.qmuiteam.qmui.arch.QMUIFragmentActivity;
 import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
 import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction;
 import com.qmuiteam.qmui.widget.dialog.QMUITipDialog;
-
 import java.util.Hashtable;
 
-import xyz.wbsite.webclient.fragment.LoginFragment;
-
-
 public abstract class BaseSPAActivity extends QMUIFragmentActivity {
 
     protected QMUITipDialog loading;

src/main/resources/modules/Android/app/src/main/java/base/BaseSPAFragment.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.wbui.base;
+package ${domain}.base;
 
 import android.content.Intent;
 import android.os.Bundle;

src/main/resources/modules/Android/app/src/main/java/base/BaseSPATakePhotoFragment.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.wbui.base;
+package ${domain}.base;
 
 import android.content.Intent;
 import android.graphics.Bitmap;
@@ -26,9 +26,9 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import xyz.wbsite.wbui.base.utils.StorageUtil;
+import ${domain}.base.util.StorageUtil;
 
-import static xyz.wbsite.wbui.base.Consant.DIR_IMG;
+import static ${domain}.base.Consant.DIR_IMG;
 
 
 public abstract class BaseSPATakePhotoFragment extends BaseSPAFragment implements TakePhoto.TakeResultListener, InvokeListener {

src/main/resources/modules/Android/app/src/main/java/base/IActivityResult.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.wbui.base;
+package ${domain}.base;
 
 
 import android.content.Intent;

src/main/resources/modules/Android/app/src/main/java/base/activity/FilePickerActivity.java

@@ -1,13 +1,11 @@
-package xyz.wbsite.wbui.base.activity;
+package ${domain}.base.activity;
 
 
 import android.content.Intent;
 import android.os.Bundle;
-
 import com.leon.lfilepickerlibrary.LFilePicker;
 import com.leon.lfilepickerlibrary.utils.Constant;
-
+import ${domain}.base.BaseSPAActivity;
-import xyz.wbsite.wbui.base.BaseSPAActivity;
 
 public class FilePickerActivity extends BaseSPAActivity {
 

src/main/resources/modules/Android/app/src/main/java/base/activity/QRcodeActivity.java

@@ -1,15 +1,12 @@
-package xyz.wbsite.wbui.base.activity;
+package ${domain}.base.activity;
 
 import android.app.Activity;
 import android.os.Bundle;
 import android.os.PersistableBundle;
 import android.view.KeyEvent;
-
 import com.journeyapps.barcodescanner.CaptureManager;
 import com.journeyapps.barcodescanner.DecoratedBarcodeView;
-
+import ${package}.R;
-import xyz.wbsite.webclient.R;
-
 
 public class QRcodeActivity extends Activity implements DecoratedBarcodeView.TorchListener {
 
@@ -19,7 +16,7 @@ public class QRcodeActivity extends Activity implements DecoratedBarcodeView.Tor
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_custom_capture);
+        setContentView(R.layout.activity_qrcode);
 
         mDBV = (DecoratedBarcodeView) findViewById(R.id.dbv_custom);
         mDBV.setTorchListener(this);

src/main/resources/modules/Android/app/src/main/java/base/service/RestartService.java

@@ -1,5 +1,4 @@
-package xyz.wbsite.wbui.base.services;
+package ${domain}.base.service;
-
 
 import android.app.Service;
 import android.content.Context;

src/main/resources/modules/Android/app/src/main/java/base/ui/WBUICustomDialog.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.wbui.base.ui;
+package ${domain}.base.ui;
 
 import android.app.Dialog;
 import android.content.Context;

src/main/resources/modules/Android/app/src/main/java/base/ui/WBUIGridView.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.wbui.base.ui;
+package ${domain}.base.ui;
 
 
 import android.content.Context;
@@ -11,7 +11,7 @@ import android.util.AttributeSet;
 import android.view.View;
 import android.widget.GridView;
 
-import xyz.wbsite.webclient.R;
+import ${package}.R;
 
 public class WBUIGridView extends GridView {
     public WBUIGridView(Context context) {

src/main/resources/modules/Android/app/src/main/java/base/ui/WBUITextView.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.wbui.base.ui;
+package ${domain}.base.ui;
 
 import android.content.Context;
 import android.graphics.Bitmap;

src/main/resources/modules/Android/app/src/main/java/base/ui/WBUITipTextView.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.wbui.base.ui;
+package ${domain}.base.ui;
 
 import android.content.Context;
 import android.support.annotation.Nullable;

src/main/resources/modules/Android/app/src/main/java/base/ui/button/WbButton.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.wbui.base.ui.button;
+package ${domain}.base.ui.button;
 
 import android.content.Context;
 import android.content.res.ColorStateList;

src/main/resources/modules/Android/app/src/main/java/base/ui/button/WbImageButton.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.wbui.base.ui.button;
+package ${domain}.base.ui.button;
 
 import android.content.Context;
 import android.graphics.Rect;

src/main/resources/modules/Android/app/src/main/java/base/ui/button/WbMultiToggleButton.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.wbui.base.ui.button;
+package ${domain}.base.ui.button;
 
 import android.content.Context;
 import android.content.res.ColorStateList;

src/main/resources/modules/Android/app/src/main/java/base/ui/button/WbRadioButton.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.wbui.base.ui.button;
+package ${domain}.base.ui.button;
 
 import android.content.Context;
 import android.graphics.Bitmap;

src/main/resources/modules/Android/app/src/main/java/base/ui/button/WbToggleButton.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.wbui.base.ui.button;
+package ${domain}.base.ui.button;
 
 import android.content.Context;
 import android.content.res.ColorStateList;

src/main/resources/modules/Android/app/src/main/java/base/ui/dialog/ConfirmDialog.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.wbui.base.ui.dialog;
+package ${domain}.base.ui.dialog;
 
 import android.app.Dialog;
 import android.content.Context;

src/main/resources/modules/Android/app/src/main/java/base/ui/dialog/CustomDialog.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.wbui.base.ui.dialog;
+package ${domain}.base.ui.dialog;
 
 import android.app.Dialog;
 import android.content.Context;

src/main/resources/modules/Android/app/src/main/java/base/ui/dialog/MessageDialog.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.wbui.base.ui.dialog;
+package ${domain}.base.ui.dialog;
 
 import android.app.Dialog;
 import android.content.Context;

src/main/resources/modules/Android/app/src/main/java/base/ui/dialog/WBUIDialog.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.wbui.base.ui.dialog;
+package ${domain}.base.ui.dialog;
 
 import android.app.Dialog;
 import android.content.Context;

src/main/resources/modules/Android/app/src/main/java/base/ui/dialog/WbConfirmDialog.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.wbui.base.ui.dialog;
+package ${domain}.base.ui.dialog;
 
 import android.app.Dialog;
 import android.content.Context;

src/main/resources/modules/Android/app/src/main/java/base/ui/image/AnimationView.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.wbui.base.ui.image;
+package ${domain}.base.ui.image;
 
 import android.content.Context;
 import android.graphics.Canvas;

src/main/resources/modules/Android/app/src/main/java/base/ui/image/BlurImage.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.wbui.base.ui.image;
+package ${domain}.base.ui.image;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -6,7 +6,7 @@ import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.util.AttributeSet;
 
-import xyz.wbsite.wbui.base.utils.FastBlur;
+import ${domain}.base.util.FastBlur;
 
 
 public class BlurImage extends android.support.v7.widget.AppCompatImageView {

src/main/resources/modules/Android/app/src/main/java/base/ui/image/CircleImageView.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package xyz.wbsite.wbui.base.ui.image;
+package ${domain}.base.ui.image;
 
 import android.content.Context;
 import android.graphics.Canvas;

src/main/resources/modules/Android/app/src/main/java/base/ui/image/RoundImageView.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.wbui.base.ui.image;
+package ${domain}.base.ui.image;
 
 import android.content.Context;
 import android.graphics.Bitmap;

src/main/resources/modules/Android/app/src/main/java/base/ui/image/WBUISquareImageView.java

@@ -1,10 +1,10 @@
-package xyz.wbsite.wbui.base.ui.image;
+package ${domain}.base.ui.image;
 
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.util.AttributeSet;
 
-import xyz.wbsite.webclient.R;
+import ${package}.R;
 
 public class WBUISquareImageView extends android.support.v7.widget.AppCompatImageView {
 

src/main/resources/modules/Android/app/src/main/java/base/ui/image/WbRoundImageView.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.wbui.base.ui.image;
+package ${domain}.base.ui.image;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -8,7 +8,7 @@ import android.graphics.PorterDuff;
 import android.graphics.PorterDuffXfermode;
 import android.util.AttributeSet;
 
-import xyz.wbsite.wbui.base.utils.FastBlur;
+import ${domain}.base.util.FastBlur;
 
 
 public class WbRoundImageView extends android.support.v7.widget.AppCompatImageView {

src/main/resources/modules/Android/app/src/main/java/base/ui/layout/WBUIPaternalLayout.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.wbui.base.ui.layout;
+package ${domain}.base.ui.layout;
 
 import android.content.Context;
 import android.support.annotation.Nullable;
@@ -14,7 +14,7 @@ import android.view.ViewGroup;
 import android.widget.AbsListView;
 import android.widget.Scroller;
 
-import xyz.wbsite.wbui.base.utils.DensityUtil;
+import ${domain}.base.util.DensityUtil;
 
 public class WBUIPaternalLayout extends ViewGroup implements NestedScrollingParent, AbsListView.OnScrollListener {
     private static final String TAG = "WBUIPaternalLayout";

src/main/resources/modules/Android/app/src/main/java/base/ui/layout/WBUISquareLayout.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.wbui.base.ui.layout;
+package ${domain}.base.ui.layout;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -6,7 +6,7 @@ import android.util.AttributeSet;
 import android.view.View;
 import android.widget.RelativeLayout;
 
-import xyz.wbsite.webclient.R;
+import ${package}.R;
 
 public class WBUISquareLayout extends RelativeLayout {
 

src/main/resources/modules/Android/app/src/main/java/base/ui/layout/WbViewPager.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.wbui.base.ui.layout;
+package ${domain}.base.ui.layout;
 
 import android.content.Context;
 import android.graphics.Canvas;

src/main/resources/modules/Android/app/src/main/java/base/ui/list/BoundListView.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.wbui.base.ui.list;
+package ${domain}.base.ui.list;
 
 import android.content.Context;
 import android.graphics.Canvas;

src/main/resources/modules/Android/app/src/main/java/base/ui/list/NoScrollListView.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.wbui.base.ui.list;
+package ${domain}.base.ui.list;
 
 import android.content.Context;
 import android.util.AttributeSet;

src/main/resources/modules/Android/app/src/main/java/base/ui/list/OverScrollView.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.wbui.base.ui.list;
+package ${domain}.base.ui.list;
 
 import android.content.Context;
 import android.os.Handler;

src/main/resources/modules/Android/app/src/main/java/base/ui/list/OverView.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.wbui.base.ui.list;
+package ${domain}.base.ui.list;
 
 import android.content.Context;
 import android.graphics.Canvas;

src/main/resources/modules/Android/app/src/main/java/base/ui/other/LoadingProgressBar.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.wbui.base.ui.other;
+package ${domain}.base.ui.other;
 
 
 import android.animation.Animator;
@@ -15,7 +15,7 @@ import android.util.AttributeSet;
 import android.view.View;
 import android.view.animation.LinearInterpolator;
 
-import xyz.wbsite.wbui.base.utils.DensityUtil;
+import ${domain}.base.util.DensityUtil;
 
 public class LoadingProgressBar extends View {
     private ValueAnimator mAnimator;

src/main/resources/modules/Android/app/src/main/java/base/ui/other/LoadingView.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.wbui.base.ui.other;
+package ${domain}.base.ui.other;
 
 import android.content.Context;
 import android.graphics.Canvas;

src/main/resources/modules/Android/app/src/main/java/base/ui/other/LoadingView1.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.wbui.base.ui.other;
+package ${domain}.base.ui.other;
 
 import android.content.Context;
 import android.graphics.Canvas;

src/main/resources/modules/Android/app/src/main/java/base/ui/other/LoadingView2.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.wbui.base.ui.other;
+package ${domain}.base.ui.other;
 
 import android.content.Context;
 import android.graphics.Canvas;

src/main/resources/modules/Android/app/src/main/java/base/ui/other/RefreshView.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.wbui.base.ui.other;
+package ${domain}.base.ui.other;
 
 import android.content.Context;
 import android.os.Handler;

src/main/resources/modules/Android/app/src/main/java/base/ui/other/WBUIKeyboardView.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.wbui.base.witget.other;
+package ${domain}.base.witget.other;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -13,7 +13,7 @@ import android.util.AttributeSet;
 
 import java.util.List;
 
-import xyz.wbsite.webclient.R;
+import ${package}.R;
 
 public class WBUIKeyboardView extends KeyboardView {
 

src/main/resources/modules/Android/app/src/main/java/base/ui/spinner/WbSpinner.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.wbui.base.ui.spinner;
+package ${domain}.base.ui.spinner;
 
 import android.content.Context;
 import android.graphics.Color;

src/main/resources/modules/Android/app/src/main/java/base/ui/textview/AverageTextView.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.wbui.base.ui.textview;
+package ${domain}.base.ui.textview;
 
 import android.content.Context;
 import android.graphics.Canvas;

src/main/resources/modules/Android/app/src/main/java/base/ui/textview/TipTextView.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.wbui.base.ui.textview;
+package ${domain}.base.ui.textview;
 
 import android.content.Context;
 import android.support.annotation.Nullable;

src/main/resources/modules/Android/app/src/main/java/base/ui/textview/WbEditText.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.wbui.base.ui.textview;
+package ${domain}.base.ui.textview;
 
 import android.content.Context;
 import android.graphics.Bitmap;

src/main/resources/modules/Android/app/src/main/java/base/ui/textview/WbTextView.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.wbui.base.ui.textview;
+package ${domain}.base.ui.textview;
 
 import android.content.Context;
 import android.graphics.Bitmap;

src/main/resources/modules/Android/app/src/main/java/base/ui/textview/WbTextView1.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.wbui.base.ui.textview;
+package ${domain}.base.ui.textview;
 
 import android.content.Context;
 import android.graphics.Bitmap;

src/main/resources/modules/Android/app/src/main/java/base/ui/textview/WbTextView2.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.wbui.base.ui.textview;
+package ${domain}.base.ui.textview;
 
 import android.content.Context;
 import android.graphics.Bitmap;

src/main/resources/modules/Android/app/src/main/java/base/ui/toast/MessageToast.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.wbui.base.ui.toast;
+package ${domain}.base.ui.toast;
 
 import android.content.Context;
 import android.graphics.Color;

src/main/resources/modules/Android/app/src/main/java/base/util/AnimationUtil.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.wbui.base.utils;
+package ${domain}.base.util;
 
 
 import android.view.View;

src/main/resources/modules/Android/app/src/main/java/base/util/ApkUtil.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.wbui.base.utils;
+package ${domain}.base.util;
 
 import android.content.ComponentName;
 import android.content.Context;

src/main/resources/modules/Android/app/src/main/java/base/util/Base64Util.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.wbui.base.utils;
+package ${domain}.base.util;
 
 import java.util.Arrays;
 

src/main/resources/modules/Android/app/src/main/java/base/util/BitmapUtil.java

@@ -1,5 +1,5 @@
 
-package xyz.wbsite.wbui.base.utils;
+package ${domain}.base.util;
 
 import android.content.res.Resources;
 import android.graphics.Bitmap;

src/main/resources/modules/Android/app/src/main/java/base/util/BluetoothUtil.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.wbui.base.utils;
+package ${domain}.base.util;
 
 import android.bluetooth.BluetoothDevice;
 import android.util.Log;

src/main/resources/modules/Android/app/src/main/java/base/util/Consant.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.wbui.base;
+package ${domain}.base;
 
 /**
  * 内容辅助类

src/main/resources/modules/Android/app/src/main/java/base/util/DESUtil.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.wbui.base.utils;
+package ${domain}.base.util;
 
 import java.security.InvalidKeyException;
 import java.security.Key;

src/main/resources/modules/Android/app/src/main/java/base/util/DataBaseUtil.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.wbui.base.utils;
+package ${domain}.base.util;
 
 import android.content.ContentValues;
 import android.content.Context;
@@ -18,9 +18,7 @@ import java.lang.annotation.Target;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
-
+import ${domain}.base.Consant;
-import xyz.wbsite.webclient.WBUIApplication;
-import xyz.wbsite.wbui.base.Consant;
 
 public class DataBaseUtil {
     private String defaultPath = "";
@@ -395,22 +393,22 @@ public class DataBaseUtil {
      */
     public static void main(String[] args) {
         //Demo
-        DataBaseUtil db = new DataBaseUtil(WBUIApplication.getInstance(), new Register() {
+//        DataBaseUtil db = new DataBaseUtil(WBUIApplication.getInstance(), new Register() {
-            @Override
+//            @Override
-            public List<Class> run() {
+//            public List<Class> run() {
-                List<Class> objects = new ArrayList<>();
+//                List<Class> objects = new ArrayList<>();
-                objects.add(User.class);
+//                objects.add(User.class);
-                return objects;
+//                return objects;
-            }
+//            }
-        });
+//        });
-        //插入数据
+//        //插入数据
-        db.insert(new User("Test"));
+//        db.insert(new User("Test"));
-        //删除数据
+//        //删除数据
-        db.delete(new User("Test"));
+//        db.delete(new User("Test"));
-        //查询数据(不分页)
+//        //查询数据(不分页)
-        db.query(new User("Test"));
+//        db.query(new User("Test"));
-        //查询数据(分页)
+//        //查询数据(分页)
-        db.query(new User("Test"),0,10);
+//        db.query(new User("Test"),0,10);
     }
 
     /**

src/main/resources/modules/Android/app/src/main/java/base/util/DensityUtil.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.wbui.base.utils;
+package ${domain}.base.util;
 
 import android.content.Context;
 import android.util.TypedValue;

src/main/resources/modules/Android/app/src/main/java/base/util/DialogUtil.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.wbui.base.utils;
+package ${domain}.base.util;
 
 import android.content.Context;
 

src/main/resources/modules/Android/app/src/main/java/base/util/FastBlur.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.wbui.base.utils;
+package ${domain}.base.util;
 
 import android.graphics.Bitmap;
 

src/main/resources/modules/Android/app/src/main/java/base/util/FileUtil.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.wbui.base.utils;
+package ${domain}.base.util;
 
 import java.io.BufferedOutputStream;
 import java.io.ByteArrayOutputStream;

src/main/resources/modules/Android/app/src/main/java/base/util/GPSUtil.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.wbui.base.utils;
+package ${domain}.base.util;
 
 import android.annotation.SuppressLint;
 import android.content.Context;

src/main/resources/modules/Android/app/src/main/java/base/util/IdCardUtil.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.wbui.base.utils;
+package ${domain}.base.util;
 
 import java.util.Calendar;
 import java.util.Locale;

src/main/resources/modules/Android/app/src/main/java/base/util/Logger.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.wbui.base.utils;
+package ${domain}.base.util;
 
 import android.util.Log;
 

src/main/resources/modules/Android/app/src/main/java/base/util/NetUtil.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.wbui.base.utils;
+package ${domain}.base.util;
 
 import android.app.Activity;
 import android.content.ComponentName;

src/main/resources/modules/Android/app/src/main/java/base/util/RSAUtil.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.wbui.base.utils;
+package ${domain}.base.util;
 
 import java.security.InvalidKeyException;
 import java.security.KeyFactory;

src/main/resources/modules/Android/app/src/main/java/base/util/SPUtil.java

@@ -1,10 +1,10 @@
-package xyz.wbsite.wbui.base.utils;
+package ${domain}.base.util;
 
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.text.TextUtils;
 
-import xyz.wbsite.webclient.WBUIApplication;
+import ${domain}.WBUIApplication;
 
 /**
  * Created by Administrator on 2018/3/11 0011.

src/main/resources/modules/Android/app/src/main/java/base/util/ScreenUtil.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.wbui.base.utils;
+package ${domain}.base.util;
 
 import android.app.Activity;
 import android.content.Context;

src/main/resources/modules/Android/app/src/main/java/base/util/SizeUtil.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.wbui.base.utils;
+package ${domain}.base.util;
 
 import android.content.Context;
 import android.util.TypedValue;

src/main/resources/modules/Android/app/src/main/java/base/util/StorageUtil.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.wbui.base.utils;
+package ${domain}.base.util;
 
 
 import android.content.Context;

src/main/resources/modules/Android/app/src/main/java/base/util/Tasker.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.wbui.base.utils;
+package ${domain}.base.util;
 
 import android.os.AsyncTask;
 

src/main/resources/modules/Android/app/src/main/java/base/util/Toaster.java

@@ -1,8 +1,8 @@
-package xyz.wbsite.wbui.base.utils;
+package ${domain}.base.util;
 
 import android.view.View;
 
-import xyz.wbsite.webclient.WBUIApplication;
+import ${domain}.WBUIApplication;
 
 /**
  * 消息发生器

src/main/resources/modules/Android/app/src/main/java/fragment/LoginFragment.java

@@ -1,57 +0,0 @@
-package xyz.wbsite.webclient.fragment;
-
-import android.view.View;
-import android.widget.Button;
-import android.widget.CheckBox;
-import android.widget.EditText;
-import android.widget.LinearLayout;
-
-import butterknife.BindView;
-import xyz.wbsite.wbui.base.BaseSPAFragment;
-import xyz.wbsite.webclient.R;
-
-public class LoginFragment extends BaseSPAFragment {
-
-    @BindView(R.id.edtUsername)
-    EditText edtUsername;
-    @BindView(R.id.llyUsername)
-    LinearLayout llyUsername;
-    @BindView(R.id.edtPassword)
-    EditText edtPassword;
-    @BindView(R.id.llyPassword)
-    LinearLayout llyPassword;
-    @BindView(R.id.btnLogin)
-    Button btnLogin;
-    @BindView(R.id.chkPwd)
-    CheckBox chkPwd;
-    @BindView(R.id.chkAuto)
-    CheckBox chkAuto;
-
-    @Override
-    protected int getFragmnetLayout() {
-        return R.layout.fragment_login;
-    }
-
-    @Override
-    protected void onViewInit() {
-        btnLogin.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                showLoading();
-                handler.postDelayed(new Runnable() {
-                    @Override
-                    public void run() {
-                        closeLoading();
-                        startFragment(new MainFragment());
-                    }
-                }, 500);
-            }
-        });
-
-    }
-
-    @Override
-    protected boolean canDragBack() {
-        return false;
-    }
-}

src/main/resources/modules/Android/app/src/main/java/fragment/MainFragment.java

@@ -1,22 +1,14 @@
-package xyz.wbsite.webclient.fragment;
+package ${domain}.fragment;
 
-import android.support.v4.app.Fragment;
+import com.qmuiteam.qmui.widget.QMUITopBarLayout;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.view.ViewPager;
-
-import com.qmuiteam.qmui.widget.QMUITabSegment;
 import butterknife.BindView;
-import xyz.wbsite.wbui.base.BaseSPAFragment;
+import ${domain}.base.BaseSPAFragment;
-import xyz.wbsite.webclient.R;
+import ${package}.R;
 
 public class MainFragment extends BaseSPAFragment {
 
-    @BindView(R.id.pager)
+    @BindView(R.id.topbar)
-    ViewPager pager;
+    QMUITopBarLayout topbar;
-    @BindView(R.id.tabs)
-    QMUITabSegment tabs;
 
     @Override
     protected int getFragmnetLayout() {
@@ -25,10 +17,6 @@ public class MainFragment extends BaseSPAFragment {
 
     @Override
     protected void onViewInit() {
-    }
+        topbar.setTitle("Hello world");
-
-    @Override
-    protected boolean canDragBack() {
-        return false;
     }
 }

src/main/resources/modules/Android/app/src/main/res/drawable/ic_launcher_background.xml

@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportHeight="108"
-    android:viewportWidth="108">
-    <path
-        android:fillColor="#26A69A"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-</vector>

src/main/resources/modules/Android/app/src/main/res/drawable/ui_background_form_input.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <shape android:shape="rectangle">
-            <solid android:color="@color/colorFromInputActive"></solid>
-        </shape>
-    </item>
-
-    <item android:state_focused="true">
-        <shape android:shape="rectangle">
-            <solid android:color="@color/colorFromInputActive"></solid>
-        </shape>
-    </item>
-
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="@color/colorFromInput"></solid>
-        </shape>
-    </item>
-</selector>

src/main/resources/modules/Android/app/src/main/res/drawable/ui_background_login.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <corners android:radius="5dp"></corners>
-    <solid android:color="@color/colorTranslucent"></solid>
-</shape>

src/main/resources/modules/Android/app/src/main/res/drawable/ui_background_login_button.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <shape>
-            <corners android:radius="5dp"></corners>
-            <solid android:color="@color/colorPrimaryDark"></solid>
-        </shape>
-    </item>
-
-    <item>
-        <shape>
-            <corners android:radius="5dp"></corners>
-            <solid android:color="@color/colorPrimary"></solid>
-        </shape>
-    </item>
-</selector>

src/main/resources/modules/Android/app/src/main/res/drawable/ui_border_bottom.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape>
-            <solid android:color="#eeeeee"></solid>
-        </shape>
-    </item>
-    <item android:bottom="1dp">
-        <shape>
-            <solid android:color="#ffffff"></solid>
-        </shape>
-    </item>
-
-</layer-list>

src/main/resources/modules/Android/app/src/main/res/drawable/ui_drawable_click.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <item android:state_pressed="true">
-        <shape android:shape="rectangle">
-            <solid android:color="#83ececec"></solid>
-        </shape>
-    </item>
-</selector>

src/main/resources/modules/Android/app/src/main/res/drawable/ui_keyboard_key.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/key_selected_color" android:state_pressed="true" />
-    <item android:drawable="@drawable/key_normal_color" />
-</selector>

src/main/resources/modules/Android/app/src/main/res/layout/activity_qrcode.xml

@@ -38,7 +38,7 @@
                     android:paddingTop="14dp"
                     android:paddingBottom="14dp"
                     android:paddingRight="4dp"
-                    android:src="@mipmap/icon_logo" />
+                    android:src="@drawable/icon_logo" />
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"

src/main/resources/modules/Android/app/src/main/res/layout/fragment.xml

@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/ui_background">
+    android:background="@drawable/background">
 
     <com.qmuiteam.qmui.widget.QMUITopBarLayout
         android:id="@+id/topbar"

src/main/resources/modules/Android/app/src/main/res/layout/fragment_login.xml

@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.qmuiteam.qmui.widget.QMUIWindowInsetLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@drawable/ui_background">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:fitsSystemWindows="true"
-        android:orientation="vertical">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="40"
-            android:gravity="center_horizontal|bottom"
-            android:orientation="vertical">
-
-            <ImageView
-                android:layout_width="100dp"
-                android:layout_height="100dp"
-                android:src="@mipmap/icon_logo" />
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="50dp" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_marginLeft="@dimen/margin_50"
-            android:layout_marginRight="@dimen/margin_50"
-            android:layout_weight="60"
-            android:orientation="vertical">
-
-            <LinearLayout
-                android:id="@+id/llyUsername"
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/form_size"
-                android:layout_marginBottom="@dimen/padding_10"
-                android:background="@drawable/ui_background_login"
-                android:orientation="horizontal">
-
-                <xyz.wbsite.wbui.base.ui.image.WBUISquareImageView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:padding="@dimen/padding_10"
-                    android:src="@mipmap/icon_username"
-                    app:weight_height="1"
-                    app:weight_width="1" />
-
-                <View
-                    android:layout_width="2dp"
-                    android:layout_height="match_parent"
-                    android:layout_marginBottom="@dimen/margin_15"
-                    android:layout_marginTop="@dimen/margin_15"
-                    android:background="@color/colorPrimaryText"></View>
-
-                <EditText
-                    android:id="@+id/edtUsername"
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/form_size"
-                    android:background="@null"
-                    android:inputType="number"
-                    android:paddingLeft="@dimen/padding_20"
-                    android:textColor="@color/colorPrimaryText" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/llyPassword"
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/form_size"
-                android:layout_marginBottom="@dimen/padding_10"
-                android:background="@drawable/ui_background_login"
-                android:orientation="horizontal">
-
-                <xyz.wbsite.wbui.base.ui.image.WBUISquareImageView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:padding="@dimen/padding_10"
-                    android:src="@mipmap/icon_password"
-                    app:weight_height="1"
-                    app:weight_width="1" />
-
-                <View
-                    android:layout_width="2dp"
-                    android:layout_height="match_parent"
-                    android:layout_marginBottom="@dimen/margin_15"
-                    android:layout_marginTop="@dimen/margin_15"
-                    android:background="@color/colorPrimaryText"></View>
-
-                <EditText
-                    android:id="@+id/edtPassword"
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/form_size"
-                    android:background="@null"
-                    android:inputType="numberPassword"
-                    android:paddingLeft="@dimen/padding_20"
-                    android:textColor="@color/colorPrimaryText" />
-
-            </LinearLayout>
-
-            <Button
-                android:id="@+id/btnLogin"
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/form_size"
-                android:layout_marginTop="@dimen/margin_30"
-                android:background="@drawable/ui_background_login_button"
-                android:text="登 录"
-                android:textColor="@color/colorPrimaryText"
-                android:textStyle="bold" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:orientation="horizontal"
-                android:padding="@dimen/padding_10">
-
-                <CheckBox
-                    android:id="@+id/chkPwd"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:buttonTint="@color/colorPrimaryText"
-                    android:text="记住密码"
-                    android:textColor="@color/colorPrimaryText" />
-
-                <CheckBox
-                    android:id="@+id/chkAuto"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:buttonTint="@color/colorPrimaryText"
-                    android:text="自动登录"
-                    android:textColor="@color/colorPrimaryText" />
-
-            </LinearLayout>
-        </LinearLayout>
-
-    </LinearLayout>
-</com.qmuiteam.qmui.widget.QMUIWindowInsetLayout>

src/main/resources/modules/Android/app/src/main/res/layout/fragment_main.xml

@@ -1,25 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.qmuiteam.qmui.widget.QMUIWindowInsetLayout xmlns:android="http://schemas.android.com/apk/res/android"
                                                 xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:background="@drawable/ui_background"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <com.qmuiteam.qmui.widget.QMUIViewPager
-        android:id="@+id/pager"
                                                 android:layout_width="match_parent"
                                                 android:layout_height="match_parent"
-        android:layout_marginBottom="?attr/qmui_topbar_height"
+                                                android:background="@drawable/background">
-        android:fitsSystemWindows="true"/>
 
-    <com.qmuiteam.qmui.widget.QMUITabSegment
+    <com.qmuiteam.qmui.widget.QMUITopBarLayout
-        android:id="@+id/tabs"
+            android:id="@+id/topbar"
-        android:background="@android:color/white"
             android:layout_width="match_parent"
-        android:layout_height="?attr/qmui_topbar_height"
+            android:layout_height="wrap_content"
-        android:layout_gravity="bottom"
             android:fitsSystemWindows="true"
-        android:textSize="12sp"
+            app:qmui_topbar_separator_color="@color/colorGray_10"
-        app:qmui_tab_icon_position="top" />
+            app:qmui_topbar_separator_height="0dp" />
+
+    <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginTop="?attr/qmui_topbar_height"
+            android:fitsSystemWindows="true">
+        <LinearLayout
+                android:layout_width="match_parent"
+                android:orientation="vertical"
+                android:gravity="center"
+                android:layout_height="match_parent">
+
+            <TextView
+                    android:text="Hello World"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content" />
 
+        </LinearLayout>
+    </FrameLayout>
 </com.qmuiteam.qmui.widget.QMUIWindowInsetLayout>

src/main/resources/modules/Android/app/src/main/res/values/styles.xml

@@ -21,7 +21,7 @@
         <item name="qmui_tab_sign_count_view_bg">@drawable/qmui_sign_count_view_bg</item>
         <item name="qmui_tab_sign_count_view_padding_horizontal">4dp</item>
 
-        <item name="android:windowBackground">@drawable/ui_background</item>
+        <item name="android:windowBackground">@drawable/background</item>
     </style>
 
     <style name="AppTheme.Translucent">