还在构思中

Project.FLY.OBJComponents/OBJComponents/Client/BufferServiceClient.cs

@@ -30,29 +30,10 @@ namespace FLY.OBJComponents.Client
         IFConn mConn;
         UInt32 mServerID;
 
-        /// <summary>
-        /// 数据是从服务器推送过来的，忽略属性变化事件
-        /// </summary>
-        bool isIgnore = false;
 
         public BufferServiceClient(UInt32 serverid)
         {
             mServerID = serverid;
-            this.PropertyChanged += BufferServiceClient_PropertyChanged;
-        }
-
-        private void BufferServiceClient_PropertyChanged(object sender, PropertyChangedEventArgs e)
-        {
-            if (isIgnore)
-                return;
-            Dictionary<string, object> datas = new Dictionary<string, object>
-            {
-                { e.PropertyName, Misc.PropertiesManager.GetValue(sender, e.PropertyName) }
-            };
-            string json = JsonConvert.SerializeObject(datas);
-
-            CurrObjSys.SetValueEx(mConn, mServerID, ID, BUFFER_OBJ_INTERFACE.SET_PARAMS,
-                Misc.Converter.StringToBytes(json));
         }
 
         public override void Dispose()
@@ -69,6 +50,9 @@ namespace FLY.OBJComponents.Client
                 CurrObjSys.GetValueEx(
                     mConn, mServerID, ID,
                     BUFFER_OBJ_INTERFACE.GET_PARAMS);
+                CurrObjSys.GetValueEx(
+                    mConn, mServerID, ID,
+                    BUFFER_OBJ_INTERFACE.GET_STATUS);
 
                 CurrObjSys.SenseConfigEx(
                     mConn, mServerID, ID,
@@ -90,19 +74,16 @@ namespace FLY.OBJComponents.Client
                 case BUFFER_OBJ_INTERFACE.GET_PARAMS:
                     {
                         string json = Misc.Converter.BytesToString(infodata);
-
-                        Dictionary<string, object> datas = JsonConvert.DeserializeObject<Dictionary<string, object>>(json);
-                        
-                        //设置属性
-                        //屏蔽属性改变后，设置到服务器
-                        isIgnore = true;
-
-                        foreach (KeyValuePair<string, object> kv in datas)
-                        {
-                            PropertiesManager_JSON.SetValue(this, kv.Key, kv.Value);
-                        }
-
-                        isIgnore = false;
+                        var p = Newtonsoft.Json.JsonConvert.DeserializeObject<BUFFER_OBJ_INTERFACE.Pack_Params>(json);
+                        Capacity = p.capcity;
+                    }
+                    break;
+                case BUFFER_OBJ_INTERFACE.GET_STATUS:
+                    {
+                        string json = Misc.Converter.BytesToString(infodata);
+                        var p = Newtonsoft.Json.JsonConvert.DeserializeObject<BUFFER_OBJ_INTERFACE.Pack_Status>(json);
+                        Count = p.count;
+                        NewestID = p.newestId;
                     }
                     break;
 
@@ -112,6 +93,7 @@ namespace FLY.OBJComponents.Client
         {
             switch (infoid)
             {
+                case BUFFER_OBJ_INTERFACE.PUSH_STATUS:
                 case BUFFER_OBJ_INTERFACE.PUSH_PARAMS:
                     {
                         PushGetValue(from, srcid, infoid, infodata);
@@ -175,5 +157,16 @@ namespace FLY.OBJComponents.Client
                 asyncCB, asyncContext
                 );
         }
+    
+        public void Apply()
+        {
+            var p = new BUFFER_OBJ_INTERFACE.Pack_Params()
+            {
+                capcity = Capacity
+            };
+            string json = Newtonsoft.Json.JsonConvert.SerializeObject(p);
+            CurrObjSys.SetValueEx(mConn, mServerID, ID, BUFFER_OBJ_INTERFACE.SET_PARAMS,
+                Misc.Converter.StringToBytes(json));
+        }
     }
 }

Project.FLY.OBJComponents/OBJComponents/Common/NotifyBufferChangedEventArgs.cs

@@ -18,9 +18,30 @@ namespace FLY.OBJComponents.Common
 
     public class NotifyBufferChangedEventArgs<T> : EventArgs
     {
+        /// <summary>
+        /// 动作
+        /// </summary>
         public NotifyBufferChangedAction Action { get; set; }
+        /// <summary>
+        /// 被修改的数据，可能为空，需要再向Buffer 获取
+        /// </summary>
         public IEnumerable<T> Items { get; set; }
+        /// <summary>
+        /// 最后一条记录ID
+        /// </summary>
         public int EndingID { get; set; }
+        /// <summary>
+        /// 当前修改数据量
+        /// </summary>
+        public int Count { get; set; }
+        /// <summary>
+        /// 列表最后一条记录
+        /// </summary>
+        public int BufferNewestID { get; set; }
+        /// <summary>
+        /// 列表总数据量
+        /// </summary>
+        public int BufferCount { get; set; }
     }
 
     public enum NotifyBufferChangedAction

Project.FLY.OBJComponents/OBJComponents/OBJComponents.csproj

@@ -47,6 +47,7 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Client\BufferPage.cs" />
     <Compile Include="Client\BufferWindow.cs" />
     <Compile Include="Client\BufferServiceClient.cs" />
     <Compile Include="Client\PLCProxySystemServiceClient.cs" />

Project.FLY.OBJComponents/OBJComponents/OBJ_INTERFACE/BUFFER_OBJ_INTERFACE.cs

@@ -19,6 +19,15 @@ namespace FLY.OBJComponents.OBJ_INTERFACE
         {
             public int count;
         }
+        public class Pack_Status 
+        {
+            public int newestId;
+            public int count;
+        }
+        public class Pack_Params 
+        {
+            public int capcity;
+        }
         #endregion
 
         #region SetValue
@@ -33,6 +42,10 @@ namespace FLY.OBJComponents.OBJ_INTERFACE
         /// Dictionary<string, object>
         /// </summary>
         public const UInt16 GET_PARAMS = 0;
+        /// <summary>
+        /// Pack_Status
+        /// </summary>
+        public const UInt16 GET_STATUS = 1;
         #endregion
 
         #region PushMsg
@@ -41,9 +54,13 @@ namespace FLY.OBJComponents.OBJ_INTERFACE
         /// </summary>
         public const UInt16 PUSH_PARAMS = 0;
         /// <summary>
+        /// Pack_Status
+        /// </summary>
+        public const UInt16 PUSH_STATUS = 1;
+        /// <summary>
         /// NotifyBufferChangedEventArgs
         /// </summary>
-        public const UInt16 PUSH_BUFFERCHANGED = 1;
+        public const UInt16 PUSH_BUFFERCHANGED = 10;
         #endregion
         #region Call
         /// <summary>

Project.FLY.OBJComponents/OBJComponents/Server.OBJProxy/Buffer_OBJProxy.cs

@@ -14,6 +14,8 @@ namespace FLY.OBJComponents.Server.OBJProxy
 {
     public class Buffer_OBJProxy<T> : FObj
     {
+        const int MARKNO_PUSH_STATUS = 1;
+        const int MARKNO_PUSH_PARAMS = 2;
         IBuffer<T> buffer;
 
         public Buffer_OBJProxy(int objsys_idx, UInt32 id, IBuffer<T> buffer)
@@ -36,16 +38,29 @@ namespace FLY.OBJComponents.Server.OBJProxy
 
         private void Buffer_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
         {
-            Dictionary<string, object> p = new Dictionary<string, object>
+            if ((e.PropertyName == "NewestID") ||
+                (e.PropertyName == "Count"))
             {
-                { e.PropertyName, Misc.PropertiesManager.GetValue(sender, e.PropertyName) }
-            };
-
-            string json = JsonConvert.SerializeObject(p);
-            CurrObjSys.PushObjInfoEx(
-                this, BUFFER_OBJ_INTERFACE.PUSH_PARAMS,
-                Misc.Converter.StringToBytes(json)
-                );
+                FObjBase.PollModule.Current.Poll_JustOnce(() =>
+                {
+                    byte[] buf;
+                    GetValue(null, 0, BUFFER_OBJ_INTERFACE.GET_STATUS, out buf);
+                    CurrObjSys.PushObjInfoEx(
+                        this, BUFFER_OBJ_INTERFACE.GET_STATUS,
+                        buf);
+                }, this, MARKNO_PUSH_STATUS);
+            }
+            if (e.PropertyName == "Capacity")
+            {
+                FObjBase.PollModule.Current.Poll_JustOnce(() =>
+                {
+                    byte[] buf;
+                    GetValue(null, 0, BUFFER_OBJ_INTERFACE.GET_PARAMS, out buf);
+                    CurrObjSys.PushObjInfoEx(
+                        this, BUFFER_OBJ_INTERFACE.GET_PARAMS,
+                        buf);
+                }, this, MARKNO_PUSH_PARAMS);
+            }
         }
 
         public override void SetValue(IFConn from, uint srcid, ushort memid, byte[] infodata)
@@ -55,13 +70,8 @@ namespace FLY.OBJComponents.Server.OBJProxy
                 case BUFFER_OBJ_INTERFACE.SET_PARAMS:
                     {
                         string json = Misc.Converter.BytesToString(infodata);
-
-                        Dictionary<string, object> p = JsonConvert.DeserializeObject<Dictionary<string, object>>(json);
-
-                        foreach (var kv in p)
-                        {
-                            PropertiesManager_JSON.SetValue(buffer, kv.Key, kv.Value);
-                        }
+                        var p = Newtonsoft.Json.JsonConvert.DeserializeObject<BUFFER_OBJ_INTERFACE.Pack_Params>(json);
+                        buffer.Capacity = p.capcity;
                     }
                     break;
             }
@@ -73,12 +83,21 @@ namespace FLY.OBJComponents.Server.OBJProxy
             {
                 case BUFFER_OBJ_INTERFACE.GET_PARAMS:
                     {
-                        Dictionary<string, object> p = new Dictionary<string, object>();
-                        IEnumerable<string> propertynames = Misc.PropertiesManager.GetAllPropertyNames(buffer);
-                        foreach (string pn in propertynames)
+                        var p = new BUFFER_OBJ_INTERFACE.Pack_Params()
+                        {
+                            capcity = buffer.Capacity
+                        };
+                        string json = JsonConvert.SerializeObject(p);
+                        infodata = Misc.Converter.StringToBytes(json);
+                    }
+                    break;
+                case BUFFER_OBJ_INTERFACE.GET_STATUS:
+                    {
+                        var p = new BUFFER_OBJ_INTERFACE.Pack_Status()
                         {
-                            p.Add(pn, Misc.PropertiesManager.GetValue(buffer, pn));
-                        }
+                            newestId = buffer.NewestID,
+                            count = buffer.Count
+                        };
                         string json = JsonConvert.SerializeObject(p);
                         infodata = Misc.Converter.StringToBytes(json);
                     }

Project.FLY.OBJComponents/OBJComponents/Server/BufferSQLite.cs

@@ -66,9 +66,20 @@ namespace FLY.OBJComponents.Server
             sqliteHelper.QueryTranAsync(sqls);
 
             Count++;
+            BufferChanged?.Invoke(this, new NotifyBufferChangedEventArgs<TLc>()
+            {
+                Action = NotifyBufferChangedAction.Add,
+                EndingID = NewestID,
+                Count = 1,
+                Items = new TLc[] { lc },
+                BufferCount = Count,
+                BufferNewestID = NewestID
+            });
         }
         public void AddRange(IEnumerable<TLc> lcs)
-        { 
+        {
+            if (lcs.Count() == 0)
+                return;
             List<string> sqls = new List<string>();
             foreach (var lc in lcs)
             {
@@ -80,6 +91,15 @@ namespace FLY.OBJComponents.Server
             sqliteHelper.QueryTranAsync(sqls);
 
             Count += lcs.Count();
+            BufferChanged?.Invoke(this, new NotifyBufferChangedEventArgs<TLc>()
+            {
+                Action = NotifyBufferChangedAction.Add,
+                EndingID = NewestID,
+                Count = lcs.Count(),
+                Items = lcs,
+                BufferCount = Count,
+                BufferNewestID = NewestID
+            });
         }
         /// <summary>
         /// 清空全部数据
@@ -91,6 +111,14 @@ namespace FLY.OBJComponents.Server
             sqls.Add($"DELETE FROM {dbTable.TableName}");
             sqliteHelper.QueryTranAsync(sqls);
             Count = 0;
+            BufferChanged?.Invoke(this, new NotifyBufferChangedEventArgs<TLc>()
+            {
+                Action = NotifyBufferChangedAction.Reset,
+                EndingID = -1,
+                Count = 0,
+                BufferCount = Count,
+                BufferNewestID = NewestID
+            });
         }
 
         /// <summary>
@@ -188,9 +216,19 @@ namespace FLY.OBJComponents.Server
             sqliteHelper.QueryTranAsync(sqls);
 
             Count++;
+            BufferChanged?.Invoke(this, new NotifyBufferChangedEventArgs<TDb>()
+            {
+                Action = NotifyBufferChangedAction.Add,
+                EndingID = NewestID,
+                Count = 1,
+                BufferCount = Count,
+                BufferNewestID = NewestID
+            });
         }
         public void AddRange(IEnumerable<TDb> dbs)
         {
+            if (dbs.Count() == 0)
+                return;
             List<string> sqls = new List<string>();
             foreach (var db in dbs)
             {
@@ -203,6 +241,14 @@ namespace FLY.OBJComponents.Server
             sqliteHelper.QueryTranAsync(sqls);
 
             Count += dbs.Count();
+            BufferChanged?.Invoke(this, new NotifyBufferChangedEventArgs<TDb>()
+            {
+                Action = NotifyBufferChangedAction.Add,
+                EndingID = NewestID,
+                Count = dbs.Count(),
+                BufferCount = Count,
+                BufferNewestID = NewestID
+            });
         }
         /// <summary>
         /// 清空全部数据
@@ -214,6 +260,14 @@ namespace FLY.OBJComponents.Server
             sqls.Add($"DELETE FROM {dbTable.TableName}");
             sqliteHelper.QueryTranAsync(sqls);
             Count = 0;
+            BufferChanged?.Invoke(this, new NotifyBufferChangedEventArgs<TDb>()
+            {
+                Action = NotifyBufferChangedAction.Reset,
+                EndingID = -1,
+                Count = 0,
+                BufferCount = Count,
+                BufferNewestID = NewestID
+            });
         }
 
         /// <summary>