1

wxr

2023-03-31 d53e6af2c5f17838fa79659614b15a2a1f383399

 Crabtree/SmartHome/HDL/Common/HDLLinkUtlis.cs

@@ -122,9 +122,20 @@
        /// 然后上传oid、sid、以及场景列表
        /// </summary>
        /// <returns></returns>
        public void OneclickUpload ()
        public void OneclickUpload (bool isMigrate = false)
        {
            MainPage.Loading.Start ("Uploading device list...");
            if (isMigrate) {
                var res = false;
                res = UploadOidAndSidList ();
                if (res) {
                    res = GetFunctionList ();
                    if (res) {
                        res = UploadSecneList ();
                    }
                }
                return;
            }
            MainPage.Loading.Start ("Uploading...");
            System.Threading.Tasks.Task.Run (() => {
                try {
                    var res = false;
@@ -136,7 +147,7 @@
                        }
                    }

                    if (!res) {
                    if (res) {
                        Utlis.ShowAlertOnMainThread (Language.StringByID (SimpleControl.R.MyInternationalizationString.SuccessfullySynchronizedToTheCloud));
                    } else {
                        Utlis.ShowAlertOnMainThread (Language.StringByID (SimpleControl.R.MyInternationalizationString.FailedToSyncToTheCloud));
@@ -653,6 +664,13 @@
                IotCloud currentProject = new IotCloud ();
                var list = GetAllDeviceList ();
                ConvertOidListToIotStruct (UserConfig.Instance.CurrentRegion.Id, UserConfig.Instance.HomeGateway.gatewayId, list, ref currentProject);
                //2022-06-21 13:10:07 mac不能为空，否则云端有问题
                foreach (var bean in currentProject.modules.devices) {
                    if (string.IsNullOrEmpty (bean.mac)) {
                        bean.mac = bean.oid;
                    }
                }

                Utlis.WriteLine ("list: " + list.Count + "currentProject : " + currentProject.functions.devices.Count);

                var revertObj = HttpServerRequest.Current.UploadDeviceOidList (currentProject.modules);
@@ -666,8 +684,8 @@
                } else {
                    IMessageCommon.Current.ShowErrorInfoAlter (revertObj.Code);
                }
            } catch {

            } catch(Exception EX) {
                Utlis.WriteLine ("catch: " + EX.ToString());
            }
            return res;
        }