提交修改

home/src/main/code/com/wdkl/ncs/android/component/home/activity/RTCVoipAudioActivity.java

@@ -1,7 +1,6 @@
-package com.wdkl.ncs.android.component.nursehome.activity;
+package com.wdkl.ncs.android.component.home.activity;
 
 import android.content.DialogInterface;
-import android.graphics.Color;
 import android.os.Bundle;
 import android.os.SystemClock;
 import android.support.v7.app.AlertDialog;
@@ -9,7 +8,6 @@ import android.util.Log;
 import android.view.View;
 import android.view.WindowManager;
 import android.widget.Chronometer;
-import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.google.gson.Gson;
@@ -17,19 +15,15 @@ import com.starrtc.demo.database.CoreDB;
 import com.starrtc.demo.database.HistoryBean;
 import com.starrtc.demo.demo.BaseActivity;
 import com.starrtc.demo.demo.MLOC;
-import com.starrtc.demo.ui.CircularCoverView;
 import com.starrtc.demo.utils.AEvent;
-import com.starrtc.demo.utils.ColorUtils;
-import com.starrtc.demo.utils.DensityUtils;
 import com.starrtc.starrtcsdk.api.XHClient;
 import com.starrtc.starrtcsdk.api.XHConstants;
 import com.starrtc.starrtcsdk.api.XHVoipManager;
 import com.starrtc.starrtcsdk.apiInterface.IXHResultCallback;
 import com.starrtc.starrtcsdk.core.audio.StarRTCAudioManager;
 import com.starrtc.starrtcsdk.core.pusher.XHCameraRecorder;
-import com.wdkl.ncs.android.component.nursehome.R;
+import com.wdkl.ncs.android.component.home.R;
 import com.wdkl.ncs.android.component.nursehome.common.Constants;
-import com.wdkl.ncs.android.component.nursehome.fragment.FramePartFragment;
 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;
@@ -47,7 +41,7 @@ public class RTCVoipAudioActivity extends BaseActivity implements View.OnClickLi
     private XHVoipManager voipManager;
     private Chronometer timer;
 
-    private TextView bao_mother_name_tv, bao_mother_age_tv;
+    private TextView bao_mother_name_tv;
 
     public static String ACTION = "ACTION";
     public static String RING = "RING";
@@ -69,7 +63,7 @@ public class RTCVoipAudioActivity extends BaseActivity implements View.OnClickLi
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
         getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
                 WindowManager.LayoutParams.FLAG_FULLSCREEN);
-        setContentView(R.layout.window_make_a_voice_call);
+        setContentView(R.layout.watch_activity_dialing_voice);
         setFinishOnTouchOutside(false);
         rtcVoipAudioActivity = this;
         //todo 设置为通话状态 有其他用户输入时 DeviceChannel设置返回通话中
@@ -93,11 +87,9 @@ public class RTCVoipAudioActivity extends BaseActivity implements View.OnClickLi
         tcpModel = (TcpModel) getIntent().getSerializableExtra("TcpModel");
 //        interactionVO = (InteractionVO) getIntent().getSerializableExtra("interactionVO");
         action = getIntent().getStringExtra(ACTION);
-        timer = (Chronometer) findViewById(R.id.voice_time_tv);
+        timer = (Chronometer) findViewById(R.id.call_duration_tv);
 
         bao_mother_name_tv = (TextView) findViewById(R.id.bao_mother_name_tv);
-        bao_mother_age_tv = findViewById(R.id.bao_mother_age_tv);
-        bao_mother_age_tv.setVisibility(View.GONE);
 
 //        ((TextView)findViewById(com.starrtc.demo.R.id.targetid_text)).setText(targetId);
 //        ((ImageView)findViewById(com.starrtc.demo.R.id.head_img)).setImageResource(MLOC.getHeadImage(RTCVoipAudioActivity.this,targetId));
@@ -106,7 +98,7 @@ public class RTCVoipAudioActivity extends BaseActivity implements View.OnClickLi
 //        int cint = DensityUtils.dip2px(RTCVoipAudioActivity.this,45);
 //        ((CircularCoverView)findViewById(com.starrtc.demo.R.id.head_cover)).setRadians(cint, cint, cint, cint,0);
 
-        findViewById(R.id.voice_hang_up_imagev).setOnClickListener(this);
+        findViewById(R.id.hang_up_imagev).setOnClickListener(this);
 //        voice_time_tv =  findViewById(R.id.voice_time_tv);
 //        voice_time_tv.setVisibility(View.GONE);
 
@@ -302,7 +294,7 @@ public class RTCVoipAudioActivity extends BaseActivity implements View.OnClickLi
     private void showTalkingView() {
         MLOC.d("", "showTalkingView");
 //        findViewById(com.starrtc.demo.R.id.calling_txt).setVisibility(View.INVISIBLE);
-        findViewById(R.id.voice_time_tv).setVisibility(View.VISIBLE);
+        findViewById(R.id.call_duration_tv).setVisibility(View.VISIBLE);
         timer.setBase(SystemClock.elapsedRealtime());
         timer.start();
         setupView();
@@ -326,10 +318,10 @@ public class RTCVoipAudioActivity extends BaseActivity implements View.OnClickLi
 
     @Override
     public void onClick(View v) {
-        if (v.getId() == R.id.voice_hang_up_imagev) {
+        if (v.getId() == R.id.hang_up_imagev) {
             InteractionVO interactionVO = null;
             if(tcpModel.getData().getClass().getName().equals(String.class.getName())) {
-                 interactionVO = new Gson().fromJson(tcpModel.getData().toString(),InteractionVO.class);
+                 interactionVO = new Gson().fromJson(tcpModel.getData().toString(), InteractionVO.class);
             }else{
                 interactionVO = (InteractionVO) tcpModel.getData();
             }

home/src/main/code/com/wdkl/ncs/android/component/home/activity/RTCVoipAudioRingingActivity.java

@@ -1,26 +1,19 @@
-package com.wdkl.ncs.android.component.nursehome.activity;
+package com.wdkl.ncs.android.component.home.activity;
 
 import android.content.Intent;
-import android.graphics.Color;
 import android.os.Bundle;
 import android.view.View;
 import android.view.WindowManager;
-import android.widget.ImageView;
-import android.widget.TextView;
 
 import com.google.gson.Gson;
 import com.starrtc.demo.database.CoreDB;
 import com.starrtc.demo.database.HistoryBean;
 import com.starrtc.demo.demo.BaseActivity;
 import com.starrtc.demo.demo.MLOC;
-import com.starrtc.demo.demo.voip.VoipAudioActivity;
-import com.starrtc.demo.ui.CircularCoverView;
 import com.starrtc.demo.utils.AEvent;
-import com.starrtc.demo.utils.ColorUtils;
-import com.starrtc.demo.utils.DensityUtils;
 import com.starrtc.starrtcsdk.api.XHClient;
 import com.starrtc.starrtcsdk.apiInterface.IXHResultCallback;
-import com.wdkl.ncs.android.component.nursehome.R;
+import com.wdkl.ncs.android.component.home.R;
 import com.wdkl.ncs.android.component.nursehome.common.Constants;
 import com.wdkl.ncs.android.middleware.model.vo.InteractionVO;
 import com.wdkl.ncs.android.middleware.tcp.TcpClient;
@@ -33,14 +26,14 @@ import java.text.SimpleDateFormat;
 public class RTCVoipAudioRingingActivity extends BaseActivity implements View.OnClickListener {
 
     private String targetId;
-    private  InteractionVO interactionVO = new InteractionVO();
+    private InteractionVO interactionVO = new InteractionVO();
     private TcpModel tcpModel = new TcpModel();
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         getWindow().setFlags(WindowManager.LayoutParams. FLAG_FULLSCREEN ,
                 WindowManager.LayoutParams. FLAG_FULLSCREEN);
-        setContentView(R.layout.window_invite_voice_calls);
+        setContentView(R.layout.watch_activity_voice_calls);
 
         //todo 设置为通话状态 有其他用户输入时 DeviceChannel设置返回通话中
         DeviceChannel.calling = true;
@@ -49,8 +42,8 @@ public class RTCVoipAudioRingingActivity extends BaseActivity implements View.On
         targetId = getIntent().getStringExtra("targetId");
         tcpModel = (TcpModel) getIntent().getSerializableExtra("TcpModel");
 
-        findViewById(R.id.voice_hang_up_imagev).setOnClickListener(this);
-        findViewById(R.id.the_voice_answered_imagev).setOnClickListener(this);
+        findViewById(R.id.hang_up_imagev).setOnClickListener(this);
+        findViewById(R.id.call_the_voice_imagev).setOnClickListener(this);
 //        ((TextView)findViewById(R.id.targetid_text)).setText(targetId);
 //        ((ImageView)findViewById(R.id.head_img)).setImageResource(MLOC.getHeadImage(RTCVoipAudioRingingActivity.this,targetId));
 //        findViewById(R.id.head_bg).setBackgroundColor(ColorUtils.getColor(RTCVoipAudioRingingActivity.this,targetId));
@@ -110,7 +103,7 @@ public class RTCVoipAudioRingingActivity extends BaseActivity implements View.On
     @Override
     public void onClick(View v) {
         int id = v.getId();
-        if (id == R.id.voice_hang_up_imagev) {
+        if (id == R.id.hang_up_imagev) {
             //todo 给服务器发送拒接 tcp
 //            InteractionVO interactionVO = (InteractionVO) tcpModel.getData();
             InteractionVO interactionVO =  new Gson().fromJson(tcpModel.getData().toString(), InteractionVO.class);
@@ -129,7 +122,7 @@ public class RTCVoipAudioRingingActivity extends BaseActivity implements View.On
                     finish();
                 }
             });
-        } else if (id == R.id.the_voice_answered_imagev) {
+        } else if (id == R.id.call_the_voice_imagev) {
             //todo 给服务器发送接听 tcp
 //            InteractionVO interactionVO = (InteractionVO) tcpModel.getData();
             InteractionVO interactionVO =  new Gson().fromJson(tcpModel.getData().toString(), InteractionVO.class);

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

@@ -3,6 +3,7 @@ package com.wdkl.ncs.android.component.home.activity
 import android.content.Intent
 import android.graphics.Color
 import android.util.Log
+import android.view.View
 import com.alibaba.android.vlayout.DelegateAdapter
 import com.alibaba.android.vlayout.VirtualLayoutManager
 import com.enation.javashop.android.jrouter.external.annotation.Router
@@ -83,8 +84,10 @@ class WatchCallRecordsActivity : BaseActivity<WatchCallRecordsFragmentPresenter,
         if (action == all) {
             if (customerId.equals("")) {
             presenter.loadFloor(all, 1,30, Constants.ids.toInt(),0)
+                call_relyout.visibility = View.GONE
             }
         }else {
+            call_relyout.visibility = View.VISIBLE
             presenter.loadFloor(initiator, 1, 30,Constants.ids.toInt(),customerId.toInt())
         }
     }

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

@@ -29,7 +29,7 @@ class WatchContractsActivity : BaseActivity<WatchActivityPresenter, WatchContact
     private var page: Int = 1
     private val adapter = WatchContactsItemAdapter(ArrayList())
 
-    var deviceId: Int = 16
+    var deviceId: Int = 17
 
     private lateinit var virtualLayoutManager: VirtualLayoutManager
 
@@ -89,12 +89,10 @@ class WatchContractsActivity : BaseActivity<WatchActivityPresenter, WatchContact
             presenter.loadData(1, deviceId)
         }
 
-        adapter.setOnItemLongClickListener { data, position ->
+        adapter.setOnItemClickListener { data, position ->
             //todo 临时写的测试语音通话功能
 
 
-
-
             var customerId = data.customerId
             if(data.customerId == null){
                 customerId = 0