fix bug: connection failed

Author: xiaodingtw

.idea/caches/build_file_checksums.ser

@@ -7,8 +7,8 @@ android {
         applicationId "com.alfaloop.android.alfabeacon"
         minSdkVersion 21
         targetSdkVersion 26
-        versionCode 4
-        versionName "0.4"
+        versionCode 5
+        versionName "0.5"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             cmake {

app/build.gradle

@@ -34,11 +34,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public class DeviceAdapter extends RecyclerView.Adapter<DeviceAdapter.MyViewHolder> implements Filterable {
+public class DeviceAdapter extends RecyclerView.Adapter<DeviceAdapter.MyViewHolder> implements Filterable{
 
     public interface OnItemClickListener {
-        void onItemClick(int position);
-        void onConnectClick(int position);
+        void onConnectClick(LeBeacon beacon);
     }
 
     private ItemFilter mFilter = new ItemFilter();
@@ -77,7 +76,7 @@ public MyViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
 
     @Override
     public void onBindViewHolder(MyViewHolder holder, int position) {
-        LeBeacon item = mFilterItems.get(position);
+        final LeBeacon item = mFilterItems.get(position);
 
         if (item.getType() == LeBeacon.LEBEACON_TYPE_AA) {
             holder.imvBeaconType.setImageResource(R.drawable.ic_beacon_alfa_aa);
@@ -106,7 +105,7 @@ public void onBindViewHolder(MyViewHolder holder, int position) {
             @Override
             public void onClick(View v) {
                 if (itemClickListener != null) {
-                    itemClickListener.onConnectClick(position);
+                    itemClickListener.onConnectClick(item);
                 }
             }
         });
@@ -115,13 +114,21 @@ public void onClick(View v) {
             @Override
             public void onClick(View v) {
                 if (itemClickListener != null) {
-                    itemClickListener.onItemClick(position);
+                    itemClickListener.onConnectClick(item);
                 }
             }
         });
 
         if (item.getiBeacon() != null) {
             holder.vBeaconContainer.setVisibility(View.VISIBLE);
+            holder.vBeaconContainer.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (itemClickListener != null) {
+                        itemClickListener.onConnectClick(item);
+                    }
+                }
+            });
             holder.vIBeacon.setVisibility(View.VISIBLE);
             holder.tvIBeaconUuid.setText(String.format("UUID • %s", item.getiBeacon().getUuid()));
             holder.tvIBeaconMajor.setText(String.format("Major • %d", item.getiBeacon().getMajor()));

app/src/main/java/com/alfaloop/android/alfabeacon/adapter/DeviceAdapter.java

@@ -15,6 +15,7 @@
  **/
 package com.alfaloop.android.alfabeacon.fragment;
 
+import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothGattCharacteristic;
 import android.bluetooth.BluetoothGattService;
 import android.content.DialogInterface;
@@ -107,8 +108,6 @@ public class ConnectedFragment extends BaseBackFragment implements View.OnClickL
     private RxBleClient rxBleClient;
     private RxBleConnection rxBleConnection;
     private Disposable connectionDisposable;
-    private Observable<RxBleConnection> mConnectionObservable;
-    private PublishSubject<Boolean> disconnectTriggerSubject = PublishSubject.create();
     private int mergeProcessCounter = 0;
 
     // GUI components
@@ -192,9 +191,12 @@ private void initView(View view) {
         mToolbar.setNavigationOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                if (connectionDisposable != null)
+//                RxBleDevice rxdevice = rxBleClient.getBleDevice(macAddress);
+//                RxBleConnection.RxBleConnectionState state = rxdevice.getConnectionState();
+//                if (state == )
+                if (connectionDisposable != null) {
                     connectionDisposable.dispose();
-//                _mActivity.onBackPressed();
+                }
             }
         });
 
@@ -280,10 +282,14 @@ public void onTextChanged(CharSequence charSequence, int i, int i2, int i3) {
             }
             @Override
             public void afterTextChanged(Editable editable) {
-                int major = Integer.parseInt(iBeaconMajorEdit.getText().toString());
-                if (major < 0 || major > 65535) {
+               /* if (iBeaconMajorEdit.getText().length() > 0) {
+                    int major = Integer.parseInt(iBeaconMajorEdit.getText().toString());
+                    if (major > 65535) {
+                        iBeaconMajorEdit.setText("65535");
+                    }
+                } else {
                     iBeaconMajorEdit.setText("0");
-                }
+                }*/
             }
         });
         iBeaconMajorEdit.setOnFocusChangeListener(this);
@@ -297,10 +303,14 @@ public void onTextChanged(CharSequence charSequence, int i, int i2, int i3) {
             }
             @Override
             public void afterTextChanged(Editable editable) {
-                int major = Integer.parseInt(iBeaconMinorEdit.getText().toString());
-                if (major < 0 || major > 65535) {
+               /* if (iBeaconMinorEdit.getText().length() > 0) {
+                    int major = Integer.parseInt(iBeaconMinorEdit.getText().toString());
+                    if (major > 65535) {
+                        iBeaconMinorEdit.setText("65535");
+                    }
+                } else {
                     iBeaconMinorEdit.setText("0");
-                }
+                }*/
             }
         });
         iBeaconMinorEdit.setOnFocusChangeListener(this);

app/src/main/java/com/alfaloop/android/alfabeacon/fragment/ConnectedFragment.java

@@ -16,7 +16,11 @@
 package com.alfaloop.android.alfabeacon.fragment;
 
 import android.animation.ObjectAnimator;
+import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothGattServer;
+import android.bluetooth.BluetoothManager;
+import android.content.Context;
 import android.os.Bundle;
 import android.os.ParcelUuid;
 import android.support.annotation.Nullable;
@@ -138,17 +142,8 @@ private void initView(View view) {
         mAdapter = new DeviceAdapter(_mActivity);
         mAdapter.setItemClickListener(new DeviceAdapter.OnItemClickListener() {
             @Override
-            public void onItemClick(int position) {
+            public void onConnectClick(LeBeacon beacon) {
                 stopScan();
-                List<LeBeacon> valueList = new ArrayList<LeBeacon>(mLeBeaconHashMap.values());
-                LeBeacon beacon = valueList.get(position);
-                start(ConnectedFragment.newInstance(beacon));
-            }
-            @Override
-            public void onConnectClick(int position) {
-                stopScan();
-                List<LeBeacon> valueList = new ArrayList<LeBeacon>(mLeBeaconHashMap.values());
-                LeBeacon beacon = valueList.get(position);
                 start(ConnectedFragment.newInstance(beacon));
             }
         });
@@ -220,6 +215,9 @@ public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser)
             @Override
             public void onClick(final View v) {
                 mExpandLayout.toggle();
+                if (mExpandLayout.isExpanded()) {
+                    hideSoftInput();
+                }
             }
         });
 
@@ -294,6 +292,11 @@ public void onFocusChange(View v, boolean hasFocus) {
         }
     }
 
+    @Override
+    public void onSupportVisible() {
+        super.onSupportVisible();
+    }
+
     @Override
     public void onDestroyView() {
         super.onDestroyView();