20200909

wxr

2020-09-09 c3e1b733fc45bd9f0b88bfb560cfa87a270b079b

 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,7 +15,7 @@
            dialog.AddChidren(bodyView);

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

            new PublicAssmebly().TipMsg(StringId.Tip, StringId.UpdataTcpResidenceDataTip, action);
@@ -26,14 +26,17 @@
        /// </summary>
        /// <param name="sidObjects"></param>
        /// <param name="functionOids"></param>
        public void UpdataFunctionList(List<Function> sidObjects, List<FunctionOid> functionOids)
        public void UpdataFunctionList(List<Function> sidObjects, string oidJsonString)//, List<FunctionOid> functionOids)
        {
            DB_ResidenceData.SaveFunctionOidList(functionOids);
            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();