Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	GisDevelop_Exp/MainWindow.xaml
#	GisDevelop_Exp/MainWindow.xaml.cs

GisDevelop_Exp/MainWindow.xaml.cs

@@ -201,7 +201,6 @@ namespace GisDevelop_Exp
                     await MainMapView.SetViewpointGeometryAsync(openedFeature.Extent);
                 }
             }
-
             AddLayerNameToList();
         }
 
@@ -237,7 +236,6 @@ namespace GisDevelop_Exp
                 MainMapView.Map.InitialViewpoint = geodatabaseViewPoint;
                 // MainMapView.Map = geodatabaseMap;
             }
-
             AddLayerNameToList();
         }
 
@@ -257,7 +255,7 @@ namespace GisDevelop_Exp
             Color fillColor = Color.FromArgb(0, 0, 0, 0);
             SimpleFillSymbol fillSymbol = new SimpleFillSymbol(SimpleFillSymbolStyle.Solid, fillColor, lineSymbol);
             var graphicOverlay = new Esri.ArcGISRuntime.UI.GraphicsOverlay();
-            var envGraphic = new Esri.ArcGISRuntime.UI.Graphic(vExtent, fillSymbol);
+            var envGraphic = new Esri.ArcGISRuntime.UI.Graphic(eagleViewEnvelop, fillSymbol);
             graphicOverlay.Graphics.Add(envGraphic);
             EagleMapView.GraphicsOverlays.Add(graphicOverlay);
         }
@@ -764,8 +762,7 @@ namespace GisDevelop_Exp
                     MainMapView.GraphicsOverlays[0].Graphics.Add(lineGraphic);//加入该图形元素到覆盖层中
                     linesList.Add(lineGraphic);//同时，将该图形加入链表
                 }
-            }
+            }else if (m_CurOper== CURRENTOPERATION.ModifyFeature)
-            else if (m_CurOper == CURRENTOPERATION.ModifyFeature)
             {
                 if (_featureLayer == null)
                     return;
@@ -981,7 +978,8 @@ namespace GisDevelop_Exp
                 aMap.InitialViewpoint = geodatabaseViewPoint;
                 MainMapView.Map = aMap;
             }
-            // AddLayerNameToList();
+
+            AddLayerNameToList();
         }
 
         private void LayerListBox_OnPreviewMouseMove(object sender, MouseEventArgs e)
@@ -1331,7 +1329,6 @@ namespace GisDevelop_Exp
                 if (linesList != null)
                     linesList.Clear();
             }
-
             m_CurOper = CURRENTOPERATION.NullOpe;
         }
         
@@ -1604,6 +1601,7 @@ namespace GisDevelop_Exp
                 pSymbol = null;
                 SetSimpleRender((FeatureLayer)symbologyLayer, null);
             }
+
             e.Handled = true;
         }