Bladeren bron

接入 用户列表、登录、项目列表 三个接口

DGJ 1 jaar geleden
bovenliggende
commit
b778b9ce98

+ 7 - 6
Assets/DownLoadXR/DownLoadXRManager.cs

@@ -39,6 +39,7 @@ public class DownLoadXRManager
         JsonData data = JsonMapper.ToObject(msg);
         if (data["drive"].ToString() == "minio")
         {
+            // 涓嬭浇瀹屽悗灏哹yte[] 鏍规嵁URL 鐢≒layerPrefs 瀛樺叆鏈�湴
             return false;
         }
         else if (data["drive"].ToString() == "COS")
@@ -64,11 +65,11 @@ public class DownLoadXRManager
                     bytes?.Invoke(PlayerPrefs.GetString("DownLoadXR_" + Url));
                 }else
                 {
-                    //文件流信息  
+                    //鏂囦欢娴佷俊鎭�  
                     //StreamWriter sw;  
                     Stream sw;
                     string path = Application.persistentDataPath + "/DownLoadXR/" + Url.Split("/")[Url.Split("/").Length - 1];
-                    Debug.Log("准备存文件===》"+path);
+                    Debug.Log("鍑嗗�瀛樻枃浠�===銆�"+path);
                     FileInfo file = new FileInfo(path);
                     try
                     {
@@ -81,12 +82,12 @@ public class DownLoadXRManager
                         {
                             Directory.CreateDirectory(Application.persistentDataPath + "/DownLoadXR");
                         }
-                        //如果此文件存在则打开  
+                        //濡傛灉姝ゆ枃浠跺瓨鍦ㄥ垯鎵撳紑  
                         //sw = file .Append();  
-                        //如果此文件不存在则创建  
+                        //濡傛灉姝ゆ枃浠朵笉瀛樺湪鍒欏垱寤�  
                         sw = file.Create();
 
-                        //以行的形式写入信息  
+                        //浠ヨ�鐨勫舰寮忓啓鍏ヤ俊鎭�  
                         //sw.WriteLine(info);  
                         sw.Write(fileBytes, 0, fileBytes.Length);
                         sw.Close();
@@ -101,7 +102,7 @@ public class DownLoadXRManager
                         backTip.Add(data.ToJson());
                         backTip.Add(data.ToJson());
                         backTip.Add(data.ToJson());
-                        WindowsManager.Instance.show(WindowConfig.windowType.Error, false, WindowsManager.Instance.getErrorData("文件提示", "文件存储失败"+ path, Color.white, "icon", backTip, false, "", 5, "知道了.", "", "").ToJson());
+                        WindowsManager.Instance.show(WindowConfig.windowType.Error, false, WindowsManager.Instance.getErrorData("鏂囦欢鎻愮ず", "鏂囦欢瀛樺偍澶辫触"+ path, Color.white, "icon", backTip, false, "", 5, "鐭ラ亾浜�.", "", "").ToJson());
                         */
                     }
 

+ 52 - 27
Assets/FrameWork/Login/Scripts/LoginDataManager.cs

@@ -1,6 +1,8 @@
 
 
 using LitJson;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using SC.XR.Unity;
 using System;
 using System.Collections;
@@ -10,23 +12,44 @@ using UnityEngine;
 public class LoginDataManager:Singleton<LoginDataManager>
 {
 
-    string[] testAclist =new string[] { "ÂÞ½­", "´÷¹ã¾ü", "³ÌÔ£Ïè", "ÍõÓñ½à", "ÒÁÅô·É", "¸êÏþ·Ò","ºú¼Ñ¿¥" };
+    string[] testAclist =new string[] { "罗江", "戴广军", "程裕翔", "王玉�", "伊�飞", "戈晓芬","胡佳�" };
     List<AccountData> ldata;
 
-    //½Ó¿Ú-----»ñÈ¡ Õ˺ŵǼµÄÁбí
+    
+
+    //接�-----获� 账�登录的列表
     public void GetLoginData(Action<List<AccountData>> callback)
     {
-        ldata = new List<AccountData>();
-        AccountData adata;
-        for (int i = 0; i < testAclist.Length; i++)
-        {
-            adata = new AccountData();
-            adata.account = testAclist[i];
-            adata.name = testAclist[i];
-            adata.iconUrl = Application.streamingAssetsPath + "/icon/" +i+".png";
-            ldata.Add(adata);
-        }
-        WindowsManager.Instance.StartCoroutine(testBack(callback));
+        HttpTool.Instance.Post(HttpEdustryAction.LoginList, "", (string msg) => {
+
+            Debug.Log(msg);
+            JObject jObject = JObject.Parse(msg);
+            ldata = new List<AccountData>();
+            if (jObject["code"].ToString() == "200")
+            {
+                Debug.Log("DGJ ==> "+ jObject["data"]["list"].ToString());
+               
+                ldata = JsonConvert.DeserializeObject<List<AccountData>>(jObject["data"]["list"].ToString());
+                Debug.Log(ldata.Count);
+                //AccountData adata;
+                //for (int i = 0; i < testAclist.Length; i++)
+                //{
+                //    adata = new AccountData();
+                //    adata.account = testAclist[i];
+                //    adata.name = testAclist[i];
+                //    adata.iconUrl = Application.streamingAssetsPath + "/icon/" + i + ".png";
+                //    ldata.Add(adata);
+                //}
+                WindowsManager.Instance.StartCoroutine(testBack(callback));
+            }
+            else
+            {
+                Debug.LogError(" 获�登录列表失败 "+ jObject["code"].ToString());
+                WindowsManager.Instance.StartCoroutine(testBack(callback));
+            }
+        });
+
+      
     }
 
 
@@ -38,7 +61,7 @@ public class LoginDataManager:Singleton<LoginDataManager>
 
 
     List<AccountData> OftenUseldata;
-    //»ñÈ¡³£ÓÃÕ˺ÅÁбí
+    //获�常用账�列表
 
     public void GetOftenUseLoginData(Action<List<AccountData>> callback)
     {
@@ -51,10 +74,10 @@ public class LoginDataManager:Singleton<LoginDataManager>
             for (int i = data.Count-1; i >=0 ; i--)
             {
                 adata = new AccountData();
-                adata.account = data[i]["account"].ToString();
+                adata.number = data[i]["number"].ToString();
                 adata.name = data[i]["name"].ToString();
-                adata.iconUrl = data[i]["iconUrl"].ToString();
-                adata.password = data[i]["password"].ToString();
+                adata.avatar = data[i]["avatar"].ToString();
+                adata.phone = data[i]["phone"].ToString();
                 OftenUseldata.Add(adata);
             }
         }
@@ -71,7 +94,7 @@ public class LoginDataManager:Singleton<LoginDataManager>
 
             for (int i = data.Count - 1; i >= 0; i--)
             {
-                if(adata["account"].ToString() == data[i]["account"].ToString())
+                if(adata["number"].ToString() == data[i]["number"].ToString())
                 {
                     return i;
                 }
@@ -85,15 +108,15 @@ public class LoginDataManager:Singleton<LoginDataManager>
         callback.Invoke(OftenUseldata);
     }
 
-    //Ìí¼Ó³£×¤Õ˺Å
+    //添加常驻账�
     public void setOftenUseAcc(AccountData adata)
     {
         JsonData data = getOftenUseAcc();
         JsonData accData = new JsonData();
         accData["name"] = adata.name;
-        accData["password"] = adata.password;
-        accData["account"] = adata.account;
-        accData["iconUrl"] =  adata.iconUrl;
+        accData["phone"] = adata.phone;
+        accData["number"] = adata.number;
+        accData["avatar"] =  adata.avatar;
         int index = checkData(accData);
         
             JsonData accDataNew = new JsonData();
@@ -114,10 +137,12 @@ public class LoginDataManager:Singleton<LoginDataManager>
      
     }
 
-    //»ñÈ¡³£×¤Õ˺Å
+    //获�常驻账�
     public JsonData getOftenUseAcc()
     {
+       // PlayerPrefs.DeleteAll();
         string OftenUse = PlayerPrefs.GetString("OftenUse");
+        Debug.Log("DGJ ===> getOftenUseAcc " + OftenUse);
         JsonData data = new JsonData();
         if (OftenUse != "" && OftenUse != null)
         {
@@ -136,8 +161,8 @@ public class LoginDataManager:Singleton<LoginDataManager>
 }
 public class AccountData
 {
-    public string name = "";
-    public string password = "";
-    public string account = "";
-    public string iconUrl = "";
+    public string name { get; set; }
+    public string phone { get; set; }
+    public string number { get; set; }
+    public string avatar { get; set; }
 }

+ 36 - 8
Assets/FrameWork/Login/Scripts/LoginManager.cs

@@ -60,14 +60,20 @@ public class LoginManager : MonoSingleton<LoginManager>
         {
             if (LoginPassWordManager.Instance.tmpField.text.Length > 4)
             {
-                TimerMgr.Instance.CreateTimer(()=> { testOk(); },1f);
-                /*
+                //TimerMgr.Instance.CreateTimer(()=> { testOk(); },1f);
+                ///*
+                //JsonData data = new JsonData();
+                //data["account"] = "18767144539";
+                //data["password"] = "1";
+                //HttpTool.Instance.PostLogin("/cmcc-endustry/v1/user/login", data.ToJson(), RTCTestLoginCallBack);*/
+                //isTongxun = true;
+                //ShowInfoTipManager.Instance.showTip("正在登录,请稍后");
+
                 JsonData data = new JsonData();
-                data["account"] = "18767144539";
-                data["password"] = "1";
-                HttpTool.Instance.PostLogin("/cmcc-endustry/v1/user/login", data.ToJson(), LoginCallBack);*/
-                isTongxun = true;
-                ShowInfoTipManager.Instance.showTip("正在登录,请稍后");
+                data["account"] = LoginPassWordManager.Instance.nameText.text;
+                data["password"] = LoginPassWordManager.Instance.tmpField.text;
+                Debug.Log("DGJ ==> Login " + data.ToJson());
+                HttpTool.Instance.PostLogin(HttpEdustryAction.Login, data.ToJson(), LogingCallBack);
             }
             else
             {
@@ -148,7 +154,29 @@ public class LoginManager : MonoSingleton<LoginManager>
 
     }
     bool isTongxun;
-    public void LoginCallBack(string msg)
+
+    public void LogingCallBack(string msg)
+    {
+        Debug.Log(msg);
+        JObject obj = JObject.Parse(msg);
+
+        if (obj["code"].ToString() == "200")
+        {
+            string token = obj["data"]["token"].ToString();
+            login.UserInfo.Instance.Token = token;
+            HttpEdustryAction.Token = token;
+
+            TimerMgr.Instance.CreateTimer(() => { testOk(); }, 1f);
+            isTongxun = true;
+            ShowInfoTipManager.Instance.showTip("正在登录,请稍后");
+        }
+        else
+        {
+            WindowsManager.Instance.show(WindowConfig.windowType.Tip2, false, obj["code"].ToString());
+        }
+    }
+
+    public void RTCTestLoginCallBack(string msg)
     {
         isTongxun = false;
         ShowInfoTipManager.Instance.closeTip();

+ 1 - 1
Assets/FrameWork/Login/Scripts/SmallLoginItem.cs

@@ -16,7 +16,7 @@ public class SmallLoginItem : MonoBehaviour
         this.isChooseBig = isChooseBig;
         this.ad = ad;
         textName.text = ad.name;
-        DownLoadXRManager.DownLoadForTexture(DownLoadXRManager.getTestData(( ad.iconUrl)), (Texture2D tex) => {
+        DownLoadXRManager.DownLoadForTexture(DownLoadXRManager.getTestData(( ad.avatar)), (Texture2D tex) => {
             texture = tex;
             iconImg.texture = tex;
         }, null);

+ 2 - 0
Assets/FrameWork/Login/Scripts/Window/LoginWindowsManager.cs

@@ -28,6 +28,8 @@ public class LoginWindowsManager : WindowSingleton<LoginWindowsManager>
 
         loginMain.show();
         loginPassWord.hide();
+
+       
     }
 
     public void Login()

+ 121 - 46
Assets/FrameWork/ProjectManager/Scripts/Project/XunJian/XunJianDataManager.cs

@@ -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));
+      // 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";
 
 
-            //任务id
+            //浠诲姟id
             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;
 
-            //RTC按钮
+            //RTC鎸夐挳
             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/169.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
+
+
     }
 }

+ 12 - 12
Assets/FrameWork/ProjectManager/XunJian/标题.prefab

@@ -68,8 +68,8 @@ MonoBehaviour:
       m_Calls: []
   m_text: 1111111111111111
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: fb2cd06170cbccb45aeb2aa643b0e4d4, type: 2}
-  m_sharedMaterial: {fileID: 8874737445518861689, guid: fb2cd06170cbccb45aeb2aa643b0e4d4, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 87d73d15ccf613c4c8dad6b4c03399f9, type: 2}
+  m_sharedMaterial: {fileID: 1738077909898060448, guid: 87d73d15ccf613c4c8dad6b4c03399f9, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -203,8 +203,8 @@ MonoBehaviour:
       m_Calls: []
   m_text: 1111111111111111
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: fb2cd06170cbccb45aeb2aa643b0e4d4, type: 2}
-  m_sharedMaterial: {fileID: 8874737445518861689, guid: fb2cd06170cbccb45aeb2aa643b0e4d4, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 87d73d15ccf613c4c8dad6b4c03399f9, type: 2}
+  m_sharedMaterial: {fileID: 1738077909898060448, guid: 87d73d15ccf613c4c8dad6b4c03399f9, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -338,8 +338,8 @@ MonoBehaviour:
       m_Calls: []
   m_text: 1111111111111111
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: fb2cd06170cbccb45aeb2aa643b0e4d4, type: 2}
-  m_sharedMaterial: {fileID: 8874737445518861689, guid: fb2cd06170cbccb45aeb2aa643b0e4d4, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 87d73d15ccf613c4c8dad6b4c03399f9, type: 2}
+  m_sharedMaterial: {fileID: 1738077909898060448, guid: 87d73d15ccf613c4c8dad6b4c03399f9, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -546,8 +546,8 @@ MonoBehaviour:
       m_Calls: []
   m_text: 1111111111111111
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: fb2cd06170cbccb45aeb2aa643b0e4d4, type: 2}
-  m_sharedMaterial: {fileID: 8874737445518861689, guid: fb2cd06170cbccb45aeb2aa643b0e4d4, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 87d73d15ccf613c4c8dad6b4c03399f9, type: 2}
+  m_sharedMaterial: {fileID: 1738077909898060448, guid: 87d73d15ccf613c4c8dad6b4c03399f9, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -681,8 +681,8 @@ MonoBehaviour:
       m_Calls: []
   m_text: 1111111111111111
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: fb2cd06170cbccb45aeb2aa643b0e4d4, type: 2}
-  m_sharedMaterial: {fileID: 8874737445518861689, guid: fb2cd06170cbccb45aeb2aa643b0e4d4, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 87d73d15ccf613c4c8dad6b4c03399f9, type: 2}
+  m_sharedMaterial: {fileID: 1738077909898060448, guid: 87d73d15ccf613c4c8dad6b4c03399f9, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -999,8 +999,8 @@ MonoBehaviour:
       m_Calls: []
   m_text: 1111111111111111
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: fb2cd06170cbccb45aeb2aa643b0e4d4, type: 2}
-  m_sharedMaterial: {fileID: 8874737445518861689, guid: fb2cd06170cbccb45aeb2aa643b0e4d4, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 87d73d15ccf613c4c8dad6b4c03399f9, type: 2}
+  m_sharedMaterial: {fileID: 1738077909898060448, guid: 87d73d15ccf613c4c8dad6b4c03399f9, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []

+ 13 - 0
Assets/Scripts/HttpEdustryAction.cs

@@ -0,0 +1,13 @@
+
+public class HttpEdustryAction 
+{
+    public static string LoginList = "/mr-endustry/v1/user/login/list";
+
+    public static string Login = "/mr-endustry/v1/user/login";
+
+    public static string InspectionList = "/mr-endustry/v1/project/inspectionList";
+
+    public static string Token = "";
+
+
+}

+ 11 - 0
Assets/Scripts/HttpEdustryAction.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d5e4991c7887f6744b45e23601a3698c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: