diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1fa527c..0879cc2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -148,6 +148,10 @@
android:name=".ui.activity.sbxj.SxgzActivity"
android:exported="false"
android:screenOrientation="portrait" />
+
-
+
@@ -16,6 +16,14 @@
+
+
+
+
+
+
+
+
diff --git a/app/src/main/java/com/rehome/dywoa/Contans.java b/app/src/main/java/com/rehome/dywoa/Contans.java
index 97fe0ae..5f424c1 100644
--- a/app/src/main/java/com/rehome/dywoa/Contans.java
+++ b/app/src/main/java/com/rehome/dywoa/Contans.java
@@ -42,16 +42,14 @@ public class Contans {
public static final String OPENQRCODESCAN = "OPENQRCODESCAN";
//连接服务器测试，看客户端是否能连接到服务器，如果能就响应个1
public static final String check_server_connect = "api/app/login/checkServerConnect";
- //获取当天点检任务执行情况
- public static final String CURRENT_DAY_DJ_FINISH_TJ = "api/app/pointTask/getTaskRunningState";
- //点检综合统计信息
- public static final String ZHTJ_DJ_FINISH_TJ = "api/app/pointTask/getPointTaskStatsComp";
- //历史点检记录
- public static final String HISTORY_DJ_FINISH_TJ = "api/app/pointTask/getPointTaskHistoryState";
+
+ //-----------------------kks码查询---------------------//
//获取KKS码信息
public static final String GET_KKS_INFO = "api/app/pointTask/getDeviceInfo";
//KKS码查工单消缺
public static final String KKS_SEARCH_GDXQ = "api/app/pointTask/getDefectWorkOrderInfo";
+ //-----------------------kks码查询结束---------------------//
+
//获取应急预案
public static final String YJYA_GET_LIST_TJ = "api/emergency/getPlan";
@@ -73,19 +71,45 @@ public class Contans {
- //-----------------------推送-待办事物---------------------//
- public static String PUSH = "TZDB/GetData.aspx"; //userid=test2
-
//-----------------------点检--------------------------//
- //获取点检列表数据
+ //获取点检下载列表数据
public static String DJJHLIST = "api/app/pointTask/getPlanTask";
+ //下载点检数据
public static String DJJHDLB = "api/app/pointTask/getUploadTaskList";
//待办
public static final String WAIT_FOR_TO_DO_WORK = "api/app/pointTask/getTaskToDo";
- //点检数据下载
- public static String DJJHXCJSSC = "DJGL/DJGL_XCJS.ashx";//ms:描述 fileps:文件 poinnum jhid
- public static String DJJHSC = "api/app/pointTask/uploadTaskList";//json字符串
+ //多条点检数据上传
+ public static String DJJHSC = "api/app/pointTask/uploadTaskList";
+ //待办事项(个人待办，对应网页端)
public static String GET_WAIT_FOR_TO_DO = "api/app/pointTask/getToDoCount";
+ //获取当天点检任务执行情况
+ public static final String CURRENT_DAY_DJ_FINISH_TJ = "api/app/pointTask/getTaskRunningState";
+ //点检综合统计信息
+ public static final String ZHTJ_DJ_FINISH_TJ = "api/app/pointTask/getPointTaskStatsComp";
+ //历史点检记录
+ public static final String HISTORY_DJ_FINISH_TJ = "api/app/pointTask/getPointTaskHistoryState";
+ //点检过程单条数据上传
+ public static String DJ_SINGLE_SC = "api/app/pointTask/uploadTaskOne";
+
+ //-----------------------点检结束--------------------------//
+
+ //==============================巡视抄表=========================================//
+ public final static String XSCB = "api/app/task/getPlanTask";//巡检管理/巡检任务列表
+ public final static String XSCB_PLAN_DOWNLOAD = "api/app/task/getUploadTaskList";///巡检管理/巡检任务/巡检数据管理/计划下载
+ public final static String XSCB_PLAN_UPLOAD = "api/app/task/uploadTaskList";//巡检管理/巡检任务/巡检数据管理/计划上传
+ public final static String XJD_UPLOAD_PHOTO = "api/app/task/upload";//巡检点上传图片
+ public final static String XSCB_PLAN_UPLOAD_TASK_ONE = "api/app/task/uploadTaskOne";//上传单个巡检点数据
+ public final static String XJ_GET_DROWDOWN_DATA = "api/app/task/getInspectionBasicData";//巡检统计获取下拉数据，专业，类型，值次
+ public final static String XJ_GET_ZH_TJ = "api/app/task/getIntegrativeStatisticsData";//巡检终合统计
+ //==============================巡视抄表结束=========================================//
+
+ //==============================缺陷工单=========================================//
+ //缺陷工单获取下拉数据，专业，机组，响应等级
+ public final static String QX_GET_DROWDOWN_DATA = "api/app/task/getBasicEquipmentData";
+ //上传单条缺陷工单
+ public final static String XJD_UPLOAD_QX = "api/app/task/addDefectLogin";
+ //==============================缺陷工单结束=========================================//
+
public static String DJJHQXGD = "DJGL/DJGL_QXGD.ashx";//json字符串
public final static int DLB = 1;
@@ -151,15 +175,8 @@ public class Contans {
public static final String SELECT_DAGER_DEPARTMENT = "select_dager_department";
}
- //==============================巡视抄表=========================================//
- public final static String XSCB = "api/app/task/getPlanTask";//巡检管理/巡检任务列表
- public final static String XSCB_PLAN_DOWNLOAD = "api/app/task/getUploadTaskList";///巡检管理/巡检任务/巡检数据管理/计划下载
- public final static String XSCB_PLAN_UPLOAD = "api/app/task/uploadTaskList";//巡检管理/巡检任务/巡检数据管理/计划上传
- public final static String XJD_UPLOAD_PHOTO = "api/app/task/upload";//巡检点上传图片
- public final static String XSCB_PLAN_UPLOAD_TASK_ONE = "api/app/task/uploadTaskOne";//上传单个巡检点数据
- //缺陷工单获取下拉数据，专业，机组，响应等级
- public final static String QX_GET_DROWDOWN_DATA = "api/app/task/getBasicEquipmentData";
- public final static String XJD_UPLOAD_QX = "api/app/task/addDefectLogin";//上传单条缺陷工单
+
+
public final static String BAXJ = "XSCB/BA_XJGL.ashx";//保安巡检任务列表
public final static String XSCB_PLAN_BA_DOWNLOAD = "XSCB/BA_XJGL.ashx";///保安巡检计划下载
public final static String XSCB_PLAN_BA_UPLOAD = "XSCB/BA_XJGL.ashx";///保安巡检计划上传
diff --git a/app/src/main/java/com/rehome/dywoa/DBModel/LxXjTjDropDown.java b/app/src/main/java/com/rehome/dywoa/DBModel/LxXjTjDropDown.java
new file mode 100644
index 0000000..75fcb39
--- /dev/null
+++ b/app/src/main/java/com/rehome/dywoa/DBModel/LxXjTjDropDown.java
@@ -0,0 +1,32 @@
+package com.rehome.dywoa.DBModel;
+
+
+
+import org.litepal.crud.DataSupport;
+
+/**
+ * Created by HuangWenfei on 2024/9/4.
+ * 巡检终合统计类型下拉数据
+ */
+
+public class LxXjTjDropDown extends DataSupport {
+
+ private String key;
+ private String value;
+
+ public String getKey() {
+ return key;
+ }
+
+ public void setKey(String key) {
+ this.key = key;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+}
diff --git a/app/src/main/java/com/rehome/dywoa/DBModel/LxXjTjDropDownData.java b/app/src/main/java/com/rehome/dywoa/DBModel/LxXjTjDropDownData.java
new file mode 100644
index 0000000..58f7387
--- /dev/null
+++ b/app/src/main/java/com/rehome/dywoa/DBModel/LxXjTjDropDownData.java
@@ -0,0 +1,34 @@
+package com.rehome.dywoa.DBModel;
+
+import java.util.List;
+
+public class LxXjTjDropDownData {
+ private int state;
+ private String msg;
+
+ private List data;
+
+ public int getState() {
+ return state;
+ }
+
+ public void setState(int state) {
+ this.state = state;
+ }
+
+ public String getMsg() {
+ return msg;
+ }
+
+ public void setMsg(String msg) {
+ this.msg = msg;
+ }
+
+ public List getData() {
+ return data;
+ }
+
+ public void setData(List data) {
+ this.data = data;
+ }
+}
diff --git a/app/src/main/java/com/rehome/dywoa/DBModel/ZcXjTjDropDown.java b/app/src/main/java/com/rehome/dywoa/DBModel/ZcXjTjDropDown.java
new file mode 100644
index 0000000..541d0c0
--- /dev/null
+++ b/app/src/main/java/com/rehome/dywoa/DBModel/ZcXjTjDropDown.java
@@ -0,0 +1,31 @@
+package com.rehome.dywoa.DBModel;
+
+
+import org.litepal.crud.DataSupport;
+
+/**
+ * Created by HuangWenfei on 2024/9/4.
+ * 巡检终合统计值次下拉数据
+ */
+
+public class ZcXjTjDropDown extends DataSupport {
+
+ private String key;
+ private String value;
+
+ public String getKey() {
+ return key;
+ }
+
+ public void setKey(String key) {
+ this.key = key;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/rehome/dywoa/DBModel/ZcXjTjDropDownData.java b/app/src/main/java/com/rehome/dywoa/DBModel/ZcXjTjDropDownData.java
new file mode 100644
index 0000000..a699f43
--- /dev/null
+++ b/app/src/main/java/com/rehome/dywoa/DBModel/ZcXjTjDropDownData.java
@@ -0,0 +1,34 @@
+package com.rehome.dywoa.DBModel;
+
+import java.util.List;
+
+public class ZcXjTjDropDownData {
+ private int state;
+ private String msg;
+
+ private List data;
+
+ public int getState() {
+ return state;
+ }
+
+ public void setState(int state) {
+ this.state = state;
+ }
+
+ public String getMsg() {
+ return msg;
+ }
+
+ public void setMsg(String msg) {
+ this.msg = msg;
+ }
+
+ public List getData() {
+ return data;
+ }
+
+ public void setData(List data) {
+ this.data = data;
+ }
+}
diff --git a/app/src/main/java/com/rehome/dywoa/DBModel/ZyXjTjDropDown.java b/app/src/main/java/com/rehome/dywoa/DBModel/ZyXjTjDropDown.java
new file mode 100644
index 0000000..a6cad98
--- /dev/null
+++ b/app/src/main/java/com/rehome/dywoa/DBModel/ZyXjTjDropDown.java
@@ -0,0 +1,31 @@
+package com.rehome.dywoa.DBModel;
+
+
+import org.litepal.crud.DataSupport;
+
+/**
+ * Created by HuangWenfei on 2024/9/4.
+ * 巡检终合统计专业下拉数据
+ */
+
+public class ZyXjTjDropDown extends DataSupport {
+
+ private String key;
+ private String value;
+
+ public String getKey() {
+ return key;
+ }
+
+ public void setKey(String key) {
+ this.key = key;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+}
diff --git a/app/src/main/java/com/rehome/dywoa/DBModel/ZyXjTjDropDownData.java b/app/src/main/java/com/rehome/dywoa/DBModel/ZyXjTjDropDownData.java
new file mode 100644
index 0000000..78f037d
--- /dev/null
+++ b/app/src/main/java/com/rehome/dywoa/DBModel/ZyXjTjDropDownData.java
@@ -0,0 +1,34 @@
+package com.rehome.dywoa.DBModel;
+
+import java.util.List;
+
+public class ZyXjTjDropDownData {
+ private int state;
+ private String msg;
+
+ private List data;
+
+ public int getState() {
+ return state;
+ }
+
+ public void setState(int state) {
+ this.state = state;
+ }
+
+ public String getMsg() {
+ return msg;
+ }
+
+ public void setMsg(String msg) {
+ this.msg = msg;
+ }
+
+ public List getData() {
+ return data;
+ }
+
+ public void setData(List data) {
+ this.data = data;
+ }
+}
diff --git a/app/src/main/java/com/rehome/dywoa/adapter/SpinnerAdapter.java b/app/src/main/java/com/rehome/dywoa/adapter/SpinnerAdapter.java
index 796f8bc..475d010 100644
--- a/app/src/main/java/com/rehome/dywoa/adapter/SpinnerAdapter.java
+++ b/app/src/main/java/com/rehome/dywoa/adapter/SpinnerAdapter.java
@@ -10,8 +10,11 @@ import android.widget.TextView;
import com.rehome.dywoa.DBModel.Gzlx;
import com.rehome.dywoa.DBModel.Jz;
+import com.rehome.dywoa.DBModel.LxXjTjDropDown;
import com.rehome.dywoa.DBModel.Xydj;
+import com.rehome.dywoa.DBModel.ZcXjTjDropDown;
import com.rehome.dywoa.DBModel.Zy;
+import com.rehome.dywoa.DBModel.ZyXjTjDropDown;
import com.rehome.dywoa.R;
import com.rehome.dywoa.entity.HgInfo;
import com.zhy.autolayout.utils.AutoUtils;
@@ -78,6 +81,12 @@ public class SpinnerAdapter extends BaseAdapter {
holder.tv.setText(((Gzlx) object).getValue());
}else if (object instanceof HgInfo.Hg) {
holder.tv.setText(((HgInfo.Hg) object).getBinnum());
+ }else if (object instanceof ZyXjTjDropDown) {
+ holder.tv.setText(((ZyXjTjDropDown) object).getValue());
+ }else if (object instanceof ZcXjTjDropDown) {
+ holder.tv.setText(((ZcXjTjDropDown) object).getValue());
+ }else if (object instanceof LxXjTjDropDown) {
+ holder.tv.setText(((LxXjTjDropDown) object).getValue());
}
} else {
holder.tv.setText(((HgInfo.Hg) object).getLotnum());
diff --git a/app/src/main/java/com/rehome/dywoa/adapter/XjZhTjAdapter.kt b/app/src/main/java/com/rehome/dywoa/adapter/XjZhTjAdapter.kt
new file mode 100644
index 0000000..13b52a9
--- /dev/null
+++ b/app/src/main/java/com/rehome/dywoa/adapter/XjZhTjAdapter.kt
@@ -0,0 +1,49 @@
+package com.rehome.dywoa.adapter
+
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import com.rehome.dywoa.base.BaseViewBindingAdapter
+import com.rehome.dywoa.bean.DjZhTjBean
+import com.rehome.dywoa.bean.HistoryDjBean
+import com.rehome.dywoa.bean.XjZhTjBean
+import com.rehome.dywoa.databinding.AdapterDjZhTjBinding
+import com.rehome.dywoa.databinding.AdapterHistoryDjBinding
+import com.rehome.dywoa.databinding.AdapterXjZhTjBinding
+
+class XjZhTjAdapter(var context: Context,
+ var data: MutableList) : BaseViewBindingAdapter(context) {
+ override fun getCount(): Int {
+ return data.count()
+ }
+
+ override fun getItem(position: Int): Any {
+ return data[position]
+ }
+
+ override fun getItemId(position: Int): Long {
+ return position.toLong()
+ }
+
+ override fun getBinding(
+ inflater: LayoutInflater,
+ parent: ViewGroup?
+ ) = AdapterXjZhTjBinding.inflate(inflater, parent, false)
+ override fun handleData(position: Int, binding: AdapterXjZhTjBinding) {
+ val item: XjZhTjBean.Row = data[position]
+ binding.tvJhmc.text = item.name
+
+ binding.tvSt.text = item.startTime
+ binding.tvEt.text = item.endTime
+
+ binding.tvZds.text = item.zds
+ binding.tvYjds.text = item.yjds
+ binding.tvWjds.text = item.wjds
+
+ binding.tvMjds.text = item.mjds
+ binding.tvRate.text = item.rate
+ }
+
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/rehome/dywoa/bean/XjZhTjBean.java b/app/src/main/java/com/rehome/dywoa/bean/XjZhTjBean.java
new file mode 100644
index 0000000..c3f1bf2
--- /dev/null
+++ b/app/src/main/java/com/rehome/dywoa/bean/XjZhTjBean.java
@@ -0,0 +1,91 @@
+package com.rehome.dywoa.bean;
+
+import java.util.List;
+
+public class XjZhTjBean extends BaseListBean{
+
+ private List Rows;
+
+ public List getRows() {
+ return Rows;
+ }
+
+ public void setRows(List rows) {
+ Rows = rows;
+ }
+
+ public static class Row {
+ private String name;
+ private String startTime;
+ private String endTime;
+ private String zds;
+ private String yjds;
+ private String wjds;
+ private String mjds;
+ private String rate;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getStartTime() {
+ return startTime;
+ }
+
+ public void setStartTime(String startTime) {
+ this.startTime = startTime;
+ }
+
+ public String getEndTime() {
+ return endTime;
+ }
+
+ public void setEndTime(String endTime) {
+ this.endTime = endTime;
+ }
+
+ public String getZds() {
+ return zds;
+ }
+
+ public void setZds(String zds) {
+ this.zds = zds;
+ }
+
+ public String getYjds() {
+ return yjds;
+ }
+
+ public void setYjds(String yjds) {
+ this.yjds = yjds;
+ }
+
+ public String getWjds() {
+ return wjds;
+ }
+
+ public void setWjds(String wjds) {
+ this.wjds = wjds;
+ }
+
+ public String getMjds() {
+ return mjds;
+ }
+
+ public void setMjds(String mjds) {
+ this.mjds = mjds;
+ }
+
+ public String getRate() {
+ return rate;
+ }
+
+ public void setRate(String rate) {
+ this.rate = rate;
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/HomeActivity.kt b/app/src/main/java/com/rehome/dywoa/ui/activity/HomeActivity.kt
index 29fc758..584de95 100644
--- a/app/src/main/java/com/rehome/dywoa/ui/activity/HomeActivity.kt
+++ b/app/src/main/java/com/rehome/dywoa/ui/activity/HomeActivity.kt
@@ -35,13 +35,19 @@ import com.rehome.dywoa.DBModel.Gzlx
import com.rehome.dywoa.DBModel.GzlxQxData
import com.rehome.dywoa.DBModel.Jz
import com.rehome.dywoa.DBModel.JzQxData
+import com.rehome.dywoa.DBModel.LxXjTjDropDown
+import com.rehome.dywoa.DBModel.LxXjTjDropDownData
import com.rehome.dywoa.DBModel.XSJJHDataBean
import com.rehome.dywoa.DBModel.XSJJHXZDataBean
import com.rehome.dywoa.DBModel.Xjjh
import com.rehome.dywoa.DBModel.Xydj
import com.rehome.dywoa.DBModel.XydjQxData
+import com.rehome.dywoa.DBModel.ZcXjTjDropDown
+import com.rehome.dywoa.DBModel.ZcXjTjDropDownData
import com.rehome.dywoa.DBModel.Zy
import com.rehome.dywoa.DBModel.ZyQxData
+import com.rehome.dywoa.DBModel.ZyXjTjDropDown
+import com.rehome.dywoa.DBModel.ZyXjTjDropDownData
import com.rehome.dywoa.R
import com.rehome.dywoa.base.BaseActivityOaToolbarViewBinding
import com.rehome.dywoa.bean.ApkUpdateBean
@@ -201,15 +207,22 @@ class HomeActivity : BaseActivityOaToolbarViewBinding() {
}
override fun initData() {
- deleteExpirePlan()
- waitForToDo()
+ deleteXjExpirePlan()
+ //巡检，点检待办
+ //waitForToDo()
+ //缺陷工单下拉数据
getQxDropDown("zy");
getQxDropDown("jz");
getQxDropDown("xydj");
getQxDropDown("gzlx");
+
+ //巡检终合统计下拉数据
+ getXjZhTjDropDown("zy");
+ getXjZhTjDropDown("zc");
+ getXjZhTjDropDown("lx");
}
- private fun deleteExpirePlan(){
+ private fun deleteXjExpirePlan(){
val xjdListAll = DataSupport.where("download = ? and username = ?", "1", username).find(Xjjh::class.java)
if(xjdListAll!=null&&xjdListAll.size>0){
for (xjdPlanItem in xjdListAll) {
@@ -563,9 +576,6 @@ class HomeActivity : BaseActivityOaToolbarViewBinding() {
val credential = "Bearer $token"
request.addHeader("Authorization", credential)
request.addHeader("token", token)
- showLog(request.url())
-// showLog(credential);
-// showLog(new Gson().toJson(request.headers()));
}
val gson = Gson()
@@ -625,9 +635,6 @@ class HomeActivity : BaseActivityOaToolbarViewBinding() {
val credential = "Bearer $token"
request.addHeader("Authorization", credential)
request.addHeader("token", token)
- showLog(request.url())
-// showLog(credential);
-// showLog(new Gson().toJson(request.headers()));
}
queueNoHttp.add(3, request, object : OnResponseListener {
@@ -763,14 +770,14 @@ class HomeActivity : BaseActivityOaToolbarViewBinding() {
request.addHeader("token", token)
}
- queueNoHttp.add(4, request, object : OnResponseListener {
+ queueNoHttp.add(4, request, object : OnResponseListener {
override fun onStart(what: Int) {
}
override fun onSucceed(what: Int, response: Response?) {
val result = response?.get()
- showLog(result)
+ //showLog(result)
//专业
if(type=="zy"){
@@ -780,9 +787,9 @@ class HomeActivity : BaseActivityOaToolbarViewBinding() {
showLog(zyQxData.data.size.toString())
val zyList = DataSupport.findAll(Zy::class.java)
if(zyList!=null&&zyList.size>0){
- showLog("zyList size > 0")
- showLog(GsonUtils.GsonString(zyList))
- showLog(zyList.size.toString())
+// showLog("zyList size > 0")
+// showLog(GsonUtils.GsonString(zyList))
+// showLog(zyList.size.toString())
DataSupport.deleteAll(Zy::class.java)
DataSupport.saveAll(zyQxData.data)
}else{
@@ -800,9 +807,9 @@ class HomeActivity : BaseActivityOaToolbarViewBinding() {
showLog(jzQxData.data.size.toString())
val jzList = DataSupport.findAll(Jz::class.java)
if(jzList!=null&&jzList.size>0){
- showLog("jzList size > 0")
- showLog(GsonUtils.GsonString(jzList))
- showLog(jzList.size.toString())
+// showLog("jzList size > 0")
+// showLog(GsonUtils.GsonString(jzList))
+// showLog(jzList.size.toString())
DataSupport.deleteAll(Jz::class.java)
DataSupport.saveAll(jzQxData.data)
}else{
@@ -820,9 +827,9 @@ class HomeActivity : BaseActivityOaToolbarViewBinding() {
showLog(xydjQxData.data.size.toString())
val xydjList = DataSupport.findAll(Xydj::class.java)
if(xydjList!=null&&xydjList.size>0){
- showLog("xydjList size > 0")
- showLog(GsonUtils.GsonString(xydjList))
- showLog(xydjList.size.toString())
+// showLog("xydjList size > 0")
+// showLog(GsonUtils.GsonString(xydjList))
+// showLog(xydjList.size.toString())
DataSupport.deleteAll(Xydj::class.java)
DataSupport.saveAll(xydjQxData.data)
}else{
@@ -840,9 +847,9 @@ class HomeActivity : BaseActivityOaToolbarViewBinding() {
showLog(gzlxQxData.data.size.toString())
val gzlxList = DataSupport.findAll(Gzlx::class.java)
if(gzlxList!=null&&gzlxList.size>0){
- showLog("gzlxList size > 0")
- showLog(GsonUtils.GsonString(gzlxList))
- showLog(gzlxList.size.toString())
+// showLog("gzlxList size > 0")
+// showLog(GsonUtils.GsonString(gzlxList))
+// showLog(gzlxList.size.toString())
DataSupport.deleteAll(Gzlx::class.java)
DataSupport.saveAll(gzlxQxData.data)
}else{
@@ -864,4 +871,103 @@ class HomeActivity : BaseActivityOaToolbarViewBinding() {
})
}
+ //巡检终合统计类型下拉数据
+ private fun getXjZhTjDropDown(type: String) {
+ var param = HashMap()
+ param["action"] = "QJ_TJ";
+ param["type"] = type
+ val json = GsonUtils.GsonString(param)
+
+ val url = Contans.IP + Contans.XJ_GET_DROWDOWN_DATA
+ showLog(url)
+ val request = NoHttp.createStringRequest(url, RequestMethod.POST)
+ request.setDefineRequestBodyForJson(json)
+
+ if (App.getInstance().userInfo != null && App.getInstance().userInfo.token != null) {
+ val token = App.getInstance().userInfo.token
+ val credential = "Bearer $token"
+ request.addHeader("Authorization", credential)
+ request.addHeader("token", token)
+ }
+
+ queueNoHttp.add(5, request, object : OnResponseListener {
+ override fun onStart(what: Int) {
+
+ }
+
+ override fun onSucceed(what: Int, response: Response?) {
+ val result = response?.get()
+ showLog(result)
+
+ //专业
+ if(type=="zy"){
+ val zyXjZhTjData = GsonUtils.GsonToBean(result, ZyXjTjDropDownData::class.java)
+ if (zyXjZhTjData != null&&zyXjZhTjData.state == 1) {
+ if (zyXjZhTjData.data != null&&zyXjZhTjData.data.size > 0) {
+ showLog(zyXjZhTjData.data.size.toString())
+ val xjZyList = DataSupport.findAll(ZyXjTjDropDown::class.java)
+ if(xjZyList!=null&&xjZyList.size>0){
+ showLog("xjZyList size > 0")
+ showLog(GsonUtils.GsonString(xjZyList))
+ showLog(xjZyList.size.toString())
+ DataSupport.deleteAll(ZyXjTjDropDown::class.java)
+ DataSupport.saveAll(zyXjZhTjData.data)
+ }else{
+ showLog("xjZyList size == 0")
+ DataSupport.saveAll(zyXjZhTjData.data)
+ }
+ }
+ }
+ }
+ //值次
+ if(type=="zc"){
+ val zcData = GsonUtils.GsonToBean(result, ZcXjTjDropDownData::class.java)
+ if (zcData != null&&zcData.state == 1) {
+ if (zcData.data != null&&zcData.data.size > 0) {
+ showLog(zcData.data.size.toString())
+ val zcList = DataSupport.findAll(ZcXjTjDropDown::class.java)
+ if(zcList!=null&&zcList.size>0){
+ showLog("zcList size > 0")
+ showLog(GsonUtils.GsonString(zcList))
+ showLog(zcList.size.toString())
+ DataSupport.deleteAll(ZcXjTjDropDown::class.java)
+ DataSupport.saveAll(zcData.data)
+ }else{
+ showLog("jzList size == 0")
+ DataSupport.saveAll(zcData.data)
+ }
+ }
+ }
+ }
+ //类型
+ if(type=="lx"){
+ val lxData = GsonUtils.GsonToBean(result, LxXjTjDropDownData::class.java)
+ if (lxData != null&&lxData.state == 1) {
+ if (lxData.data != null&&lxData.data.size > 0) {
+ showLog(lxData.data.size.toString())
+ val lxList = DataSupport.findAll(LxXjTjDropDown::class.java)
+ if(lxList!=null&&lxList.size>0){
+ showLog("lxList size > 0")
+ showLog(GsonUtils.GsonString(lxList))
+ showLog(lxList.size.toString())
+ DataSupport.deleteAll(LxXjTjDropDown::class.java)
+ DataSupport.saveAll(lxData.data)
+ }else{
+ showLog("lxList size == 0")
+ DataSupport.saveAll(lxData.data)
+ }
+ }
+ }
+ }
+ }
+
+ override fun onFailed(what: Int, response: Response?) {
+
+ }
+
+ override fun onFinish(what: Int) {
+
+ }
+ })
+ }
}
\ No newline at end of file
diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/LoginActivity.kt b/app/src/main/java/com/rehome/dywoa/ui/activity/LoginActivity.kt
index ace8d1b..8fbef20 100644
--- a/app/src/main/java/com/rehome/dywoa/ui/activity/LoginActivity.kt
+++ b/app/src/main/java/com/rehome/dywoa/ui/activity/LoginActivity.kt
@@ -189,8 +189,8 @@ class LoginActivity : BaseActivityOaToolbarViewBinding() {
if (BuildConfig.LOG_ERROR) {
//测试
-// binding.etUsername.setText("371522")
-// binding.etPassword.setText("A000000a")
+ binding.etUsername.setText("371522")
+ binding.etPassword.setText("A000000a")
// binding.etUsername.setText("CY00011")
// binding.etPassword.setText("A000000a")
diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/SQxgdlrfActivity.java b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/SQxgdlrfActivity.java
index 0a9790d..f120319 100644
--- a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/SQxgdlrfActivity.java
+++ b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/SQxgdlrfActivity.java
@@ -184,10 +184,8 @@ public class SQxgdlrfActivity extends BaseActivity {
private SpinnerAdapter adapterZy;
private List zys;
-
private SpinnerAdapter adapterJz;
private List jzs;
-
private SpinnerAdapter adapterXydj;
private List xydjs;
private SpinnerAdapter adapterGzlx;
diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/XjZhTjActivity.kt b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/XjZhTjActivity.kt
new file mode 100644
index 0000000..5be927f
--- /dev/null
+++ b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/XjZhTjActivity.kt
@@ -0,0 +1,274 @@
+package com.rehome.dywoa.ui.activity.sbxj
+
+import android.util.Log
+import android.view.View
+import com.rehome.dywoa.App
+import com.rehome.dywoa.Contans
+import com.rehome.dywoa.DBModel.LxXjTjDropDown
+import com.rehome.dywoa.DBModel.ZcXjTjDropDown
+import com.rehome.dywoa.DBModel.ZyXjTjDropDown
+import com.rehome.dywoa.adapter.SpinnerAdapter
+import com.rehome.dywoa.adapter.XjZhTjAdapter
+import com.rehome.dywoa.base.BaseActivityOaToolbarViewBinding
+import com.rehome.dywoa.bean.XjZhTjBean
+import com.rehome.dywoa.databinding.ActivityXjZhTjBinding
+import com.rehome.dywoa.utils.GsonUtils
+import com.rehome.dywoa.utils.HttpListener
+import com.rehome.dywoa.utils.NoProgresshttpUtils
+import com.rehome.dywoa.utils.NohttpUtils
+import com.rehome.dywoa.weiget.DatePickDialog
+import com.yolanda.nohttp.NoHttp
+import com.yolanda.nohttp.RequestMethod
+import com.yolanda.nohttp.rest.RequestQueue
+import com.yolanda.nohttp.rest.Response
+import org.litepal.crud.DataSupport
+import java.text.SimpleDateFormat
+import java.util.Calendar
+
+class XjZhTjActivity : BaseActivityOaToolbarViewBinding() {
+
+ private var stime: String = ""
+ private var etime: String = ""
+
+ private lateinit var adapter: XjZhTjAdapter
+ private var datas: MutableList = mutableListOf()
+
+ private lateinit var queueNoHttp: RequestQueue
+ private lateinit var username: String
+
+ private lateinit var adapterZy: SpinnerAdapter<*>
+ private var zys: List = mutableListOf()
+ private lateinit var adapterZc: SpinnerAdapter<*>
+ private var zcs: List = mutableListOf()
+ private lateinit var adapterLx: SpinnerAdapter<*>
+ private var lxs: List = mutableListOf()
+
+ //XjZhTjAdapter XjZhTjBean adapter_xj_zh_tj
+ override fun getViewBinding() = ActivityXjZhTjBinding.inflate(layoutInflater)
+
+ override fun getToolbar() = binding.toolbarView.toolbar
+
+ override fun initView() {
+ initToolbar("巡检综合统计", "") {
+
+ }
+
+ queueNoHttp = NoHttp.newRequestQueue(1)
+ username = App.getInstance().userInfo.manid
+
+ adapter = XjZhTjAdapter(context, datas)
+ binding.lv.adapter = adapter
+
+ binding.tvNodata.visibility= View.VISIBLE
+ binding.lv.visibility= View.GONE
+
+
+
+ //格式化日期的对象(转化成习惯的时间格式)
+ val sdFormat = SimpleDateFormat("yyyy-MM-dd")
+ var calendar = Calendar.getInstance()
+ val nowStr = sdFormat.format(calendar.time)
+ showLog(nowStr)
+
+
+ binding.tvSt.text = nowStr
+ binding.tvEt.text = nowStr
+
+ binding.tvSt.setOnClickListener(View.OnClickListener { view: View? ->
+
+ val dialog = DatePickDialog(
+ context, calendar
+ ) { outPutDate: String?,calendarBack: Calendar? ->
+ stime = binding.tvSt.getText().toString().trim { it <= ' ' }
+ binding.tvSt.text = outPutDate
+ calendar = calendarBack;
+ checkServerConnectStatus()
+ }
+ dialog.show()
+ })
+
+
+
+ binding.tvEt.setOnClickListener(View.OnClickListener { view: View? ->
+
+ val dialog = DatePickDialog(
+ context, calendar
+ ) { outPutDate: String?,calendarBack: Calendar? ->
+ etime = binding.tvEt.getText().toString().trim { it <= ' ' }
+ binding.tvEt.text = outPutDate
+ calendar = calendarBack;
+ checkServerConnectStatus()
+ }
+ dialog.show()
+ })
+
+ binding.tvSearch.setOnClickListener(View.OnClickListener { view: View? ->
+ //检查服务器连接状态
+ checkServerConnectStatus()
+ })
+
+ }
+
+ override fun initData() {
+ //专业
+ zys = DataSupport.findAll(ZyXjTjDropDown::class.java)
+ initSpinnerZy()
+ //值次
+ zcs = DataSupport.findAll(ZcXjTjDropDown::class.java)
+ initSpinnerZc()
+ //类型
+ lxs = DataSupport.findAll(LxXjTjDropDown::class.java)
+ initSpinnerLx()
+
+ //检查服务器连接状态
+ checkServerConnectStatus()
+ }
+
+ //给专业spinner填充数据
+ private fun initSpinnerZy() {
+ adapterZy = SpinnerAdapter(zys, context)
+ binding.etZy.setAdapter(adapterZy)
+ var item = -1
+ for (i in zys.indices) {
+ if (zys[i].value == "不选") {
+ item = i
+ break
+ }
+ }
+ if (item != -1) {
+ binding.etZy.setSelection(item)
+ }
+ }
+
+ //给值次spinner填充数据
+ private fun initSpinnerZc() {
+ adapterZc = SpinnerAdapter(zcs, context)
+ binding.etZc.setAdapter(adapterZc)
+ var item = -1
+ for (i in zcs.indices) {
+ if (zcs[i].value == "不选") {
+ item = i
+ break
+ }
+ }
+ if (item != -1) {
+ binding.etZc.setSelection(item)
+ }
+ }
+
+ //给类型spinner填充数据
+ private fun initSpinnerLx() {
+ adapterLx = SpinnerAdapter(lxs, context)
+ binding.etLx.setAdapter(adapterLx)
+ var item = -1
+ for (i in lxs.indices) {
+ if (lxs[i].value == "不选") {
+ item = i
+ break
+ }
+ }
+ if (item != -1) {
+ binding.etLx.setSelection(item)
+ }
+ }
+
+ //检查服务器连接状态
+ private fun checkServerConnectStatus() {
+ var param = HashMap()
+ param["login"] = "dywoa";
+ val json = GsonUtils.GsonString(param)
+ val url = Contans.IP + Contans.check_server_connect
+ Log.i("app",url)
+ Log.i("app",json)
+ val request = NoHttp.createStringRequest(
+ url,
+ RequestMethod.POST
+ )
+ request.setDefineRequestBodyForJson(json)
+ NoProgresshttpUtils.getInstance().add(this, 0, request, object : HttpListener {
+ override fun onSucceed(what: Int, response: Response?) {
+ val result = response?.get()
+ if (result != null) {
+ showLog("-----onSucceed----")
+ showLog(result)
+ if(result == "1"){
+ showLog("connect server success")
+ //获取数据
+ getListData()
+ }
+ }
+ }
+
+ override fun onFailed(what: Int, response: Response?) {
+ showLog("connect server onFailed")
+ showToast("无法连接到服务器，请检查网络环境")
+ }
+ })
+ }
+
+ fun getListData() {
+
+ var param = HashMap()
+ param["startDate"] = binding.tvSt.text.toString().trim();
+ param["endDate"] = binding.tvEt.text.toString().trim();
+
+ val zy = zys[binding.etZy.selectedItemPosition].key
+ val zc = zcs[binding.etZc.selectedItemPosition].key
+ val lx = lxs[binding.etLx.selectedItemPosition].key
+
+ if(zy!="不选"){
+ param["zy"] = zy
+ }
+
+ if(zc!="不选"){
+ param["zc"] = zc
+ }
+
+ if(lx!="不选"){
+ param["lx"] = lx
+ }
+
+ showLog(zy)
+ showLog(zc)
+ showLog(lx)
+
+ val json = GsonUtils.GsonString(param)
+
+ val url: String = Contans.IP + Contans.XJ_GET_ZH_TJ
+ val request = NoHttp.createStringRequest(url, RequestMethod.POST)
+ request.setDefineRequestBodyForJson(json)
+ NohttpUtils.getInstance().add(this, 0, request, object : HttpListener {
+ override fun onSucceed(what: Int, response: Response?) {
+ if (response != null) {
+ val result = response.get()
+ showLog(result)
+ val bean = GsonUtils.GsonToBean(result, XjZhTjBean::class.java)
+ if (bean != null && bean.total != 0) {
+ if (bean.rows != null && bean.rows.size>0) {
+ datas.clear()
+ datas.addAll(bean.rows)
+ adapter.notifyDataSetChanged()
+ binding.tvNodata.visibility= View.GONE
+ binding.lv.visibility= View.VISIBLE
+ }else {
+ datas.clear()
+ adapter.notifyDataSetChanged()
+ binding.tvNodata.visibility= View.VISIBLE
+ binding.lv.visibility= View.GONE
+ }
+ }else{
+ datas.clear()
+ adapter.notifyDataSetChanged()
+ binding.tvNodata.visibility= View.VISIBLE
+ binding.lv.visibility= View.GONE
+ }
+ }
+ }
+
+ override fun onFailed(what: Int, response: Response?) {
+
+ }
+
+ }, true, true, "正在加载数据...")
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/XscbglActivity.java b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/XscbglActivity.java
index dafb079..96a38d0 100755
--- a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/XscbglActivity.java
+++ b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/XscbglActivity.java
@@ -51,9 +51,9 @@ public class XscbglActivity extends BaseActivity2 {
private String username;
- private String[] str = {"待办任务", "巡检工作", "读取NFC数据", "缺陷工单录入"};
- private int[] imageId = {R.mipmap.icon_xs1, R.mipmap.icon6, R.mipmap.icon11, R.drawable.icon15};
- private int[] colors = {R.drawable.radius_b1, R.drawable.radius_a4, R.drawable.radius_d1, R.drawable.radius_e4};
+ private String[] str = {"待办任务", "巡检工作", "统计", "读取NFC数据", "缺陷工单录入"};
+ private int[] imageId = {R.mipmap.icon_xs1, R.mipmap.icon6, R.mipmap.icon_task_count, R.mipmap.icon11, R.drawable.icon15};
+ private int[] colors = {R.drawable.radius_b1, R.drawable.radius_a4, R.drawable.radius_b3, R.drawable.radius_d1, R.drawable.radius_e4};
private GridViewAdapter adapter;
private BroadcastReceiver myReceiver = new BroadcastReceiver() {
@@ -109,10 +109,14 @@ public class XscbglActivity extends BaseActivity2 {
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
break;
case 2:
- intent = new Intent(XscbglActivity.this, NFCInfoActivity.class);
+ intent = new Intent(XscbglActivity.this, XjZhTjActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
break;
case 3:
+ intent = new Intent(XscbglActivity.this, NFCInfoActivity.class);
+ intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
+ break;
+ case 4:
intent = new Intent(XscbglActivity.this, SQxgdlrfActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
break;
diff --git a/app/src/main/res/drawable/radius_b3.xml b/app/src/main/res/drawable/radius_b3.xml
new file mode 100755
index 0000000..dc9be0e
--- /dev/null
+++ b/app/src/main/res/drawable/radius_b3.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_xj_zh_tj.xml b/app/src/main/res/layout/activity_xj_zh_tj.xml
new file mode 100644
index 0000000..5d47443
--- /dev/null
+++ b/app/src/main/res/layout/activity_xj_zh_tj.xml
@@ -0,0 +1,201 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/adapter_xj_zh_tj.xml b/app/src/main/res/layout/adapter_xj_zh_tj.xml
new file mode 100644
index 0000000..11e68d0
--- /dev/null
+++ b/app/src/main/res/layout/adapter_xj_zh_tj.xml
@@ -0,0 +1,234 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/icon_task_count.png b/app/src/main/res/mipmap-hdpi/icon_task_count.png
new file mode 100755
index 0000000..66ccda6
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/icon_task_count.png differ
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 68e2fab..f62f98f 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -33,6 +33,7 @@
#AA603C
#2DAC74
#BABB59
+ #838383
#737373
#39838C
#6C36E5
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 5caf55f..0882927 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -197,5 +197,11 @@
- 5dp
- center|start
+