注册界面增加进入系统设置入口，增加呼叫转移开关，默认关闭

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

@@ -23,6 +23,7 @@ import com.wdkl.ncs.android.component.home.ui.SingleCallFragment
 import com.wdkl.ncs.android.component.home.util.HandleTcpConnect
 import com.wdkl.ncs.android.component.home.util.RingPlayHelper
 import com.wdkl.ncs.android.component.home.util.SpeechUtil
+import com.wdkl.ncs.android.lib.base.BaseApplication
 import com.wdkl.ncs.android.lib.utils.AppTool
 import com.wdkl.ncs.android.lib.utils.showMessage
 import com.wdkl.ncs.android.lib.vo.MessageEvent
@@ -141,7 +142,7 @@ class NewCallListActivity : BaseToolActivity(), NewCallItemAdapter.CallClickList
         WdKeepAliveService.mNewCallListActive = true
 
         //启动线程处理呼叫转移
-        if (Constants.supportTrans) {
+        if (SettingConfig.getTransCall(BaseApplication.appContext) == 1) {
             startLoopTransfer()
         }
     }

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

@@ -181,6 +181,9 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
         if (SettingConfig.getVoiceCallType(BaseApplication.appContext) == -1) {
             SettingConfig.setVoiceCallType(BaseApplication.appContext, SettingConfig.SIP_CALL)
         }
+        if (SettingConfig.getTransCall(BaseApplication.appContext) == -1) {
+            SettingConfig.setTransCall(BaseApplication.appContext, 0)
+        }
     }
 
     private fun regReceiver() {

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

@@ -66,7 +66,7 @@ public class WatchUserSettingActivity extends Activity {
         tvServerIp.setText(Constants.Companion.getTcpServer());
         tvPhoneType.setText("手机-" + Constants.Companion.getPhoneType() + ", 分机-" + Constants.Companion.getBedPhoneType() + ", 主机-" + Constants.Companion.getNursePhoneType());
 
-        if (SettingConfig.getVoiceCallType(BaseApplication.appContext) == SettingConfig.VOICE_CALL) {
+        if (SettingConfig.getTransCall(BaseApplication.appContext) == 1) {
             callYes.setChecked(true);
         } else {
             callNo.setChecked(true);
@@ -110,24 +110,16 @@ public class WatchUserSettingActivity extends Activity {
                 }
             }
         });
-        btnSystemSetting.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                Intent intent = new Intent(Settings.ACTION_SETTINGS);
-                startActivity(intent);
-            }
+        btnSystemSetting.setOnClickListener(view -> {
+            Intent intent = new Intent(Settings.ACTION_SETTINGS);
+            startActivity(intent);
         });
 
-        callGroup.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(RadioGroup group, int checkedId) {
-                if (checkedId == R.id.rb_call_yes) {
-                    //普通电话
-                    SettingConfig.setVoiceCallType(BaseApplication.appContext, SettingConfig.VOICE_CALL);
-                } else {
-                    //网络电话
-                    SettingConfig.setVoiceCallType(BaseApplication.appContext, SettingConfig.SIP_CALL);
-                }
+        callGroup.setOnCheckedChangeListener((group, checkedId) -> {
+            if (checkedId == R.id.rb_call_yes) {
+                SettingConfig.setTransCall(BaseApplication.appContext, 1);
+            } else {
+                SettingConfig.setTransCall(BaseApplication.appContext, 0);
             }
         });
     }

home/src/main/code/com/wdkl/ncs/android/component/home/settingconfig/SettingConfig.java

@@ -10,6 +10,7 @@ public class SettingConfig {
     //呼叫转接时间设置
     private static final String KEY_SP_COUNTDOWN_TIME = "KEY_SP_COUNTDOWN_TIME";
     private static final int CountdownTime = 15;
+    private static final String KEY_SP_TRANSFER_CALL = "KEY_SP_TRANSFER_CALL";
 
     //电话功能类型
     private static final String KEY_SP_VOICE_CALL_TYPE = "KEY_SP_VOICE_CALL_TYPE";
@@ -45,6 +46,14 @@ public class SettingConfig {
         getEditor(context).putInt(KEY_SP_VOICE_CALL_TYPE, value).apply();
     }
 
+    public static int getTransCall(Context context) {
+        return getSP(context).getInt(KEY_SP_TRANSFER_CALL, -1);
+    }
+
+    public static void setTransCall(Context context, int value) {
+        getEditor(context).putInt(KEY_SP_TRANSFER_CALL, value).apply();
+    }
+
 
     private static SharedPreferences getSP(Context context) {
         return context.getSharedPreferences(SP_NAME, Context.MODE_PRIVATE);

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

@@ -251,9 +251,8 @@
                     android:layout_height="wrap_content"
                     android:layout_below="@id/btn_check_update"
                     android:layout_marginTop="16dp"
-                    android:text="使用普通电话:"
-                    android:textSize="16sp"
-                    android:visibility="gone"/>
+                    android:text="呼叫转移:"
+                    android:textSize="16sp" />
 
                 <RadioGroup
                     android:id="@+id/group_call"
@@ -263,8 +262,7 @@
                     android:layout_toRightOf="@id/tv_call_title"
                     android:layout_marginTop="10dp"
                     android:layout_marginLeft="4dp"
-                    android:orientation="horizontal"
-                    android:visibility="gone">
+                    android:orientation="horizontal">
                     <RadioButton
                         android:id="@+id/rb_call_yes"
                         android:layout_width="wrap_content"

middleware/src/main/code/com/wdkl/ncs/android/middleware/common/Constants.kt

@@ -47,7 +47,7 @@ class Constants {
         //是否支持语音通话
         val supportCall = false
         //是否支持呼叫转移
-        var supportTrans = true
+        //var supportTrans = true
 
         //手机通话方式: 默认网络
         var phoneType = CommunicationEnum.NET_WORK.value()