Bug fixes.

Author: Cheong2K

Examples/Chat/AndroidManifest.xml

@@ -7,7 +7,7 @@
     <uses-sdk
         android:minSdkVersion="18"
         android:targetSdkVersion="18" />
-    
+
     <uses-feature
         android:name="android.hardware.bluetooth_le"
         android:required="true" />
@@ -30,13 +30,16 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        
+        <activity android:name="com.redbear.chat.Chat" >
+        </activity>
         <activity
-            android:name="com.redbear.chat.Chat" ></activity>
-        
+            android:name=".Device"
+            android:theme="@android:style/Theme.Dialog" >
+        </activity>
+
         <service
             android:name="com.redbear.chat.RBLService"
             android:enabled="true" />
     </application>
 
-</manifest>
+</manifest>

Examples/Chat/ic_launcher-web.png

@@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=Google Inc.:Google APIs:18
+target=android-18

Examples/Chat/libs/android-support-v4.jar

@@ -0,0 +1,13 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:background="#FFF"
+    android:orientation="vertical" >
+
+    <ListView
+        android:id="@+id/listView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+    </ListView>
+
+</LinearLayout>

Examples/Chat/proguard-project.txt

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical" >
+    
+    <TextView
+        android:id="@+id/deviceName"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textColor="#000"
+        android:textSize="25sp" />
+    
+    <TextView
+        android:id="@+id/deviceAddr"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textColor="#000"
+        android:textSize="12sp" />
+
+</LinearLayout>

Examples/Chat/project.properties

@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:gravity="center"
-    android:orientation="vertical" >
+    android:layout_height="fill_parent" >
 
     <TextView
         android:id="@+id/tv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Char\nDemo"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="50dp"
+        android:text="Chat Demo"
         android:textSize="30sp" />
 
     <Button
         android:id="@+id/btn"
         style="@style/button_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
+        android:layout_centerInParent="true"
         android:background="@drawable/red_button"
         android:text="Connect" />
 
-</LinearLayout>
+</RelativeLayout>

Examples/Chat/res/drawable/red_button.xml

@@ -3,6 +3,6 @@
 
     <string name="app_name">Chat</string>
     <string name="action_settings">Settings</string>
-    <string name="searching">Connecting....</string>
+    <string name="searching">Searching....</string>
 
 </resources>

Examples/Chat/res/drawable/redbear.png

@@ -5,7 +5,6 @@
 import java.util.UUID;
 
 import android.app.Activity;
-import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothGattCharacteristic;
 import android.bluetooth.BluetoothGattService;
 import android.content.BroadcastReceiver;
@@ -29,7 +28,6 @@ public class Chat extends Activity {
 	private final static String TAG = Chat.class.getSimpleName();
 
 	public static final String EXTRAS_DEVICE = "EXTRAS_DEVICE";
-	private BluetoothDevice device;
 	private TextView tv = null;
 	private EditText et = null;
 	private Button btn = null;
@@ -91,8 +89,14 @@ public void onClick(View v) {
 				BluetoothGattCharacteristic characteristic = map
 						.get(RBLService.UUID_BLE_SHIELD_TX);
 
-				String str = et.getText().toString() + "\r\n";
-				final byte[] tx = str.getBytes();
+				String str = et.getText().toString();
+				byte b = 0x00;
+				byte[] tmp = str.getBytes();
+				byte[] tx = new byte[tmp.length + 1];
+				tx[0] = b;
+				for (int i = 1; i < tmp.length + 1; i++) {
+					tx[i] = tmp[i - 1];
+				}
 
 				characteristic.setValue(tx);
 				mBluetoothLeService.writeCharacteristic(characteristic);
@@ -102,11 +106,9 @@ public void onClick(View v) {
 		});
 
 		Intent intent = getIntent();
-		Bundle bundle = intent.getExtras();
-		device = bundle.getParcelable(EXTRAS_DEVICE);
 
-		mDeviceAddress = device.getAddress();
-		mDeviceName = device.getName();
+		mDeviceAddress = intent.getStringExtra(Device.EXTRA_DEVICE_ADDRESS);
+		mDeviceName = intent.getStringExtra(Device.EXTRA_DEVICE_NAME);
 
 		getActionBar().setTitle(mDeviceName);
 		getActionBar().setDisplayHomeAsUpEnabled(true);

Examples/Chat/res/layout/device_list.xml

@@ -0,0 +1,70 @@
+package com.redbear.chat;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import android.app.Activity;
+import android.bluetooth.BluetoothDevice;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemClickListener;
+import android.widget.ListView;
+import android.widget.SimpleAdapter;
+
+public class Device extends Activity implements OnItemClickListener {
+
+	private ArrayList<BluetoothDevice> devices;
+	private List<Map<String, String>> listItems = new ArrayList<Map<String, String>>();
+	private SimpleAdapter adapter;
+	private Map<String, String> map = null;
+	private ListView listView;
+	private String DEVICE_NAME = "name";
+	private String DEVICE_ADDRESS = "address";
+	public static final int RESULT_CODE = 31;
+	public final static String EXTRA_DEVICE_ADDRESS = "EXTRA_DEVICE_ADDRESS";
+	public final static String EXTRA_DEVICE_NAME = "EXTRA_DEVICE_NAME";
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.device_list);
+
+		setTitle("Device");
+
+		listView = (ListView) findViewById(R.id.listView);
+
+		devices = (ArrayList<BluetoothDevice>) Main.mDevices;
+		for (BluetoothDevice device : devices) {
+			map = new HashMap<String, String>();
+			map.put(DEVICE_NAME, device.getName());
+			map.put(DEVICE_ADDRESS, device.getAddress());
+			listItems.add(map);
+		}
+
+		adapter = new SimpleAdapter(getApplicationContext(), listItems,
+				R.layout.list_item, new String[] { "name", "address" },
+				new int[] { R.id.deviceName, R.id.deviceAddr });
+		listView.setAdapter(adapter);
+		listView.setOnItemClickListener(this);
+	}
+
+	@Override
+	public void onItemClick(AdapterView<?> adapterView, View view,
+			int position, long id) {
+		HashMap<String, String> hashMap = (HashMap<String, String>) listItems
+				.get(position);
+		String addr = hashMap.get(DEVICE_ADDRESS);
+		String name = hashMap.get(DEVICE_NAME);
+
+		Intent intent = new Intent(Device.this, Chat.class);
+		intent.putExtra(EXTRA_DEVICE_ADDRESS, addr);
+		intent.putExtra(EXTRA_DEVICE_NAME, name);
+		startActivity(intent);
+		Main.instance.finish();
+		finish();
+	}
+}

Examples/Chat/res/layout/list_item.xml

@@ -1,5 +1,7 @@
 package com.redbear.chat;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Timer;
 import java.util.TimerTask;
 
@@ -24,11 +26,11 @@
 
 public class Main extends Activity {
 	private BluetoothAdapter mBluetoothAdapter;
-	private BluetoothDevice mDevice;
-	private Button connect = null;
 	private static final int REQUEST_ENABLE_BT = 1;
 	private static final long SCAN_PERIOD = 3000;
 	private Dialog mDialog;
+	public static List<BluetoothDevice> mDevices = new ArrayList<BluetoothDevice>();
+	public static Main instance = null;
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
@@ -52,33 +54,52 @@ protected void onCreate(Bundle savedInstanceState) {
 			return;
 		}
 
-		connect = (Button) findViewById(R.id.btn);
-		connect.setOnClickListener(new OnClickListener() {
-
+		if (!mBluetoothAdapter.isEnabled()) {
+			Intent enableBtIntent = new Intent(
+					BluetoothAdapter.ACTION_REQUEST_ENABLE);
+			startActivityForResult(enableBtIntent, REQUEST_ENABLE_BT);
+		}
+		
+		Button btn = (Button)findViewById(R.id.btn);
+		btn.setOnClickListener(new OnClickListener() {
+			
 			@Override
 			public void onClick(View v) {
 				scanLeDevice();
 
-				showRoundProcessDialog(Main.this,
-						R.layout.loading_process_dialog_anim);
+				showRoundProcessDialog(Main.this, R.layout.loading_process_dialog_anim);
+
 				Timer mTimer = new Timer();
 				mTimer.schedule(new TimerTask() {
 
 					@Override
 					public void run() {
-						Intent deviceListIntent = new Intent(
-								getApplicationContext(), Chat.class);
-						Bundle bundle = new Bundle();
-						bundle.putParcelable(Chat.EXTRAS_DEVICE, mDevice);
-						deviceListIntent.putExtras(bundle);
+						Intent deviceListIntent = new Intent(getApplicationContext(),
+								Device.class);
 						startActivity(deviceListIntent);
 						mDialog.dismiss();
-						Main.this.finish();
 					}
 				}, SCAN_PERIOD);
-
 			}
 		});
+
+		scanLeDevice();
+
+		showRoundProcessDialog(Main.this, R.layout.loading_process_dialog_anim);
+
+		Timer mTimer = new Timer();
+		mTimer.schedule(new TimerTask() {
+
+			@Override
+			public void run() {
+				Intent deviceListIntent = new Intent(getApplicationContext(),
+						Device.class);
+				startActivity(deviceListIntent);
+				mDialog.dismiss();
+			}
+		}, SCAN_PERIOD);
+
+		instance = this;
 	}
 
 	public void showRoundProcessDialog(Context mContext, int layout) {
@@ -97,21 +118,10 @@ public boolean onKey(DialogInterface dialog, int keyCode,
 		mDialog = new AlertDialog.Builder(mContext).create();
 		mDialog.setOnKeyListener(keyListener);
 		mDialog.show();
-		// 注意此处要放在show之后 否则会报异常
+		// 娉ㄦ��姝ゅ��瑕���惧��show涔���� ������浼���ュ��甯�
 		mDialog.setContentView(layout);
 	}
 
-	@Override
-	protected void onResume() {
-		super.onResume();
-
-		if (!mBluetoothAdapter.isEnabled()) {
-			Intent enableBtIntent = new Intent(
-					BluetoothAdapter.ACTION_REQUEST_ENABLE);
-			startActivityForResult(enableBtIntent, REQUEST_ENABLE_BT);
-		}
-	}
-
 	private void scanLeDevice() {
 		new Thread() {
 
@@ -138,8 +148,9 @@ public void onLeScan(final BluetoothDevice device, final int rssi,
 			runOnUiThread(new Runnable() {
 				@Override
 				public void run() {
-					if (device != null && device.getName().contains("Shield")) {
-						mDevice = device;
+					if (device != null) {
+						if (mDevices.indexOf(device) == -1)
+							mDevices.add(device);
 					}
 				}
 			});
@@ -158,9 +169,9 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
 	}
 
 	@Override
-	protected void onStop() {
-		super.onStop();
+	protected void onDestroy() {
+		super.onDestroy();
 
-		this.finish();
+		System.exit(0);
 	}
 }