From 15f5680b532238290d0adf095a93e5af1c5f1203 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期五, 07 二月 2025 17:14:57 +0800
Subject: [PATCH] 1.添加显示隐藏取水口、分水房功能 2.完善图例自定义控件功能和显示 3.处理工单添加选择时间功能
---
app/src/main/java/com/dayu/pipirrapp/activity/OrderDealActivity.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/app/src/main/java/com/dayu/pipirrapp/activity/OrderDealActivity.java b/app/src/main/java/com/dayu/pipirrapp/activity/OrderDealActivity.java
index 0d707c0..411a8e2 100644
--- a/app/src/main/java/com/dayu/pipirrapp/activity/OrderDealActivity.java
+++ b/app/src/main/java/com/dayu/pipirrapp/activity/OrderDealActivity.java
@@ -23,13 +23,11 @@
import com.dayu.pipirrapp.bean.net.AddProcessingRequest;
import com.dayu.pipirrapp.bean.net.InsectionResult;
import com.dayu.pipirrapp.bean.net.UplodFileState;
-import com.dayu.pipirrapp.dao.DaoSingleton;
import com.dayu.pipirrapp.databinding.ActivityOrderDealBinding;
import com.dayu.pipirrapp.fragment.OrderFragment;
import com.dayu.pipirrapp.net.ApiManager;
import com.dayu.pipirrapp.net.BaseResponse;
import com.dayu.pipirrapp.net.subscribers.SubscriberListener;
-import com.dayu.pipirrapp.net.upload.UploadFileListener;
import com.dayu.pipirrapp.tool.FileUploadUtils;
import com.dayu.pipirrapp.tool.FullyGridLayoutManager;
import com.dayu.pipirrapp.tool.GlideEngine;
@@ -58,10 +56,8 @@
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import retrofit2.Call;
@@ -87,6 +83,7 @@
Map<String, UplodFileState> uplodFileStates = new HashMap<>();
String workOrderId;
LatLonBean latLonBean;
+ String strCompleteTime;
/**
* 瀹氫綅鐩戝惉
@@ -124,13 +121,15 @@
new CardDatePickerDialog.Builder(this)
.setTitle("閫夋嫨澶勭悊鏃堕棿")
.setOnChoose("纭畾", aLong -> {
- //aLong = millisecond
-
+ //aLong = millisecond
+ strCompleteTime = com.dayu.pipirrapp.utils.DateUtils.formatTimestamp(aLong);
+ binding.timeData.setText(strCompleteTime);
return null;
})
.showBackNow(true)
.setDefaultTime(time)
.setMaxTime(time)
+ .setMinTime(time - 365L * 24 * 60 * 60 * 1000) // 璁剧疆鏈�灏忔椂闂翠负涓�骞村墠
.setDisplayType(list)
.build().show();
});
@@ -306,7 +305,7 @@
result.setContent(binding.contentET.getText().toString());
result.setInspectorId(MyApplication.myApplication.userId);
result.setWorkOrderId(workOrderId);
- result.setCompleteTime(com.dayu.pipirrapp.utils.DateUtils.getNowDateToMMStr());
+ result.setCompleteTime(strCompleteTime);
if (latLonBean != null) {
result.setLat(String.valueOf(latLonBean.getLatitude()));
result.setLng(String.valueOf(latLonBean.getLongitude()));
--
Gitblit v1.8.0