修改IsSaved调用时值类型错误；调整读取的xml文件及相关程序

Code/IVRFlowEditor/Utility/IVRFlowSerializer.cs

@@ -39,7 +39,9 @@ namespace HySoft.IVRFlowEditor.Utility
 
                      if (o.IVRControl != null && o.IVRControl.Count > 0)
                     {
-                        xmlBuilder.Append("<flow Name=\"" + o.IVR_Name + "\" Type=\"" + o.IVRFlowType.ToString() + "\" IVR_Name=\"" + o.IVR_Name + "\"  IVR_Text=\"" + o.IVR_Text + "\" MatchedNum=\"\" MatchedLine=\"\" Concurrency=\"1\"> \r\n");
+                        //xmlBuilder.Append("<flow Name=\"" + o.IVR_Name + "\" Type=\"" + o.IVRFlowType.ToString() + "\" IVR_Name=\"" + o.IVR_Name + "\"  IVR_Text=\"" + o.IVR_Text + "\" MatchedNum=\"\" MatchedLine=\"\" Concurrency=\"1\"> \r\n");
+                        //2017-4-28修改
+                        xmlBuilder.Append("<flow Name=\"" + o.IVR_Name + "\" Type=\"" + o.IVRFlowType.ToString() + "\" IVR_Name=\"" + o.IVR_Name + "\"  IVR_Text=\"" + o.IVR_Text + "\" MatchedNum=\".\" MatchedLine=\"|-1|\" Concurrency=\"1\"> \r\n");
                         foreach (IVRControlBase ivr in o.IVRControl)
                         {
                             Dictionary<int,string> disAtt=new Dictionary<int,string>();
@@ -211,8 +213,9 @@ namespace HySoft.IVRFlowEditor.Utility
                         XmlNodeList flowNodes = doc.GetElementsByTagName("flow");
                         foreach (XmlNode node in flowNodes)
                         {
-                            val.Add(new IVRFlowSerializerInfo() { IVR_Name = node.Attributes["IVR_Name"].Value, IVR_Text = node.Attributes["IVR_Text"].Value, IVRFlowType = (IVRFlowType)Enum.Parse(typeof(IVRFlowType), node.Attributes["Type"].Value), IVRControl = new List<IVRControlBase>(), LineNodes = new List<LineInfo>(), IVRVar=new List<IVRDefinevarDefVar>() });
-
+                            //val.Add(new IVRFlowSerializerInfo() { IVR_Name = node.Attributes["Name"].Value, IVR_Text = node.Attributes["Name"].Value, IVRFlowType = (IVRFlowType)Enum.Parse(typeof(IVRFlowType), node.Attributes["Type"].Value), IVRControl = new List<IVRControlBase>(), LineNodes = new List<LineInfo>(), IVRVar=new List<IVRDefinevarDefVar>() });
+                            //2017-4-27
+                            val.Add(new IVRFlowSerializerInfo() { IVR_Name = node.Attributes["IVR_Name"].Value, IVR_Text = node.Attributes["IVR_Text"].Value, IVRFlowType = (IVRFlowType)Enum.Parse(typeof(IVRFlowType), node.Attributes["Type"].Value), IVRControl = new List<IVRControlBase>(), LineNodes = new List<LineInfo>(), IVRVar = new List<IVRDefinevarDefVar>() });
                             XmlNodeList CellNode = node.SelectNodes("cell");
                             foreach (XmlNode cell in CellNode)
                             {
@@ -236,7 +239,7 @@ namespace HySoft.IVRFlowEditor.Utility
                                             if (p.PropertyType == typeof(IVRControlBase))
                                             {
                                                 if (cell.Attributes[p.Name].Value != "0" && !string.IsNullOrEmpty(cell.Attributes[p.Name].Value))
-                                                    val.Last().LineNodes.Add(new LineInfo() { AttributeName = p.Name, StartNodeID = val.Last().IVRControl.Last().Pos, EndNodeID = cell.Attributes[p.Name].Value });
+                                                    val.Last().LineNodes.Add(new LineInfo() { AttributeName = p.Name , StartNodeID = val.Last().IVRControl.Last().Pos, EndNodeID = cell.Attributes[p.Name].Value });
                                             }
                                             else if (p.PropertyType.IsEnum)
                                             {
@@ -267,7 +270,17 @@ namespace HySoft.IVRFlowEditor.Utility
                                                 if (p.PropertyType == typeof(Int32) || p.PropertyType == typeof(int))
                                                     p.SetValue(val.Last().IVRControl.Last(), Int32.Parse(cell.Attributes[p.Name].Value), null);
                                                 else if (p.PropertyType == typeof(Boolean) || p.PropertyType == typeof(bool))
-                                                    p.SetValue(val.Last().IVRControl.Last(), bool.Parse(cell.Attributes[p.Name].Value), null);
+                                                //2017-4-28添加
+                                                {
+                                                    bool bvalue = false;
+                                                    if (cell.Attributes[p.Name].Value.ToString() == "no")
+                                                    { bvalue = false; }
+                                                    else if (cell.Attributes[p.Name].Value.ToString() == "yes")
+                                                    { bvalue = true ; }
+                                                    else
+                                                    { bvalue = bool.Parse(cell.Attributes[p.Name].Value); }
+                                                    p.SetValue(val.Last().IVRControl.Last(), bvalue, null);//p.SetValue(val.Last().IVRControl.Last(), bool.Parse(cell.Attributes[p.Name].Value), null);//2017-4-28
+                                                }
                                                 else
                                                     p.SetValue(val.Last().IVRControl.Last(), cell.Attributes[p.Name].Value.ToString(), null);
                                             }

Code/IVRFlowUI/FrmMain.cs

@@ -137,15 +137,27 @@ namespace IVRFlowUI
                     svf.InitialDirectory = Application.StartupPath;
                     //2017-4-26
                     #region 直接按原文件名进行保存
+                    bool pd = false;
                     string fp = this.tabControl1.SelectedTab.Text;
-                    int ffp = fp.IndexOf(".xml");
-                    int startindex = fp.LastIndexOf("\\");
-                    int leng = ffp - startindex-1;
-                    string fn = fp.Substring(startindex+1 ,leng);
-                    svf.FileName = this.tabControl1.SelectedTab.Text;//fn;
+                    if (this.tabControl1.SelectedTab.Text != "空白标签")
+                    {
+                        int ffp = fp.IndexOf(".xml");
+                        int startindex = fp.LastIndexOf("\\");
+                        int leng = ffp - startindex - 1;
+                        string fn = fp.Substring(startindex + 1, leng);
+                        svf.FileName = this.tabControl1.SelectedTab.Text;//fn;
+                        pd = true;
+                    }
+                    else
+                    {
+                        if (svf.ShowDialog() == DialogResult.OK)
+                        {
+                            pd = true;
+                        }
+                    }
                     #endregion
 
-                    //if (svf.ShowDialog() == DialogResult.OK)
+                    if(pd==true)//if (svf.ShowDialog() == DialogResult.OK)
                     {
                         List<IVRFlowSerializerInfo> f = new List<IVRFlowSerializerInfo>();
                         foreach(TabPage tp  in  this.tabControl1.SelectedTab.Controls[0].Controls)
@@ -162,7 +174,7 @@ namespace IVRFlowUI
                         }
                         MessageInfo msg =GlobalController.GetSerializerHandle().SaveFileInfo(svf.FileName, f);
                          MessageBox.Show(msg.Message);
-                        this.tabControl1.SelectedTab.Text = fp ;//this.tabControl1.SelectedTab.Text = svf.FileName;//2017-4-26修改
+                        this.tabControl1.SelectedTab.Text = svf.FileName;
 
                     }