0.0.39.beta2

DialogX/src/main/java/com/kongzue/dialogx/dialogs/MessageDialog.java

@@ -8,6 +8,7 @@ import android.os.Handler;
 import android.os.Looper;
 import android.text.InputFilter;
 import android.text.InputType;
+import android.text.method.LinkMovementMethod;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.animation.AccelerateInterpolator;
@@ -277,6 +278,8 @@ public class MessageDialog extends BaseDialog {
             btnSelectPositive.getPaint().setFakeBoldText(true);
             btnSelectOther.getPaint().setFakeBoldText(true);
             
+            txtDialogTip.setMovementMethod(LinkMovementMethod.getInstance());
+            
             boxRoot.setParentDialog(me);
             boxRoot.setOnLifecycleCallBack(new DialogXBaseRelativeLayout.OnLifecycleCallBack() {
                 @Override

DialogX/src/main/java/com/kongzue/dialogx/interfaces/BaseDialog.java

@@ -51,19 +51,26 @@ public abstract class BaseDialog {
     private WeakReference<View> dialogView;
     
     public static void init(Context context) {
+        if (context instanceof Activity) {
+            initActivityContext((Activity) context);
+        }
         ActivityLifecycleImpl.init(context, new ActivityLifecycleImpl.onActivityResumeCallBack() {
             @Override
             public void getActivity(Activity activity) {
-                try {
-                    contextWeakReference = new WeakReference<>(activity);
-                    rootFrameLayout = new WeakReference<>((FrameLayout) activity.getWindow().getDecorView());
-                } catch (Exception e) {
-                    error("DialogX.init: 初始化异常，找不到Activity的根布局");
-                }
+                initActivityContext(activity);
             }
         });
     }
     
+    private static void initActivityContext(Activity activity) {
+        try {
+            contextWeakReference = new WeakReference<>(activity);
+            rootFrameLayout = new WeakReference<>((FrameLayout) activity.getWindow().getDecorView());
+        } catch (Exception e) {
+            error("DialogX.init: 初始化异常，找不到Activity的根布局");
+        }
+    }
+    
     protected static void log(Object o) {
         if (DEBUGMODE) Log.i(">>>", o.toString());
     }
@@ -344,7 +351,7 @@ public abstract class BaseDialog {
     }
     
     public static void recycleDialog(Activity activity) {
-        if (DialogX.implIMPLMode == DialogX.IMPL_MODE.WINDOW){
+        if (DialogX.implIMPLMode == DialogX.IMPL_MODE.WINDOW) {
             if (runningDialogList != null) {
                 CopyOnWriteArrayList<BaseDialog> copyOnWriteList = new CopyOnWriteArrayList<>(runningDialogList);
                 for (BaseDialog baseDialog : copyOnWriteList) {

app/build.gradle

@@ -29,11 +29,11 @@ repositories {
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'com.kongzue.baseframeworkx:baseframework:6.7.9'
+    implementation 'com.github.kongzue:BaseFramework:6.7.9.5'
 
-    implementation 'com.github.kongzue.dialogx:DialogXIOSStyle:0.0.37.beta1'
-    implementation 'com.github.kongzue.dialogx:DialogXKongzueStyle:0.0.37.beta1'
-    implementation 'com.github.kongzue.dialogx:DialogXMIUIStyle:0.0.37.beta1'
+    implementation 'com.github.kongzue.dialogx:DialogXIOSStyle:0.0.38'
+    implementation 'com.github.kongzue.dialogx:DialogXKongzueStyle:0.0.38'
+    implementation 'com.github.kongzue.dialogx:DialogXMIUIStyle:0.0.38'
 
     implementation 'com.github.kongzue:DialogXStyle-Snackbar:1.0.6'
     //implementation 'com.github.kongzue.dialogx:DialogX:0.0.37'

app/release/output-metadata.json

@@ -5,13 +5,13 @@
     "kind": "Directory"
   },
   "applicationId": "com.kongzue.dialogxdemo",
-  "variantName": "processReleaseResources",
+  "variantName": "release",
   "elements": [
     {
       "type": "SINGLE",
       "filters": [],
-      "versionCode": 37,
-      "versionName": "0.0.37.beta1",
+      "versionCode": 38,
+      "versionName": "0.0.39.beta1",
       "outputFile": "app-release.apk"
     }
   ]

app/src/main/java/com/kongzue/dialogxdemo/MainActivity.java

@@ -9,6 +9,11 @@ import android.graphics.PixelFormat;
 import android.net.Uri;
 import android.os.Handler;
 import android.os.Looper;
+import android.text.Spannable;
+import android.text.SpannableString;
+import android.text.Spanned;
+import android.text.style.ClickableSpan;
+import android.text.style.ForegroundColorSpan;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.View;
@@ -265,6 +270,7 @@ public class MainActivity extends BaseActivity {
                         return false;
                     }
                 });
+//                showSecondDialog1();
             }
         });
         
@@ -724,6 +730,28 @@ public class MainActivity extends BaseActivity {
         });
     }
     
+//    private void showSecondDialog1() {
+//        SpannableString spannableString = new SpannableString("这里是一段文本，点击链接");
+//        spannableString.setSpan(new ClickableSpan(){
+//            @Override
+//            public void onClick(@NonNull View widget) {
+//                showSecondDialog2();
+//            }
+//        },9, spannableString.length(), Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
+//        MessageDialog.show("标题", spannableString, "确定");
+//    }
+//
+//    private void showSecondDialog2() {
+//        SpannableString spannableString = new SpannableString("这里是另一段一段文本，再次点击链接");
+//        spannableString.setSpan(new ClickableSpan(){
+//            @Override
+//            public void onClick(@NonNull View widget) {
+//                showSecondDialog1();
+//            }
+//        },14, spannableString.length(), Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
+//        MessageDialog.show("标题", spannableString, "确定");
+//    }
+    
     private void initFullScreenLoginDemo(final FullScreenDialog fullScreenDialog) {
         btnCancel.setOnClickListener(new View.OnClickListener() {
             @Override

gradle.properties

@@ -18,5 +18,5 @@ android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
 
-BUILD_VERSION=0.0.39.beta1
+BUILD_VERSION=0.0.39.beta2
 BUILD_VERSION_INT=38