bug fix

Author: Andy Liao

app/app.iml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="BLEDemo" external.system.module.version="unspecified"type="JAVA_MODULE"version="4">
+<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="androidBLEDemo" external.system.module.version="unspecified"type="JAVA_MODULE"version="4">
  <componentname="FacetManager">
  <facettype="android-gradle"name="Android-Gradle">
  <configuration>

blelibrary/blelibrary.iml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":blelibrary" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="BLEDemo" external.system.module.version="unspecified"type="JAVA_MODULE"version="4">
+<module external.linked.project.id=":blelibrary" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="androidBLEDemo" external.system.module.version="unspecified"type="JAVA_MODULE"version="4">
  <componentname="FacetManager">
  <facettype="android-gradle"name="Android-Gradle">
  <configuration>

blelibrary/src/main/java/me/czvn/blelibrary/bluetooth/BLEClient.java

@@ -26,11 +26,8 @@
  * 对bluetoothGatt进行了封装
  */
 publicfinalclassBLEClient{
-// TODO: 2016/1/22 为了实现多人聊天的情景，可以将消息全部改成Json传输
 privatestaticfinalStringTAG = BLEClient.class.getSimpleName();
 privateContextmContext;
-privateBluetoothManagerbluetoothManager;
-privateBluetoothAdapterbluetoothAdapter;
 
 privateBluetoothGattCallbackgattCallback;
 privateBluetoothGattbluetoothGatt;
@@ -44,9 +41,7 @@ public final class BLEClient{
 
 privatebooleanconnected;
 
-privateMsgQueuemsgQueue;//使用消息队列达到异步处理数据发送的问题
-// 现在在中文字符数达到一定量的时候会乱码，说明这部分还是有问题，可能跟中文字符的getBytes方法有关系，需要尝试指定字符编码
-//指定字符编码无效，待Debug
+privateMsgQueue<byte[]> msgQueue;//使用消息队列达到异步处理数据发送的问题
 
 privatebooleanonWrite;//是否正在发送数据
 
@@ -68,7 +63,7 @@ public void receiveMessage(String msg){
 ibleCallback.onMessageReceived(msg);
  }
  });
-msgQueue = newMsgQueue();
+msgQueue = newMsgQueue<>();
 initGattCallback();
 
  }
@@ -80,8 +75,8 @@ public void receiveMessage(String msg){
  * @return 是否连接成功
  */
 publicbooleanstartConnect(Stringadderss){
-bluetoothManager = (BluetoothManager) mContext.getSystemService(Context.BLUETOOTH_SERVICE);
-bluetoothAdapter = bluetoothManager.getAdapter();
+BluetoothManagerbluetoothManager = (BluetoothManager) mContext.getSystemService(Context.BLUETOOTH_SERVICE);
+BluetoothAdapterbluetoothAdapter = bluetoothManager.getAdapter();
 bluetoothGatt = bluetoothAdapter.getRemoteDevice(adderss).connectGatt(mContext, false, gattCallback);
 if (bluetoothGatt.connect()){
 connected = true;
@@ -146,7 +141,7 @@ public void onServicesDiscovered(BluetoothGatt gatt, int status){
 if (service != null){
 BluetoothGattCharacteristiccharacteristic = service.getCharacteristic(UUID.fromString(BLEProfile.UUID_CHARACTERISTIC_NOTIFY));
 if (characteristic != null){
-//SetNotification
+//订阅通知，这段代码对iOS的peripheral也能订阅
 Log.i(TAG, "SetNotification");
 bluetoothGatt.setCharacteristicNotification(characteristic, true);
 for (BluetoothGattDescriptordescriptor : characteristic.getDescriptors()){

blelibrary/src/main/java/me/czvn/blelibrary/bluetooth/BLEScanner.java

@@ -27,7 +27,6 @@ public final class BLEScanner{
 
 privateContextcontext;
 privateIScanResultListenerscanResultListener;
-privateBluetoothAdapterbluetoothAdapter;
 privateBluetoothLeScannerscanner;
 privateScanCallbackscanCallback;
 privateScanSettingsscanSettings;
@@ -55,7 +54,7 @@ public static BLEScanner getInstance(Context context, IScanResultListener listen
  * @return 如果设备不支持BLE扫描则返回false，支持返回true
  */
 publicbooleanstartScan(){
-bluetoothAdapter = ((BluetoothManager) context.getSystemService(Context.BLUETOOTH_SERVICE)).getAdapter();
+BluetoothAdapterbluetoothAdapter = ((BluetoothManager) context.getSystemService(Context.BLUETOOTH_SERVICE)).getAdapter();
 if (bluetoothAdapter == null){
 Log.e(TAG, "bluetoothAdapter is null");
 returnfalse;

blelibrary/src/main/java/me/czvn/blelibrary/bluetooth/BLEServer.java

@@ -105,7 +105,6 @@ public void sendMsg(String msg){
  }
 
 
-
 privatevoidsetCallback(IBLECallbackcallback){
 this.callback = callback;
  }

blelibrary/src/main/java/me/czvn/blelibrary/utils/MsgQueue.java

@@ -4,7 +4,7 @@
  * Created by andy on 2016/1/19.
  * 链表实现的队列
  */
-publicclassMsgQueue{
+publicfinalclassMsgQueue<T>{
 privateNodefirst;
 privateNodelast;
 privateintlength;
@@ -17,7 +17,7 @@ public int size(){
 returnlength;
  }
 
-publicvoidenQueue(byte[]item){
+publicvoidenQueue(Titem){
 Nodeoldlast = last;
 last = newNode();
 last.item = item;
@@ -31,19 +31,19 @@ public void enQueue(byte[] item){
 
  }
 
-publicbyte[]deQueue(){
+publicTdeQueue(){
 if (isEmpty()){
 last = null;
 returnnull;
  }
-byte[]values = first.item;
+Tvalues = first.item;
 first = first.next;
 length--;
 returnvalues;
  }
 
 privateclassNode{
-byte[]item;
+Titem;
 Nodenext;
  }
 }