浏览代码

添加选择时间

Frankensteinly 1 年之前
父节点
当前提交
916d4739b6

+ 2 - 0
app/build.gradle

@@ -79,4 +79,6 @@ dependencies {
     implementation 'androidx.recyclerview:recyclerview:1.3.0'
 
     implementation 'com.leon:lfilepickerlibrary:1.8.0'
+
+    implementation 'com.github.jzmanu:MDatePickerSample:v1.0.5'
 }

+ 28 - 0
app/src/main/java/com/grkj/iscs/presentation/PresentationActivity.kt

@@ -1,10 +1,14 @@
 package com.grkj.iscs.presentation
 
 import android.os.Environment
+import android.view.Gravity
 import com.grkj.iscs.base.BaseMvpActivity
 import com.grkj.iscs.databinding.ActivityPresentationBinding
 import com.grkj.iscs.util.FileUtil
 import com.grkj.iscs.widget.SelectableInput
+import com.manu.mdatepicker.MDatePicker
+import java.text.SimpleDateFormat
+import java.util.Date
 import java.util.stream.Collectors
 
 class PresentationActivity :
@@ -68,6 +72,30 @@ class PresentationActivity :
         mBinding?.confirm?.setOnClickListener {
             confirm()
         }
+
+        mBinding?.tvStartTime?.setOnClickListener {
+            MDatePicker.create(this)
+                .setCanceledTouchOutside(true)
+                .setGravity(Gravity.BOTTOM)
+                .setSupportTime(true)
+                .setTwelveHour(false)
+                .setOnDateResultListener {
+                    mBinding?.tvStartTime?.text = SimpleDateFormat("yyyy-MM-dd HH:mm").format(Date(it))
+                }
+                .build().show()
+        }
+
+        mBinding?.tvEndTime?.setOnClickListener {
+            MDatePicker.create(this)
+                .setCanceledTouchOutside(true)
+                .setGravity(Gravity.BOTTOM)
+                .setSupportTime(true)
+                .setTwelveHour(false)
+                .setOnDateResultListener {
+                    mBinding?.tvEndTime?.text = SimpleDateFormat("yyyy-MM-dd HH:mm").format(Date(it))
+                }
+               .build().show()
+        }
     }
 
     private fun confirm() {

+ 0 - 1
app/src/main/java/com/grkj/iscs/widget/SelectableInput.kt

@@ -59,7 +59,6 @@ class SelectableInput(private val ctx: Context, attrs: AttributeSet) : LinearLay
 
 //            btnDropdown.visibility = View.VISIBLE
             mBinding.et.setOnClickListener {
-                println("haha : ${mOptionList.isNotEmpty()}")
                 if (mOptionList.isNotEmpty()) {
                     showDropdown()
                 }

+ 39 - 4
app/src/main/res/layout/activity_presentation.xml

@@ -6,10 +6,10 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
+    android:overScrollMode="never"
     android:paddingHorizontal="100px"
     android:paddingTop="100px"
     android:scrollbars="none"
-    android:overScrollMode="never"
     tools:context=".presentation.PresentationActivity">
 
     <LinearLayout
@@ -115,15 +115,50 @@
             app:mode="select"
             app:name="@string/presentation_person_safety" />
 
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20px"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="@dimen/selectable_input_width"
+                android:layout_height="wrap_content"
+                android:layout_margin="20px"
+                android:text="@string/start_time"
+                android:textColor="@color/main_color" />
+
+            <TextView
+                android:id="@+id/tv_start_time"
+                android:layout_width="400px"
+                android:layout_height="wrap_content"
+                android:layout_margin="20px"
+                android:background="@drawable/selectable_input_text_bg" />
+
+            <TextView
+                android:layout_width="@dimen/selectable_input_width"
+                android:layout_height="wrap_content"
+                android:layout_margin="20px"
+                android:text="@string/end_time"
+                android:textColor="@color/main_color" />
+
+            <TextView
+                android:id="@+id/tv_end_time"
+                android:layout_width="400px"
+                android:layout_height="wrap_content"
+                android:layout_margin="20px"
+                android:background="@drawable/selectable_input_text_bg" />
+        </LinearLayout>
+
         <Button
             android:id="@+id/confirm"
             android:layout_width="200dp"
             android:layout_height="50dp"
+            android:layout_gravity="center_horizontal"
+            android:layout_margin="5dp"
             android:minWidth="0dp"
             android:minHeight="0dp"
             android:text="确定"
-            android:textSize="10sp"
-            android:layout_margin="5dp"
-            android:layout_gravity="center_horizontal"/>
+            android:textSize="10sp" />
     </LinearLayout>
 </androidx.core.widget.NestedScrollView>