冲突解决

BPASmartClient.CustomResource/Pages/Model/AlarmHelper.cs

@@ -107,8 +107,18 @@ namespace BPASmartClient.CustomResource.Pages.Model
                 Time = DateTime.Now.ToString("HH:mm:ss"),
             };
 
-            var res = Sqlite<Alarm>.GetInstance.Base.Add(tempAlarm);
-            Sqlite<Alarm>.GetInstance.Save();
+            var res = Sqlite<BPASmartClient.Model.Alarm>.GetInstance.Base.Add(tempAlarm);
+            try
+            {
+               
+                    Sqlite<BPASmartClient.Model.Alarm>.GetInstance.Save(); 
+                
+            }
+            catch (Exception)
+            {
+
+                //throw;
+            }
 
             if (Alarms.FirstOrDefault(p => p.Info == AlarmInfo) == null)
             {

DosingSystem/Model/DeviceInquire.cs

@@ -197,9 +197,9 @@ namespace BPASmartClient.DosingSystem
                     }
                 }
             }*/
-            for (int i = 0; i < 15; i++)
+            for (int i = 0; i < 6; i++)
             {
-                IPLists.Add($"{IPSegment}{(i + 1) * 10}");
+                    IPLists.Add($"{IPSegment}{(i + 1) * 10}");
             }
 
             IPLists.ForEach((item) =>