修改日志种类

修改地址为 爱帝宫地址

home/src/main/code/com/wdkl/ncs/android/component/home/activity/WatchCallRecordsActivity.kt

@@ -166,7 +166,7 @@ class WatchCallRecordsActivity : BaseActivity<WatchCallRecordsFragmentPresenter,
     }
 
     override fun renderFloor(data: ArrayList<InteractionVO>) {
-        Log.e(TAG, "renderFloor() " + data.size)
+        Log.i(TAG, "renderFloor() " + data.size)
         if (action.equals(unread)) {
             EventBus.getDefault().post(MessageEvent(data, Constants.EVENT_UNTREATED_QUANTITY))
         }
@@ -184,7 +184,7 @@ class WatchCallRecordsActivity : BaseActivity<WatchCallRecordsFragmentPresenter,
      * 显示发起人的呼叫记录
      */
     override fun showInitiatorData(data: ArrayList<InteractionVO>) {
-        Log.e(TAG, "showInitiatorData() " + data.size)
+        Log.i(TAG, "showInitiatorData() " + data.size)
         refresh.finishRefresh()
         if (data.size > 0) {
             watchCallRecordsItemAdapter.data.clear()

home/src/main/code/com/wdkl/ncs/android/component/home/activity/WatchContactsActivity.kt

@@ -120,7 +120,7 @@ class WatchContactsActivity : BaseActivity<WatchActivityPresenter, WatchContacts
 
     override fun render(data: ArrayList<WatchContactsVO>) {
 
-        Log.e(TAG,"返回的数据 "+data)
+        Log.i(TAG,"返回的数据 "+data)
         refresh.finishRefresh()
         if (page == 1) {
             refresh.resetNoMoreData()

home/src/main/code/com/wdkl/ncs/android/component/home/activity/WatchEventDetailActivity.kt

@@ -104,7 +104,7 @@ class WatchEventDetailActivity : BaseActivity<WatchHomeActivityPresenter, WatchA
 
         call_relyout.setOnClickListener {
             if (isClick) {
-                Log.e(TAG, "tcpModel 发送的 " + tcpModel?.toJson())
+                Log.i(TAG, "tcpModel 发送的 " + tcpModel?.toJson())
                 var tcpModel: TcpModel? = null
                 if (interactionVO?.actionDirectionType == 1) {
                     tcpModel = VoiceUtil.voiceCall(Integer.parseInt(Constants.ids), interactionVO?.fromDeviceId)

home/src/main/code/com/wdkl/ncs/android/component/home/activity/WatchHome2Activity.kt

@@ -119,16 +119,16 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
 
 
         Constants.imei = Util().getIMEI(this)
-        Log.e(TAG, "IMEI " + Util().getIMEI(this))
+        Log.i(TAG, "IMEI " + Util().getIMEI(this))
 
         Constants.mac = NetHelper.getInstance().macAddress
         //Constants.mac = "4C:C0:0A:8E:D6:BB"
-        Log.e(TAG, "mac " + Constants.mac)
+        Log.i(TAG, "mac " + Constants.mac)
         tv_mac_addr.text = "MAC地址: " + Constants.mac + "\n" + "IMEI号：" + Constants.imei
 
         Thread(Runnable {
             while (isRegister) {
-                Log.e(TAG,"注册心跳")
+                Log.i(TAG,"注册心跳")
                 runOnUiThread(Runnable {
                     presenter.loadTcpServerHost()
 
@@ -153,13 +153,13 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
                 Manifest.permission.RECORD_AUDIO,
                 Manifest.permission.READ_PHONE_STATE)).subscribe {
             if (it) {
-                Constants.imei = Util().getIMEI(this)
-                Log.e(TAG, "IMEI " + Util().getIMEI(this))
-
-                Constants.mac = NetHelper.getInstance().macAddress
-                //Constants.mac = "4C:C0:0A:8E:D6:BB"
-                Log.e(TAG, "mac " + Constants.mac)
-                tv_mac_addr.text = "MAC地址: " + Constants.mac + "\n" + "IMEI号：" + Constants.imei
+//                Constants.imei = Util().getIMEI(this)
+//                Log.e(TAG, "IMEI " + Util().getIMEI(this))
+//
+//                Constants.mac = NetHelper.getInstance().macAddress
+//                //Constants.mac = "4C:C0:0A:8E:D6:BB"
+//                Log.e(TAG, "mac " + Constants.mac)
+//                tv_mac_addr.text = "MAC地址: " + Constants.mac + "\n" + "IMEI号：" + Constants.imei
 
 //                presenter.loadData(Constants.mac)//传Mac
                 presenter.loadData(Constants.imei)// 传imei
@@ -180,7 +180,7 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
     }
 
     override fun userLogin() {
-        Log.e(TAG, "webrtc 注册完成")
+        Log.i(TAG, "webrtc 注册完成")
         sip_state_tv.setBackgroundColor(Color.parseColor("#00FFFF"))
         // webRTC呼叫测试
 //        var room = UUID.randomUUID().toString() + System.currentTimeMillis()
@@ -201,7 +201,7 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
 
     override fun userLogout() {
         sip_state_tv.setBackgroundColor(Color.parseColor("#FF0000"))
-        Log.e(TAG, "webrtc 注册失败")
+        Log.i(TAG, "webrtc 注册失败")
         var intent = Intent(this,WatchRegisterActivity::class.java)
         startActivity(intent)
         finish()
@@ -269,7 +269,7 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
         watch_activity_register_layout.visibility = View.GONE
         watch_activity_home_linyout.visibility = View.VISIBLE
 
-        Log.e(TAG, "收到返回的设备信息 ")
+        Log.i(TAG, "收到返回的设备信息 ")
         Constants.part_id = data.partId
         Constants.ids = "" + data.id
         Constants.sip_id = data.sipId
@@ -374,13 +374,13 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
         // 连接socket:登录
         SocketManager.getInstance().connect(Urls.WS, Constants.sip_id, 0)
 
-        Log.e(TAG, "Urls.WS " + Urls.WS + " sip_id " + Constants.sip_id)
+        Log.i(TAG, "Urls.WS " + Urls.WS + " sip_id " + Constants.sip_id)
 
         wifiManager = (applicationContext.getSystemService(Context.WIFI_SERVICE)) as WifiManager
         teleManager = (applicationContext.getSystemService(Context.TELEPHONY_SERVICE)) as TelephonyManager
 
         netType = NetHelper.getInstance().getNetworkState(applicationContext)
-        Log.e(TAG, "wzlll 网络类型：" + netType)
+        Log.i(TAG, "wzlll 网络类型：" + netType)
         if (netType == NetHelper.NETWORK_2G || netType == NetHelper.NETWORK_3G || netType == NetHelper.NETWORK_4G) {
             if (teleManager != null) {
                 teleManager.listen(object : PhoneStateListener() {
@@ -569,7 +569,7 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
             checkAppVersion()
         } else if (messageEvent.tag == Constants.EVENT_SIP_REGISTER_STATUS) {
             var message = messageEvent.getMessage() as String
-            Log.e(TAG, "收到sip註冊消息 " + message)
+            Log.i(TAG, "收到sip註冊消息 " + message)
             runOnUiThread {
 //                if (message.equals(SipHelperUtil.REGISTERING)) {
 //                    sip_state_tv.setBackgroundColor(Color.parseColor("#FFFF00"))
@@ -611,7 +611,7 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
 
             var tcpModel = messageEvent.getMessage() as TcpModel
             var responseTcpModel: TcpModel
-            Log.e(TAG, "" + tcpModel.getType() + " " + tcpModel.getAction())
+            Log.i(TAG, "" + tcpModel.getType() + " " + tcpModel.getAction())
             when (tcpModel.getType()) {
                 TcpType.CALLBACK -> if (tcpModel.getAction() === TcpAction.CallbackAction.SUCCESS) {
                     //todo: 刷新呼叫记录列表
@@ -628,7 +628,7 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
                         //给服务器发送正在通话中 tcp
                         TcpClient.getInstance().sendMsg(responseTcpModel.toJson())
                     } else {
-                        Log.e(TAG, "启动接听界面")
+                        Log.i(TAG, "启动接听界面")
                         responseTcpModel = VoiceUtil.voiceSuccess(tcpModel.getToId(), tcpModel.getFromId(), interactionVO.getId())
                         TcpClient.getInstance().sendMsg(responseTcpModel.toJson())
 
@@ -672,10 +672,10 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
                 }
                 TcpType.EVENT -> if (tcpModel.getAction() === TcpAction.EventAction.KEY_CLICK) { //有新事件过来
                     //todo: 服务端通过data给出具体的事件名称放置data。使用通话中界面，显示事件名称，停留3秒，结束至正常界面
-                    Log.e(TAG, "收到事件tcp")
+                    Log.i(TAG, "收到事件tcp")
                 }
                 TcpType.SOS -> if (tcpModel.getAction() === TcpAction.SOSAction.CALL) {
-                    Log.e(TAG, "" + tcpModel.getType() + " " + tcpModel.getAction())
+                    Log.i(TAG, "" + tcpModel.getType() + " " + tcpModel.getAction())
 
                     var intent = Intent()
                     intent.setClass(this, SOSEmergencyCallActivity::class.java)

home/src/main/code/com/wdkl/ncs/android/component/home/activity/WatchHomeActivity.kt

@@ -101,13 +101,13 @@ class WatchHomeActivity : BaseActivity<WatchHomeActivityPresenter, WatchActivity
         // 连接socket:登录
         SocketManager.getInstance().connect(Urls.WS, Constants.sip_id, 0)
 
-        Log.e(TAG,"Urls.WS "+Urls.WS+" sip_id "+Constants.sip_id)
+        Log.i(TAG,"Urls.WS "+Urls.WS+" sip_id "+Constants.sip_id)
 
         wifiManager = (applicationContext.getSystemService(Context.WIFI_SERVICE)) as WifiManager
         teleManager = (applicationContext.getSystemService(Context.TELEPHONY_SERVICE)) as TelephonyManager
 
         netType = NetHelper.getInstance().getNetworkState(applicationContext)
-        Log.e(TAG, "wzlll 网络类型：" + netType)
+        Log.i(TAG, "wzlll 网络类型：" + netType)
         if (netType == NetHelper.NETWORK_2G || netType == NetHelper.NETWORK_3G || netType == NetHelper.NETWORK_4G) {
             if (teleManager != null) {
                 teleManager.listen(object : PhoneStateListener() {
@@ -118,7 +118,7 @@ class WatchHomeActivity : BaseActivity<WatchHomeActivityPresenter, WatchActivity
                         if (lastSignal > 0) {
                             var mobileNetworkSignal = lastSignal
                         }
-                        Log.e(TAG, "wzlll 数据连接信号强度：" + lastSignal)
+                        Log.i(TAG, "wzlll 数据连接信号强度：" + lastSignal)
                     }
                 }, PhoneStateListener.LISTEN_SIGNAL_STRENGTHS);
             }
@@ -147,7 +147,7 @@ class WatchHomeActivity : BaseActivity<WatchHomeActivityPresenter, WatchActivity
     }
 
     override fun userLogin() {
-        Log.e(TAG,"webrtc 注册完成")
+        Log.i(TAG,"webrtc 注册完成")
         sip_state_tv.setBackgroundColor(Color.parseColor("#00FFFF"))
           // webRTC呼叫测试
 //        var room = UUID.randomUUID().toString() + System.currentTimeMillis()
@@ -168,7 +168,7 @@ class WatchHomeActivity : BaseActivity<WatchHomeActivityPresenter, WatchActivity
 
     override fun userLogout() {
         sip_state_tv.setBackgroundColor(Color.parseColor("#FF0000"))
-        Log.e(TAG,"webrtc 注册失败")
+        Log.i(TAG,"webrtc 注册失败")
         var intent = Intent(this,WatchRegisterActivity::class.java)
         startActivity(intent)
         finish()
@@ -322,7 +322,7 @@ class WatchHomeActivity : BaseActivity<WatchHomeActivityPresenter, WatchActivity
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onMoonEvent(messageEvent: MessageEvent) {
-        Log.e(TAG,""+messageEvent.tag)
+        Log.i(TAG,""+messageEvent.tag)
 //        var tcpModels = messageEvent.getMessage() as TcpModel
 //        Log.e(TAG,""+tcpModels.getAction())
         if(messageEvent.tag == 14){
@@ -334,7 +334,7 @@ class WatchHomeActivity : BaseActivity<WatchHomeActivityPresenter, WatchActivity
             checkAppVersion()
         }else if(messageEvent.tag == Constants.EVENT_SIP_REGISTER_STATUS){
             var message = messageEvent.getMessage() as String
-            Log.e(TAG,"收到sip註冊消息 "+ message)
+            Log.i(TAG,"收到sip註冊消息 "+ message)
 
         }else if(messageEvent.tag == Constants.EVENT_INTERNETPING){
 
@@ -368,7 +368,7 @@ class WatchHomeActivity : BaseActivity<WatchHomeActivityPresenter, WatchActivity
 
             var tcpModel = messageEvent.getMessage() as TcpModel
             var responseTcpModel: TcpModel
-            Log.e(TAG,""+tcpModel.getType()+" "+tcpModel.getAction())
+            Log.i(TAG,""+tcpModel.getType()+" "+tcpModel.getAction())
             when (tcpModel.getType()) {
                 TcpType.CALLBACK -> if (tcpModel.getAction() === TcpAction.CallbackAction.SUCCESS) {
                     //todo: 刷新呼叫记录列表
@@ -385,7 +385,7 @@ class WatchHomeActivity : BaseActivity<WatchHomeActivityPresenter, WatchActivity
                         //给服务器发送正在通话中 tcp
                         TcpClient.getInstance().sendMsg(responseTcpModel.toJson())
                     } else {
-                        Log.e(TAG,"启动接听界面")
+                        Log.i(TAG,"启动接听界面")
                         responseTcpModel = VoiceUtil.voiceSuccess(tcpModel.getToId(), tcpModel.getFromId(), interactionVO.getId())
                         TcpClient.getInstance().sendMsg(responseTcpModel.toJson())
 
@@ -430,10 +430,10 @@ class WatchHomeActivity : BaseActivity<WatchHomeActivityPresenter, WatchActivity
                 }
                 TcpType.EVENT -> if (tcpModel.getAction() === TcpAction.EventAction.KEY_CLICK) { //有新事件过来
                     //todo: 服务端通过data给出具体的事件名称放置data。使用通话中界面，显示事件名称，停留3秒，结束至正常界面
-                    Log.e(TAG, "收到事件tcp")
+                    Log.i(TAG, "收到事件tcp")
                 }
                 TcpType.SOS -> if (tcpModel.getAction() === TcpAction.SOSAction.CALL) {
-                    Log.e(TAG,""+tcpModel.getType()+" "+tcpModel.getAction())
+                    Log.i(TAG,""+tcpModel.getType()+" "+tcpModel.getAction())
 
                     var intent = Intent()
                     intent.setClass(this, SOSEmergencyCallActivity::class.java)

home/src/main/code/com/wdkl/ncs/android/component/home/activity/WebRTCVoipAudioActivity.kt

@@ -129,12 +129,12 @@ class WebRTCVoipAudioActivity : Activity(), View.OnClickListener {
 
 
         targetId = intent.getStringExtra("targetId")
-        Log.e(TAG, "SIP账号$targetId")
+        Log.i(TAG, "SIP账号$targetId")
         tcpModel = intent.getSerializableExtra("TcpModel") as TcpModel
 //        interactionVO = (InteractionVO) getIntent().getSerializableExtra("interactionVO");
         action = intent.getStringExtra(ACTION)
 
-        Log.e(TAG, "tcpModel" + tcpModel.action)
+        Log.i(TAG, "tcpModel" + tcpModel.action)
         //测试
 //        SipHelperUtil.getInstance(this).getmSipCallBack().startCall(targetId)
 //        SipHelperUtil.getInstance(this).getmSipCallBack().startCall("3288")
@@ -163,14 +163,14 @@ class WebRTCVoipAudioActivity : Activity(), View.OnClickListener {
         }
 
         if (action == CALLING) {
-            Log.e(TAG, "自己同意 拨打过去。。。")
+            Log.i(TAG, "自己同意 拨打过去。。。")
             //主动拨打电话
 //            SipHelperUtil.getInstance(this).getmSipCallBack().startCall(targetId)
 
 
             //webRTC
             var room = UUID.randomUUID().toString() + System.currentTimeMillis()
-            Log.e(TAG, "生成的房间号room " + room + "sipid targetId" + targetId)
+            Log.i(TAG, "生成的房间号room " + room + "sipid targetId" + targetId)
             val b = gEngineKit?.startOutCall(applicationContext, room, targetId, true)
             if (b!!) {
 //                finish()
@@ -194,7 +194,7 @@ class WebRTCVoipAudioActivity : Activity(), View.OnClickListener {
             }, 2900)
 
         } else if (action == RING) {
-            Log.e(TAG, "接电话。。。")
+            Log.i(TAG, "接电话。。。")
             //接听电话
 //            SipHelperUtil.getInstance(this).getmSipCallBack().autoTalking()
         }
@@ -227,8 +227,8 @@ class WebRTCVoipAudioActivity : Activity(), View.OnClickListener {
                 } else {
                     interactionVO = tcpModel.data as InteractionVO
                 }
-                Log.e(TAG, "tcpModel" + interactionVO!!.id!!)
-                Log.e(TAG, "tcpModel" + tcpModel.toJson())
+                Log.i(TAG, "tcpModel" + interactionVO!!.id!!)
+                Log.i(TAG, "tcpModel" + tcpModel.toJson())
 
                 if(!TcpClientHandler.connecteds){
                     EventBus.getDefault().post(MessageEvent(tcpModel, Constants.EVENT_TCP_BREAK))
@@ -260,9 +260,9 @@ class WebRTCVoipAudioActivity : Activity(), View.OnClickListener {
 
             }
             R.id.hands_free_image -> {
-                Log.e(TAG,"handsFree "+handsFree)
+                Log.i(TAG,"handsFree "+handsFree)
                 if (!handsFree) {
-                    Log.e(TAG,"handsFree222 "+handsFree)
+                    Log.i(TAG,"handsFree222 "+handsFree)
                     hands_free_image.setImageResource(R.drawable.av_handfree_hover)
                     val session = gEngineKit?.getCurrentSession()
                     if (session != null) {
@@ -270,7 +270,7 @@ class WebRTCVoipAudioActivity : Activity(), View.OnClickListener {
                     }
                     handsFree = true
                 } else {
-                    Log.e(TAG,"handsFree333 "+handsFree)
+                    Log.i(TAG,"handsFree333 "+handsFree)
                     hands_free_image.setImageResource(R.drawable.av_handfree)
                     val session = gEngineKit?.getCurrentSession()
                     if (session != null) {
@@ -302,7 +302,7 @@ class WebRTCVoipAudioActivity : Activity(), View.OnClickListener {
         if (messageEvent.tag == 2) {
 
             val tcpModel = messageEvent.getMessage() as TcpModel
-            Log.e(TAG, "收到数据 " + tcpModel.toJson())
+            Log.i(TAG, "收到数据 " + tcpModel.toJson())
             if (tcpModel.action === TcpAction.VoiceAction.ACCEPT) {
                 MediaPlayHelper.getInstance().stopMusic()
                 Log.i(TAG, "对方接听电话啦")
@@ -321,7 +321,7 @@ class WebRTCVoipAudioActivity : Activity(), View.OnClickListener {
 //                SipHelperUtil.getInstance(this).getmSipCallBack().startCall(targetId)
 
                 var room = UUID.randomUUID().toString() + System.currentTimeMillis()
-                Log.e(TAG, "生成的房间号room " + room + "sipid targetId" + targetId)
+                Log.i(TAG, "生成的房间号room " + room + "sipid targetId" + targetId)
 
                 val b = gEngineKit?.startOutCall(applicationContext, room, targetId, true)
                 if (b!!) {

home/src/main/code/com/wdkl/ncs/android/component/home/activity/WebRTCVoipAudioRingingActivity.kt

@@ -138,7 +138,7 @@ class WebRTCVoipAudioRingingActivity : Activity(), View.OnClickListener {
 
             override fun onFinish() {
                 if (isAnswerOrHangUp) return
-                Log.e(TAG, "时间到 转发了")
+                Log.i(TAG, "时间到 转发了")
                 MediaPlayHelper.getInstance().stopMusic()
                 //todo 给服务器发送转接 tcp
                 val interactionVO = Gson().fromJson(tcpModel.data.toString(), InteractionVO::class.java)
@@ -173,11 +173,11 @@ class WebRTCVoipAudioRingingActivity : Activity(), View.OnClickListener {
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onMoonEvent(messageEvent: MessageEvent) {
-        Log.e(TAG,"收到tcp"+tcpModel!!.action)
+        Log.i(TAG,"收到tcp"+tcpModel!!.action)
 
         if (messageEvent.tag == 2) {
             val tcpModel = messageEvent.getMessage() as TcpModel?
-            Log.e(TAG,"收到tcp"+tcpModel!!.action)
+            Log.i(TAG,"收到tcp"+tcpModel!!.action)
             if (tcpModel!!.action === TcpAction.VoiceAction.CANCEL || tcpModel!!.action === TcpAction.VoiceAction.HANDOFF) {
                 //对方取消;
                 countDownTimer?.cancel()

middleware/src/main/code/com/wdkl/ncs/android/middleware/api/UrlManager.kt

@@ -57,7 +57,7 @@ private class DevUrlManager : UrlManager{
 //        get() = "http://dev.base.wdklian.com"
 //        get() = "http://8.129.220.143"
 //        get() = "http://192.168.1.188"
-      get() = "http://192.168.1.102"
+      get() = "http://120.76.246.253"
 
     override val device_url: String
 //        get() = "${base}:6005/"