2020-04-17 1.项目引用库更新。 2.备份上传和下载速度优化。

JLChen

2020-04-17 525d4d5c18ad5f8a7976f1fd20cef7f1d7e82831

 Crabtree/SmartHome/UI/SimpleControl/CommonPage.cs

@@ -2112,6 +2112,85 @@
            return s;//
        }

        //static void httpListener_EventHandler (System.Collections.Specialized.NameValueCollection nameValueCollection, System.IO.Stream outputStream, System.IO.Stream inputStream)
        //{
        //    //if (!isHttpListenerStart) {
        //    //    return;
        //    //}
        //    try {
        //        //System.Net.WebClient webClient = new System.Net.WebClient ();
        //        //byte []bytes= webClient.DownloadData("http://ip:6001/GetAllFiles");
        //        //               System.Text.Encoding.UTF8.GetString (bytes);
        //        //List<string> list = new List<string> ();
        //        //foreach(string s in list) { 
        //        //    byte [] bytes = webClient.DownloadData ("http://ip:6001/Get"+s);
        //        //    FileUtils.WriteFileByBytes (s, bytes);
        //        //}

        //        if (nameValueCollection ["Command"] != null && nameValueCollection ["Command"].StartsWith ("Get")) {
        //            string tempFileName = nameValueCollection ["Command"].Replace ("Get", "");
        //            if ("AllFiles" == tempFileName) {
        //                byte [] bytes = System.Text.Encoding.UTF8.GetBytes (Newtonsoft.Json.JsonConvert.SerializeObject (IO.FileUtils.ReadFiles ()));
        //                outputStream.Write (bytes, 0, bytes.Length);
        //                outputStream.Flush ();
        //            } else {
        //                byte [] bytes;
        //                if (!IO.FileUtils.Exists (tempFileName)) {
        //                    bytes = System.Text.Encoding.UTF8.GetBytes ("文件名不存在！");
        //                    outputStream.Write (bytes, 0, bytes.Length);
        //                    outputStream.Flush ();
        //                    return;
        //                }
        //                System.IO.FileStream fs = new System.IO.FileStream (Application.RootPath + tempFileName, System.IO.FileMode.Open);
        //                bytes = new byte [fs.Length];
        //                fs.Read (bytes, 0, bytes.Length);
        //                fs.Close ();
        //                outputStream.Write (bytes, 0, bytes.Length);
        //                outputStream.Flush ();
        //            }
        //        } else if (nameValueCollection ["Command"].StartsWith ("Upload")) {
        //            string path = Application.RootPath + nameValueCollection ["Command"].Replace ("Upload", "");
        //            string dePath = nameValueCollection ["Command"].Replace ("Upload", "");
        //            if (dePath.StartsWith ("Room_")) {
        //                new Room ().Add (dePath);
        //            }
        //            if (dePath.Split ('_').Length == 5) {
        //                if (dePath.Split ('_') [1] == (typeof (OnePortBus).Name) || dePath.Split ('_') [1] == (typeof (OnePortWirelessFR).Name)) {
        //                    UserConfig.Instance.RemoteModeFile = dePath;
        //                    UserConfig.Instance.SaveUserConfig ();
        //                }
        //                if (dePath.Split ('_') [1] == (typeof (SecurityModul).Name)) {
        //                    if (UserConfig.Instance.HideDeviceTypes.Contains ((R.MyInternationalizationString.Security))) {
        //                        UserConfig.Instance.HideDeviceTypes.Remove (R.MyInternationalizationString.Security);
        //                        UserConfig.Instance.SaveUserConfig ();
        //                    }
        //                }
        //            }

        //            if (dePath.Split ('_').Length == 2 && dePath.StartsWith ("GlobalScene")) {
        //                var sceneFileList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<string>> (System.Text.Encoding.UTF8.GetString (IO.FileUtils.ReadFile (Scene.GlobalSceneFilePath)));
        //                if (!sceneFileList.Contains (dePath)) {
        //                    sceneFileList.Add (dePath);
        //                    IO.FileUtils.WriteFileByBytes (Scene.GlobalSceneFilePath, CommonPage.MyEncodingUTF8.GetBytes (Newtonsoft.Json.JsonConvert.SerializeObject (sceneFileList)));
        //                }
        //            }
        //            //Utlis.WriteLine ("接收"+path);
        //            FileUtils.WriteFileByInputStream (path, inputStream);
        //            Common common = Newtonsoft.Json.JsonConvert.DeserializeObject<Common> (CommonPage.MyEncodingUTF8.GetString (IO.FileUtils.ReadFile (path)));
        //            if (common.DeviceTextID == R.MyInternationalizationString.ElectricalControl) {
        //                UserConfig.Instance.SocketList.Add (common.CommonLoopID);
        //            }
        //        } else {
        //            byte [] bytes = System.Text.Encoding.UTF8.GetBytes ("请求命令无效！");
        //            outputStream.Write (bytes, 0, bytes.Length);
        //            outputStream.Flush ();
        //        }
        //    } catch (Exception ex) {
        //        Utlis.WriteLine ("httpListener_EventHandler" + ex.ToString ());
        //    } 
        //}


        static void httpListener_EventHandler (System.Collections.Specialized.NameValueCollection nameValueCollection, System.IO.Stream outputStream, System.IO.Stream inputStream)
        {
            //if (!isHttpListenerStart) {
@@ -2151,9 +2230,11 @@
                } else if (nameValueCollection ["Command"].StartsWith ("Upload")) {
                    string path = Application.RootPath + nameValueCollection ["Command"].Replace ("Upload", "");
                    string dePath = nameValueCollection ["Command"].Replace ("Upload", "");
                    if (dePath.StartsWith ("Room_")) {
                    if (dePath.Contains ("Room_")) {
                        new Room ().Add (dePath);
                    }


                    if (dePath.Split ('_').Length == 5) {
                        if (dePath.Split ('_') [1] == (typeof (OnePortBus).Name) || dePath.Split ('_') [1] == (typeof (OnePortWirelessFR).Name)) {
                            UserConfig.Instance.RemoteModeFile = dePath;
@@ -2165,6 +2246,7 @@
                                UserConfig.Instance.SaveUserConfig ();
                            }
                        }

                    }

                    if (dePath.Split ('_').Length == 2 && dePath.StartsWith ("GlobalScene")) {
@@ -2174,7 +2256,6 @@
                            IO.FileUtils.WriteFileByBytes (Scene.GlobalSceneFilePath, CommonPage.MyEncodingUTF8.GetBytes (Newtonsoft.Json.JsonConvert.SerializeObject (sceneFileList)));
                        }
                    }
                    //Utlis.WriteLine ("接收"+path);
                    FileUtils.WriteFileByInputStream (path, inputStream);
                    Common common = Newtonsoft.Json.JsonConvert.DeserializeObject<Common> (CommonPage.MyEncodingUTF8.GetString (IO.FileUtils.ReadFile (path)));
                    if (common.DeviceTextID == R.MyInternationalizationString.ElectricalControl) {