Safemobile/safedispatch-mobile
20
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

text color on radio #13

Merged
CiufudeanDani merged 1 commits from feature/icon_and_background into develop 2022-03-28 13:38:39 +00:00
Conversation 0 Commits 1 Files Changed 4 +10 -14
4 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libSafeMobile/src/main/java/com/safemobile/services/TCPService.java
View File

@ -28,13 +28,11 @@ public class TCPService extends Service {
int port = 13589;
try {
port = Integer.parseInt(AppParams.PORT);
}
catch(Exception ex) { }
} catch(Exception ex) { }
tcpParser = new TCPmsgParser();
if(tcp == null && !AppParams.IP.equalsIgnoreCase("n/a"))
{
if(tcp == null && !AppParams.IP.equalsIgnoreCase("n/a")) {
tcp = new TCPhandler(getApplicationContext(), AppParams.IP, port);
}

2
libSafeMobile/src/main/java/com/safemobile/services/TCPhandler.java
View File

@ -25,7 +25,7 @@ public class TCPhandler implements Runnable
private boolean alive = true;
public String serverHostname = new String ("10.120.1.114");//
private int port = 13579;
private int port;
private Thread listenThread;
private Socket soc =null;

8
safeDispatch/src/main/java/com/safemobile/safedispatch/SDMobileActivity.java
View File

@ -233,10 +233,10 @@ public class SDMobileActivity extends Activity {
etPassword.setText(AppParams.PASSWORD.equalsIgnoreCase("n/a") ? "" : AppParams.PASSWORD);
}
layoutTCP = (RelativeLayout) findViewById(R.id.layoutTCP);
layoutTCP = findViewById(R.id.layoutTCP);
llUsername = (LinearLayout) findViewById(R.id.llUsername);
llPassword = (LinearLayout) findViewById(R.id.llPassword);
llUsername = findViewById(R.id.llUsername);
llPassword = findViewById(R.id.llPassword);
// enable ui after the language is changed and tcp connection is on
if (tcp != null && tcp.isConnectionUP) {
@ -663,7 +663,7 @@ public class SDMobileActivity extends Activity {
// get default password
AppParams.PASSWORD = AppParams.prefs.getString(PASSWORD, "n/a");
// get default IP
AppParams.IP = AppParams.prefs.getString("ip", "192.168.2.100");
AppParams.IP = AppParams.prefs.getString("ip", "185.8.154.190");
// get Radio ID & IP
AppParams.RADIOID = AppParams.prefs.getInt("radioId", 100);

8
safeDispatch/src/main/res/layout/tabradio.xml
View File

@ -237,7 +237,6 @@
android:layout_height="wrap_content"
android:text="@string/Zone"
android:textStyle="bold"
android:textColor="#ffffffff"
android:textAppearance="?android:attr/textAppearanceMedium"/>
<LinearLayout
android:id="@+id/layoutSpinnerZone"
@ -277,7 +276,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/Channel"
android:textColor="#ffffffff"
android:textStyle="bold"
android:textAppearance="?android:attr/textAppearanceMedium"/>
@ -387,7 +385,7 @@
android:checked="true"
android:text="@string/AllCall"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="#ffffffff" />
/>
<RadioButton
android:id="@+id/radioGroup"
@ -395,7 +393,7 @@
android:layout_height="30dp"
android:text="@string/GroupCall"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="#ffffffff" />
/>
<RadioButton
android:id="@+id/radioPrivate"
@ -403,7 +401,7 @@
android:layout_height="30dp"
android:text="@string/PrivateCall"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="#ffffffff" />
/>
</RadioGroup>
<LinearLayout