Compare commits
No commits in common. "master" and "refactor_AppServer_LocationThread" have entirely different histories.
master
...
refactor_A
@ -23,7 +23,6 @@ namespace AppServer
|
||||
private volatile DBvehiclesManager dbvehs;
|
||||
private DBvehiclesManager DBvehInfo;
|
||||
|
||||
|
||||
public static volatile Int32 LocationCheckQueuesCount = 0;
|
||||
Int64 count = 0;
|
||||
private bool sendCalloutStop;
|
||||
@ -185,12 +184,12 @@ namespace AppServer
|
||||
{
|
||||
Vehicle_Data v_data = (Vehicle_Data)MainForm.VehList[radioID2.ToString()];
|
||||
Alarm alarm = v_data.alm;
|
||||
|
||||
|
||||
bool zone = (alarm.Zone != "") ;
|
||||
bool landMark = (alarm.Landmark != "") ;
|
||||
|
||||
bool zone = false;
|
||||
bool landMark = false;
|
||||
String SpeedProccess = "";
|
||||
if (alarm.Zone != "") zone = true;
|
||||
if (alarm.Landmark != "") landMark = true;
|
||||
|
||||
if (zone || landMark)
|
||||
{
|
||||
SpeedProccess = processZoneAlarm(radioID2, dec2.cell, zone, landMark, alarm.Email, !prevGps);
|
||||
@ -257,12 +256,11 @@ namespace AppServer
|
||||
{
|
||||
try
|
||||
{
|
||||
// skip sending enable/disable if the unit is not in the vehicles list
|
||||
// skip sending enable/disable if the unit is not in the vehicles lis t
|
||||
if (!MainForm.VehList.ContainsKey(radioID2))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
//get unit system position
|
||||
int unitSC_ID = ((Vehicle_Data)MainForm.VehList[radioID2]).sc_id;
|
||||
UnitSysPosition sysPos = DBvehInfo.getSystemPosition(unitSC_ID);
|
||||
@ -272,8 +270,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 +348,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(SafeMobileLib.Utils.Convert_text_For_multicast("#0.0" + test2), SafeMobileLib.Utils.Convert_text_For_multicast("#0.0" + test2).Length);
|
||||
}
|
||||
catch (Exception ex2)
|
||||
{
|
||||
@ -403,10 +396,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(SafeMobileLib.Utils.Convert_text_For_multicast("#0.0" + test), SafeMobileLib.Utils.Convert_text_For_multicast("#0.0" + test).Length);
|
||||
Utils.WriteLine($"Sent CallOut Stop request with Severity [{callout.Severity}] for unit {callout.RadioID.ToString()} ");
|
||||
}
|
||||
}
|
||||
@ -417,17 +407,6 @@ namespace AppServer
|
||||
|
||||
private void sendMailGeo(string mes, String subj, string mailAdr)
|
||||
{
|
||||
|
||||
if (Program.cfg.enableEmailService)
|
||||
{
|
||||
if (!String.IsNullOrEmpty(Program.cfg.emailAddress) && !String.IsNullOrEmpty(mailAdr))
|
||||
{
|
||||
if (MainForm.IsBlacklistedAddress(mailAdr))
|
||||
{
|
||||
Utils.WriteLine($"sendMailGeo : The email '{subj}' was not sent. Email address '{mailAdr}' is in blacklist count = {MainForm.blackListAddress[mailAdr]}");
|
||||
return;
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
MailAddress from = new MailAddress(Program.cfg.emailAddress);
|
||||
@ -451,39 +430,14 @@ namespace AppServer
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
if (ex.ToString().Contains("timed out") ||
|
||||
ex.ToString().Contains("the client was not authenticated"))
|
||||
MainForm.HandleTimeoutError(mailAdr);
|
||||
|
||||
Utils.WriteLine($"Exception in sendMailGeo: {ex.ToString()}");
|
||||
Console.WriteLine("Exception in sendMailGeo: ", ex.ToString());
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
Utils.WriteLine($"Missing email address From = {Program.cfg.emailAddress} To = {mailAdr})", ConsoleColor.Cyan);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
Utils.WriteLine("Email Server not Set", ConsoleColor.Cyan);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
private void sendAlarmMail(string title, string mes, string mailAdr)
|
||||
{
|
||||
if (Program.cfg.enableEmailService)
|
||||
if (Program.cfg.enableEmailService && !String.IsNullOrEmpty(mailAdr))
|
||||
{
|
||||
if (!String.IsNullOrEmpty(Program.cfg.emailAddress) && !String.IsNullOrEmpty(mailAdr))
|
||||
{
|
||||
|
||||
if (MainForm.IsBlacklistedAddress(mailAdr))
|
||||
{
|
||||
Utils.WriteLine($" sendAlarmMail : The email '{title}' was not sent. Email address '{mailAdr}' is in blacklist count = {MainForm.blackListAddress[mailAdr]}");
|
||||
return;
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
MailAddress from = new MailAddress(Program.cfg.emailAddress);
|
||||
@ -495,21 +449,12 @@ namespace AppServer
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
if ( ex.ToString().Contains("timed out") ||
|
||||
ex.ToString().Contains("the client was not authenticated"))
|
||||
MainForm.HandleTimeoutError(mailAdr);
|
||||
|
||||
Utils.WriteLine("Exception in sendMailAlarm2: {0}" + ex.ToString(), ConsoleColor.Red);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
Utils.WriteLine($"Missing email address From = {Program.cfg.emailAddress} To = {mailAdr})", ConsoleColor.Cyan);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
Utils.WriteLine("Email Server not Set", ConsoleColor.Cyan);
|
||||
Utils.WriteLine("Email Server not Set",ConsoleColor.Cyan);
|
||||
}
|
||||
}
|
||||
|
||||
@ -560,19 +505,18 @@ namespace AppServer
|
||||
|
||||
if (validAlarm)
|
||||
{
|
||||
|
||||
Utils.WriteLine("Add new zone alarm");
|
||||
DBalarm.Insert_Zone_Alarm(((Vehicle_Data)MainForm.VehList[radioID.ToString()]).sc_id, time, obj2.zone_id, obj2.action, true);
|
||||
Utils.WriteLine("Done Add new zone alarm");
|
||||
|
||||
// send Alert by email if the emailServer is configured
|
||||
if (Program.cfg.enableEmailService && !String.IsNullOrEmpty(Program.cfg.emailAddress) && !String.IsNullOrEmpty(mailAdr))
|
||||
{
|
||||
|
||||
string veh_name = ((Vehicle_Data)MainForm.VehList[radioID.ToString()]).Name;
|
||||
string speed_km_or_mph = obj2.speedUnit.Equals("k") ? $"{speed} km/h" : $"{speedMiles} mph";
|
||||
string message = $"Zone alarm for {veh_name} {tmpresp}. Unit speed {speed_km_or_mph} at time: {Utils.UnixTimeStampToDateTime(time).ToLocalTime()} [{cell.lat},{cell.lng} ]";
|
||||
string title = $"Zone alarm for {veh_name}";
|
||||
|
||||
string message = "Zone alarm for " + ((Vehicle_Data)MainForm.VehList[radioID.ToString()]).Name + " " + tmpresp
|
||||
+ $". Unit speed {speed_km_or_mph} at time:" + Utils.UnixTimeStampToDateTime(time).ToLocalTime() + " [" + cell.lat + " , " + cell.lng + "]";
|
||||
|
||||
string title = "Zone alarm for " + ((Vehicle_Data)MainForm.VehList[radioID.ToString()]).Name;
|
||||
if (mailAdr != "")
|
||||
{
|
||||
Task.Factory.StartNew(() =>
|
||||
{
|
||||
sendAlarmMail(title, message, mailAdr);
|
||||
@ -587,10 +531,8 @@ 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(SafeMobileLib.Utils.Convert_text_For_multicast("#0.0" + test), SafeMobileLib.Utils.Convert_text_For_multicast("#0.0" + test).Length);
|
||||
}
|
||||
|
||||
String date = DateTime.Now.ToUniversalTime().DateTo70Format().ToString();
|
||||
///send SMS
|
||||
UnitSysPosition tmpX = null;
|
||||
@ -616,11 +558,8 @@ 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);
|
||||
|
||||
Thread.Sleep(100);
|
||||
MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#0." + date + test), SafeMobileLib.Utils.Convert_text_For_multicast("#0." + date + test).Length);
|
||||
System.Threading.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)}]");
|
||||
}
|
||||
@ -631,8 +570,7 @@ namespace AppServer
|
||||
{
|
||||
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);
|
||||
MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#0." + date + test), SafeMobileLib.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,15 +580,14 @@ 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(SafeMobileLib.Utils.Convert_text_For_multicast("#0.0" + test), SafeMobileLib.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)}]");
|
||||
}
|
||||
|
||||
// send by email if the emailServer is configured
|
||||
if (Program.cfg.enableEmailService && obj2.sentemail)
|
||||
///send email
|
||||
if (obj2.sentemail)
|
||||
{
|
||||
Task.Factory.StartNew(() =>
|
||||
{
|
||||
@ -670,23 +607,16 @@ namespace AppServer
|
||||
String speedMiles = Convert.ToString((int)Math.Round(speed * 0.621371192));
|
||||
if (tmpresp.Length > 1)
|
||||
{
|
||||
|
||||
int sc_id = ((Vehicle_Data)MainForm.VehList[radioID.ToString()]).sc_id;
|
||||
|
||||
// insert Alert into database
|
||||
Utils.WriteLine("Insert Landmarks Alarm " + radioID.ToString() + " " + sc_id);
|
||||
DBalarm.Insert_Zone_Alarm(sc_id, time, obj2.land_id, obj2.action, false);
|
||||
Utils.WriteLine("Insert Landmarks Alarm " + radioID.ToString() + " " + ((Vehicle_Data)MainForm.VehList[radioID.ToString()]).sc_id);
|
||||
DBalarm.Insert_Zone_Alarm(((Vehicle_Data)MainForm.VehList[radioID.ToString()]).sc_id, time, obj2.land_id, obj2.action, false);
|
||||
|
||||
|
||||
// send alert by email if the emailServer is configured
|
||||
if (Program.cfg.enableEmailService && !String.IsNullOrEmpty(Program.cfg.emailAddress) && !String.IsNullOrEmpty(mailAdr))
|
||||
{
|
||||
|
||||
string veh_name = ((Vehicle_Data)MainForm.VehList[radioID.ToString()]).Name;
|
||||
string speed_km_or_mph = obj2.speedUnit.Equals("k") ? $"{speed} km/h" : $"{speedMiles} mph";
|
||||
string message = $"Landmark alarm for {veh_name} {tmpresp}. Unit speed {speed_km_or_mph} at time: {Utils.UnixTimeStampToDateTime(time).ToLocalTime()} [{cell.lat},{cell.lng} ]";
|
||||
string title = $"Landmark alarm for {veh_name}";
|
||||
|
||||
string message = "Landmark alarm for " + ((Vehicle_Data)MainForm.VehList[radioID.ToString()]).Name + " " + tmpresp
|
||||
+ $". Unit speed {speed_km_or_mph} at time:" + Utils.UnixTimeStampToDateTime(time).ToLocalTime() + " [" + cell.lat + " , " + cell.lng + "]";
|
||||
string title = "Landmark alarm for " + ((Vehicle_Data)MainForm.VehList[radioID.ToString()]).Name;
|
||||
if (mailAdr != "")
|
||||
{
|
||||
Task.Factory.StartNew(() =>
|
||||
{
|
||||
sendAlarmMail(title, message, mailAdr);
|
||||
@ -694,21 +624,18 @@ namespace AppServer
|
||||
}
|
||||
|
||||
|
||||
//send Alert on message buss
|
||||
|
||||
if (sendOnMsgBus)
|
||||
{
|
||||
//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(SafeMobileLib.Utils.Convert_text_For_multicast("#0.0" + test), SafeMobileLib.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(SafeMobileLib.Utils.Convert_text_For_multicast("#0.0" + test), SafeMobileLib.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} ");
|
||||
@ -740,48 +667,47 @@ namespace AppServer
|
||||
{
|
||||
DBalarmManager DBalarm = new DBalarmManager(Program.cfg.DB_IP, Program.cfg.DB_schema, Program.cfg.DB_user, Program.cfg.DB_passwd, Program.cfg.DB_port);
|
||||
|
||||
int speed = (int)Convert.ToDouble(cell.spd);
|
||||
int speedMiles = (int)Math.Round(speed * 0.621371192);
|
||||
|
||||
|
||||
uint time = DateTo70Format(cell.location_time);
|
||||
string speed4send = speed.ToString() + "_" + speedUnits;
|
||||
|
||||
|
||||
int treshold = (int)Convert.ToDouble(speedTreshold);
|
||||
if (speedUnits == "m")
|
||||
treshold = (int)(treshold * 1.609);
|
||||
|
||||
int speed = (int)Convert.ToDouble(cell.spd);
|
||||
if (speedUnits != "m")
|
||||
{
|
||||
if (speed >= treshold)
|
||||
{
|
||||
uint time = DateTo70Format(cell.location_time);
|
||||
// insert alert into database
|
||||
DBalarm.Insert_Speed_Alarm(radioID, time, speed, cell.lat, cell.lng);
|
||||
Utils.WriteLine("Speed alarm detected!");
|
||||
DBalarm.Insert_Speed_Alarm(radioID, time, speed,cell.lat,cell.lng);
|
||||
Utils.WriteLine("Done inserting speed alarm!");
|
||||
|
||||
|
||||
//send Alert by email if EmailServer si configured
|
||||
if (Program.cfg.enableEmailService && !String.IsNullOrEmpty(mailAdr))
|
||||
{
|
||||
|
||||
int speedMiles = (int)Math.Round(speed * 0.621371192);
|
||||
string veh_name = ((Vehicle_Data)MainForm.VehList[radioID.ToString()]).Name;
|
||||
string speed_km_or_mph = (speedUnits != "m") ? $"{speed} km/h" : $"{speedMiles} mph";
|
||||
string message = $"Speed alarm for {veh_name}. Unit speed {speed_km_or_mph} at time: {Utils.UnixTimeStampToDateTime(time).ToLocalTime()} [{cell.lat},{cell.lng}]";
|
||||
string title = $"Speed alarm for unit {veh_name}";
|
||||
|
||||
|
||||
string message = "Speed alarm for " + ((Vehicle_Data)MainForm.VehList[radioID.ToString()]).Name
|
||||
+ $". Unit speed {speed_km_or_mph} at time:" + Utils.UnixTimeStampToDateTime(time).ToLocalTime() + " [" + cell.lat + " , " + cell.lng + "]";
|
||||
string title = "Speed alarm for unit " + ((Vehicle_Data)MainForm.VehList[radioID.ToString()]).Name;
|
||||
if (mailAdr != "")
|
||||
{
|
||||
Task.Factory.StartNew(() =>
|
||||
{
|
||||
sendAlarmMail(title, message, mailAdr);
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
//send Alert on message buss
|
||||
if (sendOnMsgBus)
|
||||
{
|
||||
//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);
|
||||
MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#0.0" + test), SafeMobileLib.Utils.Convert_text_For_multicast("#0.0" + test).Length);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
@ -96,9 +96,6 @@ namespace AppServer
|
||||
public static String dbAccess;
|
||||
private WebsocketThread websocket = null;
|
||||
|
||||
public static Dictionary<string, int> blackListAddress = new Dictionary<string, int>();
|
||||
public const int MAX_ATTEMPTS = 100;
|
||||
|
||||
|
||||
public delegate void UpdateLicensesUIInvokeCallBack();
|
||||
public MainForm()
|
||||
@ -341,37 +338,6 @@ namespace AppServer
|
||||
}
|
||||
|
||||
|
||||
|
||||
public static void HandleTimeoutError(string mailAdr)
|
||||
{
|
||||
|
||||
// add address to backlist
|
||||
if (!blackListAddress.ContainsKey(mailAdr))
|
||||
blackListAddress.Add(mailAdr, MAX_ATTEMPTS);
|
||||
|
||||
}
|
||||
|
||||
|
||||
public static bool IsBlacklistedAddress(string mailAdr)
|
||||
{
|
||||
|
||||
if (!blackListAddress.ContainsKey(mailAdr))
|
||||
return false;
|
||||
|
||||
// avoid to send the email MAX_ATTEMPTS times => give another chance to try to send email when count = 0
|
||||
int count = blackListAddress[mailAdr];
|
||||
if (count == 0)
|
||||
{
|
||||
blackListAddress.Remove(mailAdr);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
blackListAddress[mailAdr] = count - 1;
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
private void ConfigureWebSocket()
|
||||
{
|
||||
if (!checkWebsocketServerStatus.Enabled)
|
||||
@ -1058,8 +1024,7 @@ namespace AppServer
|
||||
{
|
||||
try
|
||||
{
|
||||
byte[] dataToSend = Utils.Convert_text_For_multicast("#0.0#210#4#AppServer stoped#");
|
||||
udp.Send(dataToSend, dataToSend.Length);
|
||||
udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#0.0#210#4#AppServer stoped#"), SafeMobileLib.Utils.Convert_text_For_multicast("#0.0#210#4#AppServer stoped#").Length);
|
||||
}
|
||||
catch (Exception ex2)
|
||||
{
|
||||
@ -1107,8 +1072,7 @@ namespace AppServer
|
||||
error = true;
|
||||
try
|
||||
{
|
||||
byte[] dataToSend = Utils.Convert_text_For_multicast("#0.0#210#2#Dongle missing Application server stopped#");
|
||||
udp.Send(dataToSend, dataToSend.Length);
|
||||
udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#0.0#210#2#Dongle missing Application server stopped#"), SafeMobileLib.Utils.Convert_text_For_multicast("#0.0#210#2#Dongle missing Application server stopped#").Length);
|
||||
}
|
||||
catch (Exception ex2)
|
||||
{
|
||||
@ -1228,10 +1192,8 @@ namespace AppServer
|
||||
|
||||
|
||||
MainForm.websocketLocationQueue.PostItem(data);
|
||||
|
||||
if (!sendWebsocketTimer.Enabled)
|
||||
if(!sendWebsocketTimer.Enabled)
|
||||
sendWebsocketTimer.Enabled = true;
|
||||
|
||||
if (!checkWebsocketServerStatus.Enabled)
|
||||
checkWebsocketServerStatus.Enabled = true;
|
||||
}
|
||||
@ -1283,12 +1245,10 @@ namespace AppServer
|
||||
}
|
||||
try
|
||||
{
|
||||
byte[] dataToSend = Utils.Convert_text_For_multicast($"#0.0#{Utils.enumConvertToString(MessageBusCmds.WebsocketStatusToMsgBus)}#offline#");
|
||||
udp.Send(dataToSend, dataToSend.Length);
|
||||
|
||||
|
||||
dataToSend = Utils.Convert_text_For_multicast("#0.0#210#4#Application server stopped#");
|
||||
udp.Send(dataToSend, dataToSend.Length);
|
||||
udp.Send(Utils.Convert_text_For_multicast($"#0.0#{Utils.enumConvertToString(MessageBusCmds.WebsocketStatusToMsgBus)}#offline#"),
|
||||
Utils.Convert_text_For_multicast($"#0.0#{Utils.enumConvertToString(MessageBusCmds.WebsocketStatusToMsgBus)}#offline#").Length);
|
||||
udp.Send(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);
|
||||
}
|
||||
catch (Exception ex2)
|
||||
{
|
||||
@ -1304,8 +1264,7 @@ namespace AppServer
|
||||
{
|
||||
try
|
||||
{
|
||||
byte[] dataToSend = Utils.Convert_text_For_multicast("#0.0#210#5#Application server restart#");
|
||||
udp.Send(dataToSend, dataToSend.Length);
|
||||
udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#0.0#210#5#Application server restart#"), SafeMobileLib.Utils.Convert_text_For_multicast("#0.0#210#5#Application server restart#").Length);
|
||||
}
|
||||
catch (Exception ex2)
|
||||
{
|
||||
|
@ -28,7 +28,6 @@ namespace AppServer
|
||||
private DBvehiclesManager dbvehs;
|
||||
internal DBsubsOperationManager dbsubsoperManage;
|
||||
private DBcallPatchManager dbCallPatch;
|
||||
|
||||
#region code for zone
|
||||
private volatile static ArrayList ZoneList = new ArrayList();
|
||||
private volatile static ArrayList LandList = new ArrayList();
|
||||
@ -606,8 +605,7 @@ namespace AppServer
|
||||
Utils.WriteLine("Radio disable was sent on " + sysPos.Gw_id + "." + sysPos.R_gw_id + " gateway", ConsoleColor.Cyan);
|
||||
//send radio disable to GW
|
||||
string test2 = "#150#" + 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)
|
||||
{
|
||||
@ -728,9 +726,7 @@ namespace AppServer
|
||||
UnitSysPosition sysPos = DBvehInfo.getSystemPosition(unitSC_ID);
|
||||
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);
|
||||
MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#0.0"+test1), SafeMobileLib.Utils.Convert_text_For_multicast("#0.0"+test1).Length);
|
||||
}
|
||||
//send to email if was sms->email type
|
||||
if (dec3.isEmail)
|
||||
@ -738,11 +734,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,8 +749,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 + "#");
|
||||
MainForm.udp.Send(dataToSend, dataToSend.Length);
|
||||
MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#0.0#154#" + dest + "#"), SafeMobileLib.Utils.Convert_text_For_multicast("#0.0#154#" + dest + "#").Length);
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
@ -931,9 +927,7 @@ namespace AppServer
|
||||
System.Threading.Thread.Sleep(100);
|
||||
SM.Debug("Sending telemetry alarm to SD; digital:" + tObj.DigitalNr);
|
||||
test = $"#140#{radioID}#{tObj.Name}#";
|
||||
|
||||
byte[] dataToSend = Utils.Convert_text_For_multicast("#0.0" + test);
|
||||
MainForm.udp.Send(dataToSend, dataToSend.Length);
|
||||
MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#0.0" + test), SafeMobileLib.Utils.Convert_text_For_multicast("#0.0"+test).Length);
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -944,8 +938,7 @@ namespace AppServer
|
||||
}
|
||||
if (IhaveData)
|
||||
{
|
||||
byte[] dataToSend = Utils.Convert_text_For_multicast("#0.0#154#" + dest + "#");
|
||||
MainForm.udp.Send(dataToSend, dataToSend.Length);
|
||||
MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#0.0#154#" + dest + "#"), SafeMobileLib.Utils.Convert_text_For_multicast("#0.0#154#" + dest + "#").Length);
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
@ -1039,8 +1032,7 @@ namespace AppServer
|
||||
bgWorkerDBbackup.RunWorkerAsync(param);
|
||||
|
||||
//send ACK back to SUM
|
||||
byte[] dataToSend = Utils.Convert_text_For_multicast("#0.0#71#1#");
|
||||
MainForm.udp.Send(dataToSend, dataToSend.Length);
|
||||
MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#0.0#71#1#"), SafeMobileLib.Utils.Convert_text_For_multicast("#0.0#71#1#").Length);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
@ -1068,14 +1060,12 @@ namespace AppServer
|
||||
object[] param2 = { completeFileName, posgresPath };
|
||||
bgWorkerDBrestore.RunWorkerAsync(param2);
|
||||
//send ACK back to SUM
|
||||
byte[] dataToSend = Utils.Convert_text_For_multicast("#0.0#72#1#");
|
||||
MainForm.udp.Send(dataToSend, dataToSend.Length);
|
||||
MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#0.0#72#1#"), SafeMobileLib.Utils.Convert_text_For_multicast("#0.0#72#1#").Length);
|
||||
}
|
||||
else
|
||||
{
|
||||
SM.Debug("DB restored failed !!!" + "File " + completeFileName + " missing!!!");
|
||||
byte[] dataToSend = Utils.Convert_text_For_multicast("#0.0#62#0#");
|
||||
MainForm.udp.Send(dataToSend, dataToSend.Length);
|
||||
MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#0.0#62#0#"), SafeMobileLib.Utils.Convert_text_For_multicast("#0.0#62#0#").Length);
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
@ -1147,9 +1137,7 @@ namespace AppServer
|
||||
//send broadcast messages I'm back in business
|
||||
Utils.WriteLine(string.Format("receive 500 from radio: Gateway {0} is ON", ((RadioGateway)MainForm.RadioGWHash[key]).Name), ConsoleColor.Green);
|
||||
string test1 = "#501#" + tempArr[4] + "#" + tempArr[5] + "#" + "ON#" + ((RadioGateway)MainForm.RadioGWHash[key]).Name + "#";
|
||||
|
||||
byte[] dataToSend = Utils.Convert_text_For_multicast("#" + seqID4 + test1);
|
||||
MainForm.udp.Send(dataToSend, dataToSend.Length);
|
||||
MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#" + seqID4 + test1), SafeMobileLib.Utils.Convert_text_For_multicast("#" + seqID4 + test1).Length);
|
||||
}
|
||||
((RadioGateway)MainForm.RadioGWHash[key]).Alive = true;
|
||||
((RadioGateway)MainForm.RadioGWHash[key]).LastUpdate = DateTime.UtcNow;
|
||||
@ -1176,9 +1164,7 @@ namespace AppServer
|
||||
string status = ((RadioGateway)(entry.Value)).Alive ? "ON" : "OFF";
|
||||
Utils.WriteLine(string.Format("Response for SD request: Gateway {0} is {1}", ((RadioGateway)(entry.Value)).Name, status), status == "ON" ? ConsoleColor.Green : ConsoleColor.Red);
|
||||
string test1 = "#501#" + ((RadioGateway)(entry.Value)).Gw_id + "#" + ((RadioGateway)(entry.Value)).Id + "#" + status + "#" + ((RadioGateway)(entry.Value)).Name + "#";
|
||||
|
||||
byte[] dataToSend = Utils.Convert_text_For_multicast("#" + "0.0" + test1);
|
||||
MainForm.udp.Send(dataToSend, dataToSend.Length);
|
||||
MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#" + "0.0" + test1), SafeMobileLib.Utils.Convert_text_For_multicast("#" + "0.0" + test1).Length);
|
||||
}
|
||||
}
|
||||
break;
|
||||
@ -1301,14 +1287,11 @@ namespace AppServer
|
||||
if (sysPos != null) dest = sysPos.Gw_id + "." + sysPos.R_gw_id + "." + radioID.ToString();
|
||||
|
||||
String test = "#154#" + dest + "#";
|
||||
|
||||
byte[] dataToSend = Utils.Convert_text_For_multicast("#" + seqId + test);
|
||||
MainForm.udp.Send(dataToSend, dataToSend.Length);
|
||||
MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#" + seqId + test), SafeMobileLib.Utils.Convert_text_For_multicast("#" + seqId + test).Length);
|
||||
|
||||
//send emergency alarm to SD
|
||||
test = "#134#" + radioID.ToString() + "#" + emergencyType;
|
||||
dataToSend = Utils.Convert_text_For_multicast("#" + seqId + test);
|
||||
MainForm.udp.Send(dataToSend, dataToSend.Length);
|
||||
MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#" + seqId + test), SafeMobileLib.Utils.Convert_text_For_multicast("#" + seqId + test).Length);
|
||||
|
||||
((VehicleStatus)MainForm.VehicleHashStat[radioID]).curentStatus = Status_for_tab.EMERG;
|
||||
((VehicleStatus)MainForm.VehicleHashStat[radioID]).lastArsTime = DateTime.Now;
|
||||
@ -1389,9 +1372,7 @@ namespace AppServer
|
||||
UnitSysPosition tmpX = dbvehs.getSystemPosition(msg.sc_id_dest);
|
||||
//string test = "#143#" + tmpX.Gw_id + "." + tmpX.R_gw_id+"."+msg.imei_dest + "#" + msg.mess + "#" + msg.sched_timeGMT + "#";
|
||||
string test = "#143#" + tmpX.Gw_id + "." + tmpX.R_gw_id + "." + msg.imei_dest + "#" + msg.mess + "#" + msg.sched_timeGMT + "#" + msg.dispatcherID + "#";
|
||||
|
||||
byte[] dataToSend = Utils.Convert_text_For_multicast("#" + msg.seq_id + test);
|
||||
MainForm.udp.Send(dataToSend, dataToSend.Length);
|
||||
MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#" + msg.seq_id + test), SafeMobileLib.Utils.Convert_text_For_multicast("#" + msg.seq_id + test).Length);
|
||||
}
|
||||
else
|
||||
SM.Debug("message will be sent at a later time - schedule: " + msg.sched_timeGMT + " current:" + DateTime.Now.ToUniversalTime().DateTo70Format());
|
||||
@ -1423,7 +1404,6 @@ namespace AppServer
|
||||
string test = "";
|
||||
String cmdok = "";
|
||||
var subsBlackList = new List<int> { (int)Status_for_tab.OFF, (int)Status_for_tab.DISABLE, (int)Status_for_tab.MADEOFF };
|
||||
byte[] dataToSend = null;
|
||||
|
||||
foreach (smsmessage msg in smss)
|
||||
{
|
||||
@ -1436,9 +1416,7 @@ namespace AppServer
|
||||
if (SysPosList[sc_id]!=null)
|
||||
test = "#143#" + ((UnitSysPosition)SysPosList[sc_id]).Gw_id + "." + ((UnitSysPosition)SysPosList[sc_id]).R_gw_id + "." + msg.imei_dest + "#" + msg.mess + "#" + msg.sched_timeGMT + "#" + msg.dispatcherID + "#";
|
||||
else test = "#143#" + "0.0" + "." + msg.imei_dest + "#" + msg.mess + "#" + msg.sched_timeGMT + "#" + msg.dispatcherID + "#";
|
||||
|
||||
dataToSend = Utils.Convert_text_For_multicast("#" + msg.seq_id + test);
|
||||
MainForm.udp.Send(dataToSend, dataToSend.Length);
|
||||
MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#" + msg.seq_id + test), SafeMobileLib.Utils.Convert_text_For_multicast("#" + msg.seq_id + test).Length);
|
||||
}
|
||||
else
|
||||
SM.Debug("message will be sent at a later time - schedule: " + msg.sched_timeGMT + " current:" + DateTime.Now.ToUniversalTime().DateTo70Format());
|
||||
@ -1451,8 +1429,7 @@ namespace AppServer
|
||||
UnitSysPosition tmpX = dbvehs.getSystemPosition_for_group(msg.imei_dest);
|
||||
|
||||
test = "#145#" + tmpX.Gw_id + "." + tmpX.R_gw_id + "." + msg.sc_id_dest + "#" + msg.mess + "#" + msg.sched_timeGMT + "#";
|
||||
dataToSend = Utils.Convert_text_For_multicast("#" + msg.seq_id + test);
|
||||
MainForm.udp.Send(dataToSend, dataToSend.Length);
|
||||
MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#" + msg.seq_id + test), SafeMobileLib.Utils.Convert_text_For_multicast("#" + msg.seq_id + test).Length);
|
||||
}
|
||||
|
||||
Utils.WriteLine($"Undelivered {undeliveredSMS} private messages and {smss.Count} group messages", ConsoleColor.White);
|
||||
@ -1468,19 +1445,19 @@ namespace AppServer
|
||||
{
|
||||
//Check4ExpiredTickets
|
||||
List<JobTickets> jtlist = new List<JobTickets>();
|
||||
|
||||
string list_of_id_text = "";
|
||||
try
|
||||
{
|
||||
DBTicketingManager DBT = new DBTicketingManager(Program.cfg.DB_IP, Program.cfg.DB_schema, Program.cfg.DB_user, Program.cfg.DB_passwd, Program.cfg.DB_port);
|
||||
List<Int32> ExpiredTicketsIdList = DBT.updateTicketExpireDate(DateTo70Format(DateTime.UtcNow));
|
||||
if(ExpiredTicketsIdList.Count>0)
|
||||
{
|
||||
|
||||
// get comma separated list
|
||||
string list_of_id_text = string.Join<string>(",", ExpiredTicketsIdList.Select(x => $"{x}"));
|
||||
|
||||
byte[] dataToSend = Utils.Convert_text_For_multicast($"#0.0#251#{list_of_id_text}#");
|
||||
MainForm.udp.Send(dataToSend, dataToSend.Length);
|
||||
foreach(Int32 id in ExpiredTicketsIdList)
|
||||
{
|
||||
list_of_id_text += id + ",";
|
||||
}
|
||||
list_of_id_text = list_of_id_text.Substring(0, list_of_id_text.Length - 1);
|
||||
MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#0.0#251#" + list_of_id_text + "#"), SafeMobileLib.Utils.Convert_text_For_multicast("#0.0#251#" + list_of_id_text + "#").Length);
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
@ -1518,10 +1495,7 @@ namespace AppServer
|
||||
string head = "#143#0.0." + ticket.Imei + "#";
|
||||
if (SysPosList[ticket.sc_id] != null) head = "#143#" + ((UnitSysPosition)SysPosList[ticket.sc_id]).Gw_id + "." + ((UnitSysPosition)SysPosList[ticket.sc_id]).R_gw_id + "." + ticket.Imei + "#";
|
||||
string test = head + message + "#" + 0 + "#";
|
||||
|
||||
|
||||
byte[] dataToSend = Utils.Convert_text_For_multicast("#" + ticket.seq_id + test);
|
||||
MainForm.udp.Send(dataToSend, dataToSend.Length);
|
||||
MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#" + ticket.seq_id + test), SafeMobileLib.Utils.Convert_text_For_multicast("#" + ticket.seq_id + test).Length);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1547,8 +1521,7 @@ namespace AppServer
|
||||
if (SysPosList[ticket.sc_id] != null) head = "#143#" + ((UnitSysPosition)SysPosList[ticket.sc_id]).Gw_id + "." + ((UnitSysPosition)SysPosList[ticket.sc_id]).R_gw_id + "." + ticket.Imei + "#";
|
||||
|
||||
string test = head + ticket.Name + "#" + 0 + "#";
|
||||
byte[] dataToSend = Utils.Convert_text_For_multicast("#" + ticket.seq_id + test);
|
||||
MainForm.udp.Send(dataToSend, dataToSend.Length);
|
||||
MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#" + ticket.seq_id + test), SafeMobileLib.Utils.Convert_text_For_multicast("#" + ticket.seq_id + test).Length);
|
||||
}
|
||||
else
|
||||
SM.Debug("ticket will be sent at a later time - schedule: " + ticket.sched_timegmt + " current:" + DateTime.Now.ToUniversalTime().DateTo70Format());
|
||||
@ -1580,9 +1553,7 @@ namespace AppServer
|
||||
if (DateTime.Now.ToUniversalTime() > item.Timegmt.AddSeconds(item.ArsInterval + 10))// added 10 seconds; marja erroare
|
||||
{
|
||||
SM.Debug("Unit:" + item.Imei + " ARS interval expired. Marking unit as OFF");
|
||||
|
||||
byte[] dataToSend = Utils.Convert_text_For_multicast("#0.0#130#" + item.Imei + "#OFF#");
|
||||
MainForm.udp.Send(dataToSend, dataToSend.Length);
|
||||
MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#0.0#130#" + item.Imei + "#OFF#"), SafeMobileLib.Utils.Convert_text_For_multicast("#0.0#130#" + item.Imei + "#OFF#").Length);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1628,9 +1599,7 @@ namespace AppServer
|
||||
|
||||
|
||||
string test = "#501#" + ((RadioGateway)(entry.Value)).Gw_id + "#" + ((RadioGateway)(entry.Value)).Id + "#" + "OFF" + "#" + ((RadioGateway)(entry.Value)).Name + "#";
|
||||
|
||||
byte[] dataToSend = Utils.Convert_text_For_multicast("#" + "0.0" + test);
|
||||
MainForm.udp.Send(dataToSend, dataToSend.Length);
|
||||
MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#" + "0.0" + test), SafeMobileLib.Utils.Convert_text_For_multicast("#" + "0.0" + test).Length);
|
||||
((RadioGateway)(entry.Value)).Alive = false;
|
||||
}
|
||||
}
|
||||
@ -1715,9 +1684,7 @@ namespace AppServer
|
||||
public static void PushStatus(String IMEI,Status_for_tab stat)
|
||||
{
|
||||
Utils.WriteLine("Send PushStatus:" + stat+" Imei:"+IMEI,ConsoleColor.Yellow);
|
||||
|
||||
byte[] dataToSend = Utils.Convert_text_For_multicast("#0.0#153#" + IMEI + "#" + (Int32)stat + "#");
|
||||
MainForm.udp.Send(dataToSend, dataToSend.Length);
|
||||
MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#0.0#153#" + IMEI + "#" + (Int32)stat + "#"), SafeMobileLib.Utils.Convert_text_For_multicast("#0.0#153#" + IMEI + "#" + (Int32)stat + "#").Length);
|
||||
}
|
||||
|
||||
|
||||
@ -2116,8 +2083,7 @@ namespace AppServer
|
||||
messageOnScreen = true;
|
||||
try
|
||||
{
|
||||
byte[] dataToSend = Utils.Convert_text_For_multicast("#Application server database connection failed#");
|
||||
MainForm.udp.Send(dataToSend, dataToSend.Length);
|
||||
MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#Application server database connection failed#"), SafeMobileLib.Utils.Convert_text_For_multicast("#0.0#210#3#Application server database connection failed#").Length);
|
||||
}
|
||||
catch (Exception ex2)
|
||||
{
|
||||
@ -2184,17 +2150,6 @@ namespace AppServer
|
||||
|
||||
private void sendAlarmMail(string mes, string mailAdr)
|
||||
{
|
||||
if (Program.cfg.enableEmailService)
|
||||
{
|
||||
|
||||
if (!String.IsNullOrEmpty(Program.cfg.emailAddress) && !String.IsNullOrEmpty(mailAdr))
|
||||
{
|
||||
if (MainForm.IsBlacklistedAddress(mailAdr))
|
||||
{
|
||||
Utils.WriteLine($" sendAlarmMail : The email was not sent. Email address '{mailAdr}' is in blacklist ");
|
||||
return;
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
MailAddress from = new MailAddress(Program.cfg.emailAddress);
|
||||
@ -2206,24 +2161,10 @@ namespace AppServer
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
if (ex.ToString().Contains("timed out"))
|
||||
MainForm.HandleTimeoutError(mailAdr);
|
||||
|
||||
Utils.WriteLine("Exception in sendMailAlarm: " + ex.ToString(), ConsoleColor.Red);
|
||||
//Console.WriteLine(e.ToString());
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
Utils.WriteLine($"Missing email address From = {Program.cfg.emailAddress} To = {mailAdr})", ConsoleColor.Red);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
SM.Debug("email disabled");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public void sendDailyReportMail(String PdfFile, string mailAdr)
|
||||
{
|
||||
@ -2298,20 +2239,11 @@ namespace AppServer
|
||||
if (Program.cfg.enableEmailService)
|
||||
{
|
||||
SM.Debug(new string[] { "Checking mail at:" + DateTime.Now.ToString(), "For " + Program.cfg.emailAddress.ToString() + " on " + Program.cfg.pop3Server.ToString() });
|
||||
|
||||
emailHT = dbsubsoperManage.getAll_imei_sc_id("ByMail");
|
||||
if (emailHT.Count > 0)
|
||||
{
|
||||
SM.Debug("Load " + emailHT.Count + " subscribers emails from DB ...");
|
||||
}
|
||||
|
||||
if (sslServer == null)
|
||||
{
|
||||
SM.Debug("sslServer is null");
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
Int64 latestEmailTime = sslServer.getLastEmailTime();
|
||||
ArrayList EmailList = sslServer.getEmails();
|
||||
|
||||
@ -2322,23 +2254,19 @@ namespace AppServer
|
||||
DB.SetLastEmailTime(sslServer.getLastEmailTime());
|
||||
}
|
||||
|
||||
|
||||
DBsmsManager DBsms = new DBsmsManager(Program.cfg.DB_IP, Program.cfg.DB_schema, Program.cfg.DB_user, Program.cfg.DB_passwd, Program.cfg.DB_port);
|
||||
DBvehiclesManager dbvehs = new DBvehiclesManager(Program.cfg.DB_IP, Program.cfg.DB_schema, Program.cfg.DB_user, Program.cfg.DB_passwd, Program.cfg.DB_port);
|
||||
|
||||
|
||||
foreach (EmailtoSMS obj in EmailList)
|
||||
{
|
||||
String seqID = "0." + (DateTime.Now.GetSecondsLocalFromDT()) + DateTime.Now.Millisecond.ToString();
|
||||
|
||||
SM.Debug(new string[] { "-----START OK----",
|
||||
SM.Debug(new string[] {"-----START OK----",
|
||||
"From: " + obj.from,
|
||||
"ID: " + obj.id,
|
||||
"Text: " + obj.text});
|
||||
try
|
||||
{
|
||||
// app server idx =0
|
||||
|
||||
DBsmsManager DB = new DBsmsManager(Program.cfg.DB_IP, Program.cfg.DB_schema, Program.cfg.DB_user, Program.cfg.DB_passwd, Program.cfg.DB_port);
|
||||
//bigu code remove # from text and also replace "'"
|
||||
try
|
||||
{
|
||||
@ -2349,15 +2277,13 @@ namespace AppServer
|
||||
{
|
||||
SM.Debug("Error on converting email:" + ex.ToString());
|
||||
}
|
||||
|
||||
//end bigu code
|
||||
if (!obj.is_group) DBsms.insert_sms_received(obj.id, obj.text, 7, obj.from, seqID);
|
||||
if (!obj.is_group) DB.insert_sms_received(obj.id, obj.text, 7, obj.from, seqID);
|
||||
if (obj.is_sierra)
|
||||
{
|
||||
if (emailHT.Contains(obj.from))
|
||||
{
|
||||
SM.Debug("Email received <<" + obj.text + ">> from address: " + obj.from);
|
||||
|
||||
seqID = "1." + Utils.GetSecondsLocalFromDT(DateTime.Now).ToString() + DateTime.Now.Millisecond.ToString();
|
||||
string test = "#132#" + ((SW_Subscriber)emailHT[obj.from]).imei + "#" + obj.text + "#hyt#";
|
||||
String cmdok = "#" + seqID + test; Int32 tmp = cmdok.Length + 1; tmp += tmp.ToString().Length; cmdok = "#" + tmp.ToString() + cmdok;
|
||||
@ -2365,7 +2291,6 @@ namespace AppServer
|
||||
byte[] buf = enc.GetBytes(cmdok);
|
||||
//send to messagebus
|
||||
MainForm.udp.Send(buf, buf.Length);
|
||||
|
||||
SM.Debug("Email thread successfully sent data to message bus");
|
||||
}
|
||||
}
|
||||
@ -2380,21 +2305,15 @@ namespace AppServer
|
||||
obj.text = obj.text.Remove(140 - 3 - obj.from.Length) + " [" + obj.from + "]";
|
||||
else
|
||||
obj.text = obj.text + " [" + obj.from + "]";
|
||||
|
||||
//send SMS on message buss
|
||||
if (!obj.is_sierra)
|
||||
{
|
||||
|
||||
if (dbvehs != null)
|
||||
{
|
||||
UnitSysPosition tmpX = dbvehs.getSystemPosition(dbvehs.getSCID(obj.id));
|
||||
|
||||
string cmd = $"{tmpX.Gw_id}.{tmpX.R_gw_id}.{obj.id}#{obj.text}#{DateTime.Now.GetSecondsLocalFromDT()}#";
|
||||
string code = (obj.is_group) ? "#144#" : "#143#" ;
|
||||
byte[] msg = Utils.Convert_text_For_multicast("#0.0" + code + cmd);
|
||||
string msg = "#143#" + tmpX.Gw_id + "." + tmpX.R_gw_id + "." + obj.id + "#" + obj.text + "#" + (DateTime.Now.GetSecondsLocalFromDT()) + "#";
|
||||
if (obj.is_group) msg = "#144#" + tmpX.Gw_id + "." + tmpX.R_gw_id + "." + obj.id + "#" + obj.text + "#" + (DateTime.Now.GetSecondsLocalFromDT()) + "#";
|
||||
|
||||
if (msg != null && msg.Length > 0)
|
||||
MainForm.udp.Send(msg, msg.Length);
|
||||
MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#0.0" + msg), SafeMobileLib.Utils.Convert_text_For_multicast("#0.0" + msg).Length);
|
||||
|
||||
if (obj.is_group)
|
||||
{
|
||||
@ -2404,12 +2323,8 @@ namespace AppServer
|
||||
if (oldgatewayID != obj2.Gw_id)
|
||||
{
|
||||
oldgatewayID = (Int32)obj2.Gw_id;
|
||||
cmd = $"#144#{obj2.Gw_id}.{obj2.Id}.{obj.id}#{obj.text}#{DateTime.Now.GetSecondsLocalFromDT()}#";
|
||||
byte[] msg2 = Utils.Convert_text_For_multicast("#1." + (DateTime.Now.GetSecondsLocalFromDT()) + DateTime.Now.Ticks.ToString() + cmd);
|
||||
|
||||
if( msg2 != null && msg2.Length > 0)
|
||||
MainForm.udp.Send(msg2, msg2.Length);
|
||||
}
|
||||
string msg2 = "#144#" + obj2.Gw_id + "." + obj2.Id + "." + obj.id + "#" + obj.text + "#" + (DateTime.Now.GetSecondsLocalFromDT()) + "#";
|
||||
MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#1." + (DateTime.Now.GetSecondsLocalFromDT()) + DateTime.Now.Ticks.ToString() + msg2), SafeMobileLib.Utils.Convert_text_For_multicast("#1." + (DateTime.Now.GetSecondsLocalFromDT()) + DateTime.Now.Ticks.ToString() + msg2).Length);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -2433,16 +2348,6 @@ namespace AppServer
|
||||
{
|
||||
if (Program.cfg.enableEmailService)
|
||||
{
|
||||
if (!String.IsNullOrEmpty(Program.cfg.emailAddress) && !String.IsNullOrEmpty(mailAdr))
|
||||
{
|
||||
|
||||
if (MainForm.IsBlacklistedAddress(mailAdr))
|
||||
{
|
||||
Utils.WriteLine($"sendMail : The email was not sent. Email address '{mailAdr}' is in blacklist count = {MainForm.blackListAddress[mailAdr]}");
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
SM.Debug("Sending mail to " + mailAdr + " from radioId " + radioID.ToString());
|
||||
try
|
||||
{
|
||||
@ -2460,19 +2365,10 @@ namespace AppServer
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
if (ex.ToString().Contains("timed out") ||
|
||||
ex.ToString().Contains("the client was not authenticated"))
|
||||
MainForm.HandleTimeoutError(mailAdr);
|
||||
|
||||
Utils.WriteLine("Exception in sendMail: " + ex.ToString(), ConsoleColor.Red);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
Utils.WriteLine($"Missing email address From = {Program.cfg.emailAddress} To = {mailAdr})", ConsoleColor.Red);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
SM.Debug("email disabled");
|
||||
}
|
||||
@ -2482,19 +2378,7 @@ namespace AppServer
|
||||
//sms-> email Sierra Wireless
|
||||
private void sendMail_SW(string mailAdr, string mailBody)
|
||||
{
|
||||
if (Program.cfg.enableEmailService)
|
||||
{
|
||||
if (!String.IsNullOrEmpty(Program.cfg.emailAddress) && !String.IsNullOrEmpty(mailAdr))
|
||||
{
|
||||
|
||||
if (MainForm.IsBlacklistedAddress(mailAdr))
|
||||
{
|
||||
Utils.WriteLine($"sendMail_SW : The email was not sent. Email address '{mailAdr}' is in blacklist count = {MainForm.blackListAddress[mailAdr]}");
|
||||
return;
|
||||
}
|
||||
|
||||
SM.Debug("Sending mail to " + mailAdr);
|
||||
|
||||
try
|
||||
{
|
||||
MailMessage message = new MailMessage();
|
||||
@ -2507,21 +2391,7 @@ namespace AppServer
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
if (ex.ToString().Contains("timed out") ||
|
||||
ex.ToString().Contains("the client was not authenticated"))
|
||||
MainForm.HandleTimeoutError(mailAdr);
|
||||
|
||||
Utils.WriteLine("Exception in sendMail Sierra Wireless Gateway: " + ex.ToString(), ConsoleColor.Red);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
Utils.WriteLine($"Missing email address From = {Program.cfg.emailAddress} To = {mailAdr})", ConsoleColor.Red);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
SM.Debug("email disabled");
|
||||
Utils.WriteLine("Exception in sendMail Sierra Wireless Gateway: "+ ex.ToString() ,ConsoleColor.Red);
|
||||
}
|
||||
|
||||
}
|
||||
@ -2553,9 +2423,8 @@ namespace AppServer
|
||||
{
|
||||
//send emergency alarm to SD
|
||||
//send ACK back to GW
|
||||
string code = (backupDOne == true) ? "#61#1#" : "#61#0#";
|
||||
byte[] dataToSend = Utils.Convert_text_For_multicast("#0.0" + code);
|
||||
MainForm.udp.Send(dataToSend, dataToSend.Length);
|
||||
string test = (backupDOne == true) ? "#61#1#" : "#61#0#";
|
||||
MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#0.0" + test), SafeMobileLib.Utils.Convert_text_For_multicast("#0.0" + test).Length);
|
||||
}
|
||||
#endregion
|
||||
|
||||
@ -2582,10 +2451,8 @@ namespace AppServer
|
||||
{
|
||||
//send emergency alarm to SD
|
||||
//send ACK back to GW
|
||||
string code = (restoreDOne == true) ? "#62#1#" : "#252#0#";
|
||||
|
||||
byte[] dataToSend = Utils.Convert_text_For_multicast("#0.0" + code);
|
||||
MainForm.udp.Send(dataToSend, dataToSend.Length);
|
||||
string test = (restoreDOne == true) ? "#62#1#" : "#252#0#";
|
||||
MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#0.0" + test), SafeMobileLib.Utils.Convert_text_For_multicast("#0.0" + test).Length);
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
@ -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();
|
||||
@ -241,9 +241,7 @@ 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();
|
||||
|
@ -14,5 +14,5 @@
|
||||
// You can specify all the values or you can default the Build and Revision Numbers
|
||||
// by using the '*' as shown below:
|
||||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
[assembly: AssemblyVersion("8.2.0.10898")]
|
||||
[assembly: AssemblyFileVersion("8.2.0.10898")]
|
||||
[assembly: AssemblyVersion("8.1.0.10898")]
|
||||
[assembly: AssemblyFileVersion("8.1.0.10898")]
|
@ -51,7 +51,7 @@ namespace AppServer
|
||||
String stringData = System.Text.Encoding.ASCII.GetString(data, 0, data.Length);
|
||||
String usefulData = stringData.Trim();
|
||||
Console.WriteLine("Data received:" + usefulData);
|
||||
String[] command = usefulData.Split("#".ToCharArray());
|
||||
String[] command = usefulData.Split('#');
|
||||
SDRegistration sdReg = null;
|
||||
String header = "";
|
||||
int digCommand;
|
||||
@ -108,9 +108,8 @@ namespace AppServer
|
||||
+ 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);
|
||||
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
|
||||
|
@ -172,9 +172,7 @@ namespace AppServer
|
||||
|
||||
|
||||
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);
|
||||
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)
|
||||
|
@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
|
||||
// You can specify all the values or you can default the Build and Revision Numbers
|
||||
// by using the '*' as shown below:
|
||||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
[assembly: AssemblyVersion("8.2.0.10898")]
|
||||
[assembly: AssemblyFileVersion("8.2.0.10898")]
|
||||
[assembly: AssemblyVersion("8.1.0.10898")]
|
||||
[assembly: AssemblyFileVersion("8.1.0.10898")]
|
||||
|
@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
|
||||
// You can specify all the values or you can default the Build and Revision Numbers
|
||||
// by using the '*' as shown below:
|
||||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
[assembly: AssemblyVersion("8.2.0.10898")]
|
||||
[assembly: AssemblyFileVersion("8.2.0.10898")]
|
||||
[assembly: AssemblyVersion("8.1.0.10898")]
|
||||
[assembly: AssemblyFileVersion("8.1.0.10898")]
|
@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
|
||||
// You can specify all the values or you can default the Build and Revision Numbers
|
||||
// by using the '*' as shown below:
|
||||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
[assembly: AssemblyVersion("8.2.0.10898")]
|
||||
[assembly: AssemblyFileVersion("8.2.0.10898")]
|
||||
[assembly: AssemblyVersion("8.1.0.10898")]
|
||||
[assembly: AssemblyFileVersion("8.1.0.10898")]
|
||||
|
@ -31,6 +31,6 @@ using System.Runtime.InteropServices;
|
||||
//
|
||||
// You can specify all the values or you can default the Build and Revision Numbers
|
||||
// by using the '*' as shown below:
|
||||
[assembly: AssemblyVersion("8.2.0.10898")]
|
||||
[assembly: AssemblyFileVersion("8.2.0.10898")]
|
||||
[assembly: AssemblyVersion("8.1.0.10898")]
|
||||
[assembly: AssemblyFileVersion("8.1.0.10898")]
|
||||
|
||||
|
@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
|
||||
// You can specify all the values or you can default the Build and Revision Numbers
|
||||
// by using the '*' as shown below:
|
||||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
[assembly: AssemblyVersion("8.2.0.10898")]
|
||||
[assembly: AssemblyFileVersion("8.2.0.10898")]
|
||||
[assembly: AssemblyVersion("8.1.0.10898")]
|
||||
[assembly: AssemblyFileVersion("8.1.0.10898")]
|
||||
|
@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
|
||||
// You can specify all the values or you can default the Build and Revision Numbers
|
||||
// by using the '*' as shown below:
|
||||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
[assembly: AssemblyVersion("8.2.0.10898")]
|
||||
[assembly: AssemblyFileVersion("8.2.0.10898")]
|
||||
[assembly: AssemblyVersion("8.1.0.10898")]
|
||||
[assembly: AssemblyFileVersion("8.1.0.10898")]
|
||||
|
@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
|
||||
//
|
||||
// You can specify all the values or you can default the Build and Revision Numbers
|
||||
// by using the '*' as shown below:
|
||||
[assembly: AssemblyVersion("8.2.0.10898")]
|
||||
[assembly: AssemblyFileVersion("8.2.0.10898")]
|
||||
[assembly: AssemblyVersion("8.1.0.10898")]
|
||||
[assembly: AssemblyFileVersion("8.1.0.10898")]
|
||||
|
@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
|
||||
// You can specify all the values or you can default the Build and Revision Numbers
|
||||
// by using the '*' as shown below:
|
||||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
[assembly: AssemblyVersion("8.2.0.10898")]
|
||||
[assembly: AssemblyFileVersion("8.2.0.10898")]
|
||||
[assembly: AssemblyVersion("8.1.0.10898")]
|
||||
[assembly: AssemblyFileVersion("8.1.0.10898")]
|
||||
|
@ -376,8 +376,34 @@ namespace MotoTrbo_GW
|
||||
}
|
||||
|
||||
|
||||
private void FetchAudioSettings()
|
||||
private void ContinueConstructor()
|
||||
{
|
||||
|
||||
if (!registeredIP)
|
||||
{
|
||||
tabVoice.Enabled = false;
|
||||
|
||||
DialogResult result = FeedbackRadMessageBox.ShowExclamation("Please register your copy of MotoTrbo Gateway using the Administrative Module.\n Your IP address is:" + YourIPaddress, "Info");
|
||||
if (result == DialogResult.OK)
|
||||
Application.Exit();
|
||||
}
|
||||
else if (registeredIP && !App.isValidVersion(APP_SERVER_VERSION,
|
||||
System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString()))
|
||||
{
|
||||
DialogResult dr = RadMessageBox.Show("Please update your version of software to the latest one required by Application Server. Do you wish to update now?",
|
||||
"Update required...", MessageBoxButtons.YesNo, RadMessageIcon.Exclamation);
|
||||
|
||||
if (dr == DialogResult.Yes)
|
||||
{
|
||||
CheckForUpdate(true);
|
||||
Application.Exit();
|
||||
}
|
||||
else
|
||||
Application.Exit();
|
||||
}
|
||||
else
|
||||
{
|
||||
// Get Audio settings
|
||||
DBsettingsManager dbSettings = new DBsettingsManager(DBServer, DBSchema, DBUser, DBPass, DBPort);
|
||||
|
||||
string tmpSamplaRate = dbSettings.getSettingValue(0, "sampleRate");
|
||||
@ -408,99 +434,6 @@ namespace MotoTrbo_GW
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
private void ContinueConstructor()
|
||||
{
|
||||
|
||||
if (!registeredIP)
|
||||
{
|
||||
tabVoice.Enabled = false;
|
||||
|
||||
DialogResult result = FeedbackRadMessageBox.ShowExclamation("Please register your copy of MotoTrbo Gateway using the Administrative Module.\n Your IP address is:" + YourIPaddress, "Info");
|
||||
if (result == DialogResult.OK)
|
||||
Application.Exit();
|
||||
}
|
||||
else if (registeredIP && !App.isValidVersion(APP_SERVER_VERSION,
|
||||
System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString()))
|
||||
{
|
||||
DialogResult dr = RadMessageBox.Show("Please update your version of software to the latest one required by Application Server. Do you wish to update now?",
|
||||
"Update required...", MessageBoxButtons.YesNo, RadMessageIcon.Exclamation);
|
||||
|
||||
if (dr == DialogResult.Yes)
|
||||
CheckForUpdate(true);
|
||||
|
||||
Application.Exit();
|
||||
}
|
||||
else
|
||||
{
|
||||
//new code
|
||||
List <Gateway> listGW = new List<Gateway>();
|
||||
try
|
||||
{
|
||||
|
||||
if (!string.IsNullOrEmpty(DBServer))
|
||||
{
|
||||
listGW = getGWidFromDB(DBServer);
|
||||
}
|
||||
|
||||
|
||||
if (listGW.Count == 0)
|
||||
{
|
||||
DBServer = "127.0.0.1";
|
||||
listGW = getGWidFromDB(DBServer);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
SafeMobileLib.Utils.WriteLine("Ex on find automat the gateway ID:" + ex.ToString());
|
||||
}
|
||||
|
||||
|
||||
try
|
||||
{
|
||||
if (listGW.Count == 0)
|
||||
{
|
||||
FeedbackRadMessageBox.ShowError("Gateway IP not present in DB\n\r Please go to Administrative module and register this GW with IP:!!!" + DBServer, "IP missing");
|
||||
|
||||
System.Environment.Exit(0);
|
||||
return;
|
||||
}
|
||||
else
|
||||
{
|
||||
GWID = ((Gateway)listGW[0]).Id;
|
||||
source = new IniConfigSource(Main.CFG_FILE);
|
||||
source.Configs["Gateway"].Set("id", GWID);
|
||||
// source.Configs["NAI"].Set("peerID", ((Gateway)listGW[0]).Peer_id);
|
||||
source.Save();
|
||||
|
||||
SafeMobileLib.Utils.WriteLine("Gateway ID is " + GWID, ConsoleColor.Cyan);
|
||||
|
||||
//SafeMobileLib.Utils.WriteLine("ID:" + GWID + " saved to config file.");
|
||||
btGWID.Text = GWID.ToString();
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
SafeMobileLib.Utils.WriteLine("DB error!!!");
|
||||
SafeMobileLib.Utils.WriteLine(ex.ToString());
|
||||
|
||||
FeedbackRadMessageBox.ShowError("DB error.\n\rPlease turn down the firewall or add an exception for the Datebase in the firewall and try again!!!\n\r DB ip:" + DBServer,
|
||||
"DB error");
|
||||
|
||||
|
||||
System.Environment.Exit(0);
|
||||
//System.Windows.Forms.Application.Exit();
|
||||
return;
|
||||
}
|
||||
//end of new code
|
||||
|
||||
|
||||
// Get Audio settings
|
||||
FetchAudioSettings();
|
||||
|
||||
|
||||
//int asio driver object
|
||||
if (Main.AudioDriver == AudioDriverType.Asio)
|
||||
@ -536,7 +469,91 @@ namespace MotoTrbo_GW
|
||||
}
|
||||
}
|
||||
}
|
||||
//old code
|
||||
/*if (GWID == -1)
|
||||
{
|
||||
int id = getGWidFromDB(YourIPaddress);
|
||||
if (id == -1)
|
||||
{
|
||||
RadMessageBox.Show("Gateway IP not present in DB\n\r Please go to Administrative module and register this GW with IP:!!!" + YourIPaddress, "IP missing", MessageBoxButtons.OK, RadMessageIcon.Error);
|
||||
System.Environment.Exit(0);
|
||||
}
|
||||
else
|
||||
{
|
||||
GWID = id;
|
||||
source = new IniConfigSource(Main.CFG_FILE);
|
||||
source.Configs["Gateway"].Set("id", id);
|
||||
source.Save();
|
||||
SafeMobileLib.Utils.WriteLine("ID:" + id +" saved to config file.");
|
||||
}
|
||||
}*/
|
||||
|
||||
//new code
|
||||
List <Gateway> listGW = new List<Gateway>();
|
||||
try
|
||||
{
|
||||
listGW = getGWidFromDB(YourIPaddress);
|
||||
|
||||
if (listGW.Count == 0)
|
||||
{
|
||||
if (DBServer.Contains("127.0.0.1") || (DBServer.ToUpper().Contains("LOCALHOST")))
|
||||
listGW = getGWidFromDB("127.0.0.1");
|
||||
}
|
||||
else
|
||||
{
|
||||
if (GWID != -1)
|
||||
{
|
||||
Boolean find = false;
|
||||
foreach (Gateway obj in listGW)
|
||||
if (obj.Id == GWID) { find = true; break; }
|
||||
if ((!find) && (DBServer.Contains("127.0.0.1") || (DBServer.ToUpper().Contains("LOCALHOST"))))
|
||||
listGW = getGWidFromDB("127.0.0.1");
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
SafeMobileLib.Utils.WriteLine("Ex on find automat the gateway ID:" + ex.ToString());
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
if (listGW.Count == 0)
|
||||
{
|
||||
FeedbackRadMessageBox.ShowError("Gateway IP not present in DB\n\r Please go to Administrative module and register this GW with IP:!!!" + YourIPaddress, "IP missing");
|
||||
|
||||
System.Environment.Exit(0);
|
||||
return;
|
||||
}
|
||||
else
|
||||
{
|
||||
GWID = ((Gateway)listGW[0]).Id;
|
||||
source = new IniConfigSource(Main.CFG_FILE);
|
||||
source.Configs["Gateway"].Set("id", GWID);
|
||||
// source.Configs["NAI"].Set("peerID", ((Gateway)listGW[0]).Peer_id);
|
||||
source.Save();
|
||||
|
||||
SafeMobileLib.Utils.WriteLine("Gateway ID is " + GWID, ConsoleColor.Cyan);
|
||||
|
||||
//SafeMobileLib.Utils.WriteLine("ID:" + GWID + " saved to config file.");
|
||||
btGWID.Text = GWID.ToString();
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
SafeMobileLib.Utils.WriteLine("DB error!!!");
|
||||
SafeMobileLib.Utils.WriteLine(ex.ToString());
|
||||
|
||||
FeedbackRadMessageBox.ShowError("DB error.\n\rPlease turn down the firewall or add an exception for the Datebase in the firewall and try again!!!\n\r DB ip:" + YourIPaddress,
|
||||
"DB error");
|
||||
|
||||
|
||||
System.Environment.Exit(0);
|
||||
//System.Windows.Forms.Application.Exit();
|
||||
return;
|
||||
}
|
||||
//end of new code
|
||||
|
||||
/*try
|
||||
{
|
||||
@ -1257,7 +1274,7 @@ because base station {radioGwID} failed to send PTT", ConsoleColor.Red);
|
||||
IPEndPoint serverEndPoint = new IPEndPoint(IPAddress.Parse(Main.ApplicationServer), registrationPort);
|
||||
client.Connect(serverEndPoint);
|
||||
NetworkStream clientStream = client.GetStream();
|
||||
YourIPaddress = (client.Client.LocalEndPoint.ToString().Split(":".ToCharArray()))[0];
|
||||
YourIPaddress = (client.Client.LocalEndPoint.ToString().Split(':'))[0];
|
||||
|
||||
Version v = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
|
||||
|
||||
|
@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
|
||||
// You can specify all the values or you can default the Build and Revision Numbers
|
||||
// by using the '*' as shown below:
|
||||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
[assembly: AssemblyVersion("8.2.0.10898")]
|
||||
[assembly: AssemblyFileVersion("8.2.0.10898")]
|
||||
[assembly: AssemblyVersion("8.1.0.10898")]
|
||||
[assembly: AssemblyFileVersion("8.1.0.10898")]
|
||||
|
@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
|
||||
// You can specify all the values or you can default the Build and Revision Numbers
|
||||
// by using the '*' as shown below:
|
||||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
[assembly: AssemblyVersion("8.2.0.10898")]
|
||||
[assembly: AssemblyFileVersion("8.2.0.10898")]
|
||||
[assembly: AssemblyVersion("8.1.0.10898")]
|
||||
[assembly: AssemblyFileVersion("8.1.0.10898")]
|
||||
|
10
ReportsLibrary/Properties/VersionInfo.cs
Normal file
10
ReportsLibrary/Properties/VersionInfo.cs
Normal file
@ -0,0 +1,10 @@
|
||||
|
||||
// Generated on Wed, Jun 5, 2024 3:16:51 PM by prebuild script
|
||||
namespace SafeDispatch-git
|
||||
{
|
||||
public class VersionInfo
|
||||
{
|
||||
public string Version{ get; set; } = "8.1.0.10898-7-ga2c35ac";
|
||||
}
|
||||
}
|
||||
|
@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
|
||||
// You can specify all the values or you can default the Build and Revision Numbers
|
||||
// by using the '*' as shown below:
|
||||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
[assembly: AssemblyVersion("8.2.0.10898")]
|
||||
[assembly: AssemblyFileVersion("8.2.0.10898")]
|
||||
[assembly: AssemblyVersion("8.1.0.10898")]
|
||||
[assembly: AssemblyFileVersion("8.1.0.10898")]
|
||||
|
@ -452,9 +452,13 @@ namespace SafeMobileLib
|
||||
|
||||
BatchHistoryData batchHistObj = null;
|
||||
|
||||
|
||||
|
||||
try
|
||||
{
|
||||
|
||||
|
||||
|
||||
lat = Convert.ToDouble(dr["lat"]);
|
||||
lng = Convert.ToDouble(dr["lng"]);
|
||||
timegmt = Convert.ToInt32(dr["timegmt"]);
|
||||
@ -464,22 +468,16 @@ namespace SafeMobileLib
|
||||
|
||||
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();
|
||||
|
||||
|
||||
}
|
||||
|
@ -74,7 +74,7 @@ namespace SafeMobileLib
|
||||
Int32 sc_id = 0;
|
||||
Int32 job_status = 0;
|
||||
int specified_end_time = -1;
|
||||
string[] messageString = mess.Split("^".ToCharArray());
|
||||
string[] messageString = mess.Split('^');
|
||||
string text = messageString[0];
|
||||
string comment = messageString[1];
|
||||
string priority = messageString[2];
|
||||
|
@ -1018,7 +1018,7 @@ namespace SafeMobileLib
|
||||
vehResponse resp;
|
||||
NpgsqlCommand cmd;
|
||||
bool isDeleted;
|
||||
string[] idListArray = idlist.Replace("(", "").Replace(")", "").Split(",".ToCharArray());
|
||||
string[] idListArray = idlist.Replace("(", "").Replace(")", "").Split(',');
|
||||
isDeleted = isUnitDeleted(idListArray[0]);
|
||||
|
||||
NpgsqlTransaction transaction = null;
|
||||
|
@ -25,8 +25,6 @@ namespace SafeMobileLib
|
||||
private bool isSSL = true;
|
||||
private Int64 lastEmailTime = 0;
|
||||
private Int64 startEmailServiceTime = 0;
|
||||
public static Dictionary<string, int> blackList = new Dictionary<string, int>();
|
||||
public const int MAX_ATTEMPTS = 100;
|
||||
|
||||
// blank constructor in order to be used in Email Checking
|
||||
public EmailServerSSL()
|
||||
@ -336,7 +334,7 @@ namespace SafeMobileLib
|
||||
|
||||
if (ets.from.Contains("@"))
|
||||
{
|
||||
string temp = (ets.from.Split("@".ToCharArray()))[0];
|
||||
string temp = (ets.from.Split('@'))[0];
|
||||
|
||||
int i_id = 0;
|
||||
bool valid = Int32.TryParse(temp, out i_id);
|
||||
@ -380,46 +378,11 @@ namespace SafeMobileLib
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
public static void HandleBlacklist(string key)
|
||||
{
|
||||
// add key to backlist
|
||||
if (!blackList.ContainsKey(key))
|
||||
blackList.Add(key, MAX_ATTEMPTS);
|
||||
}
|
||||
|
||||
public static bool IsBlacklisted(string key)
|
||||
{
|
||||
|
||||
if (!blackList.ContainsKey(key))
|
||||
return false;
|
||||
|
||||
// avoid to connect to pop3 MAX_ATTEMPTS times => give another chance to try to connect to pop 3 when count = 0
|
||||
int count = blackList[key];
|
||||
if (count == 0)
|
||||
{
|
||||
blackList.Remove(key);
|
||||
return false;
|
||||
}
|
||||
|
||||
blackList[key] = count - 1;
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Connect to the Pop Server in order to be used to get the emails
|
||||
/// </summary>
|
||||
private void ConnectEmailPopServer()
|
||||
{
|
||||
if (IsBlacklisted(serverIP))
|
||||
{
|
||||
|
||||
Utils.WriteLine($"ConnectEmailPopServer : Could not conenct to the pop server '{serverIP}'. The pop server '{serverIP}' is in blacklist count = {blackList[serverIP]}");
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
Thread t = new Thread(() =>
|
||||
{
|
||||
ConnectAsync();
|
||||
@ -430,17 +393,8 @@ namespace SafeMobileLib
|
||||
|
||||
private void ConnectAsync()
|
||||
{
|
||||
try
|
||||
{
|
||||
|
||||
if (popClient != null && popClient.Connected)
|
||||
popClient.Disconnect();
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Console.WriteLine(ex.ToString());
|
||||
|
||||
}
|
||||
|
||||
popClient = null;
|
||||
popClient = new Pop3Client();
|
||||
@ -458,25 +412,18 @@ namespace SafeMobileLib
|
||||
Console.ForegroundColor = ConsoleColor.Yellow;
|
||||
Console.WriteLine("PopServerNotFoundException -> " + ee.ToString());
|
||||
Console.ForegroundColor = ConsoleColor.Gray;
|
||||
|
||||
HandleBlacklist(serverIP);
|
||||
|
||||
}
|
||||
catch (InvalidLoginException e)
|
||||
{
|
||||
Console.ForegroundColor = ConsoleColor.Yellow;
|
||||
Console.WriteLine("InvalidLoginException -> " + e.ToString());
|
||||
Console.ForegroundColor = ConsoleColor.Gray;
|
||||
|
||||
HandleBlacklist(serverIP);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Console.ForegroundColor = ConsoleColor.Red;
|
||||
Console.WriteLine("ConnectEmailPopServer -> " + ex.ToString());
|
||||
Console.ForegroundColor = ConsoleColor.Gray;
|
||||
|
||||
HandleBlacklist(serverIP);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -91,8 +91,7 @@ namespace SafeMobileLib
|
||||
{
|
||||
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
|
||||
{
|
||||
|
@ -24,7 +24,7 @@ namespace SafeMobileLib.Helpers
|
||||
IPEndPoint serverEndPoint = new IPEndPoint(IPAddress.Parse(appServerIP), registrationPort);
|
||||
client.Connect(serverEndPoint);
|
||||
NetworkStream clientStream = client.GetStream();
|
||||
GatewayIP = (client.Client.LocalEndPoint.ToString().Split(":".ToCharArray()))[0];
|
||||
GatewayIP = (client.Client.LocalEndPoint.ToString().Split(':'))[0];
|
||||
|
||||
UTF8Encoding encoding = new UTF8Encoding();
|
||||
byte[] buffer = encoding.GetBytes("200");
|
||||
|
@ -16,7 +16,7 @@ namespace SafeMobileLib
|
||||
string strInterface = "";
|
||||
try
|
||||
{
|
||||
string[] arrStr = IPstr.Split(".".ToCharArray());
|
||||
string[] arrStr = IPstr.Split('.');
|
||||
int lastPartOfIP = Convert.ToInt32(arrStr[3]);
|
||||
arrStr[3] = (lastPartOfIP + 1).ToString();
|
||||
strInterface = arrStr[0] + "." + arrStr[1] + "." + arrStr[2] + "." + arrStr[3];
|
||||
@ -34,7 +34,7 @@ namespace SafeMobileLib
|
||||
string strInterface = "";
|
||||
try
|
||||
{
|
||||
string[] arrStr = IPstr.Split(".".ToCharArray());
|
||||
string[] arrStr = IPstr.Split('.');
|
||||
int lastPartOfIP = Convert.ToInt32(arrStr[3]);
|
||||
arrStr[3] = (lastPartOfIP - 1).ToString();
|
||||
strInterface = arrStr[0] + "." + arrStr[1] + "." + arrStr[2] + "." + arrStr[3];
|
||||
@ -62,9 +62,9 @@ namespace SafeMobileLib
|
||||
System.Net.WebResponse resp = req.GetResponse();
|
||||
System.IO.StreamReader sr = new System.IO.StreamReader(resp.GetResponseStream());
|
||||
string response = sr.ReadToEnd().Trim();
|
||||
string[] a = response.Split(":".ToCharArray());
|
||||
string[] a = response.Split(':');
|
||||
string a2 = a[1].Substring(1);
|
||||
string[] a3 = a2.Split("<".ToCharArray());
|
||||
string[] a3 = a2.Split('<');
|
||||
a4 = a3[0];
|
||||
if(a4 == "")
|
||||
a4 = new WebClient().DownloadString(@"http://icanhazip.com").Trim();
|
||||
|
@ -42,11 +42,11 @@ namespace SafeMobileLib
|
||||
recv = s.Receive(b);
|
||||
else
|
||||
break;//break if socket == null
|
||||
|
||||
if (recv == 0)
|
||||
continue;//continue if return nr bytes == 0
|
||||
|
||||
|
||||
if (OnNewDataRecv != null)
|
||||
{
|
||||
byte[] tmp = new byte[recv];
|
||||
for (int i = 0; i < recv; i++)
|
||||
{
|
||||
@ -56,14 +56,22 @@ namespace SafeMobileLib
|
||||
byte[] decByte = Encrypted ? Encryption.Decrypt(tmp, EncryptionAlgorithm.Des64) : tmp;
|
||||
|
||||
// trigger event
|
||||
if (OnNewDataRecv != null)
|
||||
OnNewDataRecv(decByte, decByte.Length);
|
||||
}
|
||||
|
||||
if (OnNewDataReceived != null)
|
||||
{
|
||||
byte[] tmp = new byte[recv];
|
||||
for (int i = 0; i < recv; i++)
|
||||
{
|
||||
tmp[i] = b[i];
|
||||
}
|
||||
|
||||
byte[] decByte = Encrypted ? Encryption.Decrypt(tmp, EncryptionAlgorithm.Des64) : tmp;
|
||||
|
||||
// trigger event
|
||||
if (OnNewDataReceived != null)
|
||||
OnNewDataReceived(mcastGroup, decByte, decByte.Length);
|
||||
|
||||
}
|
||||
|
||||
|
||||
if (s == null)
|
||||
@ -100,19 +108,27 @@ namespace SafeMobileLib
|
||||
byte[] b = new byte[65507];
|
||||
Thread.Sleep(1);
|
||||
int recv = s.Receive(b);
|
||||
|
||||
if (OnNewDataRecv != null)
|
||||
{
|
||||
byte[] tmp = new byte[recv];
|
||||
for (int i = 0; i < recv; i++)
|
||||
{
|
||||
tmp[i] = b[i];
|
||||
}
|
||||
|
||||
if (this.OnNewDataRecv != null)
|
||||
this.OnNewDataRecv(tmp, tmp.Length);
|
||||
}
|
||||
|
||||
if (OnNewDataReceived != null)
|
||||
{
|
||||
byte[] tmp = new byte[recv];
|
||||
for (int i = 0; i < recv; i++)
|
||||
{
|
||||
tmp[i] = b[i];
|
||||
}
|
||||
if (this.OnNewDataReceived != null)
|
||||
this.OnNewDataReceived(mcastGroup, tmp, tmp.Length);
|
||||
|
||||
}
|
||||
|
||||
if (s == null)
|
||||
{
|
||||
@ -201,17 +217,16 @@ namespace SafeMobileLib
|
||||
IPEndPoint ipep = new IPEndPoint(myIP, port);
|
||||
s.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, 1);
|
||||
s.Bind(ipep);
|
||||
|
||||
IPAddress ip = IPAddress.Parse(mcastGroup);
|
||||
s.SetSocketOption(SocketOptionLevel.IP, SocketOptionName.AddMembership, new MulticastOption(ip, myIP));
|
||||
s.SetSocketOption(SocketOptionLevel.IP, SocketOptionName.MulticastTimeToLive, int.Parse("1"));
|
||||
s.SetSocketOption(SocketOptionLevel.IP,
|
||||
SocketOptionName.MulticastTimeToLive, int.Parse("1"));
|
||||
listenThread = new Thread(new ThreadStart(Listen));
|
||||
listenThread.IsBackground = true;
|
||||
}
|
||||
|
||||
if (listenThread != null)
|
||||
listenThread.Start();
|
||||
|
||||
ret = true;
|
||||
|
||||
Utils.WriteLine($"++++++++++++++++++++++++++++++++++++++++++\nUdpMulticast bind on {mcastGroup}:{port} Ethernet: {myIP}\n+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++");
|
||||
@ -228,14 +243,12 @@ namespace SafeMobileLib
|
||||
bool ret = false;
|
||||
working = true;
|
||||
useThreadPool = true;
|
||||
|
||||
try
|
||||
{
|
||||
if (s == null)
|
||||
{
|
||||
s = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
|
||||
}
|
||||
|
||||
if (s != null)
|
||||
{
|
||||
Utils.WriteLine(String.Format("[### {0:H:mm:ss} ###] Port multi cast {1}", DateTime.Now, port));
|
||||
@ -244,7 +257,8 @@ namespace SafeMobileLib
|
||||
s.Bind(ipep);
|
||||
IPAddress ip = IPAddress.Parse(mcastGroup);
|
||||
s.SetSocketOption(SocketOptionLevel.IP, SocketOptionName.AddMembership, new MulticastOption(ip, IPAddress.Any));
|
||||
s.SetSocketOption(SocketOptionLevel.IP, SocketOptionName.MulticastTimeToLive, int.Parse("1"));
|
||||
s.SetSocketOption(SocketOptionLevel.IP,
|
||||
SocketOptionName.MulticastTimeToLive, int.Parse("1"));
|
||||
|
||||
ThreadPool.QueueUserWorkItem(new WaitCallback(Listen_pool));
|
||||
|
||||
@ -268,7 +282,6 @@ namespace SafeMobileLib
|
||||
{
|
||||
s = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
|
||||
}
|
||||
|
||||
if (s != null)
|
||||
{
|
||||
Utils.WriteLine(String.Format("[### {0:H:mm:ss} ###] Port multi cast {1}", DateTime.Now, port));
|
||||
@ -277,14 +290,13 @@ namespace SafeMobileLib
|
||||
s.Bind(ipep);
|
||||
IPAddress ip = IPAddress.Parse(mcastGroup);
|
||||
s.SetSocketOption(SocketOptionLevel.IP, SocketOptionName.AddMembership, new MulticastOption(ip, IPAddress.Any));
|
||||
s.SetSocketOption(SocketOptionLevel.IP, SocketOptionName.MulticastTimeToLive, int.Parse("1"));
|
||||
s.SetSocketOption(SocketOptionLevel.IP,
|
||||
SocketOptionName.MulticastTimeToLive, int.Parse("1"));
|
||||
listenThread = new Thread(new ThreadStart(Listen_Decoded));
|
||||
listenThread.IsBackground = true;
|
||||
}
|
||||
|
||||
if (listenThread != null)
|
||||
listenThread.Start();
|
||||
|
||||
ret = true;
|
||||
}
|
||||
catch (Exception ex)
|
||||
|
@ -441,10 +441,8 @@ namespace SafeMobileLib
|
||||
Int32 tmp = cmdok.Length + 1;
|
||||
tmp += tmp.ToString().Length;
|
||||
String TMPcmdok = "#" + tmp.ToString() + cmdok;
|
||||
if (tmp != TMPcmdok.Length)
|
||||
cmdok = "#" + TMPcmdok.Length + cmdok;
|
||||
else
|
||||
cmdok = TMPcmdok;
|
||||
if (tmp != TMPcmdok.Length) cmdok = "#" + TMPcmdok.Length + cmdok;
|
||||
else cmdok = TMPcmdok;
|
||||
|
||||
System.Text.Encoding enc = System.Text.Encoding.ASCII;
|
||||
byte[] buf = enc.GetBytes(cmdok);
|
||||
@ -1058,7 +1056,7 @@ namespace SafeMobileLib
|
||||
if (ret == "not_available")
|
||||
{
|
||||
string myIp = UdpMulticast.getPreferedIPAdress().ToString();
|
||||
string[] ip = myIp.Split(".".ToCharArray());
|
||||
string[] ip = myIp.Split('.');
|
||||
string baseIP = $"{ip[0]}.{ip[1]}.{ip[2]}";
|
||||
//4. scan lan range :41414/status
|
||||
for (int i = 1; i <= 255; i++)
|
||||
@ -1096,7 +1094,7 @@ namespace SafeMobileLib
|
||||
string rtpstart = o["data"]["ports"]["rtpstart"].ToString();
|
||||
string rtpend = o["data"]["ports"]["rtpend"].ToString();
|
||||
string publicIp = o["data"]["network"]["publicIp"].ToString();
|
||||
string sipPort = o["data"]["ports"]["udpbindaddr"].ToString().Split(":".ToCharArray())[1];
|
||||
string sipPort = o["data"]["ports"]["udpbindaddr"].ToString().Split(':')[1];
|
||||
ret = true;
|
||||
}
|
||||
catch { Utils.WriteLine("Error on parse server response!", ConsoleColor.Red); }
|
||||
|
@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
|
||||
//
|
||||
// You can specify all the values or you can default the Revision and Build Numbers
|
||||
// by using the '*' as shown below:
|
||||
[assembly: AssemblyVersion("8.2.0.10898")]
|
||||
[assembly: AssemblyFileVersion("8.2.0.10898")]
|
||||
[assembly: AssemblyVersion("8.1.0.10898")]
|
||||
[assembly: AssemblyFileVersion("8.1.0.10898")]
|
||||
|
@ -152,7 +152,7 @@ namespace MapGoogle
|
||||
Symbolx ret = new Symbolx();
|
||||
NextCount++;
|
||||
ret.ID = (byte)NextCount;
|
||||
String[] param = FileName.Split("\\".ToCharArray());
|
||||
String[] param = FileName.Split('\\');
|
||||
if (param.Length != 0)
|
||||
ret.Name = param[param.Length - 1];
|
||||
symbolsArray.Add(ret);
|
||||
@ -659,7 +659,7 @@ namespace MapGoogle
|
||||
if (MainForm2.MapType == MapTYPE.Google)
|
||||
{
|
||||
parent.ListShapeCMD.Add(MainForm2.ShapeCMD);
|
||||
String[] listS = MainForm2.ShapeCMD.Split(",".ToCharArray());
|
||||
String[] listS = MainForm2.ShapeCMD.Split(',');
|
||||
//String PolyCMD = "poly,false," + "#" + color.R.ToString("X2") + color.G.ToString("X2") + color.B.ToString("X2") + "," + Weight + "," + listS[1];
|
||||
String PolyCMD = "poly,true," + "#" + color.R.ToString("X2") + color.G.ToString("X2") + color.B.ToString("X2") + "," + Weight + "," + listS[1];
|
||||
parent.ListShapeCMD.Add(PolyCMD);
|
||||
|
@ -591,10 +591,10 @@ namespace Safedispatch_4_0
|
||||
foreach (RadTreeNode groupNode in treeViewUnits.Nodes)
|
||||
{
|
||||
// go through each unit and get the checked ones
|
||||
string[] splitHandled_by = pd.Handled_by.Split(";".ToCharArray());
|
||||
string[] splitHandled_by = pd.Handled_by.Split(';');
|
||||
foreach (RadTreeNode unitNode in groupNode.Nodes)
|
||||
{
|
||||
unitNode.Checked = (Array.IndexOf(splitHandled_by, unitNode.Tag.ToString()) > -1);
|
||||
unitNode.Checked = (Array.IndexOf(splitHandled_by, unitNode.Tag.ToString())>-1);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -624,7 +624,7 @@ namespace Safedispatch_4_0
|
||||
foreach (RadTreeNode groupNode in treeViewUnits.Nodes)
|
||||
{
|
||||
// go through each unit and get the checked ones
|
||||
string[] splitHandled_by = CurrentConfiguration.Handled_by.Split(";".ToCharArray());
|
||||
string[] splitHandled_by = CurrentConfiguration.Handled_by.Split(';');
|
||||
foreach (RadTreeNode unitNode in groupNode.Nodes)
|
||||
{
|
||||
unitNode.Checked = (Array.IndexOf(splitHandled_by, unitNode.Tag.ToString()) > -1);
|
||||
|
@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
|
||||
// You can specify all the values or you can default the Build and Revision Numbers
|
||||
// by using the '*' as shown below:
|
||||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
[assembly: AssemblyVersion("8.2.0.10898")]
|
||||
[assembly: AssemblyFileVersion("8.2.0.10898")]
|
||||
[assembly: AssemblyVersion("8.1.0.10898")]
|
||||
[assembly: AssemblyFileVersion("8.1.0.10898")]
|
||||
|
@ -1151,7 +1151,7 @@ namespace Safedispatch_4_0
|
||||
{
|
||||
String tmpstr = url.Remove(0, url.IndexOf("points") + 7);
|
||||
//Console.WriteLine("TmpStr:" + tmpstr);
|
||||
String[] tmp = tmpstr.Split(",".ToCharArray());
|
||||
String[] tmp = tmpstr.Split(',');
|
||||
//begin
|
||||
|
||||
Int32 max = tmp.Length;
|
||||
@ -1204,7 +1204,7 @@ namespace Safedispatch_4_0
|
||||
/// <param name="mapResponse">String containing the response from the map</param>
|
||||
private void ParseLatAndLng(string mapResponse)
|
||||
{
|
||||
String[] tmp = mapResponse.Split(",".ToCharArray());
|
||||
String[] tmp = mapResponse.Split(',');
|
||||
Double lat = 0, lng = 0;
|
||||
string decimalSeparator = System.Globalization.CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator;
|
||||
String tmpLat = tmp[0];
|
||||
|
@ -1015,7 +1015,7 @@ namespace Safedispatch_4_0
|
||||
else ckSpeedLimit.Checked = false;
|
||||
tbSpeed.Value = (((ZoneClass)((RadListDataItem)cbZoneEdit.SelectedItem).Value)).speed;
|
||||
String listOfUnits = (((ZoneClass)((RadListDataItem)cbZoneEdit.SelectedItem).Value)).unitids;
|
||||
String[] tmp = listOfUnits.Split(",".ToCharArray());
|
||||
String[] tmp = listOfUnits.Split(',');
|
||||
Hashtable tmpHashName = new Hashtable();
|
||||
if (tmp.Count() > 1)
|
||||
{
|
||||
|
@ -2103,7 +2103,7 @@ namespace Safedispatch_4_0
|
||||
}
|
||||
// Console.WriteLine("Update cmd:" + updatecomand);
|
||||
Thread.Sleep(1);
|
||||
String[] tmp = updatecomand.Split(",".ToCharArray());
|
||||
String[] tmp = updatecomand.Split(',');
|
||||
if (docLoad)
|
||||
{
|
||||
//SM.Debug("Oneunit"+MainForm2.oneunit);
|
||||
@ -2116,7 +2116,7 @@ namespace Safedispatch_4_0
|
||||
//SM.Debug("Value of displayname:" + MainForm2.Displaywithname);
|
||||
if (((MainForm2.Displaywithname) && (updatecomand.Contains("setDataset,"))) || (MainForm2.ForcePutLabelsONGoogle))
|
||||
{
|
||||
String[] datas = updatecomand.Split(",".ToCharArray());
|
||||
String[] datas = updatecomand.Split(',');
|
||||
if (datas.Length > 1)
|
||||
{
|
||||
//System.Threading.Thread.Sleep(100);
|
||||
|
@ -817,7 +817,7 @@ namespace Safedispatch_4_0
|
||||
IPictureMarkerSymbol bitmapPictureMarkerSymbolCls = new
|
||||
ESRI.ArcGIS.Display.PictureMarkerSymbolClass();
|
||||
//check if bmp file is saved for emergency
|
||||
string fileNamePattern = veh.IconName.Split("/".ToCharArray())[1].Split(".".ToCharArray())[0];
|
||||
string fileNamePattern = veh.IconName.Split('/')[1].Split('.')[0];
|
||||
string filePath = System.Windows.Forms.Application.StartupPath + @"\resource\cars\" + fileNamePattern + ".png";
|
||||
Image ArcgisImage = null;
|
||||
veh.IconID = veh.is_emergency ? 10000 + veh.IconID : veh.IconID % 10000;
|
||||
|
@ -510,7 +510,7 @@ namespace Safedispatch_4_0.Radio
|
||||
// #seqID#123#gatewayId.gatewayRadioId#result#dispatcherID#
|
||||
string cmd = "";
|
||||
Utils.Convert_text_For_multicast(
|
||||
$"#1234#{mBusCmd}#{parent.SipGWIDandRadioID.Split(".".ToCharArray())[0]}.{parent.SipGWIDandRadioID.Split(".".ToCharArray())[1]}#2#{MainForm2.userIDX}#",
|
||||
$"#1234#{mBusCmd}#{parent.SipGWIDandRadioID.Split('.')[0]}.{parent.SipGWIDandRadioID.Split('.')[1]}#2#{MainForm2.userIDX}#",
|
||||
out cmd);
|
||||
this.Invoke((Action)(() => { parent.AddDataToSystemGrid(false, cmd); }));
|
||||
}
|
||||
@ -527,7 +527,7 @@ namespace Safedispatch_4_0.Radio
|
||||
// #seqID#122#gatewayId.gatewayRadioId#result#dispatcherID#
|
||||
string cmd = "";
|
||||
Utils.Convert_text_For_multicast(
|
||||
$"#1234#122#{parent.SipGWIDandRadioID.Split(".".ToCharArray())[0]}.{parent.SipGWIDandRadioID.Split(".".ToCharArray())[1]}#2#{MainForm2.userIDX}#",
|
||||
$"#1234#122#{parent.SipGWIDandRadioID.Split('.')[0]}.{parent.SipGWIDandRadioID.Split('.')[1]}#2#{MainForm2.userIDX}#",
|
||||
out cmd);
|
||||
this.Invoke((Action)(() => { parent.AddDataToSystemGrid(false, cmd); }));
|
||||
}
|
||||
@ -553,7 +553,7 @@ namespace Safedispatch_4_0.Radio
|
||||
// Show event on System log
|
||||
// #seqID#123#gatewayId.gatewayRadioId#result#dispatcherID#
|
||||
Utils.Convert_text_For_multicast(
|
||||
$"#1234#{mbusCmd}#{parent.SipGWIDandRadioID.Split(".".ToCharArray())[0]}.{parent.SipGWIDandRadioID.Split(".".ToCharArray())[1]}#1#{MainForm2.userIDX}#",
|
||||
$"#1234#{mbusCmd}#{parent.SipGWIDandRadioID.Split('.')[0]}.{parent.SipGWIDandRadioID.Split('.')[1]}#1#{MainForm2.userIDX}#",
|
||||
out cmd);
|
||||
this.Invoke((Action)(() => { parent.AddDataToSystemGrid(false, cmd); }));
|
||||
}
|
||||
@ -563,7 +563,7 @@ namespace Safedispatch_4_0.Radio
|
||||
string seqId = parent.GetCallRequestForSip(targetSipID);
|
||||
if (seqId != null)
|
||||
{
|
||||
cmd = $"#{seqId}#{mbusCmd}#{parent.SipGWIDandRadioID.Split(".".ToCharArray())[0]}.{parent.SipGWIDandRadioID.Split(".".ToCharArray())[1]}#1#{MainForm2.userIDX}#";
|
||||
cmd = $"#{seqId}#{mbusCmd}#{parent.SipGWIDandRadioID.Split('.')[0]}.{parent.SipGWIDandRadioID.Split('.')[1]}#1#{MainForm2.userIDX}#";
|
||||
parent.Send_UDP_cmd_sent_withOutID(cmd);
|
||||
}
|
||||
}
|
||||
@ -582,7 +582,7 @@ namespace Safedispatch_4_0.Radio
|
||||
// Show event on System log
|
||||
// #seqID#122#gatewayId.gatewayRadioId#result#dispatcherID#
|
||||
Utils.Convert_text_For_multicast(
|
||||
$"#1234#122#{parent.SipGWIDandRadioID.Split(".".ToCharArray())[0]}.{parent.SipGWIDandRadioID.Split(".".ToCharArray())[1]}#1#{MainForm2.userIDX}#",
|
||||
$"#1234#122#{parent.SipGWIDandRadioID.Split('.')[0]}.{parent.SipGWIDandRadioID.Split('.')[1]}#1#{MainForm2.userIDX}#",
|
||||
out cmd);
|
||||
this.Invoke((Action)(() => { parent.AddDataToSystemGrid(false, cmd); }));
|
||||
}
|
||||
@ -601,10 +601,8 @@ namespace Safedispatch_4_0.Radio
|
||||
|
||||
private void SimulateCallInitiated(string sourceCallSipID, string targetCallSipID, SafeMobileLib.CallType callType, ContactType sourceType)
|
||||
{
|
||||
string[] tmpArr = parent.SipGWIDandRadioID.Split(".".ToCharArray());
|
||||
|
||||
string gwID = tmpArr[0];
|
||||
string radioGwID = tmpArr[1];
|
||||
string gwID = parent.SipGWIDandRadioID.Split('.')[0];
|
||||
string radioGwID = parent.SipGWIDandRadioID.Split('.')[1];
|
||||
parent.Handle125Command(gwID, radioGwID, sourceCallSipID, 1, (int)callType, int.Parse(targetCallSipID), true);
|
||||
// Add info in system tab
|
||||
//#0.0#125#gatewayId.gatewayRadioId.sourceRadioId#callStatus# callType#targetId#
|
||||
@ -625,11 +623,8 @@ namespace Safedispatch_4_0.Radio
|
||||
|
||||
private void SimulateHangtime(string sourceCallSipID, string targetCallSipID, SafeMobileLib.CallType typeOfCall, ContactType sourceCallType)
|
||||
{
|
||||
|
||||
string[] tmpArr = parent.SipGWIDandRadioID.Split(".".ToCharArray());
|
||||
string gwID = tmpArr[0];
|
||||
string radioGwID = tmpArr[1];
|
||||
|
||||
string gwID = parent.SipGWIDandRadioID.Split('.')[0];
|
||||
string radioGwID = parent.SipGWIDandRadioID.Split('.')[1];
|
||||
parent.Handle125Command(gwID, radioGwID, sourceCallSipID, 2, (int)typeOfCall, int.Parse(targetCallSipID), true);
|
||||
// Show info in System Tab
|
||||
// Add info in system tab
|
||||
@ -645,11 +640,8 @@ namespace Safedispatch_4_0.Radio
|
||||
|
||||
private void SimulateCallEnded(string sourceCallSipID, string targetCallSipID, SafeMobileLib.CallType typeOfCall, ContactType sourceCallType)
|
||||
{
|
||||
string[] tmpArr = parent.SipGWIDandRadioID.Split(".".ToCharArray());
|
||||
string gwID = tmpArr[0];
|
||||
string radioGwID = tmpArr[1];
|
||||
|
||||
|
||||
string gwID = parent.SipGWIDandRadioID.Split('.')[0];
|
||||
string radioGwID = parent.SipGWIDandRadioID.Split('.')[1];
|
||||
parent.Handle125Command(gwID, radioGwID, sourceCallSipID, 3, (int)typeOfCall, int.Parse(targetCallSipID), true);
|
||||
// Show info in System Tab
|
||||
// Add info in system tab
|
||||
@ -1241,7 +1233,7 @@ namespace Safedispatch_4_0.Radio
|
||||
if (obj.group_cpsId == null)
|
||||
{
|
||||
GroupIDFromPath = obj.hddLocation;
|
||||
GroupIDFromSplit = GroupIDFromPath.Split("_".ToCharArray());
|
||||
GroupIDFromSplit = GroupIDFromPath.Split('_');
|
||||
userWhoWasCalled = GroupIDFromSplit[5];
|
||||
}
|
||||
else
|
||||
|
@ -775,7 +775,7 @@ namespace Safedispatch_4_0
|
||||
if (RepType == rep_type.JOB_TICKETING)
|
||||
{
|
||||
//get only checked elements from list
|
||||
string[] FilterTicketingDateList = rcbTicketingTime.Text.Trim().Split(";".ToCharArray());
|
||||
string[] FilterTicketingDateList = rcbTicketingTime.Text.Trim().Split(';');
|
||||
//
|
||||
if (FilterTicketingDateList.Count() > 0 && FilterTicketingDateList[0] != "")
|
||||
{
|
||||
|
@ -878,7 +878,7 @@ namespace Safedispatch_4_0
|
||||
//}
|
||||
|
||||
// find spaces to add a new line between them
|
||||
string[] split = DataString.Split(" ".ToCharArray());
|
||||
string[] split = DataString.Split(' ');
|
||||
if (split.Length == 4)
|
||||
DataString = String.Format("{0}\n{1} {2} {3}", split[0], split[1], split[2], split[3]);
|
||||
else if (split.Length == 3)
|
||||
@ -968,7 +968,7 @@ namespace Safedispatch_4_0
|
||||
//}
|
||||
|
||||
// find spaces to add a new line between them
|
||||
string[] split = DataString.Split(" ".ToCharArray());
|
||||
string[] split = DataString.Split(' ');
|
||||
if (split.Length == 4)
|
||||
DataString = String.Format("{0}\n{1} {2} {3}", split[0], split[1], split[2], split[3]);
|
||||
else if (split.Length == 3)
|
||||
@ -1590,7 +1590,7 @@ namespace Safedispatch_4_0
|
||||
if (SMSTreeView.SelectedNode == null)
|
||||
return;
|
||||
// update text for the LOGGED IN USER
|
||||
labelUser.Text = SMSTreeView.SelectedNode.Text.Split("[".ToCharArray())[0].ToUpper();
|
||||
labelUser.Text = SMSTreeView.SelectedNode.Text.Split('[')[0].ToUpper();
|
||||
|
||||
if (CanSendQuickTextMessage(SMSTreeView.SelectedNode))
|
||||
{
|
||||
@ -1627,11 +1627,11 @@ namespace Safedispatch_4_0
|
||||
}
|
||||
SM.Debug("Selected node = " + SMSTreeView.SelectedNode.Name + " with sc_id = " + selectedSC_ID);
|
||||
|
||||
|
||||
string msg = (SMSTreeView.SelectedNode.Nodes.Count > 0) ? MainForm2.returnLNGString("sendquickgroupsms") : MainForm2.returnLNGString("sendquicksms");
|
||||
rtbQuickText.NullText = String.Format(msg, SMSTreeView.SelectedNode.Text.Split("[".ToCharArray())[0]);
|
||||
|
||||
|
||||
if(SMSTreeView.SelectedNode.Nodes.Count > 0)
|
||||
rtbQuickText.NullText = String.Format(MainForm2.returnLNGString("sendquickgroupsms"), SMSTreeView.SelectedNode.Text.Split('[')[0]);
|
||||
else
|
||||
// update null text for quick send textbox
|
||||
rtbQuickText.NullText = String.Format(MainForm2.returnLNGString("sendquicksms"), SMSTreeView.SelectedNode.Text.Split('[')[0]);
|
||||
// display maximum number of characters
|
||||
rtbQuickText.MaxLength = SmsUtils.GetMaxNumberOfCharacters(MainForm2.radioType);
|
||||
if (MainForm2.vehicleHT.Contains(SMSTreeView.SelectedNode.Name))
|
||||
|
@ -627,7 +627,7 @@ namespace Safedispatch_4_0
|
||||
|
||||
public void UpdateExpiredTickets(string listOfExpiredTickets)
|
||||
{
|
||||
string[] expiredTickets = listOfExpiredTickets.Split(",".ToCharArray());
|
||||
string[] expiredTickets = listOfExpiredTickets.Split(',');
|
||||
try
|
||||
{
|
||||
foreach (string expiredTicket in expiredTickets)
|
||||
@ -1053,7 +1053,7 @@ namespace Safedispatch_4_0
|
||||
if (timeValue!= null && timeValue.Length > 0)
|
||||
{
|
||||
// find spaces to add a new line between them
|
||||
string[] split = timeValue.Split(" ".ToCharArray());
|
||||
string[] split = timeValue.Split(' ');
|
||||
if (split.Length == 4)
|
||||
cellElement.Text = String.Format("{0}\n{1} {2} {3}", split[0], split[1], split[2], split[3]);
|
||||
else if (split.Length == 3)
|
||||
@ -1079,7 +1079,7 @@ namespace Safedispatch_4_0
|
||||
{
|
||||
|
||||
// show tooltip for imei
|
||||
foreach (String imei in jb.Imei.Split(",".ToCharArray()))
|
||||
foreach (String imei in jb.Imei.Split(','))
|
||||
cellElement.ToolTipText = cellElement.ToolTipText + String.Format("{0}: {1}", imei, jb.Status) + System.Environment.NewLine;
|
||||
}
|
||||
}
|
||||
|
@ -104,7 +104,7 @@ namespace Dispatcher.maptab.UIClasses
|
||||
string key = $"{LiveTabLocation}_{tabName}";
|
||||
String[] loc = new string[0];
|
||||
if (MainForm2.HashVal.ContainsKey(key))
|
||||
loc = MainForm2.HashVal[key].ToString().Split(";".ToCharArray());
|
||||
loc = MainForm2.HashVal[key].ToString().Split(';');
|
||||
|
||||
System.Drawing.Point location = loc.Length > 2 ? new System.Drawing.Point(int.Parse(loc[0]), int.Parse(loc[1])) : new System.Drawing.Point(0, 0);
|
||||
System.Drawing.Size size = loc.Length > 3 ? new System.Drawing.Size(int.Parse(loc[2]), int.Parse(loc[3])) : new System.Drawing.Size(800, 640);
|
||||
|
@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
|
||||
// You can specify all the values or you can default the Build and Revision Numbers
|
||||
// by using the '*' as shown below:
|
||||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
[assembly: AssemblyVersion("8.2.0.10898")]
|
||||
[assembly: AssemblyFileVersion("8.2.0.10898")]
|
||||
[assembly: AssemblyVersion("8.1.0.10898")]
|
||||
[assembly: AssemblyFileVersion("8.1.0.10898")]
|
||||
|
@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
|
||||
// You can specify all the values or you can default the Build and Revision Numbers
|
||||
// by using the '*' as shown below:
|
||||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
[assembly: AssemblyVersion("8.2.0.10898")]
|
||||
[assembly: AssemblyFileVersion("8.2.0.10898")]
|
||||
[assembly: AssemblyVersion("8.1.0.10898")]
|
||||
[assembly: AssemblyFileVersion("8.1.0.10898")]
|
||||
|
@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
|
||||
// You can specify all the values or you can default the Build and Revision Numbers
|
||||
// by using the '*' as shown below:
|
||||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
[assembly: AssemblyVersion("8.2.0.10898")]
|
||||
[assembly: AssemblyFileVersion("8.2.0.10898")]
|
||||
[assembly: AssemblyVersion("8.1.0.10898")]
|
||||
[assembly: AssemblyFileVersion("8.1.0.10898")]
|
||||
|
@ -263,24 +263,19 @@ namespace SipComponent
|
||||
}
|
||||
else
|
||||
_localIPaddress = localIPAddress;
|
||||
|
||||
_sipDomainPort = sipDomainPort;
|
||||
_sipClient = CreateSipClientClass(sipDomain, _sipDomainPort, _localIPaddress, localSipPort, userName, password, requestTimeout);
|
||||
_bufferMiliseconds = bufferMiliseconds;
|
||||
|
||||
// Registration Timer
|
||||
_registrationInterval = registrationInterval;
|
||||
_registrationData = new RegistrationData(userName, _registrationInterval + 2);
|
||||
|
||||
System.Timers.Timer registrationTimer = new System.Timers.Timer();
|
||||
// Set up the registration timer
|
||||
registrationTimer.Interval = _registrationInterval * 1000;
|
||||
registrationTimer.Elapsed += _registrationTimer_Elapsed;
|
||||
|
||||
_sipID_regTimer_regStatus_Dict.Add(userName,
|
||||
new Tuple<System.Timers.Timer, RegistrationStatus>(registrationTimer, RegistrationStatus.RegistrationNotStarted
|
||||
));
|
||||
|
||||
_IDsregisteredList.Add(userName);
|
||||
StartRegistrationTimer();
|
||||
|
||||
@ -309,7 +304,6 @@ namespace SipComponent
|
||||
throw new ObjectDisposedException("SipClientClass");
|
||||
if (idToInvite == null)
|
||||
throw new ArgumentNullException("idToInvite");
|
||||
|
||||
lock (_lockerSipDialog)
|
||||
{
|
||||
if (!_IDsentInviteDict.ContainsKey(idToInvite) && !_IDreceivedInviteDict.ContainsKey(idToInvite)
|
||||
@ -330,7 +324,6 @@ namespace SipComponent
|
||||
throw new ObjectDisposedException("SipClientClass");
|
||||
if (groupIDtoInvite == null)
|
||||
throw new ArgumentNullException("groupIDtoInvite");
|
||||
|
||||
// Check if registered to the group id
|
||||
lock (_lockerSipDialog)
|
||||
{
|
||||
@ -349,7 +342,6 @@ namespace SipComponent
|
||||
{
|
||||
if (_sipClassClosed)
|
||||
throw new ObjectDisposedException("SipClientClass");
|
||||
|
||||
Task t = null;
|
||||
CancelInvite_private(idToCancel, out t);
|
||||
}
|
||||
@ -378,7 +370,6 @@ namespace SipComponent
|
||||
{
|
||||
return dialog.CallID == _IDsentInviteDict[idToCancel].CallID;
|
||||
});
|
||||
|
||||
if (d != null)
|
||||
{
|
||||
//Send Cancel Request
|
||||
@ -396,7 +387,6 @@ namespace SipComponent
|
||||
}
|
||||
}, d);
|
||||
}
|
||||
|
||||
// Remove from dict
|
||||
_IDsentInviteDict.Remove(idToCancel);
|
||||
_IDsCalledByMeList.Remove(idToCancel);
|
||||
@ -595,7 +585,6 @@ namespace SipComponent
|
||||
{
|
||||
if (_sipClassClosed)
|
||||
throw new ObjectDisposedException("SipClientClass");
|
||||
|
||||
lock (_lockerSipDialog)
|
||||
{
|
||||
if (_IDdialogTuple.ContainsKey(idToSendVoice))
|
||||
@ -614,11 +603,8 @@ namespace SipComponent
|
||||
{
|
||||
if (_sipClassClosed)
|
||||
throw new ObjectDisposedException("SipClientClass");
|
||||
|
||||
if (idToRequestGps == null)
|
||||
throw new ArgumentNullException("idToRequestGps");
|
||||
|
||||
|
||||
if (idToRequestGps != null)
|
||||
{
|
||||
// Send Gps request for Linx
|
||||
// [#msgLen]#seqID#154#
|
||||
string cmdText = string.Format("#{0}#154#", seqID);
|
||||
@ -636,6 +622,9 @@ namespace SipComponent
|
||||
; // Probably timeout exception, do not do anything
|
||||
}
|
||||
});
|
||||
}
|
||||
else
|
||||
throw new ArgumentNullException("idToRequestGps");
|
||||
|
||||
}
|
||||
|
||||
@ -647,10 +636,8 @@ namespace SipComponent
|
||||
{
|
||||
if (_sipClassClosed)
|
||||
throw new ObjectDisposedException("SipClientClass");
|
||||
|
||||
if (linxID == null)
|
||||
throw new ArgumentNullException("linxID");
|
||||
|
||||
if (linxID != null)
|
||||
{
|
||||
// Send [#msgLen]#seqID#238#
|
||||
string textToSend = string.Format("#{0}#238#", _rand.Next().ToString());
|
||||
string cmdToSend = AddMsgLenForMBus(textToSend);
|
||||
@ -666,7 +653,9 @@ namespace SipComponent
|
||||
// Do nothing
|
||||
}
|
||||
});
|
||||
|
||||
}
|
||||
else
|
||||
throw new ArgumentNullException("linxID");
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@ -680,12 +669,10 @@ namespace SipComponent
|
||||
{
|
||||
if (_sipClassClosed)
|
||||
throw new ObjectDisposedException("SipClientClass");
|
||||
|
||||
if (idToSendSMS != null && text != null)
|
||||
{
|
||||
bool sendSipMessage = true;
|
||||
string unconfirmedSmsKey = null;
|
||||
|
||||
if (_smsConfirmationFromServer)
|
||||
{
|
||||
unconfirmedSmsKey = idToSendSMS + text.GetHashCode();
|
||||
@ -704,7 +691,6 @@ namespace SipComponent
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (sendSipMessage)
|
||||
{
|
||||
// Create a new thread on which:
|
||||
@ -757,16 +743,15 @@ namespace SipComponent
|
||||
throw new ArgumentNullException("text");
|
||||
}
|
||||
|
||||
private Message GenerateSipMessage(string destinationID, string senderID, string sipServer, int sipServerPort, string text)
|
||||
private Message GenerateSipMessage(string destinationID, string senderID, string sipServer,
|
||||
int sipServerPort, string text)
|
||||
{
|
||||
Message sipMessage = new Message()
|
||||
{
|
||||
Uri = $"sip:{destinationID}@{sipServer}:{sipServerPort}",
|
||||
From = new ContactInfo($"sip:{senderID}@{sipServer}"),
|
||||
To = new ContactInfo($"sip:{destinationID}@{sipServer}"),
|
||||
ContentType = "text/plain;charset=UTF-8",
|
||||
Body = text
|
||||
};
|
||||
Message sipMessage = new Message();
|
||||
sipMessage.Uri = "sip:" + destinationID + "@" + sipServer + ":" + sipServerPort;
|
||||
sipMessage.From = new ContactInfo(string.Format("sip:{0}@{1}", senderID, sipServer));
|
||||
sipMessage.To = new ContactInfo(string.Format("sip:{0}@{1}", destinationID, sipServer));
|
||||
sipMessage.ContentType = "text/plain;charset=UTF-8";
|
||||
sipMessage.Body = text;
|
||||
|
||||
return sipMessage;
|
||||
}
|
||||
@ -848,12 +833,10 @@ namespace SipComponent
|
||||
if (!_sipClassClosed)
|
||||
{
|
||||
_sipClassClosed = true;
|
||||
|
||||
// Send ARS OFF and disconnect from socket IO
|
||||
if (_sendArsOnOff)
|
||||
_socketIOClass.SendArs(new ArsInfo(false, "0", UserName));
|
||||
_socketIOClass.Disconect();
|
||||
|
||||
//
|
||||
List<string> sipIDs = new List<string>();
|
||||
Task task = null;
|
||||
@ -909,7 +892,6 @@ namespace SipComponent
|
||||
// Stop sip class
|
||||
_sipClient.Disconnect();
|
||||
});
|
||||
|
||||
if (!async)
|
||||
t.Wait();
|
||||
}
|
||||
@ -929,8 +911,6 @@ namespace SipComponent
|
||||
zeroRegistrationData = new RegistrationData(id, 0, true);
|
||||
else
|
||||
zeroRegistrationData = new RegistrationData(id, 0);
|
||||
|
||||
|
||||
_sipID_regTimer_regStatus_Dict[id].Item1.Stop();
|
||||
SendSipRegister(zeroRegistrationData);
|
||||
}
|
||||
@ -1418,10 +1398,9 @@ namespace SipComponent
|
||||
string lastWord = source.Substring(source.LastIndexOf(' ') + 1);
|
||||
if (lastWord.Contains("delivered"))
|
||||
return true;
|
||||
|
||||
if (lastWord.Contains("failed"))
|
||||
else if (lastWord.Contains("failed"))
|
||||
return false;
|
||||
|
||||
else
|
||||
throw new ApplicationException("Error on parsing the sms confirmation from sip server");
|
||||
}
|
||||
|
||||
@ -1439,13 +1418,11 @@ namespace SipComponent
|
||||
// Extract ip and port where to send voice to simoco
|
||||
IPAddress ipToSendAudio = null;
|
||||
int portToSendAudio;
|
||||
|
||||
if (IPAddress.TryParse(receivedSDP.Connection.Address, out ipToSendAudio))
|
||||
{
|
||||
portToSendAudio = receivedSDP.Media[0].Port;
|
||||
}
|
||||
else
|
||||
throw new ApplicationException("Canot determine ip where to send audio");
|
||||
else throw new ApplicationException("Canot determine ip where to send audio");
|
||||
|
||||
// Creez clientul de UDP conectat la portul pe care voi primi voce
|
||||
UdpClient udpClient = new UdpClient(localRTPport);
|
||||
@ -1586,9 +1563,9 @@ namespace SipComponent
|
||||
|
||||
private SipClient CreateSipClientClass(string sipDomain, int sipDomainPort, string localIPaddress, int localSipPort, string userName, string password, int requestTimeout)
|
||||
{
|
||||
|
||||
SipClient sipClient;
|
||||
// Set up the master SIP class
|
||||
SipClient sipClient = new SipClient(sipDomain, sipDomainPort, Independentsoft.Sip.ProtocolType.Udp, userName, password);
|
||||
sipClient = new SipClient(sipDomain, sipDomainPort, Independentsoft.Sip.ProtocolType.Udp, userName, password);
|
||||
sipClient.LocalIPEndPoint = new IPEndPoint(IPAddress.Parse(localIPaddress), localSipPort);
|
||||
// Turn on logging
|
||||
//sipClient.Logger = new Logger(AppDomain.CurrentDomain.BaseDirectory + "\\sipLog.txt");
|
||||
@ -1613,7 +1590,6 @@ namespace SipComponent
|
||||
|
||||
int rtpPort = ReturnAvailablePort();
|
||||
SessionDescription sdp = CreateSDP(rtpPort);
|
||||
|
||||
Invite inv = new Invite();
|
||||
inv.Uri = "sip:" + idToCall + "@" + sipServerIP;
|
||||
inv.From = new ContactInfo("sip:" + sipID.ToString() + "@" + sipServerIP);
|
||||
@ -1674,7 +1650,6 @@ namespace SipComponent
|
||||
private void SendSipRegister(object registrationDataObj)
|
||||
{
|
||||
string sipServerIP = _sipClient.Domain;
|
||||
|
||||
RegistrationData regData = (RegistrationData)registrationDataObj;
|
||||
string sipIDfrom = _sipClient.Username;
|
||||
string sipIDto = regData.SipID;
|
||||
@ -1683,8 +1658,12 @@ namespace SipComponent
|
||||
|
||||
Register reg = new Register();
|
||||
reg.Uri = "sip:" + sipServerIP;
|
||||
reg.From = new ContactInfo( sipIDfrom.ToString(), $"sip:{sipIDfrom}@{sipServerIP}");
|
||||
reg.To = new ContactInfo( sipIDto.ToString(), $"sip:{sipIDto}@{sipServerIP}");
|
||||
reg.From = new ContactInfo(
|
||||
sipIDfrom.ToString(),
|
||||
"sip:" + sipIDfrom + "@" + sipServerIP);
|
||||
reg.To = new ContactInfo(
|
||||
sipIDto.ToString(),
|
||||
"sip:" + sipIDto.ToString() + "@" + sipServerIP);
|
||||
reg.Contact = new Contact("sip:" + sipIDfrom.ToString() + "@" + _sipClient.LocalIPEndPoint.ToString());
|
||||
reg.Expires = expiresValue;
|
||||
|
||||
@ -1784,7 +1763,6 @@ namespace SipComponent
|
||||
{
|
||||
SendSipRegister(state);
|
||||
}, _registrationData);
|
||||
|
||||
// Start registration timer
|
||||
_sipID_regTimer_regStatus_Dict[UserName].Item1.Start();
|
||||
}
|
||||
@ -1829,11 +1807,9 @@ namespace SipComponent
|
||||
{
|
||||
rtpPort += 2;
|
||||
}
|
||||
|
||||
if (rtpPort < MaxRtpPortNumber)
|
||||
return rtpPort;
|
||||
|
||||
|
||||
else
|
||||
throw new SipClassException(
|
||||
string.Format("Nu gasesc port liber in range-ul {0} - {1}", MinRtpPortNumber, MaxRtpPortNumber));
|
||||
}
|
||||
@ -1845,8 +1821,10 @@ namespace SipComponent
|
||||
{
|
||||
return invite.SessionDescription.Media[0].Port == portNb;
|
||||
});
|
||||
|
||||
return (inv != null);
|
||||
if (inv != null)
|
||||
return true;
|
||||
else
|
||||
return false;
|
||||
}
|
||||
|
||||
private bool IsPortAllreadyInUse(int portNumber)
|
||||
@ -1865,11 +1843,14 @@ namespace SipComponent
|
||||
public static bool ValidRtpPort(int rtpPort)
|
||||
{
|
||||
if (rtpPort < 1024 || rtpPort > 65534)
|
||||
{
|
||||
return false;
|
||||
|
||||
if (rtpPort % 2 == 1)
|
||||
}
|
||||
else if (rtpPort % 2 == 1)
|
||||
{
|
||||
return false;
|
||||
|
||||
}
|
||||
else
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -1889,6 +1870,11 @@ namespace SipComponent
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
private bool IsInSameSubnet(IPAddress address2, IPAddress address, IPAddress subnetMask)
|
||||
{
|
||||
IPAddress network1 = GetNetworkAddress(address, subnetMask);
|
||||
|
@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
|
||||
//
|
||||
// You can specify all the values or you can default the Build and Revision Numbers
|
||||
// by using the '*' as shown below:
|
||||
[assembly: AssemblyVersion("8.2.0.10898")]
|
||||
[assembly: AssemblyFileVersion("8.2.0.10898")]
|
||||
[assembly: AssemblyVersion("8.1.0.10898")]
|
||||
[assembly: AssemblyFileVersion("8.1.0.10898")]
|
||||
|
@ -266,7 +266,7 @@ namespace SubscriberAndUserManager
|
||||
|
||||
public static Boolean TestIP(string IP)
|
||||
{
|
||||
String[] tmp = IP.Split(".".ToCharArray());
|
||||
String[] tmp = IP.Split('.');
|
||||
if (tmp.Length != 4) return false;
|
||||
Int32 number;
|
||||
bool result;
|
||||
@ -913,7 +913,7 @@ namespace SubscriberAndUserManager
|
||||
int result = clientStream.Read(message, 0, message.Length);
|
||||
Console.WriteLine("Received registration from server");
|
||||
String decodedString = encoding.GetString(message).Trim('\0');
|
||||
String[] options = decodedString.Split(";".ToCharArray());
|
||||
String[] options = decodedString.Split(';');
|
||||
Console.WriteLine("Option" + decodedString);
|
||||
|
||||
APP_SERVER_VERSION = options[options.Length - 1].Replace("valid-", "");
|
||||
|
@ -32,6 +32,6 @@ using System.Runtime.InteropServices;
|
||||
// You can specify all the values or you can default the Build and Revision Numbers
|
||||
// by using the '*' as shown below:
|
||||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
[assembly: AssemblyVersion("8.2.0.10898")]
|
||||
[assembly: AssemblyFileVersion("8.2.0.10898")]
|
||||
[assembly: AssemblyVersion("8.1.0.10898")]
|
||||
[assembly: AssemblyFileVersion("8.1.0.10898")]
|
||||
|
||||
|
@ -1029,7 +1029,7 @@ namespace SubscriberAndUserManager
|
||||
private void EditRangeVehicles()
|
||||
{
|
||||
int carID = ((Car)((RadListDataItem)cbImageList.SelectedItem).Value).idx;
|
||||
string[] idList = IDList.Replace("(", "").Replace(")", "").Split(",".ToCharArray());
|
||||
string[] idList = IDList.Replace("(", "").Replace(")", "").Split(',');
|
||||
bool isUnitDeleted = DB.isUnitDeleted(idList[0]);
|
||||
|
||||
if (cbStatus.Text.Equals(MainForm.returnLNGString("active")) && isUnitDeleted)
|
||||
|
@ -836,27 +836,18 @@ 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);
|
||||
@ -870,15 +861,13 @@ namespace SubscriberAndUserManager
|
||||
else
|
||||
{
|
||||
listBackups.Items.Clear();
|
||||
string[] fileNameArr = fileNames.Split(";".ToCharArray());
|
||||
if (fileNameArr != null && fileNameArr.Length > 0)
|
||||
{
|
||||
string[] fileNameArr = fileNames.Split(';');
|
||||
foreach (string fName in fileNameArr)
|
||||
{
|
||||
if (fName != "")
|
||||
{
|
||||
listBackups.Items.Add(new RadListDataItem(fName));
|
||||
}
|
||||
RadListDataItem r = new RadListDataItem(fName);
|
||||
listBackups.Items.Add(r);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -899,7 +888,7 @@ namespace SubscriberAndUserManager
|
||||
{
|
||||
if (text.Contains(".tar"))
|
||||
{
|
||||
string[] backupList = text.Substring(0, text.Length - 1).Split(";".ToCharArray());
|
||||
string[] backupList = text.Substring(0, text.Length - 1).Split(';');
|
||||
listBackups.Items.Clear();
|
||||
foreach (string bk in backupList)
|
||||
listBackups.Items.Add(bk);
|
||||
@ -1450,7 +1439,7 @@ namespace SubscriberAndUserManager
|
||||
string rtpstart = o["data"]["ports"]["rtpstart"].ToString();
|
||||
string rtpend = o["data"]["ports"]["rtpend"].ToString();
|
||||
string publicIp = o["data"]["network"]["publicIp"].ToString();
|
||||
string sipPort = o["data"]["ports"]["udpbindaddr"].ToString().Split(":".ToCharArray())[1];
|
||||
string sipPort = o["data"]["ports"]["udpbindaddr"].ToString().Split(':')[1];
|
||||
txLanIP.Value = lanIP;
|
||||
txNatIP.Value = publicIp;
|
||||
txUdpStart.Value = rtpstart;
|
||||
|
@ -852,7 +852,7 @@ namespace SubscriberAndUserManager
|
||||
if (alm.Speed != "")
|
||||
{
|
||||
chbSpeed.Checked = true;
|
||||
string[] arrSpeed = alm.Speed.Split("_".ToCharArray());
|
||||
string[] arrSpeed = alm.Speed.Split('_');
|
||||
Int16 speed = 1;
|
||||
Int16.TryParse(arrSpeed[0], out speed);
|
||||
|
||||
@ -943,7 +943,7 @@ namespace SubscriberAndUserManager
|
||||
if (alm.Speed != "")
|
||||
{
|
||||
SpeedStat = 1;
|
||||
string[] arrSpeed = alm.Speed.Split("_".ToCharArray());
|
||||
string[] arrSpeed = alm.Speed.Split('_');
|
||||
Speedvalue = arrSpeed[0];
|
||||
if (arrSpeed.Length == 2)
|
||||
{
|
||||
@ -980,7 +980,7 @@ namespace SubscriberAndUserManager
|
||||
if (((alm.Loneworker != "") && (LoneStat ==0))||((alm.Loneworker == "") && (LoneStat ==1))) LoneStat = 2;
|
||||
if (alm.Speed != "")
|
||||
{
|
||||
string[] arrSpeed = alm.Speed.Split("_".ToCharArray());
|
||||
string[] arrSpeed = alm.Speed.Split('_');
|
||||
if (Speedvalue != arrSpeed[0])
|
||||
{
|
||||
Speedvalue = "0"; SpeedStat = 2;
|
||||
|
@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
|
||||
// You can specify all the values or you can default the Build and Revision Numbers
|
||||
// by using the '*' as shown below:
|
||||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
[assembly: AssemblyVersion("8.2.0.10898")]
|
||||
[assembly: AssemblyFileVersion("8.2.0.10898")]
|
||||
[assembly: AssemblyVersion("8.1.0.10898")]
|
||||
[assembly: AssemblyFileVersion("8.1.0.10898")]
|
||||
|
@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
|
||||
// You can specify all the values or you can default the Build and Revision Numbers
|
||||
// by using the '*' as shown below:
|
||||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
[assembly: AssemblyVersion("8.2.0.10898")]
|
||||
[assembly: AssemblyFileVersion("8.2.0.10898")]
|
||||
[assembly: AssemblyVersion("8.1.0.10898")]
|
||||
[assembly: AssemblyFileVersion("8.1.0.10898")]
|
||||
|
@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
|
||||
// You can specify all the values or you can default the Build and Revision Numbers
|
||||
// by using the '*' as shown below:
|
||||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
[assembly: AssemblyVersion("8.2.0.10898")]
|
||||
[assembly: AssemblyFileVersion("8.2.0.10898")]
|
||||
[assembly: AssemblyVersion("8.1.0.10898")]
|
||||
[assembly: AssemblyFileVersion("8.1.0.10898")]
|
||||
|
@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
|
||||
// You can specify all the values or you can default the Build and Revision Numbers
|
||||
// by using the '*' as shown below:
|
||||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
[assembly: AssemblyVersion("8.2.0.10898")]
|
||||
[assembly: AssemblyFileVersion("8.2.0.10898")]
|
||||
[assembly: AssemblyVersion("8.1.0.10898")]
|
||||
[assembly: AssemblyFileVersion("8.1.0.10898")]
|
||||
|
@ -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>
|
||||
|
Loading…
Reference in New Issue
Block a user