3128兼容性修改

android_host/src/main/h10_z3128_1h/AndroidManifest.xml

@@ -67,6 +67,16 @@
         android:label="@string/app_name"
         android:supportsRtl="true">
 
+        <meta-data
+            android:name="com.enation.javashop.imagepluin.cache.MyGlideModule"
+            android:value="GlideModule" />
+        <meta-data
+            android:name="design_width_in_dp"
+            android:value="1280"/>
+        <meta-data
+            android:name="design_height_in_dp"
+            android:value="800"/>
+
         <activity android:name="com.wdkl.ncs.android.component.nursehome.activity.RegisterActivity"
             android:launchMode="singleInstance">
             <intent-filter>

android_host/src/main/h10_z3128_1h/java/com/wdkl/ncs/android/component/nursehome/activity/NurseHomeActivity.kt

@@ -50,6 +50,7 @@ import com.wdkl.ncs.android.middleware.model.dos.DeviceDO
 import com.wdkl.ncs.android.middleware.model.dto.TcpSeverDTO
 import com.wdkl.ncs.android.middleware.model.vo.HostDevicePartSettingVO
 import com.wdkl.ncs.android.middleware.model.vo.InteractionVO
+import com.wdkl.ncs.android.middleware.model.vo.NurseDeviceInfoVO
 import com.wdkl.ncs.android.middleware.tcp.TcpClient
 import com.wdkl.ncs.android.middleware.tcp.channel.DeviceChannel
 import com.wdkl.ncs.android.middleware.tcp.channel.EntraceGuardUtil
@@ -368,8 +369,8 @@ class NurseHomeActivity  : BaseActivity<NurseHomeActivityPresenter, ActivityNurs
         var intentFilter = IntentFilter()
         intentFilter.addAction(ConnectivityManager.CONNECTIVITY_ACTION)
         //手柄状态监听
-        intentFilter.addAction(Constants.HOOK_OFF_ACTION)
-        intentFilter.addAction(Constants.HOOK_ON_ACTION)
+        intentFilter.addAction(Constants.HOOK_OFF)
+        intentFilter.addAction(Constants.HOOK_ON)
         registerReceiver(receiver, intentFilter)
     }
 
@@ -468,6 +469,11 @@ class NurseHomeActivity  : BaseActivity<NurseHomeActivityPresenter, ActivityNurs
         SerialPortUtil.getInstance().closeHeart()
         SerialPortUtil.getInstance().closeSerialPort()
     }
+
+    override fun onNoneNet() {
+        showMessage("None net")
+    }
+
     /**
      *处理错误信息
      */
@@ -549,9 +555,9 @@ class NurseHomeActivity  : BaseActivity<NurseHomeActivityPresenter, ActivityNurs
         JanusConstant.STUN_SERVER = arrayOf<String>(data.stunServer)
         //JanusConstant.TURN_SERVER = data.turnServer
 
-        if (data.isLedControl != null) {
-            SettingConfig.setLedControl(activity, data.isLedControl)
-            if (data.isLedControl) {
+        if (data.ledControl != null) {
+            SettingConfig.setLedControl(activity, data.ledControl)
+            if (data.ledControl) {
                 led_settings_radio_bt.visibility = View.GONE
             }
         }
@@ -691,6 +697,10 @@ class NurseHomeActivity  : BaseActivity<NurseHomeActivityPresenter, ActivityNurs
         }
     }
 
+    override fun showDeviceData(data: NurseDeviceInfoVO) {
+        //
+    }
+
     override fun setLedDeviceInfo(data: ArrayList<DeviceDO>) {
         Log.d(TAG, "get led count: " + data.size)
         if (data.size > 0) {

android_host/src/main/h10_z3128_1h/java/com/wdkl/ncs/android/component/nursehome/activity/RegisterActivity.kt

@@ -97,6 +97,7 @@ class RegisterActivity : BaseActivity<DevicePresenter, ActivityRegisterBinding>(
 
     private fun permissionGranted() {
         Constants.mac = NetHelper.getInstance().macAddress
+        Constants.device_serial_id = Constants.mac
         Log.e(TAG,"mac "+ Constants.mac)
         tv_local_mac.text = "MAC："+ Constants.mac
 

android_host/src/main/h10_z3128_1h/java/com/wdkl/ncs/android/component/nursehome/fragment/EntraceGuardVideoFragment.kt

@@ -111,7 +111,7 @@ class EntraceGuardVideoFragment : Fragment(), CallSessionCallback, View.OnTouchL
 
 
     private fun init() {
-        janusClient!!.connect()
+        janusClient!!.connect(-1, false)
         title.setText(interactionVO!!.fromDeviceName.toString() + "," + StringUtil.getResString(R.string.call_entrance_guard))
         WebRTCEngine.getInstance().toggleSpeaker(false)
         RingPlayHelper.playRingTone(activity, R.raw.door_bell, true)

android_host/src/main/h10_z3128_1h/java/com/wdkl/ncs/android/component/nursehome/fragment/OtherHostFragment.kt

@@ -84,7 +84,7 @@ class OtherHostFragment : BaseFragment<OtherHostPresenter, FragmentOtherHostBind
                 //加载总控主机
                 otherHostAdapter!!.data.clear()
                 if (Constants.hospital_id != -1) {
-                    presenter.loadManageDevice(DeviceTypeEnum.NURSE_HOST.value(), Constants.hospital_id)
+                    presenter.loadHostDevice(DeviceTypeEnum.NURSE_HOST.value(), Constants.hospital_id)
                 }
             }
         }
@@ -103,8 +103,10 @@ class OtherHostFragment : BaseFragment<OtherHostPresenter, FragmentOtherHostBind
     override fun destory() {
     }
 
-    override fun showManageDevice(devices: ArrayList<DeviceDO>) {
+    override fun showDevice(devices: ArrayList<DeviceDO>) {
+        otherHostAdapter!!.data.clear()
         otherHostAdapter!!.data.addAll(devices)
+        //Log.i(TAG,"其它主机数量 " + devices.size)
         otherHostAdapter!!.notifyDataSetChanged()
     }
 

android_host/src/main/h10_z3128_1h/java/com/wdkl/ncs/android/component/nursehome/fragment/SkyCallFragment.kt

@@ -125,7 +125,7 @@ class SkyCallFragment: BaseCallFragment(), CallSessionCallback {
         videoRoomCallback = VideoRoomCallback(janusClient, room, Constants.sip_id!!.toBigInteger())
         videoRoomCallback!!.callSessionCallback = this
         janusClient!!.setJanusCallback(videoRoomCallback)
-        janusClient!!.connect()
+        janusClient!!.connect(-1, false)
 
         Constants.IN_CALL = true
     }
@@ -157,13 +157,15 @@ class SkyCallFragment: BaseCallFragment(), CallSessionCallback {
             visit_list_view.setVisibility(View.GONE)
             Constants.visit_bed_name = bedVO.frameBed.fullName
 
+            VideoUtil.sendInviteVideoCall(Constants.ids, bedVO.bedDeviceId, Constants.interactionId, Constants.targetSipId)
+
             //延迟发送
-            Handler().postDelayed({ //发送探视邀请给分机
+            /*Handler().postDelayed({ //发送探视邀请给分机
                 VideoUtil.sendInviteVideoCall(
                     Constants.ids,
                     bedVO.bedDeviceId,
                     Constants.interactionId)
-            }, 2000)
+            }, 2000)*/
 
             //关闭主机和探视机的视频，然后由分机向探视机发视频通话
             /*if (gEngineKit!!.currentSession != null) {

android_host/src/main/h10_z3128_1h/java/com/wdkl/ncs/android/component/nursehome/window/VisitingWindow.java

@@ -90,7 +90,7 @@ public class VisitingWindow {
      * 删除窗口
      */
     public static void release() {
-        Constants.Companion.setCALL_STATE(Constants.Companion.getCALL_STANDBY());
+        Constants.Companion.setCALL_STATE(Constants.CALL_STANDBY);
         DeviceChannel.calling = false;
         if (view != null) {
             Chronometer time = view.findViewById(R.id.window_visiting_time);