From cf2204a85fa951dd9ce2698378101d822e6edbc8 Mon Sep 17 00:00:00 2001
From: guoshen <3129367635@qq.com>
Date: 星期六, 06 七月 2024 10:31:02 +0800
Subject: [PATCH] 会议审批显示成功
---
app/src/main/java/com/application/zhangshi_app_android/ui/function/MeetingDetailActivity.java | 75 ++++++++++++++++++
app/src/main/res/layout/item_meeting_approve.xml | 3
app/src/main/res/layout/activity_meeting_detail.xml | 1
app/src/main/res/layout/activity_meeting_approve_detail.xml | 3
app_base/src/main/java/com/android/app_base/utils/StringStatus.java | 19 ++++
app/src/main/java/com/application/zhangshi_app_android/ui/function/WebcastDetailActivity.java | 80 ++++++++++----------
app/src/main/java/com/application/zhangshi_app_android/ui/function/MeetingapproveActivity.java | 2
app/src/main/res/layout/activity_webcast_detail.xml | 50 +-----------
8 files changed, 145 insertions(+), 88 deletions(-)
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/MeetingDetailActivity.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/MeetingDetailActivity.java
index e33ebb5..68d6cd8 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/function/MeetingDetailActivity.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/MeetingDetailActivity.java
@@ -29,14 +29,19 @@
import com.application.zhangshi_app_android.bean.MeetingBean;
import com.application.zhangshi_app_android.databinding.ActivityMeetingDetailBinding;
import com.application.zhangshi_app_android.ui.DLBaseActivity;
+import com.github.gzuliyujiang.wheelpicker.DatePicker;
import com.github.gzuliyujiang.wheelpicker.OptionPicker;
+import com.github.gzuliyujiang.wheelpicker.TimePicker;
+import com.github.gzuliyujiang.wheelpicker.contract.OnDatePickedListener;
import com.github.gzuliyujiang.wheelpicker.contract.OnOptionPickedListener;
+import com.github.gzuliyujiang.wheelpicker.contract.OnTimePickedListener;
import com.luck.picture.lib.entity.LocalMedia;
import com.luck.picture.lib.interfaces.OnResultCallbackListener;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import java.util.Locale;
/**
@@ -185,6 +190,76 @@
+ binding.etStartTime.setOnClickListener(new View.OnClickListener() {
+ private String datee;
+ private String timee;
+
+ @Override
+ public void onClick(View v) {
+ DatePicker picker = getDatePicker();
+ 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);
+ 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.etEndTime.setOnClickListener(new View.OnClickListener() {
+ private String datee;
+ private String timee;
+
+ @Override
+ public void onClick(View v) {
+ DatePicker picker = getDatePicker();
+ 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);
+ 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 endtime = datee + " " + timee;
+ binding.etEndTime.setText(endtime);
+ }
+ });
+ }
+ });
+
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/MeetingapproveActivity.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/MeetingapproveActivity.java
index e75f157..1bdb555 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/function/MeetingapproveActivity.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/MeetingapproveActivity.java
@@ -78,7 +78,7 @@
binding.recyclerView.addItemDecoration(itemDecoration);
binding.recyclerView.setAdapter(adapter);
//鍙充笂瑙掓搷浣滃脊绐�
- mOperatePopupWindow = initPopUpWindow(View.inflate(this,R.layout.pop_operate,null));
+ mOperatePopupWindow = initPopUpWindow(View.inflate(this,R.layout.pop_operate_read,null));
setOnClickListener(
mOperatePopupWindow.getContentView().findViewById(R.id.tv_add),
mOperatePopupWindow.getContentView().findViewById(R.id.tv_select),
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/WebcastDetailActivity.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/WebcastDetailActivity.java
index 570c780..468f7ea 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/function/WebcastDetailActivity.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/WebcastDetailActivity.java
@@ -173,73 +173,73 @@
- 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) {
+ String time = String.format(Locale.CHINA, "%d:%02d:%02d", hour, minute, second);
+ timee = time;
- 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);
+ // 鍚堝苟鏃ユ湡鍜屾椂闂村苟璁剧疆鍒扮紪杈戞
+ String endtime = datee + " " + timee;
+ binding.etEndTime.setText(endtime);
}
});
- 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();
}
});
diff --git a/app/src/main/res/layout/activity_meeting_approve_detail.xml b/app/src/main/res/layout/activity_meeting_approve_detail.xml
index bae8c2e..d6a4e30 100644
--- a/app/src/main/res/layout/activity_meeting_approve_detail.xml
+++ b/app/src/main/res/layout/activity_meeting_approve_detail.xml
@@ -4,6 +4,7 @@
xmlns:tools="http://schemas.android.com/tools">
<data>
+ <import type="com.android.app_base.utils.StringStatus"/>
<variable
name="viewModel"
type="com.application.zhangshi_app_android.ui.function.MeetingapproveDetailActivityViewModel" />
@@ -307,7 +308,7 @@
android:textColorHint="#6b000000"
android:textColor="#DE000000"
android:textSize="16sp"
- android:text="@={viewModel.beanLiveData.statu}"
+ android:text="@={StringStatus.statusToText(viewModel.beanLiveData.statu)}"
android:enabled="@{viewModel.typeLiveData}"
/>
diff --git a/app/src/main/res/layout/activity_meeting_detail.xml b/app/src/main/res/layout/activity_meeting_detail.xml
index 357a39c..35cf55d 100644
--- a/app/src/main/res/layout/activity_meeting_detail.xml
+++ b/app/src/main/res/layout/activity_meeting_detail.xml
@@ -4,7 +4,6 @@
xmlns:tools="http://schemas.android.com/tools">
<data>
- <import type="com.android.app_base.utils.DateTimeConverter"/>
<variable
name="viewModel"
type="com.application.zhangshi_app_android.ui.function.MeetingDetailActivityViewModel" />
diff --git a/app/src/main/res/layout/activity_webcast_detail.xml b/app/src/main/res/layout/activity_webcast_detail.xml
index 634e0dd..01c1e10 100644
--- a/app/src/main/res/layout/activity_webcast_detail.xml
+++ b/app/src/main/res/layout/activity_webcast_detail.xml
@@ -4,7 +4,6 @@
xmlns:tools="http://schemas.android.com/tools">
<data>
- <import type="com.android.app_base.utils.DateTimeConverter"/>
<variable
name="viewModel"
type="com.application.zhangshi_app_android.ui.function.WebcastDetailActivityViewModel" />
@@ -151,37 +150,18 @@
>
<EditText
- android:id="@+id/et_date1"
+ android:id="@+id/et_start_time"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:enabled="@{viewModel.typeLiveData}"
- android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ュ紑濮嬫椂闂寸殑骞存湀鏃:``}"
+ android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ュ紑濮嬫椂闂碻:``}"
android:inputType="text"
- android:text="@={DateTimeConverter.dateFromString(viewModel.beanLiveData.startTime)}"
+ android:text="@={viewModel.beanLiveData.startTime}"
android:textColor="#DE000000"
android:textColorHint="#6b000000"
android:textSize="16sp"
app:isEditable="@{false}" />
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text=" "
- />
- <EditText
- android:id="@+id/et_time1"
- android:layout_width="0dp"
- android:layout_weight="1"
- android:layout_height="wrap_content"
- android:enabled="@{viewModel.typeLiveData}"
- android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ュ紑濮嬫椂闂寸殑鏃跺垎绉抈:``}"
- android:inputType="text"
- android:text="@={DateTimeConverter.timeFromString(viewModel.beanLiveData.startTime)}"
- android:textColor="#DE000000"
- android:textColorHint="#6b000000"
- android:textSize="16sp"
- app:isEditable="@{false}" />
-
</LinearLayout>
@@ -203,32 +183,14 @@
>
<EditText
- android:id="@+id/et_date2"
+ android:id="@+id/et_end_time"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:enabled="@{viewModel.typeLiveData}"
- android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ョ粨鏉熸椂闂寸殑骞存湀鏃:``}"
+ android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ョ粨鏉熸椂闂碻:``}"
android:inputType="text"
- android:text="@={DateTimeConverter.dateFromString(viewModel.beanLiveData.endTime)}"
- android:textColor="#DE000000"
- android:textColorHint="#6b000000"
- android:textSize="16sp"
- app:isEditable="@{false}" />
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text=" "
- />
- <EditText
- android:id="@+id/et_time2"
- android:layout_width="0dp"
- android:layout_weight="1"
- android:layout_height="wrap_content"
- android:enabled="@{viewModel.typeLiveData}"
- android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ョ粨鏉熸椂闂寸殑鏃跺垎绉抈:``}"
- android:inputType="text"
- android:text="@={DateTimeConverter.timeFromString(viewModel.beanLiveData.endTime)}"
+ android:text="@={viewModel.beanLiveData.endTime}"
android:textColor="#DE000000"
android:textColorHint="#6b000000"
android:textSize="16sp"
diff --git a/app/src/main/res/layout/item_meeting_approve.xml b/app/src/main/res/layout/item_meeting_approve.xml
index 0667520..db81f72 100644
--- a/app/src/main/res/layout/item_meeting_approve.xml
+++ b/app/src/main/res/layout/item_meeting_approve.xml
@@ -4,6 +4,7 @@
xmlns:tools="http://schemas.android.com/tools">
<data>
+ <import type="com.android.app_base.utils.StringStatus"/>
<variable
name="bean"
type="com.application.zhangshi_app_android.bean.MeetingBean" />
@@ -360,7 +361,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@={bean.statu}"
+ android:text="@={StringStatus.statusToText(bean.statu)}"
android:textColor="@color/black"
android:textSize="12sp"
diff --git a/app_base/src/main/java/com/android/app_base/utils/StringStatus.java b/app_base/src/main/java/com/android/app_base/utils/StringStatus.java
new file mode 100644
index 0000000..6c762c9
--- /dev/null
+++ b/app_base/src/main/java/com/android/app_base/utils/StringStatus.java
@@ -0,0 +1,19 @@
+package com.android.app_base.utils;
+
+import androidx.databinding.InverseMethod;
+
+/**
+ * Created by guoshen on 2024/7/3
+ */
+public class StringStatus {
+ @InverseMethod("statusToText")
+ public static String statusToText(String status){
+ return status =="1" ?"鍚屾剰":(status =="0"?"鎷掔粷":"寰呭鎵�");
+ }
+
+ @InverseMethod("textToStatus")
+
+ public static String textToStatus(String status){
+ return status.equals("鍚屾剰")?"1" :(status.equals("鎷掔粷")?"0":"-1");
+ }
+}
--
Gitblit v1.9.1