Updated P25 channel display to show relevant site information.

Changed Site ID Alias to a string from integer to support P25 style site identifiers (RFSS-Site)
This commit is contained in:
dennis.sheirer
2014-11-26 12:09:21 +00:00
parent 86899e8a77
commit 1ff69404f4
16 changed files with 286 additions and 107 deletions

View File

@@ -36,7 +36,7 @@ import decode.mpt1327.MPT1327Message.IdentType;
public class MPT1327ChannelState extends ChannelState
{
private int mSite;
private String mSite;
private String mFromTalkgroup;
private String mToTalkgroup;
private int mChannelNumber;
@@ -153,9 +153,9 @@ public class MPT1327ChannelState extends ChannelState
.build() );
break;
case ALH:
int sys = mpt.getSiteID();
String sys = mpt.getSiteID();
if( sys != 0 && sys != mSite )
if( sys != null && !sys.contentEquals( mSite ) )
{
mSite = sys;
broadcastChange( ChangedAttribute.CHANNEL_SITE_NUMBER );
@@ -315,7 +315,7 @@ public class MPT1327ChannelState extends ChannelState
super.reset();
}
public int getSite()
public String getSite()
{
return mSite;
}