Update method name

lmbluetoothsdk/src/main/java/co/lujun/lmbluetoothsdk/BluetoothManager.java

@@ -47,14 +47,12 @@ public class BluetoothManager implements BaseManager {
 
     private BluetoothAdapter mBluetoothAdapter;
     private BluetoothListener mBluetoothListener;
+    private BluetoothService mBluetoothService;
     private BlueToothReceiver mReceiver;
     private Context mContext;
-    private BluetoothService mBluetoothService;
 
     private static BluetoothManager sBluetoothManager;
 
-    private static final String TAG = "BluetoothManager";
-
     public static BluetoothManager getInstance(){
         if (sBluetoothManager == null){
             synchronized (BluetoothManager.class){
@@ -79,7 +77,7 @@ public BluetoothManager build(Context context){
     }
 
     /**
-     * Set bluetooth listener, you can check all bluetooth status with this listener's callback.
+     * Set bluetooth listener, you can check all bluetooth status and read data with this listener's callback.
      * @param listener
      */
     public void setBluetoothListener(BluetoothListener listener){
@@ -120,18 +118,15 @@ public boolean isEnabled(){
     }
 
     @Override
-    public void onOpenBluetooth(){
+    public void openBluetooth(){
         if (!isAvaliable()){
             return;
         }
-//        Intent intent = new Intent();
-//        intent.setAction(BluetoothAdapter.ACTION_REQUEST_ENABLE);
-//        startActivityForResult(intent, REQUEST_ENABLE_BT);
         mBluetoothAdapter.enable();
     }
 
     @Override
-    public void onCloseBluetooth(){
+    public void closeBluetooth(){
         if (!isAvaliable() && !isEnabled()){
             return;
         }
@@ -150,15 +145,15 @@ public boolean setDiscoverable(int time){
     }
 
     @Override
-    public boolean startDiscovery() {
+    public boolean startScan() {
         if (!isAvaliable() && !isEnabled()){
             return false;
         }
         return mBluetoothAdapter.startDiscovery();
     }
 
     @Override
-    public boolean cancelDiscovery() {
+    public boolean cancelScan() {
         if (!isAvaliable() && !isEnabled()){
             return false;
         }
@@ -182,7 +177,7 @@ public BluetoothDevice findDeviceByMac(String mac){
     }
 
     @Override
-    public void onStartAsServer() {
+    public void startAsServer() {
         if (mBluetoothService != null){
             mBluetoothService.start();
         }
@@ -202,7 +197,14 @@ public void connect(String mac){
     }
 
     @Override
-    public void onWrite(byte[] data) {
+    public void disconnect() {
+        if (mBluetoothService != null){
+            mBluetoothService.stop();
+        }
+    }
+
+    @Override
+    public void write(byte[] data) {
         if (mBluetoothService != null){
             mBluetoothService.write(data);
         }

lmbluetoothsdk/src/main/java/co/lujun/lmbluetoothsdk/base/BaseManager.java

@@ -1,3 +1,29 @@
+/*
+ * The MIT License (MIT)
+
+ * Copyright (c) 2015 LinkMob.cc
+
+ * Contributors: lujun
+
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
 package co.lujun.lmbluetoothsdk.base;
 
 import android.bluetooth.BluetoothDevice;
@@ -25,31 +51,31 @@ public interface BaseManager {
     /**
      * Open bluetooth.
      */
-    void onOpenBluetooth();
+    void openBluetooth();
 
     /**
      * Close bluetooth.
      */
-    void onCloseBluetooth();
+    void closeBluetooth();
 
     /**
-     * Set bluetooth discoverable with specified time.
+     * Set bluetooth discoverable with specified time(unit s).
      * @param time
      * @return
      */
     boolean setDiscoverable(int time);
 
     /**
-     * Start discovery.
+     * Start scan.
      * @return
      */
-    boolean startDiscovery();
+    boolean startScan();
 
     /**
-     * Cancel discovery.
+     * Cancel scan.
      * @return
      */
-    boolean cancelDiscovery();
+    boolean cancelScan();
 
     /**
      * Get paired devices.
@@ -67,17 +93,22 @@ public interface BaseManager {
     /**
      * Start as a server.
      */
-    void onStartAsServer();
+    void startAsServer();
 
     /**
      * Connected a bluetooth device by mac address.
      * @param mac
      */
     void connect(String mac);
 
+    /**
+     * Disconnect connection.
+     */
+    void disconnect();
+
     /**
      * Write data to remote device.
      * @param data
      */
-    void onWrite(byte[] data);
+    void write(byte[] data);
 }

lmbluetoothsdk/src/main/java/co/lujun/lmbluetoothsdk/base/BluetoothListener.java

@@ -1,3 +1,29 @@
+/*
+ * The MIT License (MIT)
+
+ * Copyright (c) 2015 LinkMob.cc
+
+ * Contributors: lujun
+
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
 package co.lujun.lmbluetoothsdk.base;
 
 import android.bluetooth.BluetoothDevice;
@@ -10,8 +36,8 @@ public interface BluetoothListener {
 
     void onActionStateChanged(int preState, int state);
     void onActionDiscoveryStateChanged(String discoveryState);
-    void onActionFound(BluetoothDevice device);
     void onActionScanModeChanged(int preScanMode, int scanMode);
     void onBluetoothServiceStateChanged(int state);
+    void onActionDeviceFound(BluetoothDevice device);
     void onReadData(byte[] data);
 }

lmbluetoothsdk/src/main/java/co/lujun/lmbluetoothsdk/receiver/BlueToothReceiver.java

@@ -1,3 +1,29 @@
+/*
+ * The MIT License (MIT)
+
+ * Copyright (c) 2015 LinkMob.cc
+
+ * Contributors: lujun
+
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
 package co.lujun.lmbluetoothsdk.receiver;
 
 import android.bluetooth.BluetoothAdapter;