Merge branch 'dev6.0' of http://private.flyautomation.net:82/panruising/thick_public into dev6.0

Project.FLY.FObjSys/FObjBaseReflect/Reflect_Proxy.cs

@@ -183,8 +183,8 @@ namespace FObjBase.Reflect
         
         private void Obj_PropertyChanged(object sender, PropertyChangedEventArgs e)
         {
-            if (ignoreSet)//从服务器接收的数据，不用再推送给服务器
-                return;
+            //if (ignoreSet)//从服务器接收的数据，不用再推送给服务器
+            //    return;
 
             if (interfaceType == null)
                 return;
@@ -207,8 +207,8 @@ namespace FObjBase.Reflect
 
         private void Sub_PropertyChanged(object sender, PropertyChangedEventArgs e)
         {
-            if (ignoreSet)//从服务器接收的数据，不用再推送给服务器
-                return;
+            //if (ignoreSet)//从服务器接收的数据，不用再推送给服务器
+            //    return;
             if (!subProperties.ContainsKey(sender))
                 return;//异常, 不是子property
 
@@ -276,9 +276,9 @@ namespace FObjBase.Reflect
                 case Reflect_OBJ_INTERFACE.CALL_SetProperty:
                     {
                         string json = Misc.Converter.BytesToString(infodata);
-                        ignoreSet = true;
+                        //ignoreSet = true;
                         JsonConvert.PopulateObject(json, obj);
-                        ignoreSet = false;
+                        //ignoreSet = false;
                     }
                     break;
 
@@ -287,14 +287,21 @@ namespace FObjBase.Reflect
                         string json = Misc.Converter.BytesToString(infodata);
                         var rData = JsonConvert.DeserializeObject<Reflect_OBJ_INTERFACE.ReflectData>(json);
                         var type = obj.GetType();
-                        var methodInfo = type.GetMethod(rData.name);
+                        var paramNames_req = rData.data.Children().OfType<JProperty>().Select(p => p.Name);
+                        MethodInfo methodInfo = GetMethodInfo(type, rData.name, paramNames_req);
+                        if (methodInfo == null)
+                        {
+                            //不能找到，
+                            throw new Exception($"程序写错了, 不能找到 rData.name={rData.name} 或者 参数名称不对，没法完全匹配");
+                        }
+
                         var parameterInfos = methodInfo.GetParameters();
                         object[] parameters = new object[parameterInfos.Count()];
                         for (int i = 0; i < parameters.Count(); i++)
                         {
                             var ptype = parameterInfos[i].ParameterType;
                             var pname = parameterInfos[i].Name;
-                            if (string.Compare(pname,"asyncDelegate",true)==0)
+                            if (string.Compare(pname, "asyncDelegate", true) == 0)
                             {
                                 parameters[i] = new AsyncCBHandler(asyncDelegate);
                             }
@@ -308,10 +315,48 @@ namespace FObjBase.Reflect
                             }
                         }
                         methodInfo.Invoke(obj, parameters);
+                        
                     }
                     break;
             }
         }
+        MethodInfo GetMethodInfo(Type type, string name, IEnumerable<string> parameterNames) 
+        {
+            
+            var methodInfos = from mi in type.GetMethods() where mi.Name == name select mi;
+            if(methodInfos.Count()==0)
+                return null;
+            if (methodInfos.Count() == 1)
+                return methodInfos.First();
+
+            //必须完全匹配
+            foreach (var methodInfo in methodInfos)
+            {
+                var parameterInfos = methodInfo.GetParameters();
+                var names = parameterInfos.Select(pi => pi.Name);
+                var names_req = parameterNames;
+                //比较 names 与 names_data
+
+                var exps_req = names_req.Except(names);
+                if (exps_req.Count() != 0)
+                {
+                    //请求的参数，这个method 不是全部都有
+                    continue;
+                }
+                var exps = names.Except(names_req);
+                if (exps.Count() == 2 && exps.Contains("asyncDelegate") && exps.Contains("asyncContext"))
+                {
+                    //请求的参数 就只有 "asyncDelegate" 与 "asyncContext" 没有而已
+                    //这个就是需要调用的 method
+                    return methodInfo;
+                }
+                else
+                {
+                    continue;
+                }
+            }
+            return null;
+        }
         void asyncDelegate(object asyncContext, object retData)
         {
             var cc = (CC)asyncContext;