diff options
author | Bjørn Mork <bjorn@mork.no> | 2019-06-02 08:26:14 +0200 |
---|---|---|
committer | Bjørn Mork <bjorn@mork.no> | 2019-06-02 08:26:14 +0200 |
commit | 807b2df1d6e9a808f56c96e1bea563991f236a48 (patch) | |
tree | 030a60e2a76563ea11245851a3c04006b2b53199 | |
parent | 4c850ee92b9683e55387de3590e4060a698b9eb6 (diff) |
move all the button boilerplate into xml
Signed-off-by: Bjørn Mork <bjorn@mork.no>
-rw-r--r-- | Defogger/res/layout/activity_main.xml | 7 | ||||
-rw-r--r-- | Defogger/src/no/mork/android/defogger/MainActivity.java | 58 |
2 files changed, 21 insertions, 44 deletions
diff --git a/Defogger/res/layout/activity_main.xml b/Defogger/res/layout/activity_main.xml index 88afb39..59c6bf6 100644 --- a/Defogger/res/layout/activity_main.xml +++ b/Defogger/res/layout/activity_main.xml @@ -20,7 +20,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/command" /> - + <EditText android:id="@+id/command" android:layout_width="fill_parent" @@ -32,11 +32,13 @@ android:id="@+id/wificonfig" android:layout_width="match_parent" android:layout_height="wrap_content" + android:onClick="getWifiConfig" android:text="@string/wificonfig"/> <Button android:id="@+id/ipconfig" android:layout_width="match_parent" android:layout_height="wrap_content" + android:onClick="getIpConfig" android:text="@string/ipconfig"/> <TextView android:id="@+id/ipaddress" @@ -59,8 +61,8 @@ android:id="@+id/sysinfo" android:layout_width="match_parent" android:layout_height="wrap_content" + android:onClick="getSysInfo" android:text="@string/sysinfo"/> - <!-- N=DCS-8000LH;P=1;T=1559330833;Z=UTC;F=2.02.02;H=A1;M=B0C5544CCC73;V=0.02 --> <TextView android:id="@+id/sysname" android:layout_width="wrap_content" @@ -81,6 +83,7 @@ android:id="@+id/setup" android:layout_width="match_parent" android:layout_height="wrap_content" + android:onClick="getWifiLink" android:text="@string/setup"/> <ListView android:id="@+id/networks" diff --git a/Defogger/src/no/mork/android/defogger/MainActivity.java b/Defogger/src/no/mork/android/defogger/MainActivity.java index dedd918..29e63bf 100644 --- a/Defogger/src/no/mork/android/defogger/MainActivity.java +++ b/Defogger/src/no/mork/android/defogger/MainActivity.java @@ -72,37 +72,6 @@ public class MainActivity extends Activity { } }); - Button tmp = (Button) findViewById(R.id.wificonfig); - tmp.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - getWifiConfig(); - } - }); - - tmp = (Button) findViewById(R.id.ipconfig); - tmp.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - getIpConfig(); - } - }); - - tmp = (Button) findViewById(R.id.sysinfo); - tmp.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - getSysInfo(); - } - }); - tmp = (Button) findViewById(R.id.setup); - tmp.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - getWifiLink(); - } - }); - EditText cmd = (EditText) findViewById(R.id.command); cmd.setOnEditorActionListener(new OnEditorActionListener() { @Override @@ -274,7 +243,7 @@ public class MainActivity extends Activity { multimsg += val.split(";",3)[2]; // repeat until result is complete if (!kv.get("N").equals(kv.get("P"))) - doWifiScan(); + readChar(0xa100); else selectNetwork(multimsg.split("&")); break; @@ -477,11 +446,12 @@ public class MainActivity extends Activity { return; /* collect current config after unlocking */ - getWifiConfig(); - getWifiLink(); - getIpConfig(); - getSysInfo(); - doWifiScan(); + View v = new View(this); + getWifiConfig(v); + getWifiLink(v); + getIpConfig(v); + getSysInfo(v); + doWifiScan(v); } private void notifications(boolean enable) { @@ -522,6 +492,8 @@ public class MainActivity extends Activity { } private void readChar(int num) { + if (!connected) + return; BluetoothGattCharacteristic c = ipcamService.getCharacteristic(UUIDfromInt(num)); if (locked) { Log.d(msg, "camera is locked"); @@ -535,6 +507,8 @@ public class MainActivity extends Activity { } private void writeChar(int num, String val) { + if (!connected) + return; BluetoothGattCharacteristic c = ipcamService.getCharacteristic(UUIDfromInt(num)); c.setValue(val); if (locked) { @@ -547,23 +521,23 @@ public class MainActivity extends Activity { writeQ.offer(c); } - private void doWifiScan() { + public void doWifiScan(View view) { readChar(0xa100); } - private void getWifiConfig() { + public void getWifiConfig(View view) { readChar(0xa101); } - private void getWifiLink() { + public void getWifiLink(View view) { readChar(0xa103); } - private void getIpConfig() { + public void getIpConfig(View view) { readChar(0xa104); } - private void getSysInfo() { + public void getSysInfo(View view) { readChar(0xa200); } |