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

Project.FLY.ControlLibrary/FLY.ControlLibrary/Themes/Styles.cs

@@ -19,7 +19,7 @@ namespace FLY.ControlLibrary.Themes
 
             AreaColors = new List<SolidColorBrush>();
             for (int i = 0; i < 5; i++)
-                AreaColors.Add(resourceDictionary[$"AreaColor{i}"] as SolidColorBrush);
+                AreaColors.Add(resourceDictionary[$"AreaColors{i}"] as SolidColorBrush);
 
             randomColors = new List<SolidColorBrush>();
             randomColors.AddRange(resourceDictionary["RandomColors"] as IEnumerable<SolidColorBrush>);

Project.FLY.FlyADBase/脚本/1.restore_resource.sh

+#!/bin/bash
+
+dest_path="../FLYAD7_Simulation_Wpf/bin/Debug"
+src_path="资料/*"
+
+if [ -e $dest_path ]; then
+    rm -rf $dest_path
+fi
+mkdir -p $dest_path
+
+echo 复制 资料
+cp -rf $src_path $dest_path
+if [ $? != 0 ]; then
+    echo 复制失败
+    exit 1
+fi
+
+echo 完成
\ No newline at end of file

Project.FLY.Misc/MISC/MyMath.cs

@@ -500,5 +500,109 @@ namespace Misc
             }
             return data_new;
         }
+
+
+        /// <summary>
+        /// 对环形数据 分区移位
+        /// </summary>
+        /// <param name="data">原始数据</param>
+        /// <param name="map">key=old_idx, value=new_idx</param>
+        /// <returns></returns>
+        public static double[] Map(IEnumerable<double> data, Dictionary<int, int> map)
+        {
+            if (map == null || map.Count() == 0)
+                return data.ToArray();
+            double[] data_new = new double[data.Count()];
+            if (map.Count() == 1)
+            {
+                //只是平移而已
+                int old_idx0 = map.Keys.ElementAt(0);
+                int new_idx0 = map[old_idx0];
+
+                for (int i = 0; i < data.Count(); i++)
+                {
+                    int new_idx = i;
+                    int old_idx = (old_idx0 - new_idx0) + new_idx;
+                    if (old_idx >= data.Count())
+                        old_idx -= data.Count();
+                    else if (old_idx < 0)
+                        old_idx += data.Count();
+                    data_new[new_idx] = data.ElementAt(old_idx);
+                }
+                return data_new;
+            }
+
+
+            for (int i = 0; i < map.Count(); i++)
+            {
+                int old_idx0 = map.Keys.ElementAt(i);
+                int new_idx0 = map[old_idx0];
+
+
+                int i_next = i + 1;
+                if (i_next >= map.Count())
+                    i_next = 0;
+
+                int old_idx1 = map.Keys.ElementAt(i_next);
+                int new_idx1 = map[old_idx1];
+
+                int cnt = new_idx1 - new_idx0;
+                if (cnt < 0)
+                    cnt += data.Count();
+
+                int cnt_old = old_idx1 - old_idx0;
+                if (cnt_old < 0)
+                    cnt_old += data.Count();
+
+                double w = 1.0 * cnt_old / cnt;
+                for (int j = 0; j < cnt; j++)
+                {
+                    int new_idx = j + new_idx0;
+                    if (new_idx >= data.Count())
+                        new_idx -= data.Count();
+
+                    double old_idx = j * w + old_idx0;
+                    int o1 = (int)Math.Ceiling(old_idx);
+                    int o0 = (int)old_idx;
+
+                    if (o0 == o1)
+                    {
+                        int old_idx_0 = o0;
+                        if (old_idx_0 >= data.Count())
+                            old_idx_0 -= data.Count();
+                        data_new[new_idx] = data.ElementAt(old_idx_0);
+                    }
+                    else
+                    {
+                        int old_idx_0 = o0;
+                        if (old_idx_0 >= data.Count())
+                            old_idx_0 -= data.Count();
+
+                        int old_idx_1 = o1;
+                        if (old_idx_1 >= data.Count())
+                            old_idx_1 -= data.Count();
+
+                        if (double.IsNaN(data.ElementAt(old_idx_1)) && double.IsNaN(data.ElementAt(old_idx_0)))
+                        {
+                            data_new[new_idx] = (data.ElementAt(old_idx_1) * (old_idx - o0) + data.ElementAt(old_idx_0) * (o1 - old_idx));
+                        }
+                        else if (double.IsNaN(data.ElementAt(old_idx_0)))
+                        {
+                            data_new[new_idx] = data.ElementAt(old_idx_0);
+                        }
+                        else if (double.IsNaN(data.ElementAt(old_idx_1)))
+                        {
+                            data_new[new_idx] = data.ElementAt(old_idx_1);
+                        }
+                        else
+                        {
+                            data_new[new_idx] = double.NaN;
+                        }
+
+                    }
+                }
+            }
+            return data_new;
+        }
     }
 }

Project.FLY.Misc/MISC/ParamDictionary.cs

@@ -117,7 +117,7 @@ namespace Misc
                 else
                 {
                     cell.ToValue<T>();
-                    var type = cell.Value.GetType();
+                    //var type = cell.Value.GetType();
 
                     return (T)cell.Value;
                 }
@@ -133,12 +133,26 @@ namespace Misc
         /// <param name="propertyName"></param>
         /// <param name="defaultValue"></param>
         public void SetBinding<T>(INotifyPropertyChanged target, string propertyName, T defaultValue)
+        {
+            SetBinding<T>(target, propertyName, propertyName, defaultValue);
+        }
+
+        /// <summary>
+        /// 双向绑定
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="src"></param>
+        /// <param name="target"></param>
+        /// <param name="propertyName"></param>
+        /// <param name="key"></param>
+        /// <param name="defaultValue"></param>
+        public void SetBinding<T>(INotifyPropertyChanged target, string propertyName, string key, T defaultValue)
         {
             Type type_s = target.GetType();
             System.Reflection.PropertyInfo pi_t = type_s.GetProperty(propertyName);
             if (pi_t == null)
                 return;
-            object obj = GetValue<T>(propertyName, defaultValue);
+            object obj = this.GetValue<T>(key, defaultValue);
             pi_t.SetValue(target, obj);
 
             target.PropertyChanged += (s, e) =>
@@ -146,19 +160,19 @@ namespace Misc
                 if (e.PropertyName == propertyName)
                 {
                     object o = pi_t.GetValue(target);
-                    SetValue(propertyName, o);
+                    this.SetValue(key, o);
                 }
             };
+
             ValueChanged += (s, e) =>
             {
-                if (e.Key == propertyName) {
-                    object o = GetValue<T>(propertyName, defaultValue);
-                    pi_t.SetValue(target, o);
+                if (e.Key == key)
+                {
+                    pi_t.SetValue(target, e.Value);
                 }
             };
         }
 
-
         private string path;
 
         public event UiParamDictionaryValueChangedHandler ValueChanged;

Project.FLY.Misc/MISC/PropertiesManager.cs

@@ -20,7 +20,16 @@ namespace Misc
 
             return from p in properties select p.Name;
         }
+        /// <summary>
+        /// 获取所有属性名。
+        /// </summary>
+        /// <returns></returns>
+        public static IEnumerable<string> GetAllPropertyNames(Type type)
+        {
+            PropertyInfo[] properties = type.GetProperties();
 
+            return from p in properties select p.Name;
+        }
         /// <summary>
         /// 设定参数（属性）的值，触发属性值变化“通知”,writeVal
         /// </summary>

Project.FLY.Thick.Base/FLY.Thick.Base.UI/CustomMenu/CustomMenu.cs

@@ -37,6 +37,8 @@ namespace FLY.Thick.Base.UI.CustomMenu
 
         public void OnClick()
         {
+            if (!WdPassword.Authorize("CustomSetting"))
+                return;
             var p = this.container.Resolve<PgCustomSections>();
             FlyLayoutManager.NavigationService.Navigate(p);
         }

Project.FLY.Thick.Base/FLY.Thick.Base.UI/FLY.Thick.Base.UI.csproj

@@ -607,6 +607,9 @@
     <PackageReference Include="PropertyChanged.Fody">
       <Version>3.2.5</Version>
     </PackageReference>
+    <PackageReference Include="Unity">
+      <Version>5.11.2</Version>
+    </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Images\doorplate.jpg" />

Project.FLY.Thick.Base/FLY.Thick.Base.UI/PasswordAuthorize.cs

@@ -249,8 +249,10 @@ namespace FLY.Thick.Base.UI
 
 
             if (!File.Exists(file_path))
+            {
+                check_db();
                 return;
-            
+            }
             
 
             string json = File.ReadAllText(file_path);

Project.FLY.Thick.Base/FLY.Thick.Base.UI/UiModule/FixGraph/FixGraph.xaml.cs

@@ -87,7 +87,7 @@ namespace FLY.Thick.Base.UI.UiModule
             viewModel.GetDatas(out double intervalms, out List<double> datas);
             PgFixAnalyze p = new PgFixAnalyze();
             p.Init(intervalms, datas);
-            (Application.Current.Properties["NavigationService"] as NavigationService).Navigate(p);
+            MultiLayout.FlyLayoutManager.NavigationService.Navigate(p);
         }
     }
 

Project.FLY.Thick.Base/FLY.Thick.Base.UI/UiModule/FixGraph/FixGraphParams.cs

@@ -20,7 +20,7 @@ namespace FLY.Thick.Base.UI.UiModule
         }
         public FixGraphParams()
         {
-            string path = System.IO.Path.Combine(FlyLayout.BasePath, "fixgraph.xml");
+            string path = System.IO.Path.Combine(FlyLayout.BasePath, "fixgraph.json");
             FilePath = path;
         }
         static FixGraphParams current = null;

读取xmind/WpfApp1/WpfApp1/MainWindow.xaml.cs

@@ -43,7 +43,7 @@ namespace WpfApp1
             {
                 string xmindPath = openFileDialog.FileName;
                 string outDirPath = System.IO.Path.GetDirectoryName(xmindPath);
-                if (Xmind2UnityConfigCore.TopicExt.ToUnity(openFileDialog.FileName, null) == 0) {
+                if (Xmind2UnityConfigCore.XMindTypeExt.ToUnity(openFileDialog.FileName, null, true) == 0) {
                     MessageBox.Show($@"完成 输出到{outDirPath}\unity");
                 }
             }

读取xmind/WpfApp1/WpfApp1/Xmind2UnityConfigUI.csproj

@@ -5,7 +5,7 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{840673C1-3705-42EC-A3EB-6A7F803590CF}</ProjectGuid>
-    <OutputType>WinExe</OutputType>
+    <OutputType>Exe</OutputType>
     <RootNamespace>Xmind2UnityConfigUI</RootNamespace>
     <AssemblyName>Xmind2UnityConfigUI</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>

读取xmind/WpfApp1/Xmind2UnityConfig/Program.cs

@@ -17,11 +17,15 @@ namespace Xmind2UnityConfig
             }
             else if (args.Length == 1)
             {
-                return Xmind2UnityConfigCore.TopicExt.ToUnity(args[0], null);
+                return Xmind2UnityConfigCore.XMindTypeExt.ToUnity(args[0], null, true);
             }
-            else
+            else if (args.Length == 2)
             {
-                return Xmind2UnityConfigCore.TopicExt.ToUnity(args[0], args[1]);
+                return Xmind2UnityConfigCore.XMindTypeExt.ToUnity(args[0], args[1], true);
+            }
+            else// if (args.Length == 2)
+            {
+                return Xmind2UnityConfigCore.XMindTypeExt.ToUnity(args[0], args[1], bool.Parse(args[2]));
             }
         }
     }

读取xmind/WpfApp1/Xmind2UnityConfigCore/TopicExt.cs

@@ -39,6 +39,12 @@ namespace Xmind2UnityConfigCore
 
             string filePath = System.IO.Path.Combine(tempPath, "content.json");
             string json = File.ReadAllText(filePath);
+
+            //var xmind = JsonConvert.DeserializeObject<XMindRootTopic[]>(json);
+
+            //转义title
+            //string unescape = System.Text.RegularExpressions.Regex.Unescape(str);
+
             JArray jArray = JsonConvert.DeserializeObject(json) as JArray;
 
             var jobject_topic = jArray.First() as JObject;
@@ -82,6 +88,7 @@ namespace Xmind2UnityConfigCore
             return topic;
         }
 
+
         static void ToUnity(Topic rootTopic, string path)
         {
             path = System.IO.Path.Combine(path, "unity");
@@ -97,6 +104,8 @@ namespace Xmind2UnityConfigCore
             File.WriteAllText(System.IO.Path.Combine(path, "relationship.json"), json);
 
         }
+
+
         static RelationShip ToRelationShip(Topic topic, string path)
         {
             RelationShip relationShip = new RelationShip();
@@ -291,4 +300,6 @@ namespace Xmind2UnityConfigCore
             xdoc.Save(filepath);
         }
     }
+
+
 }

读取xmind/WpfApp1/Xmind2UnityConfigCore/XMindType.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Xmind2UnityConfigCore
+{
+    public class XMindRootTopic
+    {
+        public XMindTopic rootTopic;
+        public override string ToString()
+        {
+            return rootTopic.ToString();
+        }
+    }
+    public class XMindTopic
+    {
+        public string title;
+        public XMindChildren children;
+        public override string ToString()
+        {
+            return title;
+        }
+    }
+    public class XMindChildren
+    {
+        public List<XMindTopic> attached;
+    }
+}

读取xmind/WpfApp1/Xmind2UnityConfigCore/XMindTypeExt.cs

+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.IO.Compression;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using System.Xml.Linq;
+
+namespace Xmind2UnityConfigCore
+{
+    public static class XMindTypeExt
+    {
+        public static int ToUnity(string xmindPath, string outDirPath,bool isDebug)
+        {
+            if (!File.Exists(xmindPath))
+            {
+                Console.WriteLine($"{xmindPath} is not exist!!");
+                return -1;
+            }
+            if (string.IsNullOrEmpty(outDirPath))
+                outDirPath = System.IO.Path.GetDirectoryName(xmindPath);
+
+            //var zipArchive = ZipFile.o(openFileDialog.FileName);
+            //zipArchive.
+
+            //解压缩的临时路径
+            string tempPath = System.IO.Path.Combine(
+                    System.IO.Path.GetTempPath(),
+                    System.IO.Path.GetFileNameWithoutExtension(xmindPath));
+
+            if (Directory.Exists(tempPath))
+                Directory.Delete(tempPath, true);
+
+            ZipFile.ExtractToDirectory(xmindPath, tempPath);
+
+            string filePath = System.IO.Path.Combine(tempPath, "content.json");
+            string json = File.ReadAllText(filePath);
+
+            var xmind = JsonConvert.DeserializeObject<XMindRootTopic[]>(json);
+
+            //转义title
+            //string unescape = System.Text.RegularExpressions.Regex.Unescape(str);
+            if (isDebug)
+            {
+                json = Newtonsoft.Json.JsonConvert.SerializeObject(xmind, Formatting.Indented);
+                Console.WriteLine(json);
+            }
+
+            var rootTopic = xmind.First().rootTopic;
+            //把全部注解删除
+            MakeTopicLegal(rootTopic);
+
+
+            ToUnity(rootTopic, outDirPath);
+            Console.WriteLine($@"success!!! out to {System.IO.Path.Combine(outDirPath, "unity")}");
+            return 0;
+        }
+
+        static string MakeTitleLegal(string title) 
+        {
+            //把全部 中文的 （） 替换为 英文的 ()
+            title = new string(title.Select((c) =>
+            {
+                switch (c)
+                {
+                    case '（':
+                        return '(';
+                    case '）':
+                        return ')';
+                    case '“':
+                        return '"';
+                    case '”':
+                        return '"';
+                    case '\n':
+                        return ' ';
+                    default:
+                        return c;
+                }
+            }).ToArray());
+
+            //删除全部注解
+            Regex regex_instruction = new Regex(@"\([\s\S]*\)");
+
+            title = regex_instruction.Replace(title, "");
+
+            title.Trim();
+
+            //全部注解删除后，什么也没有
+            if (string.IsNullOrEmpty(title))
+                return null;
+
+            return title;
+        }
+        static void MakeTopicLegal(XMindTopic topic)
+        {
+            topic.title = MakeTitleLegal(topic.title);
+            if (topic.title == null)
+                return;
+
+            if (
+                topic.children == null
+                || topic.children.attached == null
+                || topic.children.attached.Count() == 0
+                )
+                return;
+            foreach (var t in topic.children.attached)
+            {
+                MakeTopicLegal(t);
+            }
+            topic.children.attached.RemoveAll(t => t.title == null);
+        }
+        static void ToUnity(XMindTopic rootTopic, string path)
+        {
+            path = System.IO.Path.Combine(path, "unity");
+            if (!Directory.Exists(path))
+                Directory.CreateDirectory(path);
+
+            //register \ntype=\"IUnityContainer\"\nname=\"root\"\n(根容器)
+
+            //生成relationship.json
+
+            RelationShip relationShip = ToRelationShip(rootTopic, path);
+            string json = Newtonsoft.Json.JsonConvert.SerializeObject(relationShip, Newtonsoft.Json.Formatting.Indented);
+            File.WriteAllText(System.IO.Path.Combine(path, "relationship.json"), json);
+
+        }
+
+
+        static RelationShip ToRelationShip(XMindTopic topic, string path)
+        {
+            RelationShip relationShip = new RelationShip();
+
+            var x_root = ToXElement(topic.title);
+
+            string name = x_root.Attribute("name").Value;
+
+            relationShip.Name = name;
+
+            foreach (var subTopic in topic.children.attached)
+            {
+                if (subTopic.title.Contains("register")
+                    && subTopic.title.Contains("type=\"IUnityContainer\""))
+                {
+                    //这是子容器
+                    var subRelationShip = ToRelationShip(subTopic, path);
+                    relationShip.Children.Add(subRelationShip);
+                }
+                else 
+                {
+                    //这是config文件
+                    //var ss = subTopic.title.Split('\n');
+                    string filename = subTopic.title;//  ss[0].Trim();
+                    relationShip.Path.Add(filename);
+                    string filepath = System.IO.Path.Combine(path, filename);
+                    //创建 xxx.config 文件 
+                    ToConfig(subTopic.children.attached, filepath);
+                }
+
+            }
+            return relationShip;
+        }
+
+
+        static XElement ToXElement(string title)
+        {
+            if (string.IsNullOrEmpty(title))
+                return null;
+            
+            title = title.Trim();
+            
+            //什么也没有
+            if (string.IsNullOrEmpty(title))
+                return null;
+
+            Regex regex_xml = new Regex(@"\<[\s\S]*/\>");
+            var match = regex_xml.Match(title);
+            if (match.Success)
+            {
+                //它就是标准的xml格式,直接转换
+                return XElement.Parse(title);
+            }
+
+            //头尾添加< />
+            title = $@"<{title} />";
+            return XElement.Parse(title);
+        }
+        static XElement ToXElement(XMindTopic topic)
+        {
+            XElement x = ToXElement(topic.title);
+            if (x == null)
+                return null;
+
+            if (topic.children == null || topic.children.attached == null)
+                return x;
+
+            foreach (var sub in topic.children.attached)
+            {
+                var x_sub = ToXElement(sub);
+                if (x_sub == null)
+                    continue;
+                x.Add(x_sub);
+            }
+            return x;
+        }
+
+        static void ToConfig(List<XMindTopic> topics, string filepath)
+        {
+            XDocument xdoc = new XDocument();
+            //创建根元素
+            XElement x_configuration = new XElement("configuration");
+            //把根元素添加到文件中
+            xdoc.Add(x_configuration);
+
+            XElement x_configSections = new XElement("configSections");
+            x_configuration.Add(x_configSections);
+
+            XElement x_section = new XElement("section");
+            x_configSections.Add(x_section);
+            x_section.Add(
+                new XAttribute("name", "unity"),
+                new XAttribute("type", "Microsoft.Practices.Unity.Configuration.UnityConfigurationSection,Unity.Configuration")
+                );
+
+
+            //XNamespace ns = "http://schemas.microsoft.com/practices/2010/unity";
+            XElement x_unity = new XElement("unity");// (ns+"unity");
+            x_configuration.Add(x_unity);
+
+
+            //找出全部assembly 与 alias
+
+            var assemblies_topics = topics.FindAll( t => !string.IsNullOrEmpty(t.title) && t.title.Trim().StartsWith("assembly"));
+            foreach (var assemblies_topic in assemblies_topics)
+            {
+                foreach (var assembly_topic in assemblies_topic.children.attached)
+                {
+                    XElement x_assembly = new XElement("assembly");
+                    x_unity.Add(x_assembly);
+
+                    if (string.IsNullOrEmpty(assembly_topic.title))
+                        throw new Exception($"filepath={filepath} error!!!!  because of \"assembly_topic.title==null\"");
+
+
+                    x_assembly.Add(new XAttribute("name", assembly_topic.title));
+
+                    foreach (var namespace_topic in assembly_topic.children.attached)
+                    {
+                        XElement x_namespace = new XElement("namespace");
+                        x_unity.Add(x_namespace);
+
+                        if (string.IsNullOrEmpty(namespace_topic.title))
+                            throw new Exception($"filepath={filepath} error!!!!  because of \"namespace_topic.title==null\"");
+
+                        x_namespace.Add(new XAttribute("name", namespace_topic.title));
+                    }
+                }
+            }
+
+            var aliass_topics = topics.FindAll(t => t.title.Trim().StartsWith("alias"));
+            foreach (var aliass_topic in aliass_topics)
+            {
+                foreach (var alias_topic in aliass_topic.children.attached)
+                {
+                    if (string.IsNullOrEmpty(alias_topic.title))
+                        throw new Exception($"filepath={filepath} error!!!!  because of \"alias_topic.title==null\"");
+
+                    if (alias_topic.children == null)
+                        throw new Exception($"filepath={filepath} error!!!!  because of \"alias_topic.children == null\"");
+
+                    if (alias_topic.children.attached == null)
+                        throw new Exception($"filepath={filepath} error!!!!  because of \"alias_topic.children.attached == null\"");
+
+                    if (alias_topic.children.attached.Count()!=1)
+                        throw new Exception($"filepath={filepath} error!!!!  because of \"alias_topic.children.attached.Count()!=1\"");
+
+                    XElement x_alias = new XElement("alias");
+                    x_unity.Add(x_alias);
+                    x_alias.Add(new XAttribute("alias", alias_topic.title));
+                    x_alias.Add(new XAttribute("type", alias_topic.children.attached[0].title));
+                }
+            }
+
+
+            topics.RemoveAll(t => t.title.Trim().StartsWith("assembly") || t.title.Trim().StartsWith("alias"));
+
+
+
+            //容器
+            XElement x_container = new XElement("container");
+            x_unity.Add(x_container);
+
+            foreach (var topic in topics)
+            {
+                var x = ToXElement(topic);
+                if (x == null)
+                    continue;
+                x_container.Add(x);
+            }
+
+            //保存
+            xdoc.Save(filepath);
+        }
+    }
+}

读取xmind/WpfApp1/Xmind2UnityConfigCore/Xmind2UnityConfigCore.csproj

@@ -46,6 +46,8 @@
     <Compile Include="Topic.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="TopicExt.cs" />
+    <Compile Include="XMindType.cs" />
+    <Compile Include="XMindTypeExt.cs" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json">