weizhengliang пре 1 година
родитељ
комит
a3a29c44d8

+ 2 - 2
android_host/build.gradle

@@ -115,8 +115,8 @@ dependencies {
 
     compile project(':listenvision')
 
-
-
+    //广播喊话组件
+    compile project(':gstream')
 
 }
 

+ 7 - 6
android_host/src/main/java/com/wdkl/ncs/android/component/nursehome/activity/CallingHostActivationActivity.kt

@@ -47,6 +47,7 @@ import kotlinx.android.synthetic.main.activity_register.*
 import kotlinx.android.synthetic.main.callinghost_activation.*
 import okhttp3.OkHttpClient
 import okhttp3.Request
+import org.freedesktop.gstreamer.GStreamer
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
 import java.util.concurrent.TimeUnit
@@ -98,12 +99,12 @@ class CallingHostActivationActivity  : BaseActivity<DevicePresenter, Callinghost
 
         AppUtil.checkCameraSupport()
 
-//        try {
-//            GStreamer.init(BaseApplication.appContext)
-//            Constant.gstreamer_init = true
-//        } catch (e: Exception) {
-//            e.printStackTrace()
-//        }
+        try {
+            GStreamer.init(BaseApplication.appContext)
+            Constant.gstreamer_init = true
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
 
         checkServer()
     }

+ 1 - 1
settings.gradle

@@ -1,3 +1,3 @@
 include ':app', ':common', ':welcome',  ':resource', ':middleware',
         ':callingdoor',  ':android_bed', ':android_host',
-        ':bedlib', ':janus', ':listenvision'
+        ':bedlib', ':janus', ':listenvision', ':gstream'