|
@@ -1,4 +1,6 @@
|
|
|
using LitJson;
|
|
|
+using Newtonsoft.Json;
|
|
|
+using Newtonsoft.Json.Linq;
|
|
|
using System;
|
|
|
using System.Collections;
|
|
|
using System.Collections.Generic;
|
|
@@ -13,7 +15,26 @@ public class XunJianDataManager : Singleton<XunJianDataManager>
|
|
|
|
|
|
public void GetXunJianList(Action<List<XunJianListData>> callback)
|
|
|
{
|
|
|
- WindowsManager.Instance.StartCoroutine(testBack(callback));
|
|
|
+
|
|
|
+
|
|
|
+ HttpTool.Instance.Post(HttpEdustryAction.InspectionList, "", (string msg) =>
|
|
|
+ {
|
|
|
+ Debug.Log("DGJ ===>InspectionList " + msg);
|
|
|
+ JObject jObject = JObject.Parse(msg);
|
|
|
+ if(jObject["code"].ToString()== "200")
|
|
|
+ {
|
|
|
+
|
|
|
+
|
|
|
+ List<XunJianData> data = JsonConvert.DeserializeObject<List<XunJianData>>(jObject["data"]["list"].ToString());
|
|
|
+ Debug.Log(data.Count);
|
|
|
+ callback(XunJianDataParetListData(data));
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ Debug.LogError("鑾峰彇宸℃�鍒楄〃澶辫触 "+ jObject["code"].ToString());
|
|
|
+ callback(new List<XunJianListData>());
|
|
|
+ }
|
|
|
+ });
|
|
|
}
|
|
|
|
|
|
XunJianListData testData()
|
|
@@ -21,11 +42,11 @@ public class XunJianDataManager : Singleton<XunJianDataManager>
|
|
|
XunJianListData xj = new XunJianListData();
|
|
|
xj.id = "saotu";
|
|
|
xj.url = Application.streamingAssetsPath + "/DianYun/85471-ghzoffice (2).bytes";
|
|
|
- xj.projectname = "(扫图版本)GHZ-巡检测试";
|
|
|
- xj.inarea = "杨浦区";
|
|
|
- xj.updateState = "新项目";
|
|
|
- xj.projectState = "测试巡检 ";
|
|
|
- xj.projectType = "未开始 ";
|
|
|
+ xj.projectname = "(鎵�浘鐗堟湰)GHZ-宸℃�娴嬭瘯";
|
|
|
+ xj.inarea = "鏉ㄦ郸鍖�";
|
|
|
+ xj.updateState = "鏂伴」鐩�";
|
|
|
+ xj.projectState = "娴嬭瘯宸℃� ";
|
|
|
+ xj.projectType = "鏈�紑濮� ";
|
|
|
xj.projectTime = "2023/11/23 10:53 ";
|
|
|
xj.renwuModelType = RenWuModelType.SaoTu;
|
|
|
xj.itemList = getRenwuData();
|
|
@@ -37,11 +58,11 @@ public class XunJianDataManager : Singleton<XunJianDataManager>
|
|
|
XunJianListData xj = new XunJianListData();
|
|
|
xj.id = "saotu";
|
|
|
xj.url = Application.streamingAssetsPath + "/DianYun/85471-ghzoffice (2).bytes";
|
|
|
- xj.projectname = "(点云版本)GHZ-巡检测试";
|
|
|
- xj.inarea = "杨浦区";
|
|
|
- xj.updateState = "新项目";
|
|
|
- xj.projectState = "测试巡检 ";
|
|
|
- xj.projectType = "未开始 ";
|
|
|
+ xj.projectname = "(鐐逛簯鐗堟湰)GHZ-宸℃�娴嬭瘯";
|
|
|
+ xj.inarea = "鏉ㄦ郸鍖�";
|
|
|
+ xj.updateState = "鏂伴」鐩�";
|
|
|
+ xj.projectState = "娴嬭瘯宸℃� ";
|
|
|
+ xj.projectType = "鏈�紑濮� ";
|
|
|
xj.projectTime = "2023/11/23 10:53 ";
|
|
|
xj.renwuModelType = RenWuModelType.DianYun;
|
|
|
xj.itemList = getRenwuData();
|
|
@@ -59,83 +80,83 @@ public class XunJianDataManager : Singleton<XunJianDataManager>
|
|
|
rw.imageUrl = Application.streamingAssetsPath + "/ARTargetImage/" + (j + 1) + ".png";
|
|
|
|
|
|
|
|
|
-
|
|
|
+
|
|
|
rw.id = j.ToString();
|
|
|
|
|
|
-
|
|
|
+
|
|
|
rw.index = j;
|
|
|
switch(j)
|
|
|
{
|
|
|
case 0:
|
|
|
-
|
|
|
+
|
|
|
rw.roadList = new List<Vector3>();
|
|
|
rw.roadList.Add(new Vector3(-4.2f+0.5f, 0, 0.92f));
|
|
|
rw.roadList.Add(new Vector3(-4.2f + 0.5f, 0, 2));
|
|
|
rw.roadList.Add(new Vector3(-5 + 0.5f, 0, 2));
|
|
|
- rw.info = "请检查办公室大门------并拍照/录像记录";
|
|
|
+ rw.info = "璇锋�鏌ュ姙鍏��澶ч棬------骞舵媿鐓�/褰曞儚璁板綍";
|
|
|
break;
|
|
|
case 1:
|
|
|
-
|
|
|
+
|
|
|
rw.roadList = new List<Vector3>();
|
|
|
rw.roadList.Add(new Vector3(-4.2f + 0.5f, 0, 0.92f));
|
|
|
- rw.info = "查看垃圾桶是否有垃圾------并拍照/录像记录";
|
|
|
+ rw.info = "鏌ョ湅鍨冨溇妗舵槸鍚︽湁鍨冨溇------骞舵媿鐓�/褰曞儚璁板綍";
|
|
|
break;
|
|
|
case 2:
|
|
|
-
|
|
|
+
|
|
|
rw.roadList = new List<Vector3>();
|
|
|
rw.roadList.Add(new Vector3(-4.2f + 0.5f, 0, -1.6f));
|
|
|
- rw.info = "检查空调是否正常------并拍照/录像记录";
|
|
|
+ rw.info = "妫€鏌ョ┖璋冩槸鍚︽�甯�------骞舵媿鐓�/褰曞儚璁板綍";
|
|
|
break;
|
|
|
case 3:
|
|
|
-
|
|
|
+
|
|
|
rw.roadList = new List<Vector3>();
|
|
|
rw.roadList.Add(new Vector3(-4.2f + 0.5f, 0, 0.52f));
|
|
|
rw.roadList.Add(new Vector3(-1.78f, 0, 0.52f));
|
|
|
rw.roadList.Add(new Vector3(-1.78f, 0, -1.6f));
|
|
|
- rw.info = "请打开窗户并处于通风状态------并拍照/录像记录";
|
|
|
+ rw.info = "璇锋墦寮€绐楁埛骞跺�浜庨€氶�鐘舵€�------骞舵媿鐓�/褰曞儚璁板綍";
|
|
|
break;
|
|
|
case 4:
|
|
|
-
|
|
|
+
|
|
|
rw.roadList = new List<Vector3>();
|
|
|
rw.roadList.Add(new Vector3(-1.78f, 0, 0.52f));
|
|
|
rw.roadList.Add(new Vector3(-5.18f + 0.5f, 0, 0.52f));
|
|
|
- rw.info = "冰箱内是否有过期食品------并拍照/录像记录";
|
|
|
+ rw.info = "鍐扮�鍐呮槸鍚︽湁杩囨湡椋熷搧------骞舵媿鐓�/褰曞儚璁板綍";
|
|
|
break;
|
|
|
case 5:
|
|
|
-
|
|
|
+
|
|
|
rw.roadList = new List<Vector3>();
|
|
|
rw.roadList.Add(new Vector3(-1.78f, 0, 0.52f));
|
|
|
- rw.info = "确保所有眼镜都在充电------并拍照/录像记录";
|
|
|
+ rw.info = "纭�繚鎵€鏈夌溂闀滈兘鍦ㄥ厖鐢�------骞舵媿鐓�/褰曞儚璁板綍";
|
|
|
break;
|
|
|
case 6:
|
|
|
-
|
|
|
+
|
|
|
rw.roadList = new List<Vector3>();
|
|
|
rw.roadList.Add(new Vector3(-4.2f + 0.5f, 0, 0.52f));
|
|
|
rw.roadList.Add(new Vector3(-1.78f, 0, 0.52f));
|
|
|
rw.roadList.Add(new Vector3(-1.78f, 0, -1f));
|
|
|
- rw.info = "请回到工位继续工作------并拍照/录像记录";
|
|
|
+ rw.info = "璇峰洖鍒板伐浣嶇户缁�伐浣�------骞舵媿鐓�/褰曞儚璁板綍";
|
|
|
break;
|
|
|
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
|
|
|
-
|
|
|
+
|
|
|
int randomInt = UnityEngine.Random.Range(0, 10);
|
|
|
rw.isPaiZhao = randomInt > 5 ? true : false;
|
|
|
|
|
|
-
|
|
|
+
|
|
|
int randomInt2 = UnityEngine.Random.Range(0, 10);
|
|
|
rw.isYuanCheng = randomInt2 > 5 ? true : false;
|
|
|
|
|
|
|
|
|
-
|
|
|
+
|
|
|
rw.typeList = new List<RenWuTypeModel>();
|
|
|
|
|
|
|
|
|
RenWuTypeModel rwtm = new RenWuTypeModel();
|
|
|
rwtm.id = "1";
|
|
|
rwtm.type = RenWuType.Image;
|
|
|
- rwtm.url = Application.streamingAssetsPath + "/Art/16:9.jpg";
|
|
|
+ rwtm.url = Application.streamingAssetsPath + "/Art/16锛�9.jpg";
|
|
|
rw.typeList.Add(rwtm);
|
|
|
|
|
|
|
|
@@ -169,23 +190,59 @@ public class XunJianDataManager : Singleton<XunJianDataManager>
|
|
|
callback.Invoke(xjDataList);
|
|
|
}
|
|
|
|
|
|
+ List<XunJianListData> XunJianDataParetListData(List<XunJianData> data)
|
|
|
+ {
|
|
|
+ List<XunJianListData> listData = new List<XunJianListData>();
|
|
|
+
|
|
|
+ for (int i = 0; i < data.Count; i++)
|
|
|
+ {
|
|
|
+ XunJianListData xj = new XunJianListData();
|
|
|
+ xj.id = data[i].id.ToString();
|
|
|
+ xj.projectname = data[i].name;
|
|
|
+ xj.inarea = data[i].regionName;
|
|
|
+ xj.projectState = ((ProjectStatus)data[i].status).ToString();
|
|
|
+ xj.projectType = ((ProjectType)data[i].type).ToString();
|
|
|
+ xj.projectTime = data[i].inspectionTime.ToString();
|
|
|
+ xj.updateState = data[i].status > 2 ? "宸叉洿鏂�" : "鏂伴」鐩�";
|
|
|
+ listData.Add(xj);
|
|
|
+ }
|
|
|
+
|
|
|
+ return listData;
|
|
|
+ }
|
|
|
|
|
|
public class XunJianListData
|
|
|
{
|
|
|
public int nowIndex = 0;
|
|
|
public string id;
|
|
|
public string projectname;
|
|
|
- public string inarea;
|
|
|
- public string updateState;
|
|
|
+ public string inarea;
|
|
|
+ public string updateState;
|
|
|
public string projectState;
|
|
|
public string projectType;
|
|
|
public string projectTime;
|
|
|
public List<RenWuItem> itemList;
|
|
|
public RenWuModelType renwuModelType;
|
|
|
-
|
|
|
public string url;
|
|
|
}
|
|
|
|
|
|
+ public class XunJianData
|
|
|
+ {
|
|
|
+ public int id { get; set; }
|
|
|
+ public string name { get; set; }
|
|
|
+ public string regionId { get; set; }
|
|
|
+ public string regionName { get; set; }
|
|
|
+ public int type { get; set; }
|
|
|
+ public int status { get; set; }
|
|
|
+ public int inspectionTime { get; set; }
|
|
|
+ public List<EmployeesData> listEmployees { get; set; }
|
|
|
+ }
|
|
|
+ public class EmployeesData
|
|
|
+ {
|
|
|
+ public int id { get; set; }
|
|
|
+ public string name { get; set; }
|
|
|
+ public string number { get; set; }
|
|
|
+ }
|
|
|
+
|
|
|
public void GotoXunJian(XunJianListData xjld)
|
|
|
{
|
|
|
chooseXunJian = xjld;
|
|
@@ -218,7 +275,7 @@ public class XunJianDataManager : Singleton<XunJianDataManager>
|
|
|
backTip.Add("1");
|
|
|
backTip.Add(data.ToJson());
|
|
|
backTip.Add("3");
|
|
|
- WindowsManager.Instance.show(WindowConfig.windowType.Error, false, WindowsManager.Instance.getErrorData("提示", "已经是最后一步了!", Color.gray, "icon", backTip, false, "自动退出", 5,"","退出巡检","返回").ToJson());
|
|
|
+ WindowsManager.Instance.show(WindowConfig.windowType.Error, false, WindowsManager.Instance.getErrorData("鎻愮ず", "宸茬粡鏄�渶鍚庝竴姝ヤ簡!", Color.gray, "icon", backTip, false, "鑷�姩閫€鍑�", 5,"","閫€鍑哄贰妫€","杩斿洖").ToJson());
|
|
|
|
|
|
}
|
|
|
}
|
|
@@ -259,22 +316,40 @@ public class XunJianDataManager : Singleton<XunJianDataManager>
|
|
|
}
|
|
|
public enum RenWuState
|
|
|
{
|
|
|
- None = 100001,
|
|
|
- Success = 100002,
|
|
|
- Fail = 100003,
|
|
|
+ None = 100001,
|
|
|
+ Success = 100002,
|
|
|
+ Fail = 100003,
|
|
|
}
|
|
|
|
|
|
public enum RenWuType
|
|
|
{
|
|
|
- Text = 100001,
|
|
|
- Image = 100002,
|
|
|
- Video = 100003,
|
|
|
- Model = 100004,
|
|
|
+ Text = 100001,
|
|
|
+ Image = 100002,
|
|
|
+ Video = 100003,
|
|
|
+ Model = 100004,
|
|
|
}
|
|
|
public enum RenWuModelType
|
|
|
{
|
|
|
- SaoTu = 100001,
|
|
|
- DingWeiBan = 100002,
|
|
|
- DianYun = 100003,
|
|
|
+ SaoTu = 100001,
|
|
|
+ DingWeiBan = 100002,
|
|
|
+ DianYun = 100003,
|
|
|
+ }
|
|
|
+
|
|
|
+ public enum ProjectType
|
|
|
+ {
|
|
|
+ 甯歌� =1,
|
|
|
+ 寮傚父 = 2
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ public enum ProjectStatus
|
|
|
+ {
|
|
|
+ 鏈�紑濮� = 1,
|
|
|
+ 鍗冲皢寮€濮� =2,
|
|
|
+ 宸查€炬湡 = 3,
|
|
|
+ 杩涜�涓� = 4,
|
|
|
+ 宸插畬鎴�=5
|
|
|
+
|
|
|
+
|
|
|
}
|
|
|
}
|