V1.0.6

a1anwang · Jul 17, 2018 · 0e53ff5 · 0e53ff5
1 parent 4f8f09d
commit 0e53ff5
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 14 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/src/main/java/com/a1anwang/okble_demo/views/MyDialog.java b/app/src/main/java/com/a1anwang/okble_demo/views/MyDialog.java
@@ -59,10 +59,7 @@ protected void onCreate(Bundle savedInstanceState) {
 					btn_right.setVisibility(View.GONE);
 					line_vertical.setVisibility(View.GONE);
 				}
-
 			}
-
-
 		this.setContentView(view);
 	}
 

diff --git a/app/src/main/res/layout/layout_hexinput.xml b/app/src/main/res/layout/layout_hexinput.xml
@@ -220,6 +220,6 @@
         android:layout_width="match_parent"
         android:layout_height="40dp"
         android:background="@drawable/bg_hex_button"
-        android:text="返回"
+        android:text="@string/back"
         android:textSize="18sp" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/layout_service_data_input.xml b/app/src/main/res/layout/layout_service_data_input.xml
@@ -279,7 +279,7 @@
             android:layout_weight="1"
             android:layout_height="40dp"
             android:background="@drawable/bg_hex_button"
-            android:text="返回"
+            android:text="@string/back"
             android:textSize="18sp" />
     </LinearLayout>
 

diff --git a/app/src/main/res/layout/layout_service_uuid_input.xml b/app/src/main/res/layout/layout_service_uuid_input.xml
@@ -244,7 +244,7 @@
             android:layout_weight="1"
             android:layout_height="40dp"
             android:background="@drawable/bg_hex_button"
-            android:text="返回"
+            android:text="@string/back"
             android:textSize="18sp" />
     </LinearLayout>
 

diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
@@ -9,4 +9,6 @@
     <string name="yes">是</string>
 
     <string name="no">否</string>
+
+    <string name="back">返回</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -8,4 +8,6 @@
     <string name="yes">Yes</string>
 
     <string name="no">No</string>
+
+    <string name="back">Back</string>
 </resources>
diff --git a/okble-lib/src/main/java/com/a1anwang/okble/client/core/OKBLEDevice.java b/okble-lib/src/main/java/com/a1anwang/okble/client/core/OKBLEDevice.java
@@ -29,6 +29,8 @@ public enum DeviceStatus{
      */
     String getDeviceTAG();
 
+    BluetoothDevice getBluetoothDevice();
+
     void addDeviceListener(OKBLEDeviceListener OKBLEDeviceListener);
     void removeDeviceListener(OKBLEDeviceListener OKBLEDeviceListener);
     void clearDeviceListener();

diff --git a/okble-lib/src/main/java/com/a1anwang/okble/client/core/OKBLEDeviceImp.java b/okble-lib/src/main/java/com/a1anwang/okble/client/core/OKBLEDeviceImp.java
@@ -136,6 +136,11 @@ public String getDeviceTAG() {
         return deviceTAG;
     }
 
+    @Override
+    public BluetoothDevice getBluetoothDevice() {
+        return this.bluetoothDevice;
+    }
+
 
     public OKBLEDeviceImp(Context context) {
         this.context = context;

diff --git a/okble-lib/src/main/java/com/a1anwang/okble/client/core/OKBLEDeviceListener.java b/okble-lib/src/main/java/com/a1anwang/okble/client/core/OKBLEDeviceListener.java
@@ -7,16 +7,16 @@
 
 public interface OKBLEDeviceListener {
 
-    public void onConnected(String deviceTAG);
+     void onConnected(String deviceTAG);
 
-    public void onDisconnected(String deviceTAG);
-    public void onReadBattery(String deviceTAG, int battery);
+     void onDisconnected(String deviceTAG);
+     void onReadBattery(String deviceTAG, int battery);
 
-    public void onReceivedValue(String deviceTAG,String uuid,byte[] value);
+     void onReceivedValue(String deviceTAG,String uuid,byte[] value);
 
-    public void onWriteValue(String deviceTAG,String uuid,byte[] value,boolean success);
+     void onWriteValue(String deviceTAG,String uuid,byte[] value,boolean success);
 
-    public void onReadValue(String deviceTAG,String uuid,byte[] value,boolean success);
+     void onReadValue(String deviceTAG,String uuid,byte[] value,boolean success);
 
-    public void onNotifyOrIndicateComplete(String deviceTAG,String uuid,boolean enable,boolean success);
+     void onNotifyOrIndicateComplete(String deviceTAG,String uuid,boolean enable,boolean success);
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -59,10 +59,7 @@ protected void onCreate(Bundle savedInstanceState) { @@
     					btn_right.setVisibility(View.GONE);
     					line_vertical.setVisibility(View.GONE);
     				}
     			}
     		this.setContentView(view);
     	}
@@ Expand Down @@