9 changed files with 52 additions and 94 deletions
--- a/AppServer/LocationThread.cs
+++ b/AppServer/LocationThread.cs
@ -262,7 +262,6 @@ namespace AppServer
                                            {
                                                continue;
                                            }
-
                                            //get unit system position
                                            int unitSC_ID = ((Vehicle_Data)MainForm.VehList[radioID2]).sc_id;
                                            UnitSysPosition sysPos = DBvehInfo.getSystemPosition(unitSC_ID);
@ -272,8 +271,7 @@ namespace AppServer
                                            //send radio disable to GW
                                            Utils.WriteLine("Radio disable was sent on " + sysPos.Gw_id + "." + sysPos.R_gw_id + " gateway", ConsoleColor.Cyan);
                                            string test2 = $"#{(int)MessageBusCmds.RadioEnableDisableRequest}#" + dest + "#0#";
-                                            byte[] dataToSend = Utils.Convert_text_For_multicast("#0.0" + test2);
-                                            MainForm.udp.Send(dataToSend, dataToSend.Length);
+                                            MainForm.udp.Send(Utils.Convert_text_For_multicast("#0.0" + test2), Utils.Convert_text_For_multicast("#0.0" + test2).Length);
                                        }
                                        catch (Exception ex)
                                        {
@ -351,13 +349,9 @@ namespace AppServer
                                try
                                {
                                    string test2 = "#210#1#Can't write GPS data in DB#";
-                                    if (ex.Message == "AlarmError")
-                                        test2 = "#210#5#Can't write Alarm data in DB#";
-                                    else if (ex.Message == "StolenError")
-                                        test2 = "#210#6#Can't write Stolen data in DB#";
-
-                                    byte[] dataToSend = Utils.Convert_text_For_multicast("#0.0" + test2);
-                                    MainForm.udp.Send(dataToSend, dataToSend.Length);
+                                    if (ex.Message == "AlarmError") test2 = "#210#5#Can't write Alarm data in DB#";
+                                    else if (ex.Message == "StolenError") test2 = "#210#6#Can't write Stolen data in DB#";
+                                    MainForm.udp.Send(Utils.Convert_text_For_multicast("#0.0" + test2), Utils.Convert_text_For_multicast("#0.0" + test2).Length);
                                }
                                catch (Exception ex2)
                                {
@ -403,10 +397,7 @@ namespace AppServer
                        {
                            // send callout clear
                            string test = "#178#" + callout.RadioID.ToString() + "#" + callout.Severity + "#";
-
-                            byte[] dataToSend = Utils.Convert_text_For_multicast("#0.0" + test);
-                            MainForm.udp.Send(dataToSend, dataToSend.Length);
-
+                            MainForm.udp.Send(Utils.Convert_text_For_multicast("#0.0" + test), Utils.Convert_text_For_multicast("#0.0" + test).Length);
                            Utils.WriteLine($"Sent CallOut Stop request with Severity [{callout.Severity}] for unit {callout.RadioID.ToString()} ");
                        }
                    }
@ -587,8 +578,7 @@ namespace AppServer
                                        {
                                            //send alarm on message buss
                                            test = "#136#" + radioID.ToString() + "#" + tmpresp + "#";
-                                            byte[] dataToSend = Utils.Convert_text_For_multicast("#0.0" + test);
-                                            MainForm.udp.Send(dataToSend, dataToSend.Length);
+                                            MainForm.udp.Send(Utils.Convert_text_For_multicast("#0.0" + test), Utils.Convert_text_For_multicast("#0.0" + test).Length);
                                        }

                                        String date = DateTime.Now.ToUniversalTime().DateTo70Format().ToString();
@ -616,10 +606,7 @@ namespace AppServer
                                                    tmpX = dbvehs.getSystemPosition(Convert.ToInt32(keyobj));
                                                    
                                                    test = "#142#" + tmpX.Gw_id + "." + tmpX.R_gw_id + "." + (String)tmpHashName[keyobj] + "#" + /*"Message from unit " + ((Vehicle_Data)MainForm.VehList[radioID.ToString()]).Name + " :" +*/ obj2.msgbody + "#" + date + "#";
-
-                                                    byte[] dataToSend = Utils.Convert_text_For_multicast("#0." + date + test);
-                                                    MainForm.udp.Send(dataToSend, dataToSend.Length);
-
+                                                    MainForm.udp.Send(Utils.Convert_text_For_multicast("#0." + date + test), Utils.Convert_text_For_multicast("#0." + date + test).Length);
                                                    Thread.Sleep(100);

                                                    Utils.WriteLine($"Zone alert sms request [{obj2.msgbody}] for unit {(String)tmpHashName[keyobj]} on gw [{(tmpX.Gw_id + "." + tmpX.R_gw_id)}]");
@ -630,9 +617,8 @@ namespace AppServer
                                        if (obj2.sentmsg2 && sendOnMsgBus)
                                        {
                                            tmpX = dbvehs.getSystemPositionIMEI(radioID);
-                                            test = "#142#" + tmpX.Gw_id + "." + tmpX.R_gw_id + "." + radioID + "#" + obj2.msgbody2 + "#" + DateTime.Now.ToUniversalTime().DateTo70Format().ToString() + "#";
-                                            byte[] dataToSend = Utils.Convert_text_For_multicast("#0." + date + test);
-                                            MainForm.udp.Send(dataToSend, dataToSend.Length);
+                                            test = "#142#" + tmpX.Gw_id + "." + tmpX.R_gw_id + "." + radioID + "#" + obj2.msgbody2 + "#" + DateTime.Now.ToUniversalTime().DateTo70Format().ToString() + "#";                                            
+                                            MainForm.udp.Send(Utils.Convert_text_For_multicast("#0." + date + test), Utils.Convert_text_For_multicast("#0." + date + test).Length);

                                            Utils.WriteLine($"Zone alert sms request [{obj2.msgbody2}] for unit {radioID} on gw [{(tmpX.Gw_id + "." + tmpX.R_gw_id)}]");
                                        }
@ -642,8 +628,7 @@ namespace AppServer
                                        {
                                            tmpX = dbvehs.getSystemPositionIMEI(radioID);
                                            test = "#177#" + radioID.ToString() + "#" + obj2.calloutSeverity + "#" + obj2.name + "#";
-                                            byte[] dataToSend = Utils.Convert_text_For_multicast("#0." + test);
-                                            MainForm.udp.Send(dataToSend, dataToSend.Length);
+                                            MainForm.udp.Send(Utils.Convert_text_For_multicast("#0.0" + test), Utils.Convert_text_For_multicast("#0.0" + test).Length);

                                            callOutQueue.PostItem(new CallOut() { RadioID = radioID, Severity = obj2.calloutSeverity, Time = DateTime.Now});
                                            Utils.WriteLine($"Zone CallOut request with Severity [{obj2.calloutSeverity}] for unit {radioID} on gw [{(tmpX.Gw_id + "." + tmpX.R_gw_id)}]");
@ -699,16 +684,14 @@ namespace AppServer
                                    {
                                        //send alarm on message buss
                                        string test = "#137#" + radioID.ToString() + "#" + tmpresp + "#";
-                                        byte[] dataToSend = Utils.Convert_text_For_multicast("#0.0" + test);
-                                        MainForm.udp.Send(dataToSend, dataToSend.Length);
+                                        MainForm.udp.Send(Utils.Convert_text_For_multicast("#0.0" + test), Utils.Convert_text_For_multicast("#0.0" + test).Length);
                                    }
                                    
                                    //send CallOut
                                    if(obj2.callout && tmpresp.ToString().Contains("IN "))
                                    {
                                        string test = "#177#" + radioID + "#" + obj2.calloutSeverity + "#" + obj2.name + "#";
-                                        byte[] dataToSend = Utils.Convert_text_For_multicast("#0.0" + test);
-                                        MainForm.udp.Send(dataToSend, dataToSend.Length);
+                                        MainForm.udp.Send(Utils.Convert_text_For_multicast("#0.0" + test), Utils.Convert_text_For_multicast("#0.0" + test).Length);

                                        callOutQueue.PostItem(new CallOut() { RadioID = radioID, Severity = obj2.calloutSeverity, Time = DateTime.Now });
                                        Utils.WriteLine($"Landmark CallOut request with Severity [{obj2.calloutSeverity}] for unit {radioID} ");
@ -777,7 +760,6 @@ namespace AppServer
                    //send alarm on message buss
                    string speed4send = $"{speed}_{speedUnits}";
                    string test = "#135#" + radioID.ToString() + "#" + speed4send + "#";
-
                    MainForm.udp.Send(Utils.Convert_text_For_multicast("#0.0" + test), Utils.Convert_text_For_multicast("#0.0" + test).Length);
                }
            }
--- a/AppServer/MulticastListener.cs
+++ b/AppServer/MulticastListener.cs
@ -729,8 +729,8 @@ namespace AppServer
                            string message = string.Format("Ticket no. {0} is no longer active!", dec3.delete_ticket_id);
                            string test1 = "#143#" + sysPos.Gw_id + "." + sysPos.R_gw_id + "." + radioID3 + "#" + message + "#" + 0 + "#";

-                            byte[] cmd = Utils.Convert_text_For_multicast("#0.0" + test1);
-                            MainForm.udp.Send(cmd, cmd.Length);                                    
+                            byte[] dataToSend = Utils.Convert_text_For_multicast("#0.0" + test1);
+                            MainForm.udp.Send(dataToSend, dataToSend.Length);                                    
                        }
                        //send to email if was sms->email type
                        if (dec3.isEmail)
@ -738,11 +738,12 @@ namespace AppServer
                            sendMail(dec3.emailAddr, dec3.messBody, radioID3);
                        }
                        //send ACK back to GW
-                        test = (dec3.sqlResp == sqlResponse.done) ? "#232#1#" : "#232#0#";
-                        
-
-                        byte[] dataToSend = Utils.Convert_text_For_multicast("#" + seqID3 + test);
-                        MainForm.udp.Send(dataToSend, dataToSend.Length);                                    
+                        test = "";
+                        if (dec3.sqlResp == sqlResponse.done)
+                            test = "#232#1#";
+                        else
+                            test = "#232#0#";                        
+                        MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#" + seqID3 + test), SafeMobileLib.Utils.Convert_text_For_multicast("#" + seqID3 + test).Length);                                    

                        if (MainForm.SendPOLLafterSMS)
                        {
@ -752,7 +753,7 @@ namespace AppServer
                            string dest = $"0.0.{radioID3}";
                            if (sysPos != null) dest = $"{sysPos.Gw_id}.{sysPos.R_gw_id}.{radioID3}";

-                            dataToSend = Utils.Convert_text_For_multicast("#0.0#154#" + dest + "#");
+                            byte[] dataToSend = Utils.Convert_text_For_multicast("#0.0#154#" + dest + "#");
                            MainForm.udp.Send(dataToSend, dataToSend.Length);                                    
                        }
                    }
--- a/AppServer/Program.cs
+++ b/AppServer/Program.cs
@ -215,8 +215,8 @@ namespace AppServer
            Thread.Sleep(2000);
            try
            {
-                byte[] dataToSend = Utils.Convert_text_For_multicast("#0.0#210#4#Application server stopped#");
-                MainForm.udp.Send(dataToSend, dataToSend.Length);
+                MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#0.0#210#4#Application server stopped#"),
+                Utils.Convert_text_For_multicast("#0.0#210#4#Application server stopped#").Length);

                // save all unhandled gps positions 
                MainForm.DumpLocationQueueToFile();
@ -240,10 +240,8 @@ namespace AppServer

            Thread.Sleep(2000);
            try
-            {
-
-                byte[] dataToSend = Utils.Convert_text_For_multicast("#0.0#210#4#Application server stopped#");
-                MainForm.udp?.Send(dataToSend, dataToSend.Length);
+            {                
+                MainForm.udp?.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#0.0#210#4#Application server stopped#"), SafeMobileLib.Utils.Convert_text_For_multicast("#0.0#210#4#Application server stopped#").Length);

                // save all unhandled gps positions 
                MainForm.DumpLocationQueueToFile();
--- a/AppServer/RegistrationThread.cs
+++ b/AppServer/RegistrationThread.cs
@ -107,10 +107,9 @@ namespace AppServer
                                    + Program.cfg.msgBusIP.ToString() + ";" + Program.cfg.msgBusPort + ";" + databaseIP + ";"
                                    + Program.cfg.DB_schema + ";" + Program.cfg.DB_user + ";" + Program.cfg.DB_passwd
                                    + ";" + Program.cfg.DB_port + ";" + Program.cfg.VoicePort + ";"
-                                    + audibleAlerts.ToString() + ";" + MainForm.dbAccess.ToString() + ";";
-
-                                byte[] dataToSend = Utils.Convert_text_For_multicast("#0.0#156#" + command[1].Trim() + "#");
-                                MainForm.udp.Send(dataToSend, dataToSend.Length);
+                                    + audibleAlerts.ToString() + ";" + MainForm.dbAccess.ToString() + ";";                                                   
+                                MainForm.udp.Send(Utils.Convert_text_For_multicast("#0.0#156#" + command[1].Trim() + "#"), Utils.Convert_text_For_multicast("#0.0#156#"
+                                    + command[1].Trim() + "#").Length);

                                MainForm.RegistrationAnswer = false;
                                Int32 countWait = 0; //maxim 30 = 3 seconds
--- a/AppServer/VoiceRecording.cs
+++ b/AppServer/VoiceRecording.cs
@ -171,10 +171,8 @@ namespace AppServer
                    DBrec.addRecording(rec);


-                    test = $"#155#{rec.id}#{rec.hddLocation}#{rec.gwID}#{rec.radioGWID}#{rec.group_cpsId}#{rec.subs_imei}#{rec.startTime}#{rec.endTime}#{rec.typeSD}#{rec.calltype}#{rec.dispatcher_id}#";
-
-                    byte[] dataToSend = Utils.Convert_text_For_multicast("#0.0" + test);
-                    MainForm.udp.Send(dataToSend, dataToSend.Length);                                         
+                    test = $"#155#{rec.id}#{rec.hddLocation}#{rec.gwID}#{rec.radioGWID}#{rec.group_cpsId}#{rec.subs_imei}#{rec.startTime}#{rec.endTime}#{rec.typeSD}#{rec.calltype}#{rec.dispatcher_id}#";                    
+                    MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#0.0" + test), SafeMobileLib.Utils.Convert_text_For_multicast("#0.0" + test).Length);                                         
                }
            }
            catch (Exception ex)
--- a/SafeMobileLIB_DLL/DBmanagers/DBReportingManager.cs
+++ b/SafeMobileLIB_DLL/DBmanagers/DBReportingManager.cs
@ -452,36 +452,34 @@ namespace SafeMobileLib

            BatchHistoryData batchHistObj = null;

+
+
            try
            {

+             
+
                    lat = Convert.ToDouble(dr["lat"]);
                    lng = Convert.ToDouble(dr["lng"]);
                    timegmt = Convert.ToInt32(dr["timegmt"]);

-                batchHistObj = new BatchHistoryData
-                {
+                    batchHistObj = new BatchHistoryData
+                    {

                        Department = dr["department"].ToString(),
                        Unit = dr["unit"].ToString(),
+                        Location = ((getAddress && dr["address"] != DBNull.Value) ? dr["address"].ToString() : "LAT:" + Math.Round(lat, 5).ToString() + " , LNG:" + Math.Round(lat, 5).ToString()),
                        Speed = (isInMile) ? ((int)(Convert.ToInt32(dr["speed"]) * 0.621371192)).ToString() : Convert.ToInt32(dr["speed"]).ToString(),
                        Lat = lat,
                        Lng = lng,
-                        Address = string.Empty,
+                        Address = dr["address"].ToString(),
                        Time = timegmt.TimeOfDayHHMMSSLocal(!is24hours),
                        Date = timegmt.GetDTLocalFromSeconds().Date.ToShortDateString()

                    };

-                    if (getAddress)
-                    {
-                        batchHistObj.Location = dr["address"].ToString();
-                        batchHistObj.Address = dr["address"].ToString();
-                    }
-                    else
-                        batchHistObj.Location = "LAT:" + Math.Round(lat, 5).ToString() + " , LNG:" + Math.Round(lat, 5).ToString();
-

+                
            }
            catch (Exception ex)
            {
--- a/SafeMobileLIB_DLL/GeneralLocationManager.cs
+++ b/SafeMobileLIB_DLL/GeneralLocationManager.cs
@ -90,9 +90,8 @@ namespace SafeMobileLib
        public void SendOnMsgBuss(string seqID, string test)
        {
            if (udpMulticast != null)
-            {
-               byte[] dataToSend = Utils.Convert_text_For_multicast("#" + seqID + test);
-               udpMulticast.Send(dataToSend, dataToSend.Length);                
+            {                
+                udpMulticast.Send(Utils.Convert_text_For_multicast("#" + seqID + test), Utils.Convert_text_For_multicast("#" + seqID + test).Length);                
            }
            else
            {
--- a/SubscriberAndUserManager/controlSettings.cs
+++ b/SubscriberAndUserManager/controlSettings.cs
@ -835,28 +835,19 @@ namespace SubscriberAndUserManager
        }

        private void SendBackupListRequest()
-        {
-            if (MainForm.udp != null)
-            {
-               byte[] dataToSend = Utils.Convert_text_For_multicast("#0.0#53#1#");
-               MainForm.udp.Send(dataToSend, dataToSend.Length);
-            }
+        {            
+            if(MainForm.udp != null)
+                MainForm.udp.Send(Utils.Convert_text_For_multicast("#0.0#53#1#"), Utils.Convert_text_For_multicast("#0.0#53#1#").Length);
        }
        private void SendBackupRequest()
-        {
+        {            
            if (MainForm.udp != null)
-            {
-                byte[] dataToSend = Utils.Convert_text_For_multicast("#0.0#51#1#");
-                MainForm.udp.Send(dataToSend, dataToSend.Length);
-            }
+                MainForm.udp.Send(Utils.Convert_text_For_multicast("#0.0#51#1#"), Utils.Convert_text_For_multicast("#0.0#51#1#").Length);
        }
        private void SendRestoreRequest(string filename)
-        {
+        {            
            if (MainForm.udp != null)
-            {
-                byte[] dataToSend = Utils.Convert_text_For_multicast("#0.0#52#" + filename + "#");
-                MainForm.udp.Send(dataToSend, dataToSend.Length);
-            }
+                MainForm.udp.Send(Utils.Convert_text_For_multicast("#0.0#52#" + filename + "#"), Utils.Convert_text_For_multicast("#0.0#52#" + filename + "#").Length);
        }

        delegate void UpdateList(string fileNames);
--- a/UpdateHelper/UpdateHelper.csproj
+++ b/UpdateHelper/UpdateHelper.csproj
@ -112,9 +112,7 @@
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </None>
    <None Include="prebuild.sh" />
-    <None Include="RunMessagesPartitioning.bat">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
+    <None Include="RunMessagesPartitioning.bat" />
  </ItemGroup>
  <ItemGroup>
    <BootstrapperPackage Include=".NETFramework,Version=v4.5">
@ -146,9 +144,7 @@
    <Content Include="7toLatest7.sql">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </Content>
-    <Content Include="call_messages_partitioning.sql">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
+    <Content Include="call_messages_partitioning.sql" />
    <Content Include="CreateMissingForeignKeys.sql">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </Content>
@ -158,12 +154,8 @@
    <Content Include="CreateMissingPrimaryKeys.sql">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </Content>
-    <Content Include="generate_partitioning_of_an_existing_table_by_date_unix_time.sql">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="get_query_partitioning_of_an_existing_table_by_date_unix_time.sql">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
+    <Content Include="generate_partitioning_of_an_existing_table_by_date_unix_time.sql" />
+    <Content Include="get_query_partitioning_of_an_existing_table_by_date_unix_time.sql" />
    <Content Include="NewFields.sql">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </Content>