app/src/main/java/com/application/zhangshi_app_android/ui/function/MeetingDetailActivity.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
app/src/main/java/com/application/zhangshi_app_android/ui/function/MeetingapproveActivity.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
app/src/main/java/com/application/zhangshi_app_android/ui/function/WebcastDetailActivity.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
app/src/main/res/layout/activity_meeting_approve_detail.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
app/src/main/res/layout/activity_meeting_detail.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
app/src/main/res/layout/activity_webcast_detail.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
app/src/main/res/layout/item_meeting_approve.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
app_base/src/main/java/com/android/app_base/utils/StringStatus.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
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); } }); } }); 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), 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(); } }); 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}" /> 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" /> 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" 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" app_base/src/main/java/com/android/app_base/utils/StringStatus.java
New file @@ -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"); } }