<增加单双工通话模式设置>

app/build.gradle

@@ -24,7 +24,7 @@ android {
         minSdkVersion 15
         targetSdkVersion 26
         versionCode 1
-        versionName "1.42"
+        versionName "1.43"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
 

app/src/main/java/com/wdkl/callingmainnurse/ui/activity/InitActivity.java

@@ -114,6 +114,10 @@ public class InitActivity extends BaseActivity implements SerialPortUtil.IForBro
         serialPortUtil.setOnBroadcastClickListener(this);
         serialPortUtil.setOnDataReceiveStringListener(this);
 
+        if (-100 == SharedPreferencesUtil.getIntSp(MyApplication.getAppContext(), Constants.MSG_SP, SharedPreferencesUtil.CallingMode)) {
+            SharedPreferencesUtil.putIntSp(MyApplication.getAppContext(), Constants.MSG_SP, SharedPreferencesUtil.CallingMode, 0);
+        }
+
         if (-100 == SharedPreferencesUtil.getIntSp(MyApplication.getAppContext(), Constants.MSG_SP, SharedPreferencesUtil.SbCallingVoice)) {
             SharedPreferencesUtil.putIntSp(MyApplication.getAppContext(), Constants.MSG_SP, SharedPreferencesUtil.SbCallingVoice, 70);
         }

app/src/main/java/com/wdkl/callingmainnurse/ui/activity/SysCallingVolSetActivity.java

@@ -3,6 +3,8 @@ package com.wdkl.callingmainnurse.ui.activity;
 import android.support.v7.widget.Toolbar;
 import android.util.Log;
 import android.view.View;
+import android.widget.RadioButton;
+import android.widget.RadioGroup;
 import android.widget.TextView;
 
 import com.google.gson.Gson;
@@ -16,6 +18,7 @@ import com.wdkl.callingmainnurse.util.LogUtil;
 import com.wdkl.callingmainnurse.util.SharedPreferencesUtil;
 import com.wdkl.callingmainnurse.util.SipUtil.SipHelperUtil;
 import com.wdkl.callingmainnurse.util.StringUtils;
+import com.wdkl.callingmainnurse.util.UdpSendUtil;
 import com.wdkl.callingmainnurse.util.VoiceManagerUtil;
 import com.zhy.http.okhttp.OkHttpUtils;
 import com.zhy.http.okhttp.callback.StringCallback;
@@ -37,6 +40,14 @@ import static com.wdkl.callingmainnurse.util.VoiceManagerUtil.getCallMax;
 
 public class SysCallingVolSetActivity extends BaseActivity {
 
+    //通话模式选择: 双工模式-0, 单工模式-1
+    @Bind(R.id.group_calling_mode)
+    RadioGroup groupCallingMode;
+    @Bind(R.id.rb_calling_mode_dual)
+    RadioButton rbDualMode;
+    @Bind(R.id.rb_calling_mode_single)
+    RadioButton rbSingleMode;
+
     //显示主机通话声音的TextView
     @Bind(R.id.activity_sb_calling_voice_set)
     TextView tvMainCallingVoice;
@@ -359,6 +370,7 @@ public class SysCallingVolSetActivity extends BaseActivity {
             VoiceManagerUtil.setCallVoice(MyApplication.getAppContext(), 100);
         }
 
+        int mode = SharedPreferencesUtil.getIntSp(SysCallingVolSetActivity.this, Constants.MSG_SP, SharedPreferencesUtil.CallingMode);
         int sb = SharedPreferencesUtil.getIntSp(SysCallingVolSetActivity.this, Constants.MSG_SP, SharedPreferencesUtil.SbCallingVoice);
         int sbing = SharedPreferencesUtil.getIntSp(SysCallingVolSetActivity.this, Constants.MSG_SP, SharedPreferencesUtil.SbingCallingVoice);
         int sip = SharedPreferencesUtil.getIntSp(SysCallingVolSetActivity.this, Constants.MSG_SP, SharedPreferencesUtil.SipCallingVoice);
@@ -366,6 +378,30 @@ public class SysCallingVolSetActivity extends BaseActivity {
         int sip_f = SharedPreferencesUtil.getIntSp(SysCallingVolSetActivity.this, Constants.MSG_SP, SharedPreferencesUtil.SipCallingVoice_f);
         int sip1_f = SharedPreferencesUtil.getIntSp(SysCallingVolSetActivity.this, Constants.MSG_SP, SharedPreferencesUtil.SipCallingVoice1_f);
 
+        if (mode == 1) {
+            rbSingleMode.setChecked(true);
+            UdpSendUtil.callModeChangeTradition("1");
+        } else {
+            rbDualMode.setChecked(true);
+            UdpSendUtil.callModeChangeTradition("0");
+        }
+
+        groupCallingMode.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(RadioGroup group, int checkedId) {
+                switch (checkedId) {
+                    case R.id.rb_calling_mode_dual:
+                        SharedPreferencesUtil.putIntSp(SysCallingVolSetActivity.this, Constants.MSG_SP, SharedPreferencesUtil.CallingMode, 0);
+                        UdpSendUtil.callModeChangeTradition("0");
+                        break;
+                    case R.id.rb_calling_mode_single:
+                        SharedPreferencesUtil.putIntSp(SysCallingVolSetActivity.this, Constants.MSG_SP, SharedPreferencesUtil.CallingMode, 1);
+                        UdpSendUtil.callModeChangeTradition("1");
+                        break;
+                }
+            }
+        });
+
         if (sb < 0) {
             tvMainCallingVoice.setText("主机免提通话音量: " + 70);
             sbMainCallingVoiceSet.setProgress(70);

app/src/main/java/com/wdkl/callingmainnurse/util/SharedPreferencesUtil.java

@@ -10,6 +10,7 @@ import android.content.SharedPreferences;
 
 public class SharedPreferencesUtil {
 
+    public static final String CallingMode = "CallingMode";
     public static final String SbCallingVoice = "SbCallingVoice";
     public static final String SbingCallingVoice = "SbingCallingVoice";
     public static final String SipCallingVoice = "SipCallingVoice";

app/src/main/java/com/wdkl/callingmainnurse/util/UdpSendUtil.java

@@ -37,6 +37,15 @@ public class UdpSendUtil {
     }
 
     /**
+     * 护士主机改变传统转接盒的通话模式
+     */
+    public static void callModeChangeTradition(String mode) {
+        AnalysisUdpUtil.sendUdpData("call_mode_change_tradition_system"
+                , Constants.MYSELF_ID
+                , "0", "0", Constants.SIP_IP, "0", "0", mode, "0", "0", Constants.MAC_ADDRESS);
+    }
+
+    /**
      * 请求托管
      *
      * @param sendId(发送主机一id)

app/src/main/res/layout/activity_calling_voice_set_layout.xml

@@ -23,7 +23,8 @@
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:visibility="gone">
 
             <TextView
                 android:id="@+id/activity_sb_calling_voice_set"
@@ -52,6 +53,43 @@
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1"
+            android:gravity="center_vertical">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="通话模式选择:"
+                android:textColor="@color/white"
+                android:textSize="28sp"/>
+
+            <RadioGroup
+                android:id="@+id/group_calling_mode"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="30dp"
+                android:orientation="horizontal">
+                <RadioButton
+                    android:id="@+id/rb_calling_mode_dual"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="双工模式"
+                    android:textColor="@color/white"
+                    android:textSize="28sp"/>
+                <RadioButton
+                    android:id="@+id/rb_calling_mode_single"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="30dp"
+                    android:text="单工模式"
+                    android:textColor="@color/white"
+                    android:textSize="28sp"/>
+            </RadioGroup>
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
             android:orientation="vertical">
 
             <TextView