WallyHackenslacker/NxtAR-cam
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Started redesign and testing on the Galaxy Nexus phone. onDestroy() crash fixed.

Browse Source
This commit is contained in:
Wally Hackenslacker
2013-11-25 14:42:31 -04:30
parent 99a17242cf
commit 48fff01369
2 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
res/layout/activity_main.xml
View File

@@ -13,8 +13,9 @@
android:id="@+id/connectButton" android:id="@+id/connectButton"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/imageView1" android:layout_alignLeft="@+id/startButton"
android:layout_centerHorizontal="true" android:layout_alignRight="@+id/startButton"
android:layout_centerVertical="true"
android:gravity="center" android:gravity="center"
android:onClick="connectWithRobot" android:onClick="connectWithRobot"
android:text="@string/robot_pair_button" /> android:text="@string/robot_pair_button" />
@@ -23,21 +24,10 @@
android:id="@+id/startButton" android:id="@+id/startButton"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignLeft="@+id/connectButton"
android:layout_alignRight="@+id/connectButton"
android:layout_below="@+id/connectButton" android:layout_below="@+id/connectButton"
android:layout_centerHorizontal="true"
android:gravity="center" android:gravity="center"
android:onClick="startConnections" android:onClick="startConnections"
android:text="@string/start_button" /> android:text="@string/start_button" />
<ImageView
android:id="@+id/imageView1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:layout_marginTop="60dp"
android:contentDescription="@string/lens_icon"
android:src="@drawable/camera_lens" />
</RelativeLayout> </RelativeLayout>

2
src/ve/ucv/ciens/ccg/nxtcam/MainActivity.java
View File

@@ -37,7 +37,6 @@ import android.widget.Toast;
* datagram carrying the string "NxtAR server here!" is received. * datagram carrying the string "NxtAR server here!" is received.
* *
* @author miky * @author miky
*
*/ */
public class MainActivity extends Activity implements WifiOnDialogListener, ConnectRobotDialogListener{ public class MainActivity extends Activity implements WifiOnDialogListener, ConnectRobotDialogListener{
// Cosntant fields. // Cosntant fields.
@@ -107,6 +106,7 @@ public class MainActivity extends Activity implements WifiOnDialogListener, Conn
@Override @Override
public void onDestroy(){ public void onDestroy(){
super.onDestroy();
if(btManager.isConnected()){ if(btManager.isConnected()){
try{ try{
btManager.stopConnection(); btManager.stopConnection();