fix bug

Author: Lloyd0577

README.md

@@ -25,7 +25,7 @@ SDK中Demo与API接口采用Kotlin语言编写，希望你对Kotlin有一定的
 ### gradle自动依赖
 在所需的module中的build.gradle文件下添加以下依赖即可：
 ```groovy
-implementation 'cn.entertech:flowtimeble:1.0.2'
+implementation 'cn.entertech:biomoduleble:1.0.4'
 ```
 ### jar包集成
 如果你在自动依赖遇到问题也可以手动添加依赖

app/build.gradle

@@ -27,7 +27,6 @@ android {
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'com.android.support:appcompat-v7:28.0.0'
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
@@ -38,5 +37,5 @@ dependencies {
     api "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation "com.polidea.rxandroidble2:rxandroidble:1.8.0"
     implementation 'com.orhanobut:logger:1.15'
-//    implementation 'cn.entertech:flowtimeble:1.0.3'
+    implementation 'cn.entertech:biomoduleble:1.0.4'
 }

app/libs/enter-biomodule-ble-v1.0.2.jar

@@ -42,19 +42,19 @@ dependencies {
 //添加
 apply plugin: 'com.novoda.bintray-release'
 publish {
-    bintrayUser="lloyd95"
-    bintrayKey="991689a1be9b7db7f30ead5ebea6f109cc1744d4"
+    bintrayUser="hzentertech"
+    bintrayKey="a5c7edd58f68d746817dce405483be33f6b0c219"
     //bintray.com用户名
-    userOrg = 'lloyd95'
+    userOrg = 'hzentertech'
     //jcenter上的路径
     groupId = 'cn.entertech'
     //项目名称
-    artifactId = 'biomodule-ble'
+    artifactId = 'biomoduleble'
     //版本号
-    publishVersion = '1.0.1'
+    publishVersion = '1.0.4'
     //描述，不重要
     desc = ''
     //网站，不重要
-    website = 'https://github.com/Lloyd0577/MVPDemo'
+    website = 'https://github.com/Entertech/Enter-Biomodule-BLE-Android-SDK'
     dryRun = false
 }

app/libs/enter-biomoduleble-v1.0.4.jar

@@ -8,16 +8,17 @@ import cn.entertech.ble.util.BatteryUtil
 import cn.entertech.ble.util.ByteArrayBean
 import cn.entertech.ble.util.NapBleCharacter
 import io.reactivex.disposables.Disposable
+import java.util.concurrent.CopyOnWriteArrayList
 
 class BiomoduleBleManager private constructor(context: Context) {
     val rxBleManager: RxBleManager
-    private lateinit var handler: Handler
-    private lateinit var handlerThread: HandlerThread
-    val rawDataListeners = mutableListOf<(ByteArray) -> Unit>()
-    val rawDataListeners4CSharp = mutableListOf<(ByteArrayBean) -> Unit>()
-    val contactListeners = mutableListOf<(ContactState) -> Unit>()
-    val batteryListeners = mutableListOf<(NapBattery) -> Unit>()
-    val heartRateListeners = mutableListOf<(Int) -> Unit>()
+    private var handler: Handler
+    private var handlerThread: HandlerThread
+    val rawDataListeners = CopyOnWriteArrayList<(ByteArray) -> Unit>()
+    val rawDataListeners4CSharp = CopyOnWriteArrayList<(ByteArrayBean) -> Unit>()
+    val contactListeners = CopyOnWriteArrayList<(ContactState) -> Unit>()
+    val batteryListeners = CopyOnWriteArrayList<(NapBattery) -> Unit>()
+    val heartRateListeners = CopyOnWriteArrayList<(Int) -> Unit>()
     var brainWaveDisposable: Disposable? = null
     var batteryDisposable: Disposable? = null
     var heartRateDisposable: Disposable? = null

ble/build.gradle

@@ -39,8 +39,8 @@ class RxBleManager private constructor(context: Context) {
     private lateinit var scanNearSubscription: Disposable
     private lateinit var scanSubscription: Disposable
     private val SCAN_TIMEOUT: Long = 10000
-    private val DURATION_OF_SORT: Long = 5000
-    private val CONNECT_TASK_DELAY: Long = 2000
+    private val DURATION_OF_SORT: Long = 3000
+    private val CONNECT_TASK_DELAY: Long = 1000
 
     init {
         rxBleClient = RxBleClient.create(context)
@@ -142,6 +142,9 @@ class RxBleManager private constructor(context: Context) {
                     this.rxBleConnection = rxBleConnection
                     Logger.d("conn succ")
                     success?.invoke(scanResult.bleDevice.macAddress)
+                    connectListeners.forEach {
+                        it.invoke(scanResult.bleDevice.macAddress)
+                    }
                 }, { throwable ->
                     isConnecting = false
                     disConnectListeners.forEach {