20201112

wxr

2020-11-12 a715181089be0d31cd737a5367ffd02690b9d77f

 HDL_ON/UI/UI0-Public/UpdataTcpResidenceDataDialog.cs

@@ -7,7 +7,7 @@
{
    public class UpdataTcpResidenceDataDialog 
    {
        public void ShowDialog(List<Function> sidObjects,List<FunctionOid> functionOids)
        public void ShowDialog(List<Function> sidObjects,string oidJsonString)
        {
            Dialog dialog = new Dialog();
            FrameLayout bodyView = new FrameLayout();
@@ -15,20 +15,28 @@
            dialog.AddChidren(bodyView);

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

            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, string oidJsonString)//, List<FunctionOid> functionOids)
        {
            DB_ResidenceData.residenceData.functionOidList = functionOids;
            DB_ResidenceData.residenceData.functionList.ClearAllDeviceFunctionList();
            var obj = Newtonsoft.Json.JsonConvert.DeserializeObject<Newtonsoft.Json.Linq.JObject>(oidJsonString);
            var functionOids = Newtonsoft.Json.JsonConvert.DeserializeObject<List<FunctionOid>>(obj.GetValue("objects").ToString());
            
            DB_ResidenceData.SaveFunctionOidJsonDataList(oidJsonString);
            DB_ResidenceData.functionList.ClearAllDeviceFunctionList();
            DB_ResidenceData.DelAllFunctionData();
            foreach (var sidObj in sidObjects)
            {
                var oid = functionOids.Find((obj) => obj.oid == sidObj.sid.Substring(0, 16));
                var oid = functionOids.Find((o) =>  o.oid == sidObj.sid.Substring(0, 16));
                if(oid!=null)
                {
                    sidObj.bus_Data = new BusData();
@@ -36,13 +44,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();
        }