From caead5ad019c24b9a7958f01fa663ea8159aee6c Mon Sep 17 00:00:00 2001
From: guoshen <3129367635@qq.com>
Date: 星期一, 01 七月 2024 16:16:04 +0800
Subject: [PATCH] 修复会议申请的闪退bgg(starttime,endtime字段的划分和修改)

---
 app/src/main/java/com/application/zhangshi_app_android/ui/function/MeetingapproveDetailActivity.java |  116 +++++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 78 insertions(+), 38 deletions(-)

diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/MeetingapproveDetailActivity.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/MeetingapproveDetailActivity.java
index 0e08dd8..ccb8c08 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/function/MeetingapproveDetailActivity.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/MeetingapproveDetailActivity.java
@@ -186,76 +186,116 @@
         }
 
 
-
-        binding.etDate1.setOnClickListener(new View.OnClickListener() {
+        binding.etStartTime.setOnClickListener(new View.OnClickListener() {
+            private String datee;
+            private String timee;
             @Override
             public void onClick(View v) {
                 DatePicker picker = getDatePicker();
-                picker.setTitle("閫夋嫨鏃堕棿");
+                TimePicker picker2 = getTimePicker();
+                picker.setTitle("閫夋嫨鏃ユ湡");
+                picker2.setTitle("閫夋嫨鏃堕棿");
                 picker.setOnDatePickedListener(new OnDatePickedListener() {
                     @Override
                     public void onDatePicked(int year, int month, int day) {
                         String date = String.format(Locale.CHINA, "%d-%02d-%02d", year, month, day);
-                        binding.etDate1.setText(date);
+                        datee = date;
+
+                        // 鍦ㄦ棩鏈熼�夋嫨鍚庢樉绀烘椂闂撮�夋嫨鍣�
+                        picker2.show();
                     }
                 });
                 picker.show();
+                picker2.setOnTimePickedListener(new OnTimePickedListener() {
+                    @Override
+                    public void onTimePicked(int hour, int minute, int second) {
+                        String time = String.format(Locale.CHINA, "%d:%02d:%02d", hour, minute, second);
+                        timee = time;
+                        // 鍚堝苟鏃ユ湡鍜屾椂闂村苟璁剧疆鍒扮紪杈戞
+                        String starttime = datee + " " + timee;
+                        binding.etStartTime.setText(starttime);
+                    }
+                });
             }
         });
 
-        binding.etDate2.setOnClickListener(new View.OnClickListener() {
+
+
+
+
+
+        binding.etEndTime.setOnClickListener(new View.OnClickListener() {
+            private String datee;
+            private String timee;
             @Override
             public void onClick(View v) {
                 DatePicker picker = getDatePicker();
-                picker.setTitle("閫夋嫨鏃堕棿");
+                TimePicker picker2 = getTimePicker();
+                picker.setTitle("閫夋嫨鏃ユ湡");
+                picker2.setTitle("閫夋嫨鏃堕棿");
                 picker.setOnDatePickedListener(new OnDatePickedListener() {
                     @Override
                     public void onDatePicked(int year, int month, int day) {
                         String date = String.format(Locale.CHINA, "%d-%02d-%02d", year, month, day);
-                        binding.etDate2.setText(date);
+                        datee = date;
+
+                        // 鍦ㄦ棩鏈熼�夋嫨鍚庢樉绀烘椂闂撮�夋嫨鍣�
+                        picker2.show();
                     }
                 });
                 picker.show();
-            }
-        });
-
-        binding.etTime1.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                TimePicker picker = getTimePicker();
-                picker.setTitle("閫夋嫨鏃堕棿");
-                picker.setOnTimePickedListener(new OnTimePickedListener() {
-
+                picker2.setOnTimePickedListener(new OnTimePickedListener() {
                     @Override
-
-                    public void onTimePicked(int hour, int Minute,int second) {
-//                        second = '0';
-                        String date = String.format(Locale.CHINA, "%d:%02d:%02d",hour,Minute,second);
-                        binding.etTime1.setText(date);
+                    public void onTimePicked(int hour, int minute, int second) {
+                        String time = String.format(Locale.CHINA, "%d:%02d:%02d", hour, minute, second);
+                        timee = time;
+                        // 鍚堝苟鏃ユ湡鍜屾椂闂村苟璁剧疆鍒扮紪杈戞
+                        String endtime = datee + " " + timee;
+                        binding.etEndTime.setText(endtime);
                     }
                 });
-                picker.show();
             }
         });
 
 
 
+//        binding.etDate1.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View v) {
+//                DatePicker picker = getDatePicker();
+//                picker.setTitle("閫夋嫨鏃堕棿");
+//                picker.setOnDatePickedListener(new OnDatePickedListener() {
+//                    @Override
+//                    public void onDatePicked(int year, int month, int day) {
+//                        String date = String.format(Locale.CHINA, "%d-%02d-%02d", year, month, day);
+//                        binding.etDate1.setText(date);
+//                    }
+//                });
+//                picker.show();
+//            }
+//        });
 
-        binding.etTime2.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                TimePicker picker = getTimePicker();
-                picker.setTitle("閫夋嫨鏃堕棿");
-                picker.setOnTimePickedListener(new OnTimePickedListener() {
-                    @Override
-                    public void onTimePicked(int hour, int Minute, int second) {
-                        String date = String.format(Locale.CHINA, "%d:%02d:%02d",hour,Minute,second );
-                        binding.etTime2.setText(date);
-                    }
-                });
-                picker.show();
-            }
-        });
+//
+
+//        binding.etTime1.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View v) {
+//                TimePicker picker = getTimePicker();
+//                picker.setTitle("閫夋嫨鏃堕棿");
+//                picker.setOnTimePickedListener(new OnTimePickedListener() {
+//
+//                    @Override
+//
+//                    public void onTimePicked(int hour, int Minute,int second) {
+////                        second = '0';
+//                        String date = String.format(Locale.CHINA, "%d:%02d:%02d",hour,Minute,second);
+//                        binding.etTime1.setText(date);
+//                    }
+//                });
+//                picker.show();
+//            }
+//        });
+
 
 
 

--
Gitblit v1.9.1