Merge branch 'yz_watch_wdklwebrtc_1.0.0' of http://git.wdklian.com/allen/ncs_android_frame into yz_watch_wdklwebrtc_1.0.0

修改网络监听

common/src/main/code/com/wdkl/ncs/android/lib/utils/ConnectionObserver.kt

@@ -9,6 +9,7 @@ import io.reactivex.Observer
 import io.reactivex.disposables.Disposable
 import org.json.JSONObject
 import retrofit2.HttpException
+import java.lang.Exception
 
 /**
  * @author  LDD
@@ -95,14 +96,20 @@ abstract class ConnectionObserver<T> : BaseObserver<T>(BaseApplication.appContex
 abstract class BaseObserver<T>(private val context: Context) : Observer<T> {
 
     override fun onSubscribe(disposable: Disposable) {
-        if (VoiNetTool.getAPNType(this.context) == VoiNetTool.netType.noneNet) {
-            disposable.dispose()
-            this.onNoneNet()
-        } else {
+        try {
+            if (VoiNetTool.getAPNType(this.context) == VoiNetTool.netType.noneNet) {
+                disposable.dispose()
+                this.onNoneNet()
+            } else {
+                this.onStart()
+                this.attachSubscribe(disposable)
+            }
+        } catch (e:Exception){
+            System.err.println(e.message)
+        } finally {
             this.onStart()
             this.attachSubscribe(disposable)
         }
-
     }
 
     override fun onError(e: Throwable) {