Merge branch 'V3.1.1'

cl-6666 · Jan 25, 2024 · c1acc7e · c1acc7e
2 parents 279e5fc + 2e0334f
commit c1acc7e
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 6 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -10,19 +10,26 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity android:name="com.cl.dialog.MainActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
         </activity>
 
 
         <activity android:name=".ui.SystemDialog" />
         <activity android:name=".ui.NormalDFActivity" />
         <activity android:name=".ui.DialogEncapActivity" />
         <activity android:name=".ui.DiffentDialogActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+<!--            <intent-filter>-->
+<!--                <action android:name="android.intent.action.MAIN" />-->
 
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
+<!--                <category android:name="android.intent.category.LAUNCHER" />-->
+<!--            </intent-filter>-->
         </activity>
     </application>
 
+
+
 </manifest>
diff --git a/app/src/main/java/com/cl/dialog/ui/DiffentDialogActivity.java b/app/src/main/java/com/cl/dialog/ui/DiffentDialogActivity.java
@@ -396,7 +396,10 @@ public void evaluateDialog(View view) {
                 .setScreenWidthAspect(this, 1.0f)
                 .setGravity(Gravity.BOTTOM)
                 .addOnClickListener(R.id.btn_evluate)
-                .setOnBindViewListener(new OnBindViewListener() {
+                .
+                setOnBindViewListener
+
+                        (new OnBindViewListener() {
                     @Override
                     public void bindView(BindViewHolder viewHolder) {
                         final EditText editText = viewHolder.getView(R.id.editText);

diff --git a/app/src/main/res/layout/scroll_date_picker.xml b/app/src/main/res/layout/scroll_date_picker.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <NumberPicker
+        android:id="@+id/yearPicker"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"/>
+
+    <NumberPicker
+        android:id="@+id/monthPicker"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"/>
+
+    <NumberPicker
+        android:id="@+id/dayPicker"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"/>
+</merge>
diff --git a/xdialog/src/main/java/com/cl/xdialog/list/XListDialog.kt b/xdialog/src/main/java/com/cl/xdialog/list/XListDialog.kt
@@ -48,9 +48,14 @@ class XListDialog : XDialog() {
         } else {
             Log.d("TDialog", "列表弹窗需要先调用setAdapter()方法!")
         }
-
     }
 
+    /**
+     * 返回getAdapter出去，方便外部调用notifyDataSetChanged()
+     */
+    val adapter: XBaseAdapter<*>?
+        get() = xController.adapter
+
 
     /*********************************************************************
      * 使用Builder模式实现