Browse Source

0.0.37.beta4

kongzue 4 years ago
parent
commit
84ca795055

+ 2 - 9
DialogX/src/main/java/com/kongzue/dialogx/interfaces/BaseDialog.java

@@ -272,14 +272,7 @@ public abstract class BaseDialog {
     public abstract String dialogKey();
     
     protected static void runOnMain(Runnable runnable) {
-        if (!DialogX.autoRunOnUIThread){
-            runnable.run();
-            return;
-        }
-        if (Looper.myLooper() == Looper.getMainLooper()) {
-            runnable.run();
-        } else {
-            new Handler(Looper.getMainLooper()).post(runnable);
-        }
+        if (!DialogX.autoRunOnUIThread) runnable.run();
+        new Handler(Looper.getMainLooper()).post(runnable);
     }
 }

+ 1 - 1
app/src/main/java/com/kongzue/dialogxdemo/App.java

@@ -50,7 +50,7 @@ public class App extends BaseApp<App> {
                 };
             }
         };
-        
+    
         DialogX.globalTheme = DialogX.THEME.AUTO;
         DialogX.onlyOnePopTip = false;
     }

+ 44 - 7
app/src/main/java/com/kongzue/dialogxdemo/MainActivity.java

@@ -212,6 +212,42 @@ public class MainActivity extends BaseActivity {
     
     private int selectMenuIndex;
     
+    private void b(){
+        CustomDialog.show(new OnBindView<CustomDialog>(R.layout.layout_custom_view) {
+            @Override
+            public void onBind(final CustomDialog dialog, View v) {
+                log("#B");
+                v.findViewById(R.id.img_ico).setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        log("B click!");
+                    }
+                });
+            }
+        })
+        .setAutoUnsafePlacePadding(true)
+        .setMaskColor(getResources().getColor(R.color.black30))
+        .setAlign(CustomDialog.ALIGN.TOP);
+    }
+    
+    private void a(){
+        CustomDialog.show(new OnBindView<CustomDialog>(R.layout.layout_custom_dialog) {
+            @Override
+            public void onBind(final CustomDialog dialog, View v) {
+                log("#A");
+                v.findViewById(R.id.btn_ok).setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        b();
+                        dialog.dismiss();
+                    }
+                });
+            }
+        })
+                .setFullScreen(true)
+                .setMaskColor(getResources().getColor(R.color.black30));
+    }
+    
     @Override
     public void setEvents() {
         grpTheme.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
@@ -256,13 +292,14 @@ public class MainActivity extends BaseActivity {
         btnMessageDialog.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                MessageDialog.show("标题", "这里是正文内容。", "确定").setOkButton(new OnDialogButtonClickListener<MessageDialog>() {
-                    @Override
-                    public boolean onClick(MessageDialog baseDialog, View v) {
-                        PopTip.show("点击确定按钮");
-                        return false;
-                    }
-                });
+//                MessageDialog.show("标题", "这里是正文内容。", "确定").setOkButton(new OnDialogButtonClickListener<MessageDialog>() {
+//                    @Override
+//                    public boolean onClick(MessageDialog baseDialog, View v) {
+//                        PopTip.show("点击确定按钮");
+//                        return false;
+//                    }
+//                });
+               a();
             }
         });
         

+ 1 - 1
gradle.properties

@@ -18,5 +18,5 @@ android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
 
-BUILD_VERSION=0.0.37.beta3
+BUILD_VERSION=0.0.37.beta4
 BUILD_VERSION_INT=36