Merge branch 'watch.1.0.0' of http://git.wdklian.com/allen/ncs_android_frame into watch.1.0.0

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

@@ -27,6 +27,8 @@ import com.wdkl.ncs.android.middleware.model.vo.WatchContactsVO
 import com.wdkl.ncs.android.middleware.tcp.TcpClient
 import com.wdkl.ncs.android.middleware.tcp.channel.VoiceUtil
 import com.wdkl.ncs.android.middleware.tcp.dto.TcpModel
+import com.wdkl.ncs.android.middleware.tcp.enums.TcpAction
+import com.wdkl.ncs.android.middleware.tcp.enums.TcpType
 import com.wdkl.ncs.android.middleware.utils.MessageEvent
 import kotlinx.android.synthetic.main.watch_activity_call_records.*
 import org.greenrobot.eventbus.Subscribe
@@ -59,6 +61,7 @@ class WatchCallRecordsActivity : BaseActivity<WatchCallRecordsFragmentPresenter,
     private var ACTION = "ACTION"
      var all = "ALL"
      var initiator = "INITATOR"
+     var unread = "UNREAD"
      var action: String? = null
     var receivedData :WatchContactsVO? = null
 
@@ -72,6 +75,7 @@ class WatchCallRecordsActivity : BaseActivity<WatchCallRecordsFragmentPresenter,
     }
 
     override fun init() {
+
         /**初始化LayoutMannager*/
         virtualLayoutManager = VirtualLayoutManager(this.activity)
 
@@ -89,12 +93,17 @@ class WatchCallRecordsActivity : BaseActivity<WatchCallRecordsFragmentPresenter,
         customerId = intent.getStringExtra("customer_id")
         if (action == all) {
             if (customerId.equals("")) {
-            presenter.loadFloor(all, 1,30, Constants.ids.toInt(),0)
+//            presenter.loadFloor(all, 1,30, Constants.ids.toInt(),0)
+                presenter.loadFloor(all, 1,30, 17,0,0)
                 call_relyout.visibility = View.GONE
             }
-        }else {
+        }else if(action == unread){
+            presenter.loadFloor(all, 1,30, 17,0,1)
+            call_relyout.visibility = View.GONE
+
+        }else if(action == initiator){
             call_relyout.visibility = View.VISIBLE
-            presenter.loadFloor(initiator, 1, 30,Constants.ids.toInt(),customerId.toInt())
+            presenter.loadFloor(initiator, 1, 30,Constants.ids.toInt(),customerId.toInt(),-1)
             call_relyout.setOnClickListener{
                 Log.i(TAG, "call_relyout click 111")
                 var tcpModel = VoiceUtil.voiceCall(Integer.parseInt(Constants.ids),21)
@@ -104,6 +113,30 @@ class WatchCallRecordsActivity : BaseActivity<WatchCallRecordsFragmentPresenter,
     }
 
     override fun bindEvent() {
+        watchCallRecordsItemAdapter.setOnItemClickListener { data, position ->
+
+            var intent = Intent()
+            intent.setClass(this, WatchEventDetailActivity::class.java)
+            //todo: 不优雅的传输，应该直接传递对象
+            var  tcpModel = TcpModel()
+            if(data.actionType.equals(TcpType.VOICE.name)){
+                tcpModel.type = TcpType.VOICE
+            }else if(data.actionType.equals(TcpType.EVENT.name)){
+                tcpModel.type = TcpType.EVENT
+            }else if(data.actionType.equals(TcpType.IM.name)){
+                tcpModel.type = TcpType.IM
+            }else {
+                tcpModel.type = TcpType.EVENT
+            }
+            tcpModel.action = TcpAction.VoiceAction.SUCCESS
+            tcpModel.setData(data)
+            intent.putExtra("tcpModelStr",tcpModel.toJson())
+            startActivity(intent)
+
+
+        }
+
+
 
     }
 

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

@@ -1,6 +1,7 @@
 package com.wdkl.ncs.android.component.home.activity
 
 import android.content.Intent
+import android.graphics.Color
 import android.util.Log
 import com.alibaba.android.vlayout.DelegateAdapter
 import com.alibaba.android.vlayout.VirtualLayoutManager
@@ -12,6 +13,7 @@ import com.wdkl.ncs.android.component.home.adapter.WatchContactsItemAdapter
 import com.wdkl.ncs.android.component.home.databinding.WatchContactsLayBinding
 import com.wdkl.ncs.android.component.home.launch.HomeLaunch
 import com.wdkl.ncs.android.lib.base.BaseActivity
+import com.wdkl.ncs.android.lib.utils.AppTool
 import com.wdkl.ncs.android.lib.utils.showMessage
 import com.wdkl.ncs.android.middleware.logic.contract.home.WatchActivityContract
 import com.wdkl.ncs.android.middleware.logic.presenter.home.WatchActivityPresenter
@@ -67,6 +69,7 @@ class WatchContractsActivity : BaseActivity<WatchActivityPresenter, WatchContact
     }
 
     override fun init() {
+
         /**初始化LayoutMannager*/
         virtualLayoutManager = VirtualLayoutManager(this.activity)
 

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

@@ -13,16 +13,19 @@ import com.wdkl.ncs.android.component.home.R
 import com.wdkl.ncs.android.component.home.databinding.WatchActivityEventDetailBinding
 import com.wdkl.ncs.android.component.home.launch.HomeLaunch
 import com.wdkl.ncs.android.component.nursehome.common.Constants
+import com.wdkl.ncs.android.component.nursehome.util.MediaPlayer
 import com.wdkl.ncs.android.component.nursehome.util.TimeTransition
 import com.wdkl.ncs.android.lib.base.BaseActivity
 import com.wdkl.ncs.android.lib.base.BaseContract
 import com.wdkl.ncs.android.lib.utils.push
+import com.wdkl.ncs.android.lib.utils.showMessage
 import com.wdkl.ncs.android.middleware.logic.contract.home.WatchHomeActivityContract
 import com.wdkl.ncs.android.middleware.logic.presenter.home.WatchHomeActivityPresenter
 import com.wdkl.ncs.android.middleware.model.vo.InteractionVO
 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.EventUtil
+import com.wdkl.ncs.android.middleware.tcp.channel.ImUtil
 import com.wdkl.ncs.android.middleware.tcp.dto.TcpModel
 import com.wdkl.ncs.android.middleware.tcp.enums.TcpAction
 import com.wdkl.ncs.android.middleware.tcp.enums.TcpType
@@ -34,6 +37,21 @@ import org.greenrobot.eventbus.ThreadMode
 
 @Router(path = "/event/detail")
 class WatchEventDetailActivity: BaseActivity<WatchHomeActivityPresenter, WatchActivityEventDetailBinding>(), WatchHomeActivityContract.View{
+
+    var TAG = WatchEventDetailActivity::class.java.getSimpleName()
+    //参数自动注入
+    @Autowired(name= "tcpModelStr",required = true)
+    @JvmField var tcpModelStr: String = ""
+
+    var interactionVO:InteractionVO? = null
+    var tcpModel:TcpModel? = null
+
+
+
+    override fun getLayId(): Int {
+        return R.layout.watch_activity_event_detail
+    }
+
     override fun render() {
     }
 
@@ -49,7 +67,7 @@ class WatchEventDetailActivity: BaseActivity<WatchHomeActivityPresenter, WatchAc
     override fun networkMonitor(state: NetState) {
     }
 
-    var TAG = WatchEventDetailActivity::class.java.getSimpleName()
+
 
     override fun bindDagger() {
         HomeLaunch.component.inject(this)
@@ -58,8 +76,9 @@ class WatchEventDetailActivity: BaseActivity<WatchHomeActivityPresenter, WatchAc
     override fun bindEvent() {
         back.setOnClickListener {
             push("/watch/callrecords", { postcard ->
-                postcard.withString("action","ALL")
+                postcard.withString("action","UNREAD")
                 postcard.withString("customer_id","")
+                finish()
             })
         }
         event_status_img.setOnClickListener {
@@ -69,7 +88,17 @@ class WatchEventDetailActivity: BaseActivity<WatchHomeActivityPresenter, WatchAc
                 TcpClient.getInstance().sendMsg(tcpModel.toJson())
             } else if (tcpModel?.type == TcpType.IM) {
                 //todo: 语音播放
-                Log.i(TAG, "语音播放")
+
+                if (!Constants.ids.equals("")) {
+                    var imUtilTcpModel = ImUtil.imRead(Constants.ids.toInt(), interactionVO!!.fromDeviceId, interactionVO!!.id)
+                    TcpClient.getInstance().sendMsg(imUtilTcpModel.toJson())
+                    var mediaPlayer = MediaPlayer()
+                    mediaPlayer.startMediaPlayer( Constants.eth_ip +interactionVO!!.data)
+                    mediaPlayer.setVolume(0.3f)
+                }else{
+                    showMessage("获取不到当给前设备id")
+                }
+
             }
         }
     }
@@ -77,12 +106,7 @@ class WatchEventDetailActivity: BaseActivity<WatchHomeActivityPresenter, WatchAc
     override fun destory() {
     }
 
-    //参数自动注入
-    @Autowired(name= "tcpModelStr",required = true)
-    @JvmField var tcpModelStr: String = ""
 
-    var interactionVO:InteractionVO? = null
-    var tcpModel:TcpModel? = null
 
     override fun init() {
         Log.i(TAG, "参数 tcpModelStr : " + tcpModelStr)
@@ -114,9 +138,7 @@ class WatchEventDetailActivity: BaseActivity<WatchHomeActivityPresenter, WatchAc
         }
     }
 
-    override fun getLayId(): Int {
-        return R.layout.watch_activity_event_detail
-    }
+
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onMoonEvent(messageEvent: MessageEvent){

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

@@ -147,6 +147,11 @@ class WatchHomeActivity : BaseActivity<WatchHomeActivityPresenter, WatchActivity
                 startActivity(intent)
             }
             R.id.user_nume_linlyout ->{
+                var intent = Intent(this, WatchCallRecordsActivity::class.java)
+                intent.putExtra("action", "UNREAD")
+                intent.putExtra("customer_id", "")
+                startActivity(intent)
+
             }
             R.id.state_linlyout ->{
 

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

@@ -46,7 +46,8 @@ class WatchRegisterActivity: BaseActivity<WatchDevicePresenter, WatchActivityReg
     }
 
     override fun init() {
-        Constants.mac = NetHelper.getInstance().macAddress
+//        Constants.mac = NetHelper.getInstance().macAddress
+        Constants.mac = "4C:C0:0A:8E:D6:BB"
         Log.e(TAG,"mac "+Constants.mac)
 
         requestPermissions()

home/src/main/code/com/wdkl/ncs/android/component/home/adapter/WatchCallRecordsItemAdapter.kt

@@ -72,39 +72,16 @@ class WatchCallRecordsItemAdapter(val data: ArrayList<InteractionVO>) : BaseDele
                 binding.callTimeTv.text = TimeTransition().stampToDate(itemData.createDate*1000)
             }
 
-
-//            //事件类型
-//            if (itemData.actionType == TcpType.EVENT.name) {
-//                //事件
-//                binding.playTv.visibility = View.GONE
-//                binding.projectTv.visibility = View.VISIBLE
-//
-//                //语音留言
-//            } else if (itemData.actionType.equals("IM")) {
-//
-//                binding.projectTv.visibility = View.GONE
-//                binding.playTv.visibility = View.VISIBLE
-//
-//                //语音呼叫
-//            } else if (itemData.actionType.equals("VOICE")) {
-//
-//
-//                //视频呼叫
-//            } else if (itemData.actionType.equals("VIDEO")) {
-//
-//
-//            }
             //是否已播放 已响应
             if (itemData.actionEnd != null) {
                 Log.e(TAG, "" + itemData.actionEnd+" "+position)
                 Log.e(TAG, "" + itemData.actionType+" "+position)
                 Log.e(TAG, "" + itemData.data+" "+position)
 
-                Log.e(TAG, "" + itemData.actionType+" "+position)
+                Log.e(TAG, "" + itemData.actionDirectionType+" "+position)
                 Log.e(TAG, "" + TcpType.IM.name+" "+position)
 
                 binding.treatmentStateImagev.setImageResource(R.drawable.yi_chu_li)
-//                binding.callStatusImagev.setImageResource(R.drawable.yi_jie)
                 binding.treatmentStateImagev.visibility = View.VISIBLE
                 binding.processingTimeTv.visibility = View.VISIBLE
 
@@ -138,15 +115,17 @@ class WatchCallRecordsItemAdapter(val data: ArrayList<InteractionVO>) : BaseDele
 
                 }else if(itemData.actionType == TcpType.VOICE.name){ //语音呼叫已接听
                     binding.projectTv.visibility = View.GONE
-                    binding.playTv.visibility = View.VISIBLE
+                    binding.playTv.visibility = View.GONE
                     binding.treatmentStateImagev.visibility = View.GONE
+                    binding.conductorNameTv.visibility = View.GONE
                     binding.processingTimeTv.visibility = View.GONE
 
                 }else if(itemData.actionType == TcpType.VIDEO.name){ //视频呼叫已接听
 
                     binding.projectTv.visibility = View.GONE
-                    binding.playTv.visibility = View.VISIBLE
+                    binding.playTv.visibility = View.GONE
                     binding.treatmentStateImagev.visibility = View.GONE
+                    binding.conductorNameTv.visibility = View.GONE
                     binding.processingTimeTv.visibility = View.GONE
                 }
 
@@ -155,12 +134,17 @@ class WatchCallRecordsItemAdapter(val data: ArrayList<InteractionVO>) : BaseDele
                 Log.e(TAG, "" + itemData.actionType+" "+position)
                 Log.e(TAG, "" + itemData.data+" "+position)
                 Log.e(TAG, "" + itemData.actionDirectionType+" "+position)
+
+                binding.treatmentStateImagev.setImageResource(R.drawable.wei_chu_li)
+                binding.treatmentStateImagev.visibility = View.VISIBLE
+                binding.conductorNameTv.visibility = View.GONE
+                binding.processingTimeTv.visibility = View.VISIBLE
+
                 //判断是呼入还是呼出 1 分机到主机 2主机到分机
                 if(itemData.actionDirectionType == 1){
                     Log.e(TAG, "进入。。。。" )
                     binding.sickbedTv.text = itemData.fromFrameFullName
                     binding.nameTv.text = itemData.fromMemberName
-                    // 图标显示不正常 暂时没放完整图标
                     binding.callStatusImagev.setImageResource(R.drawable.hu_ru_wei_jie)
                 }else if(itemData.actionDirectionType == 2 || itemData.actionDirectionType == 3){
                     binding.sickbedTv.text = itemData.toFrameFullName
@@ -168,11 +152,7 @@ class WatchCallRecordsItemAdapter(val data: ArrayList<InteractionVO>) : BaseDele
                     binding.callStatusImagev.setImageResource(R.drawable.hu_chu_wei_jie)
                 }
 
-                binding.treatmentStateImagev.setImageResource(R.drawable.wei_chu_li)
-//                binding.callStatusImagev.setImageResource(R.drawable.wei_jie)
-                binding.conductorNameTv.visibility = View.GONE
-                binding.treatmentStateImagev.visibility = View.VISIBLE
-                binding.processingTimeTv.visibility = View.VISIBLE
+
                 if(itemData.actionType == TcpType.EVENT.name){//事件未处理
                     binding.playTv.visibility = View.GONE
                     binding.projectTv.visibility = View.VISIBLE
@@ -199,6 +179,7 @@ class WatchCallRecordsItemAdapter(val data: ArrayList<InteractionVO>) : BaseDele
             }
 
 
+
             binding.projectTv.setOnClickListener {
                 //事件处理监听
 //                    点击之后发送通知

home/src/main/res/layout/watch_activity_call_records.xml

@@ -3,7 +3,8 @@
 
     <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:background="#FFE6E8">
 
         <com.scwang.smartrefresh.layout.SmartRefreshLayout
             android:id="@+id/refresh"
@@ -17,7 +18,8 @@
             <android.support.v7.widget.RecyclerView
                 android:id="@+id/call_records_recyv"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"></android.support.v7.widget.RecyclerView>
+                android:layout_height="match_parent"
+                android:background="#FFE6E8"></android.support.v7.widget.RecyclerView>
         </com.scwang.smartrefresh.layout.SmartRefreshLayout>
 
         <RelativeLayout

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

@@ -163,6 +163,13 @@ object ApiManager {
 
 
         /**
+         * @Name
+         * @Type  Api_WatchUntreated
+         * @Note
+         */
+        val Api_WatchUntreated :WatchUntreatedApi by lazy { apiFactory.createService(WatchUntreatedApi::class.java, urlManager.device_url)}
+
+        /**
          * @author LDD
          * @From   ApiManager
          * @Date   2018/8/13 上午8:19

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

@@ -9,7 +9,7 @@ import retrofit2.http.Query
 
 interface RegisterDeviceApi {
 
-    @GET("/ncs_nurseDevice/device/getDeviceByEthMac/{eth_mac}")
+    @GET("/watch/device/getDeviceByEthMac/{eth_mac}")
     fun getDeviceMessage(@Path("eth_mac")eth_mac:String): Observable<ResponseBody>
 
 

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

@@ -14,5 +14,6 @@ interface WatchCallRecordsFragmentApi{
 
      @POST("/watch/getInteractionVOByDeviceId")
     fun getCallRecords(@Query("page_no")page_no:Int,@Query("page_size")page_size:Int
-                       ,@Query("device_id")device_id:Int): Observable<ResponseBody>
+                       ,@Query("device_id")device_id:Int
+                       , @Query("choice") choice: Int): Observable<ResponseBody>
 }

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

@@ -10,10 +10,11 @@ import retrofit2.http.Query
 /**
  * 获取呼叫记录列表api
  */
-interface WatchInitiatorApi{
+interface WatchInitiatorApi {
 
-     @POST("/watch/getInteractionVOByCustomerId")
-    fun getInitiatorData(@Query("page_no")page_no:Int,@Query("page_size")page_size:Int
-                         ,@Query("device_id")device_id:Int
-                       ,@Query("customer_id")customer_id:Int): Observable<ResponseBody>
+    @POST("/watch/getInteractionVOByDeviceIdAndCustomerId")
+    fun getInitiatorData(@Query("page_no") page_no: Int, @Query("page_size") page_size: Int
+                         , @Query("device_id") device_id: Int
+                         , @Query("customer_id") customer_id: Int
+                         ): Observable<ResponseBody>
 }

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

@@ -0,0 +1,18 @@
+package com.wdkl.ncs.android.middleware.api
+
+import io.reactivex.Observable
+import okhttp3.ResponseBody
+import retrofit2.http.GET
+import retrofit2.http.POST
+import retrofit2.http.Path
+import retrofit2.http.Query
+
+/**
+ * 获取呼叫记录列表api
+ */
+interface WatchUntreatedApi{
+
+    @POST("/ncs_nurseDevice/page")
+    fun getCallRecords(@Query("page_no")page_no:Int,@Query("page_size")page_size:Int
+                       ,@Query("part_id")part_id:Int,@Query("choice")choice:Int): Observable<ResponseBody>
+}

middleware/src/main/code/com/wdkl/ncs/android/middleware/di/ApiProvides.kt

@@ -222,4 +222,13 @@ class ApiProvides {
     fun provideWatchInitiatorApi():WatchInitiatorApi{
         return  ApiManager.Api_WatchInitiator
     }
+
+    /**
+     * @author LDD
+     * @From   ApplicationComponent
+     */
+    @Provides
+    fun provideWatchUntreatedApi():WatchUntreatedApi{
+        return  ApiManager.Api_WatchUntreated
+    }
 }

middleware/src/main/code/com/wdkl/ncs/android/middleware/di/ApplicationComponent.kt

@@ -164,4 +164,12 @@ interface ApplicationComponent {
      * @Note
      */
     fun provideWatchInitiatorApi(): WatchInitiatorApi
+
+    /**
+     * @author LDD
+     * @From   ApplicationComponent
+     * @Date
+     * @Note
+     */
+    fun provideWatchUntreatedApi(): WatchUntreatedApi
 }

middleware/src/main/code/com/wdkl/ncs/android/middleware/logic/contract/home/WatchCallRecordsFragmentContract.kt

@@ -49,7 +49,8 @@ interface WatchCallRecordsFragmentContract {
          * @Date   2018/1/19 下午5:53
          * @Note   加载七巧板数据
          */
-        fun loadFloor(ACTION:String, page_no:Int, page_size:Int, device_id:Int, customer_id:Int)
+        fun loadFloor(ACTION:String, page_no:Int, page_size:Int, device_id:Int,
+                      customer_id:Int,choice:Int)
 
 //        /**
 //         * 获取呼叫人的呼叫记录

middleware/src/main/code/com/wdkl/ncs/android/middleware/logic/presenter/home/WatchCallRecordsFragmentPresenter.kt

@@ -82,13 +82,13 @@ class WatchCallRecordsFragmentPresenter @Inject constructor() :RxPresenter<Watch
      * @Note   加载七巧板数据
      */
     @SuppressLint("LongLogTag")
-    override fun loadFloor(ACTION:String,page_no:Int,page_size:Int,device_id:Int,customer_id: Int) {
+    override fun loadFloor(ACTION:String,page_no:Int,page_size:Int,device_id:Int,customer_id: Int,choice:Int) {
         //page_no页码  page_size每页显示的数量  device_id设备ID
         Log.e("WatchCallRecordsFragmentPresenter","qqqqqqq")
         //获取全部通话记录数据
         if(ACTION .equals("ALL")){
             //待处理
-            callRecordsFragmentApi.getCallRecords(page_no,page_size,device_id)
+            callRecordsFragmentApi.getCallRecords(page_no,page_size,device_id,choice)
                     .map {
                         var shop = ArrayList<InteractionVO>()
                         var gson = GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES).create()

starRTC/build.gradle

@@ -57,5 +57,4 @@ dependencies {
     testCompile 'junit:junit:4.12'
     compile 'com.android.support:recyclerview-v7:24.2.0'
     compile files('libs/star_rtc_sdk.jar')
-    implementation files('libs/star_rtc_sdk.jar')
 }