2020-09-01

wxr

2020-09-01 7d005a7618e3d7a80d8ede3baf6ecc4bf8019cd5

 HDL_ON/UI/UI0-Public/UpdataTcpResidenceDataDialog.cs

@@ -15,17 +15,22 @@
            dialog.AddChidren(bodyView);

            Action action = () => {
                UpdataResidenceData(sidObjects,functionOids);
                UpdataFunctionList(sidObjects,functionOids);
            };

            new PublicAssmebly().TipMsg(StringId.Tip, StringId.UpdataTcpResidenceDataTip, action);

        }

        public void UpdataResidenceData(List<Function> sidObjects, List<FunctionOid> functionOids)
        /// <summary>
        /// 更新功能列表
        /// </summary>
        /// <param name="sidObjects"></param>
        /// <param name="functionOids"></param>
        public void UpdataFunctionList(List<Function> sidObjects, List<FunctionOid> functionOids)
        {
            DB_ResidenceData.residenceData.functionOidList = functionOids;
            DB_ResidenceData.residenceData.functionList.ClearAllDeviceFunctionList();
            DB_ResidenceData.SaveFunctionOidList(functionOids);
            DB_ResidenceData.functionList.ClearAllDeviceFunctionList();
            DB_ResidenceData.DelAllFunctionData();
            foreach (var sidObj in sidObjects)
            {
                var oid = functionOids.Find((obj) => obj.oid == sidObj.sid.Substring(0, 16));
@@ -36,13 +41,8 @@
                    sidObj.bus_Data.DeviceID = Convert.ToByte(oid.dev_id, 16);
                    sidObj.bus_Data.LoopID = Convert.ToByte(sidObj.sid.Substring(20, 4),16);
                }
                DB_ResidenceData.residenceData.functionList.AddDeviceFunction(sidObj);

                DB_ResidenceData.functionList.AddDeviceFunction(sidObj);
            }
            
            DB_ResidenceData.residenceData.SaveResidenceData();
            DB_ResidenceData.residenceData.functionList.GetAllFunction();

            MainPage.GoUserPage();
        }