From cda2410f9c29f2fadc16e9de38ccae95b75a89dd Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 09 六月 2021 10:51:13 +0800
Subject: [PATCH] 1

---
 HDL_ON/UI/UI2/FuntionControlView/Video/VideoSend.cs |   34 +++++++++++++++++++++++++---------
 1 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoSend.cs b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoSend.cs
index b77730f..5a8a945 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoSend.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoSend.cs
@@ -35,9 +35,9 @@
         /// <summary>
         /// 鑾峰彇闂ㄥ彛鏈哄垪琛�(1瀹ゅ唴鏈�,2瀹ゅ鏈猴紝3鍥村鏈猴紝4绠$悊鏈�,5浜屾纭鏈�)
         /// </summary>
-        public static List<VideoMethod.FlVideo> GetVideoInfoList(VideoMethod.VideoClouds video)
+        public static List<FlVideo> GetVideoInfoList(VideoClouds video)
         {
-            List<VideoMethod.FlVideo> eSVideoInfosList = new List<VideoMethod.FlVideo>();
+            List<FlVideo> eSVideoInfosList = new List<FlVideo>();
             var jobject = new JObject();
             jobject.Add("cmtID", video.flCmtId);
             jobject.Add("unitno", video.flBuildingId);
@@ -58,7 +58,7 @@
                 {
                     return eSVideoInfosList;
                 }
-                eSVideoInfosList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<VideoMethod.FlVideo>>(json["list"].ToString());
+                eSVideoInfosList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<FlVideo>>(json["list"].ToString());
               
             }
             catch { }
@@ -67,7 +67,7 @@
         /// <summary>
         /// 涓婃姤鍔ㄦ�佸紑閿佸瘑鐮�(娉ㄦ剰锛氬瘑鐮佹湁鍙兘寤舵椂1鍒嗛挓鐢熸晥)
         /// </summary>
-        public static void GetQRcode(FrameLayout frame, VideoMethod.VideoClouds video, Action<bool, string> action)
+        public static void GetQRcode(FrameLayout frame, VideoClouds video, Action<bool, string> action)
         {
             ///鏍囪鏄惁鎴愬姛
             bool if_bool = false;
@@ -90,13 +90,29 @@
                     var str = HttpWebRequest(NewAPI.API_POST_FL_QRcode, jobject.ToString(), "POST");
                     if (!string.IsNullOrEmpty(str))
                     {
-                        var json = JObject.Parse(str);
-                        if (json != null)
+                        if (str.Contains("status"))
                         {
-                            var stateCode = json["status"].ToString();
-                            if (stateCode == "0")
+                            //var json = JObject.Parse(str);
+                            //if (json != null)
+                            //{
+                            //    var stateCode = json["status"].ToString();
+                            //    if (stateCode == "0")
+                            //    {
+                            //        if_bool = true;
+                            //    }
+                            //}
+                            if_bool = true;
+                        }
+                        else {
+                            var json = JObject.Parse(str);
+                            if (json != null)
                             {
-                                if_bool = true;
+                                var stateCode = json["desc"].ToString();
+                                Application.RunOnMainThread(() =>
+                                {
+                                    //閿欒鎻愮ず
+                                    new Intelligence.Automation.LogicView.TipPopView().FlashingBox(stateCode);
+                                });
                             }
                         }
                     }

--
Gitblit v1.8.0