Merge branch '75豪德众益洋智能家居' of http://www.imaodou.com.cn:30030/c_jack/EICP3.0_69 into 75豪德众益洋智能家居

SCADA_DAQ/Customer/CustomerEnv.cs

@@ -14,13 +14,20 @@ namespace SCADA_DAQ.Customer
 {
     static class CustomerEnv
     {
-       
+       /// <summary>
+       /// 封边1通道花纹记录
+       /// </summary>
         public static List<string> FigureModels1 { get=> _FigureModels1; }
         public static AutoSaveParameterItem<List<string>> _FigureModels1 { get; set; } = 
             AutoSaveParameterItem.Create("App.FigureModels1", new List<string> (){ "","","","","","",});
+        /// <summary>
+        /// 封边2通道花纹记录
+        /// </summary>
+        public static List<string> FigureModels2 { get => _FigureModels2; }
+        public static AutoSaveParameterItem<List<string>> _FigureModels2 { get; set; } =
+            AutoSaveParameterItem.Create("App.FigureModels2", new List<string>() { "","","","","","",});
 
 
-        public static List<string> FigureModels2 { get; set; } = new List<string>();
         public static LongMenModel LongMenModel { get => _LongMenModel.Value; }
 
         public static AutoSaveParameterItem<LongMenModel> _LongMenModel { get; set; } = AutoSaveParameterItem.Create("App.LongMenModel", new LongMenModel());

SCADA_DAQ/Customer/Machines/EdgeMachine.cs

@@ -61,7 +61,18 @@ namespace SCADA_DAQ.Customer.Machines
                 var board = RequestIn();
                 if (board != null)
                 {
+                    if(reg.Comment.GroupName == "封边机1"){ }
                     var index = CustomerEnv.FigureModels1.IndexOf(board.WidthEdgeColor1)+1;
+                    if (index != 0)//判断是否封边机是否有该花色
+                    {
+                        //GetListenReg("").WriteReg(index);
+                    }
+                    else
+                    {
+                        //GetListenReg("").WriteReg(0);
+                        //Log.Error($"{reg.Comment.GroupName}没有对应花纹");
+                    }
+
                     if (board.EdgeState == Models.EdgeState.None)   //首次封边
                     {
                         board.EdgeState |= Models.EdgeState.Up;

SCADA_DAQ/Customer/Machines/LongMen1.cs

@@ -120,29 +120,35 @@ namespace SCADA_DAQ.Customer.Machines
             {
                 Log.Info($"{BaseDevice.DeviceID}收到原点请求");
                 reg.ResetBit();
-                if (!IsWorking && !OriginNotAllow)
-                {
-                    RequestCmd(reg);
-                }
-                else
-                {
-                    IsGetRequest = true;
-                    Log.Info($"{BaseDevice.DeviceID}工作中，原点请求等待处理");
-                }
+                RequestCmd(reg);
+               
+               
+                //if (!IsWorking && !OriginNotAllow)
+                //{
+                //    RequestCmd(reg);
+                //}
+                //else
+                //{
+                //    IsGetRequest = true;
+                //    Log.Info($"{BaseDevice.DeviceID}工作中，原点请求等待处理");
+                //}
             }
             else if (reg.Comment.Variable == Tag_MiddleRequest && reg.Value == 1)   //从中间位置抓取
             {
                 Log.Info($"{BaseDevice.DeviceID}收到中点请求");
                 reg.ResetBit();
-                if (!IsWorking)
-                {
-                    MiddleRequestCmd(reg);
-                }
-                else
-                {
-                    IsGetMiddleRequest = true;
-                    Log.Info($"{BaseDevice.DeviceID}工作中，中点请求等待处理");
-                }
+                MiddleRequestCmd(reg);
+                
+
+                //if (!IsWorking)
+                //{
+                //    MiddleRequestCmd(reg);
+                //}
+                //else
+                //{
+                //    IsGetMiddleRequest = true;
+                //    Log.Info($"{BaseDevice.DeviceID}工作中，中点请求等待处理");
+                //}
             }
             else if (reg.Comment.Variable == Tag_Finished && reg.Value == 1)   //移载完成
             {
@@ -160,19 +166,19 @@ namespace SCADA_DAQ.Customer.Machines
                 }
                 Log.Info($"{BaseDevice.DeviceID}完成移载,条码为{board.Barcode}");
                 //log.Info($"龙门1移载完成，龙门4处理的板件数量为{Gantry4IsWorking}");
-                IsWorking = false;
-                if (IsGetMiddleRequest)
-                {
-                    MiddleRequestCmd(GetListenReg(Tag_MiddleRequest));
-                }
-                //else if (IsGetRequest && Gantry4IsWorking == 0)
+                //IsWorking = false;
+                //if (IsGetMiddleRequest)
+                //{
+                //    MiddleRequestCmd(GetListenReg(Tag_MiddleRequest));
+                //}
+                ////else if (IsGetRequest && Gantry4IsWorking == 0)
+                ////{
+                ////    RequestCmd(GetListenReg(Tag_Request));
+                ////}
+                //else if (IsGetRequest && !OriginNotAllow)
                 //{
                 //    RequestCmd(GetListenReg(Tag_Request));
                 //}
-                else if (IsGetRequest && !OriginNotAllow)
-                {
-                    RequestCmd(GetListenReg(Tag_Request));
-                }
 
                 //var api = new WebApiHelper(CustomerEnv.LongMenModel.LongMen1Url);
                 //if (board.Barcode != null)
@@ -284,6 +290,10 @@ namespace SCADA_DAQ.Customer.Machines
                 IsGetMiddleRequest = false;
                 Gantry4IsWorking--;
             }
+            else
+            {
+                Log.Warn("请求时中转台为空");
+            }
         }
     }
 }

SCADA_DAQ/Customer/Machines/LongMen2.cs

@@ -68,25 +68,28 @@ namespace SCADA_DAQ.Customer.Machines
             {
                 log.Info($"{BaseDevice.DeviceID}收到原点请求");
                 reg.ResetBit();
-                if (!IsWorking)
-                {
-                    RequestCmd(reg);
-                }
-                else
-                {
-                    IsGetRequest = true;
-                    log.Info($"{BaseDevice.DeviceID}工作中，原点请求等待处理");
-                }
+                RequestCmd(reg);
+               
+                //if (!IsWorking)
+                //{
+                //    RequestCmd(reg);
+                //}
+                //else
+                //{
+                //    IsGetRequest = true;
+                //    log.Info($"{BaseDevice.DeviceID}工作中，原点请求等待处理");
+                //}
             }
             else if (reg.Comment.Variable == Tag_Finished && reg.Value == 1)   //移载完成
             {
+               
                 reg.ResetBit();
                 var board = SlideOut();
                 IsWorking = false;
-                if (IsGetRequest)
-                {
-                    RequestCmd(GetListenReg(Tag_Request));
-                }
+                //if (IsGetRequest)
+                //{
+                //    RequestCmd(GetListenReg(Tag_Request));
+                //}
                 if (board.Angle % 180 == 0)
                 {
                     board.LocationX = Math.Max(board.Width, 600) / 2 * -1;

SCADA_DAQ/Customer/Machines/LongMen3.cs

@@ -69,16 +69,18 @@ namespace SCADA_DAQ.Customer.Machines
             {
                 log.Info($"{BaseDevice.DeviceID}收到中点请求");
                 reg.ResetBit();
-                if (!IsWorking)
-                {
-                    MiddleRequestCmd(reg);
-                }
-                else
-                {
-                    IsGetMiddleRequest = true;
-                    log.Info($"{BaseDevice.DeviceID}工作中，中点请求等待处理");
+                MiddleRequestCmd(reg);
+                
+                //if (!IsWorking)
+                //{
+                //    MiddleRequestCmd(reg);
+                //}
+                //else
+                //{
+                //    IsGetMiddleRequest = true;
+                //    log.Info($"{BaseDevice.DeviceID}工作中，中点请求等待处理");
 
-                }
+                //}
 
             }
             else if (reg.Comment.Variable == Tag_Finished && reg.Value == 1)   //移载完成
@@ -89,10 +91,10 @@ namespace SCADA_DAQ.Customer.Machines
                 IsWorking = false;
                 log.Info($"{BaseDevice.DeviceID}完成移载,条码为{board.Barcode}");
 
-                if (IsGetMiddleRequest)
-                {
-                    MiddleRequestCmd(GetListenReg(Tag_MiddleRequest));
-                }
+                //if (IsGetMiddleRequest)
+                //{
+                //    MiddleRequestCmd(GetListenReg(Tag_MiddleRequest));
+                //}
                 ////后面再算
                 //if (board.Angle % 180 == 0)
                 //{

SCADA_DAQ/Customer/Machines/LongMen4.cs

@@ -77,17 +77,26 @@ namespace SCADA_DAQ.Customer.Machines
             {
                 log.Info($"{BaseDevice.DeviceID}收到原点请求");
                 reg.ResetBit();
-                if (!IsWorking)
+                RequestCmd(reg);
+
+                var board =ProcessQueue.Peek();
+                var plc1 = MachineServer.GetInstance().GetMachine<LongMen1>("LongMen1");
+                if (board.EdgeState.HasFlag(Models.EdgeState.All))  //四边已经封完
                 {
-                    RequestCmd(reg);
+                    GetListenReg(Tag_ProcessFinish).WriteReg(2);
+                    log.Info("D160值已写入2");
+                  
 
                 }
-                else
+                else    //进入1号机的加工队列
                 {
-                    IsGetRequest = true;
-                    log.Info($"{BaseDevice.DeviceID}工作中，原点请求等待处理");
+                    GetListenReg(Tag_ProcessFinish).WriteReg(1);
+                    log.Info("D160值已写入1");
+
+                  
 
                 }
+               
             }
             else if (reg.Comment.Variable == Tag_Finished && reg.Value == 1)   //移载完成
             {
@@ -97,10 +106,10 @@ namespace SCADA_DAQ.Customer.Machines
                 IsWorking = false;
                 log.Info($"{BaseDevice.DeviceID}完成移载,条码为{board.Barcode}");
 
-                if (IsGetRequest)
-                {
-                    RequestCmd(GetListenReg(Tag_Request));
-                };
+                //if (IsGetRequest)
+                //{
+                //    RequestCmd(GetListenReg(Tag_Request));
+                //};
                 if (board.Angle % 180 == 0)
                 {
                     board.LocationX = Math.Max(board.Width, 600) / 2 * -1;
@@ -114,8 +123,8 @@ namespace SCADA_DAQ.Customer.Machines
 
                 if (board.EdgeState.HasFlag(Models.EdgeState.All))  //四边已经封完
                 {
-                    GetListenReg(Tag_ProcessFinish).WriteReg(2);
-                    log.Info("D160值已写入2");
+                    //GetListenReg(Tag_ProcessFinish).WriteReg(2);
+                    //log.Info("D160值已写入2");
                     //var api =new WebApiHelper(CustomerEnv.LongMenModel.LongMen1Url);
                     //var result = api.POST<ClassModel>(new
                     //{
@@ -146,8 +155,8 @@ namespace SCADA_DAQ.Customer.Machines
                 }
                 else    //进入1号机的加工队列
                 {
-                    GetListenReg(Tag_ProcessFinish).WriteReg(1);
-                    log.Info("D160值已写入1");
+                    //GetListenReg(Tag_ProcessFinish).WriteReg(1);
+                    //log.Info("D160值已写入1");
                     FinishTask?.Invoke(this, null);
                     plc1.WaitBoard = board;
 

SCADA_DAQ/Customer/Models/BoardModel.cs

@@ -184,6 +184,24 @@ namespace SCADA_DAQ.Customer.Models
         }
         private int _Angle;
 
+        /// <summary>
+        /// 
+        /// </summary>
+        [AutoViewProperty("加工状态")]
+        public ProcessState ProcessState
+        {
+            get { return _ProcessState; }
+            set
+            {
+                if (value != _ProcessState)
+                {
+                    _ProcessState = value;
+                    OnPropertyChanged(nameof(ProcessState));
+                }
+            }
+        }
+        private ProcessState _ProcessState;
+
         /// <summary>
         /// 宽1花色
         /// </summary>
@@ -264,23 +282,7 @@ namespace SCADA_DAQ.Customer.Models
         private string _HeightEdgeColor2 = "";
 
 
-        /// <summary>
-        /// 
-        /// </summary>
-        [AutoViewProperty("加工状态")]
-        public ProcessState ProcessState
-        {
-            get { return _ProcessState; }
-            set
-            {
-                if (value != _ProcessState)
-                {
-                    _ProcessState = value;
-                    OnPropertyChanged(nameof(ProcessState));
-                }
-            }
-        }
-        private ProcessState _ProcessState;
+       
 
 
 

SCADA_DAQ/Customer/Models/LongMenEdgeModel/FigureModel.cs

@@ -38,7 +38,7 @@ namespace SCADA_DAQ.Customer.Models.LongMenEdgeModel
 
         public static List<string> FigureList { get; set; } = new List<string>
         {
-            null,"米黄色","陶瓷白"
+            null,"米黄色","陶瓷白","佳荔灰","纤玉白","鲁丽暖白","乳皮白纹"
         };
 
 

SCADA_DAQ/Customer/Service/EdgeService.cs

@@ -78,6 +78,7 @@ namespace SCADA_DAQ.Customer.Service
             _holdMachine1.PropertyChanged+=_holdMachine1_PropertyChanged;
             _barcodeReader1.BarCodeReceived += _barcodeReader1_BarCodeReceived;
             BoardTasks = CSVHelper.CsvToObject<BoardTaskModel>("ATXY24031503-P1徐州老板家.csv", 0, true, ',', Encoding.Default);
+           
             //StartSim();
             return base.Start();
         }
@@ -109,7 +110,8 @@ namespace SCADA_DAQ.Customer.Service
         private void _barcodeReader1_BarCodeReceived(object sender, SCADA.BarcodeReader.BarcodeReceivedEventArgs e)
         {
             var board = new BoardModel() { Barcode = e.Barcode };
-            var boardTask = BoardTasks.FirstOrDefault(t => t.BoardID == board.Barcode);
+            //var boardTask = BoardTasks.FirstOrDefault(t => t.BoardID == board.Barcode);
+            var boardTask = Env.DAL.App_Hold_BoardInfo.GetData<BoardTaskModel>(t => t.BoardID == board.Barcode).FirstOrDefault();
             if (boardTask != null)
             {
                 board.Length = Math.Max((int)boardTask.Height, (int)boardTask.Width);
@@ -135,6 +137,7 @@ namespace SCADA_DAQ.Customer.Service
             {
                 var longMenMachine = MachineServer.GetInstance().GetMachine<BaseHoldMachine>("LongMen1");
                 longMenMachine.GetListenReg("BarCodeNoRead").WriteReg(1);
+                Log.Warn("扫码失败");
             }
 
      

SCADA_DAQ/Customer/Views/Menu/UctFrmGantry/UctFrmGantryManual.xaml

@@ -20,60 +20,55 @@
                 </Style.Triggers>
             </Style>
         </Grid.Resources>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="1.2*"/>
-            <ColumnDefinition Width="1.6*"/>
-            <ColumnDefinition Width="0.8*"/>
-        </Grid.ColumnDefinitions>
-        <Grid Margin="5">
-            <Grid.RowDefinitions>
-                <RowDefinition/>
-                <RowDefinition Height="0.4*"/>
-            </Grid.RowDefinitions>
-            <GroupBox  Header="龙门1手动">
-                <WrapPanel x:Name="GantryMain1PanelBtn">
+      
+       
+        
+      
+        <TabControl>
+            <TabItem Header="龙门1手动">
+                <GroupBox  Header="龙门1手动">
+                    <WrapPanel x:Name="GantryMain1PanelBtn">
 
-                </WrapPanel>
-            </GroupBox>
-            <GroupBox Header="封边1推手工作站手动" Grid.Row="1">
-                <WrapPanel x:Name="Push1PanelBtn">
+                    </WrapPanel>
+                </GroupBox>
+            </TabItem>
+            <TabItem Header="龙门2手动">
+                
+                <GroupBox  Header="龙门2手动">
+                    <WrapPanel x:Name="GantryMain2PanelBtn">
 
-                </WrapPanel>
-            </GroupBox>
-        </Grid>
-        <Grid Grid.Column="1" Margin="0,5,5,5">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="0.8*"/>
-                <RowDefinition/>
-            </Grid.RowDefinitions>
-            <GroupBox  Header="龙门2手动">
-                <WrapPanel x:Name="GantryMain2PanelBtn">
+                    </WrapPanel>
+                </GroupBox>
+            </TabItem>
+            <TabItem Header="龙门3手动">
+                <GroupBox Header="龙门3手动" Grid.Row="1">
+                    <WrapPanel x:Name="GantryMain3PanelBtn">
 
-                </WrapPanel>
-            </GroupBox>
-            <GroupBox Header="龙门3手动" Grid.Row="1">
-                <WrapPanel x:Name="GantryMain3PanelBtn">
+                    </WrapPanel>
+                </GroupBox>
+            </TabItem>
+            <TabItem Header="龙门4手动">
+                <GroupBox  Header="龙门4手动" Grid.Row="1">
+                    <WrapPanel x:Name="GantryMain4PanelBtn">
 
-                </WrapPanel>
-            </GroupBox>
-        </Grid>
-        <Grid Grid.Column="2" Margin="0,5,5,5">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="0.4*"/>
-                <RowDefinition/>
-            </Grid.RowDefinitions>
-            <GroupBox Header="封边2推手工作站手动" >
-                <WrapPanel x:Name="Push2PanelBtn">
+                    </WrapPanel>
+                </GroupBox>
+            </TabItem>
+            <TabItem Header="封边1手动">
+                <GroupBox Header="封边1推手工作站手动" Grid.Row="1">
+                    <WrapPanel x:Name="Push1PanelBtn">
 
-                </WrapPanel>
-            </GroupBox>
-            <GroupBox  Header="龙门4手动" Grid.Row="1">
-                <WrapPanel x:Name="GantryMain4PanelBtn">
+                    </WrapPanel>
+                </GroupBox>
+            </TabItem>
+            <TabItem Header="封边2手动">
+                <GroupBox Header="封边2推手工作站手动" >
+                    <WrapPanel x:Name="Push2PanelBtn">
 
-                </WrapPanel>
-            </GroupBox>
-        </Grid>
+                    </WrapPanel>
+                </GroupBox>
+            </TabItem>
+        </TabControl>
 
-     
     </Grid>
 </wpfcontrol:BaseUctFrm>

SCADA_DAQ/Customer/Views/Menu/UctFrmGantry/UctFrmGantryManual.xaml.cs

@@ -46,9 +46,9 @@ namespace SCADA_DAQ.Customer.Views.Menu.UctFrmGantry
             var push2BtnGroup = _LongMen3.ListenReg.Where(t => t.Value.Comment.GroupName == "推手").ToList();
             var gantry4BtnGroup = _LongMen4.ListenReg.Where(t => t.Value.Comment.GroupName == "手动").ToList();
 
-            var fontsize = 15;
-            var width = 120;
-            var height = 30;
+            var fontsize = 16;
+            var width = 170;
+            var height = 40;
             for (int i = 0; i < gantry1BtnGroup.Count; i++)
             {
                 var btn = new IconButton() { ButtonKind = SCADA.CommonCtrl.ButtonKind.ExcuteButton, Width = width, Height = height, FontSize = fontsize};
@@ -181,16 +181,6 @@ namespace SCADA_DAQ.Customer.Views.Menu.UctFrmGantry
         {
             var btn = (IconButton)sender;
             var reg = (RegInfo)btn.DataContext;
-            var model = new FigureModel();
-            //ShowChildWindow(new AutoView(model), "花纹选择", () =>
-            //{
-            //    CustomerEnv.FigureModels.Clear();
-            //    //点确定按钮之后的逻辑
-            //    CustomerEnv.FigureModels = new List<string>
-            //    { model.Figure1, model.Figure2 ,model.Figure3,model.Figure4,model.Figure5,model.Figure6};
-
-            //    return true;
-            //});
             reg.Reverse();
            
            

SCADA_DAQ/Customer/Views/Menu/UctFrmGantry/UctFrmGantryParameter.xaml

@@ -14,17 +14,17 @@
        
        
         <Grid.RowDefinitions>
-            <RowDefinition Height="0.3*"/>
-            <RowDefinition Height="0.7*"/>
+            <RowDefinition Height="auto"/>
+            <RowDefinition Height="0.6*"/>
         </Grid.RowDefinitions>
         <Grid Grid.Row="0"  x:Name="edgemode"  >
             <Grid.ColumnDefinitions>
-                <ColumnDefinition/>
-                <ColumnDefinition/>
-                <ColumnDefinition/>
+                <ColumnDefinition Width="auto"/>
+                <ColumnDefinition Width="auto"/>
+                <ColumnDefinition Width="auto"/>
             </Grid.ColumnDefinitions>
-            <uctgantry:UctEdgeFigureControl Grid.Column="1" Title="封边机1花纹" x:Name="Edg1Modify1"/>
-            <uctgantry:UctEdgeFigureControl Grid.Column="2" Title="封边机2花纹" x:Name="Edg1Modify2"/>
+            <uctgantry:UctEdgeFigureControl  Grid.Column="1" Title="封边机1花纹" x:Name="Edg1Modify1"/>
+            <uctgantry:UctEdgeFigureControl  Grid.Column="2" Title="封边机2花纹" x:Name="Edg1Modify2"/>
             <ContentControl Grid.Column="0" x:Name="contentControl"  ></ContentControl>
            
         </Grid>

SCADA_DAQ/Customer/Views/Menu/UctFrmGantry/UctFrmGantryParameter.xaml.cs

@@ -2,6 +2,7 @@
 using SCADA.CommonCtrl.WpfControl;
 using SCADA.CommonLib.Helper;
 using SCADA_DAQ.Customer.Models;
+using SCADA_DAQ.Customer.Models.BackOfSortingDelivery;
 using SCADA_DAQ.Customer.Models.LongMenEdgeModel;
 using System;
 using System.Collections.Generic;
@@ -64,8 +65,8 @@ namespace SCADA_DAQ.Customer.Views.Menu.UctFrmGantry
                   Edg1Modify1.figureModel.Figure5,
                   Edg1Modify1.figureModel.Figure6
                 };
-               
-               
+
+                //不在UI线程操作UI控件时需要委托UI线程进行调度处理
                 //Dispatcher.Invoke(() =>
                 //{
                 //    Edg1Modify1.FigureText.Content = new AutoView(Edg1Modify1.figureModel);
@@ -80,8 +81,8 @@ namespace SCADA_DAQ.Customer.Views.Menu.UctFrmGantry
             
             ShowChildWindow(new AutoView(Edg1Modify2.figureModel), "花纹选择", () =>
             {
-                CustomerEnv.FigureModels2.Clear();
-                CustomerEnv.FigureModels2 =new List<string>
+                CustomerEnv._FigureModels2.Value.Clear();
+                CustomerEnv._FigureModels2.Value=new List<string>
                 {
                     Edg1Modify2.figureModel.Figure1,
                     Edg1Modify2.figureModel.Figure2,
@@ -90,6 +91,7 @@ namespace SCADA_DAQ.Customer.Views.Menu.UctFrmGantry
                     Edg1Modify2.figureModel.Figure5,
                     Edg1Modify2.figureModel.Figure6
                 };
+                //不在UI线程操作UI控件时需要委托UI线程进行调度处理
                 //Dispatcher.Invoke(() =>
                 //{
                 //    Edg1Modify2.FigureText.Content = new AutoView(Edg1Modify2.figureModel);

SCADA_DAQ/Customer/Views/Uct/UctGantry/UctEdgeFigureControl.xaml

@@ -8,11 +8,13 @@
              x:Name="this"
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid>
-        <wpfcontrol:Card  x:Name="card" Header="{Binding Title,ElementName=this}">
+        
+        <wpfcontrol:Card   x:Name="card" Header="{Binding Title,ElementName=this}">
             <StackPanel>
                 <ContentControl x:Name="FigureText" IsEnabled="False" />
                 <wpfcontrol:IconButton ButtonKind="EditButton"  HorizontalContentAlignment="Right" VerticalContentAlignment="Bottom" Title="修改" x:Name="Modify_Btn"/>
             </StackPanel>
+            
         </wpfcontrol:Card>
     </Grid>
 </UserControl>

SCADA_DAQ/Customer/Views/Uct/UctGantry/UctEdgeFigureControl.xaml.cs

@@ -29,21 +29,28 @@ namespace SCADA_DAQ.Customer.Views.Uct.UctGantry
         {
             InitializeComponent();
 
-            FigureText.Content = new AutoView(figureModel);
+            FigureText.Content = new AutoView(figureModel, 2, Orientation.Vertical) { ContentWidth=120};
 
 
 
         }
+        /// <summary>
+        /// 更新页面花纹选择显示
+        /// </summary>
+        /// <param name="figureModels"></param>
         public void Update( List<string> figureModels)
         {
-            figureModel.Figure1 = figureModels.FirstOrDefault();
-            //figureModel.Figure2= figureModels[1].ToString();
-            //figureModel.Figure3 = figureModels[2].ToString();
-            //figureModel.Figure4 = figureModels[3].ToString();
-            //figureModel.Figure5 = figureModels[4].ToString();
-            //figureModel.Figure6 = figureModels[5].ToString();
+            figureModel.Figure1 = figureModels[0];
+            figureModel.Figure2 = figureModels[1];
+            figureModel.Figure3 = figureModels[2];
+            figureModel.Figure4 = figureModels[3];
+            figureModel.Figure5 = figureModels[4];
+            figureModel.Figure6 = figureModels[5];
         }
         //propdp
+       /// <summary>
+       /// 自定义控件里的Card标题
+       /// </summary>
         public string Title
         {
             get { return (string)GetValue(TitleProperty); }