代码整合

android_door/build.gradle

@@ -35,8 +35,6 @@ android {
         }
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-
-        buildConfigField "String", "APP_DEVICE_TYPE", "\""+app_device_type+"\""
     }
 
     sourceSets {

android_door/src/main/common/java/com/wdkl/ncs/host/service/WdklSipService.java

@@ -17,8 +17,8 @@ import android.widget.Toast;
 import androidx.annotation.Nullable;
 
 import com.wdkl.app.ncs.callingdoor.R;
-import com.wdkl.app.ncs.callingdoor.settings.SettingConfig;
 import com.wdkl.ncs.android.lib.base.BaseApplication;
+import com.wdkl.ncs.android.lib.settings.SettingConfig;
 import com.wdkl.ncs.android.middleware.common.Constant;
 import com.wdkl.ncs.android.middleware.common.MessageEvent;
 import com.wdkl.ncs.host.activity.CallActivity;

android_door/src/main/h10_3128/java/com/wdkl/app/ncs/callingdoor/activity/AppUpdateActivity.kt

@@ -7,15 +7,14 @@ import android.text.TextUtils
 import android.util.Log
 import com.enation.javashop.android.jrouter.external.annotation.Router
 import com.enation.javashop.net.engine.model.NetState
-import com.example.yf_rk3288_api.YF_RK3288_API_Manager
 import com.wdkl.app.ncs.callingdoor.R
 import com.wdkl.app.ncs.callingdoor.databinding.UpdateLayBinding
 import com.wdkl.app.ncs.callingdoor.helper.AppUpdateHelper
 import com.wdkl.app.ncs.callingdoor.helper.HttpHelper
 import com.wdkl.app.ncs.callingdoor.helper.LocaleMangerUtils
 import com.wdkl.app.ncs.callingdoor.launch.CallingdoorLaunch
-import com.wdkl.app.ncs.callingdoor.settings.SettingConfig
 import com.wdkl.ncs.android.lib.base.BaseActivity
+import com.wdkl.ncs.android.lib.settings.SettingConfig
 import com.wdkl.ncs.android.lib.utils.showMessage
 import com.wdkl.ncs.android.lib.vo.filter
 import com.wdkl.ncs.android.middleware.api.UrlManager

android_door/src/main/h10_3128/java/com/wdkl/app/ncs/callingdoor/activity/CallingdoorActivity.kt

@@ -22,9 +22,9 @@ import com.wdkl.app.ncs.callingdoor.databinding.CallingdoorMainLayBinding
 import com.wdkl.app.ncs.callingdoor.fragment.*
 import com.wdkl.app.ncs.callingdoor.helper.*
 import com.wdkl.app.ncs.callingdoor.launch.CallingdoorLaunch
-import com.wdkl.app.ncs.callingdoor.settings.SettingConfig
 import com.wdkl.ncs.android.lib.base.BaseActivity
 import com.wdkl.ncs.android.lib.base.BaseApplication
+import com.wdkl.ncs.android.lib.settings.SettingConfig
 import com.wdkl.ncs.android.lib.utils.*
 import com.wdkl.ncs.android.lib.vo.filter
 import com.wdkl.ncs.android.lib.widget.MenuDialog

android_door/src/main/h10_3128/java/com/wdkl/app/ncs/callingdoor/adapter/BedItemAdapter.java

@@ -10,7 +10,7 @@ import android.widget.TextView;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.wdkl.app.ncs.callingdoor.R;
-import com.wdkl.app.ncs.callingdoor.settings.SettingConfig;
+import com.wdkl.ncs.android.lib.settings.SettingConfig;
 import com.wdkl.ncs.android.middleware.common.Constant;
 import com.wdkl.ncs.android.middleware.model.vo.FrameBedVO;
 import com.wdkl.ncs.android.middleware.utils.CommonUtils;

android_door/src/main/h10_3128/java/com/wdkl/app/ncs/callingdoor/fragment/BaseCallFragment.kt

@@ -10,8 +10,8 @@ import android.widget.TextView
 import androidx.fragment.app.Fragment
 import com.enation.javashop.utils.base.tool.BaseToolActivity
 import com.wdkl.app.ncs.callingdoor.R
-import com.wdkl.app.ncs.callingdoor.helper.RingPlayHelper
-import com.wdkl.app.ncs.callingdoor.settings.SettingConfig
+import com.wdkl.ncs.android.lib.settings.SettingConfig
+import com.wdkl.ncs.android.lib.utils.RingPlayHelper
 import com.wdkl.ncs.android.lib.utils.showMessage
 import com.wdkl.ncs.android.middleware.common.Constant
 import com.wdkl.ncs.android.middleware.common.MessageEvent

android_door/src/main/h10_3128/java/com/wdkl/app/ncs/callingdoor/fragment/MainFragment.kt

@@ -12,8 +12,8 @@ import com.wdkl.app.ncs.callingdoor.databinding.MainViewLayoutBinding
 import com.wdkl.app.ncs.callingdoor.helper.DoorLightHelper
 import com.wdkl.app.ncs.callingdoor.helper.Utils
 import com.wdkl.app.ncs.callingdoor.launch.CallingdoorLaunch
-import com.wdkl.app.ncs.callingdoor.settings.SettingConfig
 import com.wdkl.ncs.android.lib.base.BaseFragment
+import com.wdkl.ncs.android.lib.settings.SettingConfig
 import com.wdkl.ncs.android.lib.utils.errorLog
 import com.wdkl.ncs.android.lib.utils.showMessage
 import com.wdkl.ncs.android.lib.vo.filter

android_door/src/main/h10_3128/java/com/wdkl/app/ncs/callingdoor/fragment/SipCallFragment.kt

@@ -7,16 +7,13 @@ import android.os.SystemClock
 import android.text.TextUtils
 import android.util.Log
 import android.view.View
-import android.widget.SeekBar
 import com.alibaba.fastjson.JSONObject
 import com.google.gson.Gson
 import com.wdkl.app.ncs.callingdoor.R
-import com.wdkl.app.ncs.callingdoor.activity.CallingdoorActivity
 import com.wdkl.app.ncs.callingdoor.helper.DoorLightHelper
-import com.wdkl.app.ncs.callingdoor.helper.RingPlayHelper
-import com.wdkl.app.ncs.callingdoor.helper.VoiceManagerUtil
-import com.wdkl.app.ncs.callingdoor.settings.SettingConfig
+import com.wdkl.ncs.android.lib.settings.SettingConfig
 import com.wdkl.ncs.android.lib.utils.AppTool
+import com.wdkl.ncs.android.lib.utils.RingPlayHelper
 import com.wdkl.ncs.android.lib.utils.showMessage
 import com.wdkl.ncs.android.middleware.common.Constant
 import com.wdkl.ncs.android.middleware.common.MessageEvent
@@ -25,14 +22,11 @@ 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.TcpCallback
 import com.wdkl.ncs.android.middleware.tcp.dto.TcpModel
-import com.wdkl.ncs.android.middleware.tcp.enums.DeviceTypeEnum
 import com.wdkl.ncs.android.middleware.tcp.enums.RoleTypeEnum
 import com.wdkl.ncs.android.middleware.tcp.enums.TcpAction
 import com.wdkl.ncs.android.middleware.tcp.enums.TcpType
 import com.wdkl.ncs.host.service.WdklSipService
 import com.wdkl.ncs.host.util.AudioRouteUtils
-import com.wdkl.ncs.janus.entity.Room
-import com.wdkl.ncs.janus.util.EnumType
 import kotlinx.android.synthetic.main.sky_voice_call_layout.*
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode

android_door/src/main/h10_3128/java/com/wdkl/app/ncs/callingdoor/fragment/SkyCallFragment.kt

@@ -4,7 +4,6 @@ import android.os.Build
 import android.os.Handler
 import android.os.Looper
 import android.os.SystemClock
-import android.text.TextUtils
 import android.util.Log
 import android.view.View
 import android.view.ViewGroup
@@ -12,10 +11,9 @@ import com.alibaba.fastjson.JSONObject
 import com.google.gson.Gson
 import com.wdkl.app.ncs.callingdoor.R
 import com.wdkl.app.ncs.callingdoor.helper.DoorLightHelper
-import com.wdkl.app.ncs.callingdoor.helper.RingPlayHelper
-import com.wdkl.app.ncs.callingdoor.helper.SerialPortHelper
-import com.wdkl.app.ncs.callingdoor.settings.SettingConfig
+import com.wdkl.ncs.android.lib.settings.SettingConfig
 import com.wdkl.ncs.android.lib.utils.AppTool
+import com.wdkl.ncs.android.lib.utils.RingPlayHelper
 import com.wdkl.ncs.android.lib.utils.showMessage
 import com.wdkl.ncs.android.middleware.common.Constant
 import com.wdkl.ncs.android.middleware.common.MessageEvent

android_door/src/main/h10_3128/java/com/wdkl/app/ncs/callingdoor/helper/AppUpdateHelper.java

@@ -14,8 +14,8 @@ import android.util.Log;
 
 import androidx.core.content.FileProvider;
 
-import com.wdkl.app.ncs.callingdoor.settings.SettingConfig;
 import com.wdkl.ncs.android.component.welcome.activity.WelcomeActivity;
+import com.wdkl.ncs.android.lib.settings.SettingConfig;
 import com.wdkl.ncs.host.service.WdklSipService;
 
 import java.io.BufferedReader;

android_door/src/main/h10_3128/java/com/wdkl/app/ncs/callingdoor/helper/AsyncPlayer.java

@@ -1,189 +0,0 @@
-package com.wdkl.app.ncs.callingdoor.helper;
-
-import android.content.Context;
-import android.media.AudioDeviceInfo;
-import android.media.AudioManager;
-import android.media.MediaPlayer;
-import android.net.Uri;
-import android.os.PowerManager;
-import android.os.SystemClock;
-import android.util.Log;
-
-import java.io.IOException;
-import java.util.LinkedList;
-
-/**
- * 响铃相关类
- */
-public class AsyncPlayer {
-    private static final int PLAY = 1;
-    private static final int STOP = 2;
-    private AudioManager audioManager;
-
-    private static final class Command {
-        int code;
-        Context context;
-        int resId;
-        boolean looping;
-        int stream;
-        long requestTime;
-
-        public String toString() {
-            return "{ code=" + code + " looping=" + looping + " stream=" + stream + " resId=" + resId + " }";
-        }
-    }
-
-    private final LinkedList mCmdQueue = new LinkedList();
-
-    private void startSound(Command cmd) {
-
-        try {
-            //MediaPlayer player = new MediaPlayer();
-            MediaPlayer player = MediaPlayer.create(cmd.context, cmd.resId);
-            player.setAudioStreamType(cmd.stream);
-            //player.setDataSource(cmd.context, cmd.uri);
-            player.setLooping(cmd.looping);
-            player.setVolume(1.0f, 1.0f);
-            //player.prepare();
-            player.start();
-            if (mPlayer != null) {
-                mPlayer.release();
-            }
-            mPlayer = player;
-            Log.w(mTag, "start sound " + cmd.resId);
-        } catch (Exception e) {
-            Log.w(mTag, "error loading sound for " + cmd.resId, e);
-        }
-    }
-
-    private final class Thread extends java.lang.Thread {
-        Thread() {
-            super("AsyncPlayer-" + mTag);
-        }
-
-        public void run() {
-            while (true) {
-                Command cmd = null;
-
-                synchronized (mCmdQueue) {
-
-                    cmd = (Command) mCmdQueue.removeFirst();
-                }
-
-                switch (cmd.code) {
-                    case PLAY:
-                        startSound(cmd);
-                        break;
-                    case STOP:
-
-                        if (mPlayer != null) {
-                            mPlayer.stop();
-                            mPlayer.reset();
-                            mPlayer.release();
-                            mPlayer = null;
-                        } else {
-                            Log.w(mTag, "STOP command without a player");
-                        }
-                        break;
-                }
-
-                synchronized (mCmdQueue) {
-                    if (mCmdQueue.size() == 0) {
-
-                        mThread = null;
-                        releaseWakeLock();
-                        return;
-                    }
-                }
-            }
-        }
-    }
-
-    private String mTag;
-    private Thread mThread;
-    private MediaPlayer mPlayer;
-    private PowerManager.WakeLock mWakeLock;
-
-    private int mState = STOP;
-
-    public AsyncPlayer(String tag) {
-        if (tag != null) {
-            mTag = tag;
-        } else {
-            mTag = "AsyncPlayer";
-        }
-    }
-
-    public void play(Context context, int res, boolean looping, int stream) {
-        Command cmd = new Command();
-        cmd.requestTime = SystemClock.uptimeMillis();
-        cmd.code = PLAY;
-        cmd.context = context;
-        cmd.resId = res;
-        cmd.looping = looping;
-        cmd.stream = stream;
-        synchronized (mCmdQueue) {
-            enqueueLocked(cmd);
-            mState = PLAY;
-        }
-    }
-
-    public void stop() {
-        synchronized (mCmdQueue) {
-            if (mState != STOP) {
-                Command cmd = new Command();
-                cmd.requestTime = SystemClock.uptimeMillis();
-                cmd.code = STOP;
-                enqueueLocked(cmd);
-                mState = STOP;
-            }
-        }
-    }
-
-    private void enqueueLocked(Command cmd) {
-        mCmdQueue.add(cmd);
-        if (mThread == null) {
-            acquireWakeLock();
-            mThread = new Thread();
-            mThread.start();
-        }
-    }
-
-    public void setUsesWakeLock(Context context) {
-        if (mWakeLock != null || mThread != null) {
-            throw new RuntimeException("assertion failed mWakeLock=" + mWakeLock + " mThread=" + mThread);
-        }
-        PowerManager pm = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
-        mWakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, mTag);
-    }
-
-    private void acquireWakeLock() {
-        if (mWakeLock != null) {
-            mWakeLock.acquire();
-        }
-    }
-
-    private void releaseWakeLock() {
-        if (mWakeLock != null) {
-            mWakeLock.release();
-        }
-    }
-
-    private boolean isHeadphonesPlugged(Context context) {
-        if (audioManager == null) {
-            audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
-        }
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
-            AudioDeviceInfo[] audioDevices = audioManager.getDevices(AudioManager.GET_DEVICES_ALL);
-            for (AudioDeviceInfo deviceInfo : audioDevices) {
-                if (deviceInfo.getType() == AudioDeviceInfo.TYPE_WIRED_HEADPHONES
-                        || deviceInfo.getType() == AudioDeviceInfo.TYPE_WIRED_HEADSET) {
-                    return true;
-                }
-            }
-            return false;
-        } else {
-            return audioManager.isWiredHeadsetOn();
-        }
-    }
-}

android_door/src/main/h10_3128/java/com/wdkl/app/ncs/callingdoor/helper/CallDialogHelper.java

@@ -13,6 +13,7 @@ import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 
 import com.wdkl.app.ncs.callingdoor.R;
+import com.wdkl.ncs.android.lib.utils.AsyncPlayer;
 
 public class CallDialogHelper {
 

android_door/src/main/h10_3128/java/com/wdkl/app/ncs/callingdoor/helper/DoorLightHelper.java

@@ -1,7 +1,7 @@
 package com.wdkl.app.ncs.callingdoor.helper;
 
-import com.wdkl.app.ncs.callingdoor.settings.SettingConfig;
 import com.wdkl.ncs.android.lib.base.BaseApplication;
+import com.wdkl.ncs.android.lib.settings.SettingConfig;
 import com.wdkl.ncs.android.middleware.common.Constant;
 import com.wdkl.ncs.android.middleware.tcp.dto.TcpModel;
 import com.wdkl.ncs.android.middleware.tcp.enums.TcpAction;

android_door/src/main/h10_3128/java/com/wdkl/app/ncs/callingdoor/helper/LanguageSetDialogHelper.java

@@ -18,7 +18,7 @@ import android.widget.Spinner;
 import android.widget.Toast;
 
 import com.wdkl.app.ncs.callingdoor.R;
-import com.wdkl.app.ncs.callingdoor.settings.SettingConfig;
+import com.wdkl.ncs.android.lib.settings.SettingConfig;
 
 
 public class LanguageSetDialogHelper {

android_door/src/main/h10_3128/java/com/wdkl/app/ncs/callingdoor/helper/LocaleMangerUtils.java

@@ -8,8 +8,8 @@ import android.util.DisplayMetrics;
 import android.util.Log;
 
 import com.wdkl.app.ncs.callingdoor.R;
-import com.wdkl.app.ncs.callingdoor.settings.SettingConfig;
 import com.wdkl.ncs.android.lib.base.BaseApplication;
+import com.wdkl.ncs.android.lib.settings.SettingConfig;
 
 import java.util.Locale;
 

android_door/src/main/h10_3128/java/com/wdkl/app/ncs/callingdoor/helper/RingPlayHelper.java

@@ -1,22 +0,0 @@
-package com.wdkl.app.ncs.callingdoor.helper;
-
-import android.content.Context;
-import android.media.AudioManager;
-
-public class RingPlayHelper {
-
-    private static AsyncPlayer ringPlayer;
-
-    public static void playRingTone(Context context, int res, boolean loop) {
-        if (ringPlayer == null) {
-            ringPlayer = new AsyncPlayer(null);
-        }
-        ringPlayer.play(context, res, loop, AudioManager.STREAM_MUSIC);
-    }
-
-    public static void stopRingTone() {
-        if (ringPlayer != null) {
-            ringPlayer.stop();
-        }
-    }
-}

android_door/src/main/h10_3128/java/com/wdkl/app/ncs/callingdoor/helper/SOSHelper.java

@@ -5,8 +5,8 @@ import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
 
-import com.wdkl.app.ncs.callingdoor.settings.SettingConfig;
 import com.wdkl.ncs.android.lib.base.BaseApplication;
+import com.wdkl.ncs.android.lib.settings.SettingConfig;
 import com.wdkl.ncs.android.middleware.common.Constant;
 import com.wdkl.ncs.android.middleware.tcp.channel.OtherUtil;
 

android_door/src/main/h10_3128/java/com/wdkl/app/ncs/callingdoor/sip/SipHelper.java.bak

@@ -1,579 +0,0 @@
-package com.wdkl.app.ncs.callingbed2.sip;
-
-import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.app.ActivityManager;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.ServiceConnection;
-import android.os.CountDownTimer;
-import android.os.Handler;
-import android.os.IBinder;
-import android.os.Message;
-import android.util.Log;
-
-import com.vvsip.ansip.IVvsipService;
-import com.vvsip.ansip.IVvsipServiceListener;
-import com.vvsip.ansip.VvsipCall;
-import com.vvsip.ansip.VvsipService;
-import com.vvsip.ansip.VvsipServiceBinder;
-import com.vvsip.ansip.VvsipTask;
-import com.wdkl.app.ncs.callingbed2.common.MessageEvent;
-import com.wdkl.app.ncs.callingbed2.helper.NetHelper;
-
-
-import org.greenrobot.eventbus.EventBus;
-
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.List;
-
-import static com.wdkl.app.ncs.callingbed2.common.Constant.EVENT_SIP_REGISTER_STATUS;
-import static com.wdkl.app.ncs.callingbed2.sip.SipStatus.REGISTERCOM;
-import static com.wdkl.app.ncs.callingbed2.sip.SipStatus.REGISTERFAIL;
-import static com.wdkl.app.ncs.callingbed2.sip.SipStatus.REGISTERING;
-import static com.vvsip.ansip.VvsipTask.EXOSIP_CALL_CLOSED;
-
-
-public class SipHelper {
-
-    private final static String SIP_IP_END = ":5060";
-
-    private static String sipIP = "";
-    private static String sipID = "";
-    private static String sipPWD = "";
-
-    /**
-     * Sip启动注册.
-     */
-    protected int mSipRegisterTime = 5000;
-    private Handler sipRegisterHandler = null;
-    private Runnable sipRegisterRunnable = null;
-
-    /**
-     * SIP信息
-     */
-    public static final String SipInfoTag = "SipInfo";
-    /**
-     * 电话呼叫对象
-     */
-    private List<VvsipCall> mVvsipCalls = null;
-
-
-    private static SipHelper sipHelper;
-
-    public Handler getSipRegisterHandler() {
-        return sipRegisterHandler;
-    }
-
-    public Runnable getSipRegisterRunnable() {
-        return sipRegisterRunnable;
-    }
-
-    public List<VvsipCall> getmVvsipCalls() {
-        return mVvsipCalls;
-    }
-
-    private IVvsipServiceListener sipListner;
-
-
-    private Context mContext;
-
-    public static SipHelper getInstance() {
-        if (sipHelper == null) {
-            synchronized (SipHelper.class) {
-                if (sipHelper == null) {
-                    sipHelper = new SipHelper();
-                }
-            }
-        }
-        return sipHelper;
-    }
-
-    /**
-     * Instantiates a new Sip register util.
-     */
-    private SipHelper() {
-        if (mVvsipCalls == null) {
-            mVvsipCalls = new ArrayList<VvsipCall>();
-        }
-
-        // Runnable exiting the splash screen and launching the menu
-        sipRegisterRunnable = new Runnable() {
-            public void run() {
-                isSuccessRegisterSip();
-            }
-        };
-
-        // Run the exitRunnable in in mSipRegisterTime ms
-        sipRegisterHandler = new Handler();
-
-        IVvsipService sipservice = VvsipService.getService();
-        if (sipservice != null) {
-            sipRegisterHandler.postDelayed(sipRegisterRunnable, 3000);
-            return;
-        }
-        sipRegisterHandler.postDelayed(sipRegisterRunnable, mSipRegisterTime);
-    }
-
-    public void initSip(Context context, String ip, String id, String pwd) {
-        mContext = context;
-        sipIP = ip;
-        sipID = id;
-        sipPWD = pwd;
-    }
-
-    public void setSipListner(IVvsipServiceListener listner) {
-        sipListner = listner;
-    }
-
-    /*public void addSipListner(IVvsipServiceListener listner) {
-        IVvsipService sipService = VvsipService.getService();
-        if (sipService != null && listner != null) {
-            sipService.addListener(listner);
-            Log.d("sip", "add sip listner");
-        }
-    }
-
-    public void removeSipListner(IVvsipServiceListener listner) {
-        IVvsipService sipService = VvsipService.getService();
-        if (sipService != null && listner != null) {
-            sipService.removeListener(listner);
-            Log.d("sip", "remove sip listner");
-        }
-    }*/
-
-    /**
-     * 检测Sip服务是否注册成功
-     */
-    public void isSuccessRegisterSip() {
-        VvsipTask vvsipTask = VvsipTask.getVvsipTask();
-        if (vvsipTask != null && VvsipTask.global_failure != 0) {
-            /**
-             * ==================================sip服务启动失败 ================================
-             */
-        }
-    }
-
-    /**
-     * 注销Sip服务
-     */
-    public void unRegisterSip() {
-        //LogUtil.i(SipInfoTag, "lifecycle // onDestroy");
-
-        IVvsipService sipservice = VvsipService.getService();
-        if (sipservice != null && sipListner != null) {
-            sipservice.removeListener(sipListner);
-        }
-
-        getSipServiceStartHandler().removeCallbacks(getSipServiceStartRunnable());
-        sipRegisterHandler.removeCallbacks(sipRegisterRunnable);
-        if (getSipServiceConnection() != null && isRegister) {
-            try {
-                mContext.unbindService(getSipServiceConnection());
-                setSipServiceConnection(null);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-        if (mVvsipCalls != null) {
-            mVvsipCalls.clear();
-            mVvsipCalls = null;
-        }
-
-        //Log.i(SipInfoTag, "lifecycle // onDestroy");
-    }
-
-    public static String sipStatus = "";
-
-    /**
-     * Sip信息获取
-     */
-    public void obtainSipInfo() {
-        if (sipStatus.equals(REGISTERCOM) && NetHelper.NetConn) {//sip注册成功并且以太网连上
-            return;
-        }
-        IVvsipService sipService = VvsipService.getService();
-        if (sipService != null && sipListner != null) {
-            //sipService.addListener(sipListner);
-            sipService.setMessageHandler(messageHandler);
-        } else {
-            //LogUtil.i(SipInfoTag, "lifecycle // _service==null");
-        }
-        sipRegister();
-        failUiRefreshSip();
-    }
-
-    private void failUiRefreshSip() {
-        if (!NetHelper.NetConn) {
-            sipStatus = REGISTERFAIL;
-            EventBus.getDefault().post(new MessageEvent(REGISTERFAIL, EVENT_SIP_REGISTER_STATUS));
-            if (mSipThread != null) {
-                mSipThread.interrupt();
-                mSipThread = null;
-            }
-            //LogUtil.e(SipInfoTag, "以太网断开，SIP UI状态刷新为失败");
-        }
-    }
-
-
-    /**
-     * Sip信息
-     */
-    private String sipinfo = "";
-    private static int handleCount = 0;
-    //Sip註冊次數
-    private CountDownTimer mCountDownAutoTimer;
-    @SuppressLint("HandlerLeak")
-    private Handler messageHandler = new Handler() {
-        @Override
-        public void handleMessage(Message msg) {
-            //LogUtil.i("QASE", "handleMessage==" + " msg.obj==" + msg.obj.toString() + " msg.what==" + msg.what);
-            //LogUtil.i(SipInfoTag, "#" + msg.obj);
-            sipinfo = "" + msg.obj + sipinfo;
-            //LogUtil.i(SipInfoTag, "Sip信息" + sipinfo);
-
-            if (msg.what == 22) {//释放资源
-                //EventBus.getDefault().post(new MessageEvent(msg.what, EVENT_SIP_REGISTER_STATUS));
-            }
-
-            if (sipinfo.contains("200 OK")) {//注册成功
-                sipStatus = REGISTERCOM;
-                EventBus.getDefault().post(new MessageEvent(REGISTERCOM, EVENT_SIP_REGISTER_STATUS));
-                if (mSipThread != null) {
-                    mSipThread.interrupt();
-                    mSipThread = null;
-                }
-                if (msg.obj.toString().contains("408")) {//超时
-                    sipStatus = REGISTERFAIL;
-                    EventBus.getDefault().post(new MessageEvent(REGISTERFAIL, EVENT_SIP_REGISTER_STATUS));
-                    sipRegister();
-                }
-            } else {//注册失败
-                sipStatus = REGISTERFAIL;
-                EventBus.getDefault().post(new MessageEvent(REGISTERFAIL, EVENT_SIP_REGISTER_STATUS));
-                if (mSipThread != null) {
-                    mSipThread.interrupt();
-                    mSipThread = null;
-                }
-                sipRegister();
-            }
-            failUiRefreshSip();
-
-            if (msg.obj.toString().contains("autocall")) {
-                VvsipCall pCall = null;
-                //LogUtil.e(SipInfoTag, "onClick1");
-                for (VvsipCall _pCall : mVvsipCalls) {
-                    if (_pCall.cid > 0)
-                        //LogUtil.e(SipInfoTag, "state#" + _pCall.mState);
-                        if (_pCall.cid > 0 && _pCall.mState <= 2) {
-                            pCall = _pCall;
-                            break;
-                        }
-                }
-                //LogUtil.e(SipInfoTag, "onClick2");
-                if (pCall == null)
-                    return;
-                //LogUtil.e(SipInfoTag, "onClick3#" + pCall.mState);
-                IVvsipService _service = VvsipService.getService();
-                if (_service == null)
-                    return;
-                VvsipTask _vvsipTask = _service.getVvsipTask();
-                if (_vvsipTask == null)
-                    return;
-                pCall.stop();
-                _service.setSpeakerModeOff();
-            }
-        }
-    };
-
-    /**
-     * ====================Sip注册======================
-     */
-    private Thread mSipThread;
-
-    private static class SipThread extends Thread {
-        WeakReference<Activity> mThreadCallingBedActivity;
-
-        private SipThread(Activity activity) {
-            mThreadCallingBedActivity = new WeakReference<Activity>(activity);
-        }
-
-        @Override
-        public void run() {
-            super.run();
-            if (mThreadCallingBedActivity == null)
-                return;
-            if (mThreadCallingBedActivity.get() != null) {
-                IVvsipService sipService = VvsipService.getService();
-                try {
-                    if (sipService != null && !SipHelper.getInstance().sipinfo.contains("200 OK") && NetHelper.NetConn) {
-                        sipStatus = REGISTERING;
-                        EventBus.getDefault().post(new MessageEvent(REGISTERING, EVENT_SIP_REGISTER_STATUS));
-                        sipService.register(sipIP + SIP_IP_END, sipID, sipPWD);
-                        handleCount++;
-                        Log.e(SipInfoTag, "以太网连接，SIP UI状态刷新为注册中");
-                    } else if (sipService != null && SipHelper.getInstance().sipinfo.contains("200 OK")) {
-                        sipStatus = REGISTERCOM;
-                        EventBus.getDefault().post(new MessageEvent(REGISTERCOM, EVENT_SIP_REGISTER_STATUS));
-                    }
-                } catch (NullPointerException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-    }
-
-    private void sipRegister() {
-        synchronized (this) {
-            mSipThread = new SipThread((Activity) mContext);
-            if (handleCount < 3) {
-                if (mCountDownAutoTimer == null) {
-                    mCountDownAutoTimer = new CountDownTimer(10000, 1000) {
-                        @Override
-                        public void onTick(long l) {
-                        }
-
-                        @Override
-                        public void onFinish() {
-                            handleCount = 0;
-                            if (mSipThread != null) {
-                                mSipThread.start();
-                            }
-                            if (mCountDownAutoTimer != null) {
-                                mCountDownAutoTimer.cancel();
-                                mCountDownAutoTimer = null;
-                            }
-                        }
-                    };
-                    mCountDownAutoTimer.start();
-                }
-                return;
-            } else {
-                if (mCountDownAutoTimer != null) {
-                    mCountDownAutoTimer.cancel();
-                    mCountDownAutoTimer = null;
-                }
-            }
-            if (handleCount == 0) {
-                mSipThread.start();
-            }
-        }
-    }
-
-
-    public void setmSipThread(Thread mSipThread) {
-        this.mSipThread = mSipThread;
-    }
-
-    public Thread getmSipThread() {
-        return mSipThread;
-    }
-
-    /**
-     * 开始通话
-     */
-    public void startCall(String sipUseName) {
-        IVvsipService sipService = VvsipService.getService();
-        if (sipService == null) return;
-        //----------------------------------------------携带呼叫列表转接床头机的Mac地址--------------------------------------------------//
-        sipService.initiateOutgoingCall(sipUseName, "");
-    }
-
-    /**
-     * 结束通话
-     */
-    public void endCall() {
-        VvsipCall call = null;
-        for (VvsipCall pCall : mVvsipCalls) {
-            if (pCall.cid > 0 && pCall.mState <= 2) {
-                call = pCall;
-                break;
-            }
-        }
-        if (call == null) return;
-        IVvsipService sipService = VvsipService.getService();
-        if (sipService == null) return;
-        VvsipTask sipTask = sipService.getVvsipTask();
-        if (sipTask == null) return;
-        VvsipService.getService().mainEndCall(EXOSIP_CALL_CLOSED);
-        call.stop();
-        sipService.setSpeakerModeOff();
-        sipService.stopPlayer();
-        sipService.setAudioNormalMode();
-    }
-
-    /**
-     * 添加一个电话呼叫对象
-     *
-     * @param call
-     */
-    public void addCallObject(final VvsipCall call) {
-        try {
-            if (call == null) {
-                return;
-            }
-
-            if (mVvsipCalls == null)
-                return;
-            mVvsipCalls.add(call);
-        } catch (Exception e) {
-            //LogUtil.e(SipInfoTag, "onNewVvsipCallEvent: " + e);
-        }
-    }
-
-    /**
-     * 移除一个电话呼叫对象
-     *
-     * @param call
-     */
-    public void removeCallObject(final VvsipCall call) {
-        try {
-            if (call == null) {
-                return;
-            }
-
-            // 4 crash detected here for 4.0.9 with mVvsipCalls=NULL
-            if (mVvsipCalls == null)
-                return;
-            mVvsipCalls.remove(call);
-        } catch (Exception e) {
-            //Log.e(SipInfoTag, "onRemoveVvsipCallEvent: " + e);
-        }
-    }
-
-    /**
-     * 自动接电话
-     */
-    public void autoTalking() {
-        if (mVvsipCalls == null) {
-            mVvsipCalls = new ArrayList<VvsipCall>();
-        }
-        for (VvsipCall _pCall : mVvsipCalls) {
-            if (_pCall.cid > 0 && _pCall.mState < 2 && _pCall.mIncomingCall) {
-                // ANSWER EXISTING CALL
-                int i = _pCall.answer(200, 1);
-              //LogUtil.d(SipInfoTag, "ANSWER EXISTING CALL");
-                IVvsipService _service = VvsipService.getService();
-                if (_service != null) {
-                    if (i >= 0) {
-                        _service.stopPlayer();
-                        _service.setSpeakerModeOff();
-                        _service.setAudioInCallMode();
-                    }
-                }
-                break;
-            }
-        }
-    }
-
-    public static boolean isServiceRunning(Context context, String className) {
-        boolean isRunning = false;
-        ActivityManager activityManager = (ActivityManager) context
-                .getSystemService(Context.ACTIVITY_SERVICE);
-        List<ActivityManager.RunningServiceInfo> serviceList = activityManager
-                .getRunningServices(30);
-
-        if (!(serviceList.size() > 0)) {
-            return false;
-        }
-
-        for (int i = 0; i < serviceList.size(); i++) {
-            if (serviceList.get(i).service.getClassName().equals(className) == true) {
-                isRunning = true;
-                break;
-            }
-        }
-        return isRunning;
-    }
-
-    /**
-     * #############################
-     * <p>
-     * Sip启动服务.
-     * <p>
-     * #############################
-     */
-    private static Handler sipServiceStartHandler = null;
-    private static Runnable sipServiceStartRunnable = null;
-    private static ServiceConnection sipServiceConnection;
-
-    public static Runnable getSipServiceStartRunnable() {
-        return sipServiceStartRunnable;
-    }
-
-    public static Handler getSipServiceStartHandler() {
-        return sipServiceStartHandler;
-    }
-
-    public static ServiceConnection getSipServiceConnection() {
-        return sipServiceConnection;
-    }
-
-    public static void setSipServiceConnection(ServiceConnection sipServiceConnections) {
-        sipServiceConnection = sipServiceConnections;
-    }
-
-    /**
-     * 启动服务
-     */
-    public static Boolean isRegister = false;//是否注册
-
-    public void sipStartService() {
-        sipServiceStartHandler = new Handler();
-
-        sipServiceStartRunnable = new Runnable() {
-            public void run() {
-                if (mContext == null) {
-                    sipServiceStartHandler.postDelayed(sipServiceStartRunnable, 1000);
-                    return;
-                }
-                Intent intent = new Intent(mContext.getApplicationContext(), VvsipService.class);
-                mContext.startService(intent);
-
-                sipServiceConnection = new ServiceConnection() {
-                    public void onServiceConnected(ComponentName name, IBinder service) {
-                        IVvsipService sipservice = ((VvsipServiceBinder) service).getService();
-                        if (sipservice != null && sipListner != null) {
-                            //LogUtil.i(SipInfoTag, "Connected!");
-                            sipservice.addListener(sipListner);
-                            SipHelper.getInstance().obtainSipInfo();//Sip信息获取
-                        }
-                    }
-
-                    public void onServiceDisconnected(ComponentName name) {
-                        //LogUtil.i(SipInfoTag, "Disconnected!");
-                    }
-                };
-
-                isRegister = mContext.bindService(intent, sipServiceConnection, Context.BIND_AUTO_CREATE);
-            }
-        };
-
-        sipServiceStartHandler.postDelayed(sipServiceStartRunnable, 0);
-    }
-
-    /**
-     * 用来解析错误代码
-     */
-    public static String analyseErrorCode(String errorCode) {
-        switch (errorCode) {
-            case "200":
-                return "成功";
-            case "408":
-                return "请求超时";
-            case "400":
-                return "服务器不支持请求的语法";
-            case "401":
-                return "未授权";
-            case "403":
-                return "服务器禁止请求";
-            case "404":
-                return "服务器找不到";
-            default:
-                return "未知错误";
-        }
-    }
-
-}

android_door/src/main/h10_3128/java/com/wdkl/app/ncs/callingdoor/sip/SipStatus.java.bak

@@ -1,17 +0,0 @@
-package com.wdkl.app.ncs.callingbed2.sip;
-
-public class SipStatus {
-    /**
-     * 注册中
-     */
-    public static final String REGISTERING = "register_ing";
-    /**
-     * 注册失败
-     */
-    public static final String REGISTERFAIL = "register_fail";
-    /**
-     * 注册完成
-     */
-    public static final String REGISTERCOM = "register_com";
-
-}

android_door/src/main/h10_3128_chile/java/com/wdkl/app/ncs/callingdoor/activity/AppUpdateActivity.kt

@@ -7,15 +7,14 @@ import android.text.TextUtils
 import android.util.Log
 import com.enation.javashop.android.jrouter.external.annotation.Router
 import com.enation.javashop.net.engine.model.NetState
-import com.example.yf_rk3288_api.YF_RK3288_API_Manager
 import com.wdkl.app.ncs.callingdoor.R
 import com.wdkl.app.ncs.callingdoor.databinding.UpdateLayBinding
 import com.wdkl.app.ncs.callingdoor.helper.AppUpdateHelper
 import com.wdkl.app.ncs.callingdoor.helper.HttpHelper
 import com.wdkl.app.ncs.callingdoor.helper.LocaleMangerUtils
 import com.wdkl.app.ncs.callingdoor.launch.CallingdoorLaunch
-import com.wdkl.app.ncs.callingdoor.settings.SettingConfig
 import com.wdkl.ncs.android.lib.base.BaseActivity
+import com.wdkl.ncs.android.lib.settings.SettingConfig
 import com.wdkl.ncs.android.lib.utils.showMessage
 import com.wdkl.ncs.android.lib.vo.filter
 import com.wdkl.ncs.android.middleware.api.UrlManager

android_door/src/main/h10_3128_chile/java/com/wdkl/app/ncs/callingdoor/activity/CallingdoorActivity.kt

@@ -16,17 +16,15 @@ import com.enation.javashop.android.jrouter.external.annotation.Router
 import com.enation.javashop.net.engine.model.NetState
 import com.example.yf_rk3288_api.YF_RK3288_API_Manager
 import com.google.gson.Gson
-import com.wdkl.app.ncs.callingdoor.BuildConfig
 import com.wdkl.app.ncs.callingdoor.R
 import com.wdkl.app.ncs.callingdoor.agreement.CallingdoorAgreement
 import com.wdkl.app.ncs.callingdoor.databinding.CallingdoorMainLayBinding
-import com.wdkl.app.ncs.callingdoor.entity.HandleEntity
 import com.wdkl.app.ncs.callingdoor.fragment.*
 import com.wdkl.app.ncs.callingdoor.helper.*
 import com.wdkl.app.ncs.callingdoor.launch.CallingdoorLaunch
-import com.wdkl.app.ncs.callingdoor.settings.SettingConfig
 import com.wdkl.ncs.android.lib.base.BaseActivity
 import com.wdkl.ncs.android.lib.base.BaseApplication
+import com.wdkl.ncs.android.lib.settings.SettingConfig
 import com.wdkl.ncs.android.lib.utils.*
 import com.wdkl.ncs.android.lib.vo.filter
 import com.wdkl.ncs.android.lib.widget.MenuDialog

android_door/src/main/h10_3128_chile/java/com/wdkl/app/ncs/callingdoor/adapter/FrameRoomAdapter.kt

@@ -375,13 +375,26 @@ class FrameRoomAdapter : RecyclerView.Adapter<FrameRoomAdapter.BedViewHolder> {
         holder.nursingValue5.setText(configList[4].nurseOptionName)
     }
 
-    fun updateCallings(frameId: Int, flick: Boolean) {
-        if (flick) {
+    fun addFlickBedItem(frameId: Int) {
+        synchronized(callingFrameIds) {
             callingFrameIds.add(frameId)
-        } else {
-            callingFrameIds.remove(frameId)
+            notifyDataSetChanged()
+        }
+    }
+
+    fun removeFlickBedItem(frameId: Int) {
+        synchronized(callingFrameIds) {
+            if (callingFrameIds.size > 0) {
+                val iterator = callingFrameIds.iterator()
+                while (iterator.hasNext()) {
+                    val it = iterator.next()
+                    if (it == frameId) {
+                        iterator.remove()
+                    }
+                }
+            }
+            notifyDataSetChanged()
         }
-        notifyDataSetChanged()
     }
 
     class BedViewHolder: RecyclerView.ViewHolder {

android_door/src/main/h10_3128_chile/java/com/wdkl/app/ncs/callingdoor/fragment/BaseCallFragment.kt

@@ -10,8 +10,8 @@ import android.widget.TextView
 import androidx.fragment.app.Fragment
 import com.enation.javashop.utils.base.tool.BaseToolActivity
 import com.wdkl.app.ncs.callingdoor.R
-import com.wdkl.app.ncs.callingdoor.helper.RingPlayHelper
-import com.wdkl.app.ncs.callingdoor.settings.SettingConfig
+import com.wdkl.ncs.android.lib.settings.SettingConfig
+import com.wdkl.ncs.android.lib.utils.RingPlayHelper
 import com.wdkl.ncs.android.lib.utils.showMessage
 import com.wdkl.ncs.android.middleware.common.Constant
 import com.wdkl.ncs.android.middleware.common.MessageEvent

android_door/src/main/h10_3128_chile/java/com/wdkl/app/ncs/callingdoor/fragment/MainFragment.kt

@@ -5,14 +5,15 @@ import android.text.TextUtils
 import androidx.recyclerview.widget.DefaultItemAnimator
 import androidx.recyclerview.widget.GridLayoutManager
 import com.enation.javashop.net.engine.model.NetState
+import com.google.gson.Gson
 import com.wdkl.app.ncs.callingdoor.R
 import com.wdkl.app.ncs.callingdoor.adapter.FrameRoomAdapter
 import com.wdkl.app.ncs.callingdoor.databinding.MainViewLayoutBinding
 import com.wdkl.app.ncs.callingdoor.helper.DoorLightHelper
 import com.wdkl.app.ncs.callingdoor.helper.Utils
 import com.wdkl.app.ncs.callingdoor.launch.CallingdoorLaunch
-import com.wdkl.app.ncs.callingdoor.settings.SettingConfig
 import com.wdkl.ncs.android.lib.base.BaseFragment
+import com.wdkl.ncs.android.lib.settings.SettingConfig
 import com.wdkl.ncs.android.lib.utils.errorLog
 import com.wdkl.ncs.android.lib.utils.showMessage
 import com.wdkl.ncs.android.lib.vo.filter
@@ -23,7 +24,10 @@ import com.wdkl.ncs.android.middleware.logic.contract.callingdoor.MainFragmentCo
 import com.wdkl.ncs.android.middleware.logic.presenter.callingdoor.MainFragmentPresenter
 import com.wdkl.ncs.android.middleware.model.vo.FrameBedVO
 import com.wdkl.ncs.android.middleware.model.vo.FrameRoomVO
+import com.wdkl.ncs.android.middleware.model.vo.InteractionVO
+import com.wdkl.ncs.android.middleware.tcp.dto.TcpModel
 import com.wdkl.ncs.android.middleware.tcp.enums.DeviceTypeEnum
+import com.wdkl.ncs.android.middleware.tcp.enums.TcpAction
 import com.wdkl.ncs.android.middleware.utils.CommonUtils
 import kotlinx.android.synthetic.main.main_view_layout.*
 import org.greenrobot.eventbus.EventBus
@@ -34,7 +38,7 @@ class MainFragment: BaseFragment<MainFragmentPresenter, MainViewLayoutBinding>()
     val TAG = "MainFragment"
 
     private lateinit var gridLayoutManager: OnegoGridLayoutManager
-    private lateinit var roomAdpter : FrameRoomAdapter
+    private lateinit var roomAdapter : FrameRoomAdapter
     private var bedList = ArrayList<FrameBedVO>()
 
     override fun getLayId(): Int {
@@ -51,9 +55,9 @@ class MainFragment: BaseFragment<MainFragmentPresenter, MainViewLayoutBinding>()
         } else {
             gridLayoutManager = OnegoGridLayoutManager(activity, 1, GridLayoutManager.HORIZONTAL, false)
         }
-        roomAdpter = FrameRoomAdapter(activity, bedList)
+        roomAdapter = FrameRoomAdapter(activity, bedList)
         rv_bed_view.layoutManager = gridLayoutManager
-        rv_bed_view.adapter = roomAdpter
+        rv_bed_view.adapter = roomAdapter
 
         updateInfo()
     }
@@ -70,7 +74,7 @@ class MainFragment: BaseFragment<MainFragmentPresenter, MainViewLayoutBinding>()
             var simulateBed = false
             bedList.clear()
             bedList.addAll(roomInfo.frameBedList)
-            roomAdpter.setData(bedList)
+            roomAdapter.setData(bedList)
             Utils.setInBedVos(bedList)
             rv_bed_view.itemAnimator = DefaultItemAnimator()
             if (bedList.size > 3) {
@@ -166,6 +170,19 @@ class MainFragment: BaseFragment<MainFragmentPresenter, MainViewLayoutBinding>()
             Constant.EVENT_UPDATE_CUSTOM -> {
                 updateInfo()
             }
+
+            Constant.EVENT_TCP_MSG -> {
+                val tcpModel = messageEvent.message as TcpModel
+                if (tcpModel.action == TcpAction.SideAction.SHOW || tcpModel.action == TcpAction.SideAction.CLEAR) {
+                    val interactionVO = Gson().fromJson(tcpModel.data.toString(), InteractionVO::class.java)
+                    val bedFrameId = interactionVO.fromDeviceFrameId
+                    if (tcpModel.action == TcpAction.SideAction.SHOW) {
+                        roomAdapter.addFlickBedItem(bedFrameId)
+                    } else {
+                        roomAdapter.removeFlickBedItem(bedFrameId)
+                    }
+                }
+            }
         }
     }
 }

android_door/src/main/h10_3128_chile/java/com/wdkl/app/ncs/callingdoor/fragment/SkyCallFragment.kt

@@ -4,7 +4,6 @@ import android.os.Build
 import android.os.Handler
 import android.os.Looper
 import android.os.SystemClock
-import android.text.TextUtils
 import android.util.Log
 import android.view.View
 import android.view.ViewGroup
@@ -13,10 +12,9 @@ import com.google.gson.Gson
 import com.wdkl.app.ncs.callingdoor.R
 import com.wdkl.app.ncs.callingdoor.activity.CallingdoorActivity
 import com.wdkl.app.ncs.callingdoor.helper.DoorLightHelper
-import com.wdkl.app.ncs.callingdoor.helper.RingPlayHelper
-import com.wdkl.app.ncs.callingdoor.helper.SerialPortHelper
-import com.wdkl.app.ncs.callingdoor.settings.SettingConfig
+import com.wdkl.ncs.android.lib.settings.SettingConfig
 import com.wdkl.ncs.android.lib.utils.AppTool
+import com.wdkl.ncs.android.lib.utils.RingPlayHelper
 import com.wdkl.ncs.android.lib.utils.showMessage
 import com.wdkl.ncs.android.middleware.common.Constant
 import com.wdkl.ncs.android.middleware.common.MessageEvent

android_door/src/main/h10_3128_chile/java/com/wdkl/app/ncs/callingdoor/helper/AsyncPlayer.java

@@ -1,189 +0,0 @@
-package com.wdkl.app.ncs.callingdoor.helper;
-
-import android.content.Context;
-import android.media.AudioDeviceInfo;
-import android.media.AudioManager;
-import android.media.MediaPlayer;
-import android.net.Uri;
-import android.os.PowerManager;
-import android.os.SystemClock;
-import android.util.Log;
-
-import java.io.IOException;
-import java.util.LinkedList;
-
-/**
- * 响铃相关类
- */
-public class AsyncPlayer {
-    private static final int PLAY = 1;
-    private static final int STOP = 2;
-    private AudioManager audioManager;
-
-    private static final class Command {
-        int code;
-        Context context;
-        int resId;
-        boolean looping;
-        int stream;
-        long requestTime;
-
-        public String toString() {
-            return "{ code=" + code + " looping=" + looping + " stream=" + stream + " resId=" + resId + " }";
-        }
-    }
-
-    private final LinkedList mCmdQueue = new LinkedList();
-
-    private void startSound(Command cmd) {
-
-        try {
-            //MediaPlayer player = new MediaPlayer();
-            MediaPlayer player = MediaPlayer.create(cmd.context, cmd.resId);
-            player.setAudioStreamType(cmd.stream);
-            //player.setDataSource(cmd.context, cmd.uri);
-            player.setLooping(cmd.looping);
-            player.setVolume(1.0f, 1.0f);
-            //player.prepare();
-            player.start();
-            if (mPlayer != null) {
-                mPlayer.release();
-            }
-            mPlayer = player;
-            Log.w(mTag, "start sound " + cmd.resId);
-        } catch (Exception e) {
-            Log.w(mTag, "error loading sound for " + cmd.resId, e);
-        }
-    }
-
-    private final class Thread extends java.lang.Thread {
-        Thread() {
-            super("AsyncPlayer-" + mTag);
-        }
-
-        public void run() {
-            while (true) {
-                Command cmd = null;
-
-                synchronized (mCmdQueue) {
-
-                    cmd = (Command) mCmdQueue.removeFirst();
-                }
-
-                switch (cmd.code) {
-                    case PLAY:
-                        startSound(cmd);
-                        break;
-                    case STOP:
-
-                        if (mPlayer != null) {
-                            mPlayer.stop();
-                            mPlayer.reset();
-                            mPlayer.release();
-                            mPlayer = null;
-                        } else {
-                            Log.w(mTag, "STOP command without a player");
-                        }
-                        break;
-                }
-
-                synchronized (mCmdQueue) {
-                    if (mCmdQueue.size() == 0) {
-
-                        mThread = null;
-                        releaseWakeLock();
-                        return;
-                    }
-                }
-            }
-        }
-    }
-
-    private String mTag;
-    private Thread mThread;
-    private MediaPlayer mPlayer;
-    private PowerManager.WakeLock mWakeLock;
-
-    private int mState = STOP;
-
-    public AsyncPlayer(String tag) {
-        if (tag != null) {
-            mTag = tag;
-        } else {
-            mTag = "AsyncPlayer";
-        }
-    }
-
-    public void play(Context context, int res, boolean looping, int stream) {
-        Command cmd = new Command();
-        cmd.requestTime = SystemClock.uptimeMillis();
-        cmd.code = PLAY;
-        cmd.context = context;
-        cmd.resId = res;
-        cmd.looping = looping;
-        cmd.stream = stream;
-        synchronized (mCmdQueue) {
-            enqueueLocked(cmd);
-            mState = PLAY;
-        }
-    }
-
-    public void stop() {
-        synchronized (mCmdQueue) {
-            if (mState != STOP) {
-                Command cmd = new Command();
-                cmd.requestTime = SystemClock.uptimeMillis();
-                cmd.code = STOP;
-                enqueueLocked(cmd);
-                mState = STOP;
-            }
-        }
-    }
-
-    private void enqueueLocked(Command cmd) {
-        mCmdQueue.add(cmd);
-        if (mThread == null) {
-            acquireWakeLock();
-            mThread = new Thread();
-            mThread.start();
-        }
-    }
-
-    public void setUsesWakeLock(Context context) {
-        if (mWakeLock != null || mThread != null) {
-            throw new RuntimeException("assertion failed mWakeLock=" + mWakeLock + " mThread=" + mThread);
-        }
-        PowerManager pm = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
-        mWakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, mTag);
-    }
-
-    private void acquireWakeLock() {
-        if (mWakeLock != null) {
-            mWakeLock.acquire();
-        }
-    }
-
-    private void releaseWakeLock() {
-        if (mWakeLock != null) {
-            mWakeLock.release();
-        }
-    }
-
-    private boolean isHeadphonesPlugged(Context context) {
-        if (audioManager == null) {
-            audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
-        }
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
-            AudioDeviceInfo[] audioDevices = audioManager.getDevices(AudioManager.GET_DEVICES_ALL);
-            for (AudioDeviceInfo deviceInfo : audioDevices) {
-                if (deviceInfo.getType() == AudioDeviceInfo.TYPE_WIRED_HEADPHONES
-                        || deviceInfo.getType() == AudioDeviceInfo.TYPE_WIRED_HEADSET) {
-                    return true;
-                }
-            }
-            return false;
-        } else {
-            return audioManager.isWiredHeadsetOn();
-        }
-    }
-}

android_door/src/main/h10_3128_chile/java/com/wdkl/app/ncs/callingdoor/helper/CallDialogHelper.java

@@ -13,6 +13,7 @@ import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 
 import com.wdkl.app.ncs.callingdoor.R;
+import com.wdkl.ncs.android.lib.utils.AsyncPlayer;
 
 public class CallDialogHelper {
 

android_door/src/main/h10_3128_chile/java/com/wdkl/app/ncs/callingdoor/helper/DoorLightHelper.java

@@ -1,7 +1,7 @@
 package com.wdkl.app.ncs.callingdoor.helper;
 
-import com.wdkl.app.ncs.callingdoor.settings.SettingConfig;
 import com.wdkl.ncs.android.lib.base.BaseApplication;
+import com.wdkl.ncs.android.lib.settings.SettingConfig;
 import com.wdkl.ncs.android.middleware.common.Constant;
 import com.wdkl.ncs.android.middleware.tcp.dto.TcpModel;
 import com.wdkl.ncs.android.middleware.tcp.enums.TcpAction;

android_door/src/main/h10_3128_chile/java/com/wdkl/app/ncs/callingdoor/helper/LanguageSetDialogHelper.java

@@ -18,7 +18,7 @@ import android.widget.Spinner;
 import android.widget.Toast;
 
 import com.wdkl.app.ncs.callingdoor.R;
-import com.wdkl.app.ncs.callingdoor.settings.SettingConfig;
+import com.wdkl.ncs.android.lib.settings.SettingConfig;
 
 
 public class LanguageSetDialogHelper {

android_door/src/main/h10_3128_chile/java/com/wdkl/app/ncs/callingdoor/helper/LocaleMangerUtils.java

@@ -8,8 +8,8 @@ import android.util.DisplayMetrics;
 import android.util.Log;
 
 import com.wdkl.app.ncs.callingdoor.R;
-import com.wdkl.app.ncs.callingdoor.settings.SettingConfig;
 import com.wdkl.ncs.android.lib.base.BaseApplication;
+import com.wdkl.ncs.android.lib.settings.SettingConfig;
 
 import java.util.Locale;
 

android_door/src/main/h10_3128_chile/java/com/wdkl/app/ncs/callingdoor/helper/RingPlayHelper.java

@@ -1,22 +0,0 @@
-package com.wdkl.app.ncs.callingdoor.helper;
-
-import android.content.Context;
-import android.media.AudioManager;
-
-public class RingPlayHelper {
-
-    private static AsyncPlayer ringPlayer;
-
-    public static void playRingTone(Context context, int res, boolean loop) {
-        if (ringPlayer == null) {
-            ringPlayer = new AsyncPlayer(null);
-        }
-        ringPlayer.play(context, res, loop, AudioManager.STREAM_MUSIC);
-    }
-
-    public static void stopRingTone() {
-        if (ringPlayer != null) {
-            ringPlayer.stop();
-        }
-    }
-}

android_door/src/main/h10_3128_chile/java/com/wdkl/app/ncs/callingdoor/helper/SOSHelper.java

@@ -5,8 +5,8 @@ import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
 
-import com.wdkl.app.ncs.callingdoor.settings.SettingConfig;
 import com.wdkl.ncs.android.lib.base.BaseApplication;
+import com.wdkl.ncs.android.lib.settings.SettingConfig;
 import com.wdkl.ncs.android.middleware.common.Constant;
 import com.wdkl.ncs.android.middleware.tcp.channel.OtherUtil;
 

android_door/src/main/h10_3128_chile/java/com/wdkl/app/ncs/callingdoor/settings/SettingConfig.java

@@ -1,362 +0,0 @@
-package com.wdkl.app.ncs.callingdoor.settings;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-
-
-public class SettingConfig {
-
-    private static final String SP_NAME = "SP_DOOR_FUNCTION";
-
-    //白昼设置白天的初始时间设置
-    private static final String KEY_SP_INITIAL_DAY_TIME = "KEY_SP_INITIAL_DAY_TIME";
-    private static final String initial_day_time = "07:00";
-    private static final String KEY_SP_INITIAL_DAY_TIME_LOCATION = "KEY_SP_INITIAL_DAY_TIME_LOCATION";
-    private static final String initial_day_time_location = "12";
-
-
-    //白昼设置白天的结束时间设置
-    private static final String KEY_SP_END_OF_DAY = "KEY_SP_END_OF_DAY";
-    private static final String end_of_day = "19:00";
-    //白昼设置白天的结束时间设置
-    private static final String KEY_SP_END_OF_DAY_LOCATION = "KEY_SP_END_OF_DAY_LOCATION";
-    private static final String end_of_day_location = "38";
-
-    //白天亮度
-    private static final String KEY_SP_DAYTIME_BRIGHTNESS = "KEY_SP_DAYTIME_BRIGHTNESS";
-    private static final int daytime_brightness = 80;
-    //晚上亮度
-    private static final String KEY_SP_NIGHT_BRIGHTNESS = "KEY_SP_NIGHT_BRIGHTNESS";
-    private static final int night_brightness = 50;
-
-    //门口机白天系统音量
-    private static final String KEY_SP_DOOR_DAYTIME_SYSTEM_VOLUME = "KEY_SP_DOOR_DAYTIME_SYSTEM_VOLUME";
-    private static final int door_daytime_system_volume = 100;
-    //门口机晚上系统音量
-    private static final String KEY_SP_DOOR_NIGHT_SYSTEM_VOLUME = "KEY_SP_DOOR_NIGHT_SYSTEM_VOLUME";
-    private static final int door_night_system_volume = 70;
-
-    //门口机通话音量
-    private static final String KEY_SP_DOOR_CALL_VOLUME = "KEY_SP_DOOR_CALL_VOLUME";
-    private static final int door_call_volume = 80;
-
-
-    //呼叫超时时间
-    private static final String KEY_SP_SIP_OVERTIME = "KEY_SP_SIP_OVERTIME";
-    private static final int sip_over_time = 30;
-
-    //息屏超时时间
-    private static final String KEY_SP_SLEEP_TIME = "KEY_SP_SLEEP_TIME";
-    private static final int sleep_time = 30;
-
-    //网络异常重启次数
-    private static final String KEY_SP_NET_ERR_RESET_COUNT = "KEY_SP_NET_ERR_RESET_COUNT";
-
-    //app上次启动时间
-    private static final String KEY_SP_APP_START_TIME = "KEY_SP_APP_START_TIME";
-
-    //默认语言
-    private static final String KEY_LANGUAGE_ID = "KEY_LANGUAGE_ID";
-    private static final String KEY_LANGUAGE_MODE = "KEY_LANGUAGE_MODE";
-
-    //护理状态
-    private static final String KEY_IN_NURSING = "KEY_IN_NURSING";
-    private static final String KEY_NURSING_ID = "KEY_NURSING_ID";
-
-    //呼叫时门灯是否持续亮，需要手动按护理按键切换
-    private static final String KEY_DOOR_LIGHT_ALWAYS_ON = "KEY_DOOR_LIGHT_ALWAYS_ON";
-
-    public static int getLanguageId(Context context) {
-        //0--auto, 1--English, 2--中文, 3--西班牙语, 4--俄语
-        return getSP(context).getInt(KEY_LANGUAGE_ID, 3);
-    }
-
-    public static void setLanguageId(Context context, int id) {
-        getEditor(context).putInt(KEY_LANGUAGE_ID, id).apply();
-    }
-
-    //0:同步服务器设置, 1:手动设置
-    public static int getLanguageMode(Context context) {
-        return getSP(context).getInt(KEY_LANGUAGE_MODE, 1);
-    }
-
-    public static void setLanguageMode(Context context, int mode) {
-        getEditor(context).putInt(KEY_LANGUAGE_MODE, mode).apply();
-    }
-
-    public static boolean getInNursing(Context context) {
-        return getSP(context).getBoolean(KEY_IN_NURSING, false);
-    }
-
-    public static void setInNursing(Context context, boolean nursing) {
-        getEditor(context).putBoolean(KEY_IN_NURSING, nursing).apply();
-    }
-
-    public static int getNursingId(Context context) {
-        return getSP(context).getInt(KEY_NURSING_ID, -1);
-    }
-
-    public static void setNursingId(Context context, int nursingId) {
-        getEditor(context).putInt(KEY_NURSING_ID, nursingId).apply();
-    }
-
-    public static int getDoorLightAlwaysOn(Context context) {
-        return getSP(context).getInt(KEY_DOOR_LIGHT_ALWAYS_ON, 0);
-    }
-
-    public static void setDoorLightAlwaysOn(Context context, int alwaysOn) {
-        getEditor(context).putInt(KEY_DOOR_LIGHT_ALWAYS_ON, alwaysOn).apply();
-    }
-
-    /**
-     * 获取白天亮度
-     *
-     * @return
-     */
-    public static int getDaytimeBrightness(Context context) {
-        return getSP(context).getInt(KEY_SP_DAYTIME_BRIGHTNESS, daytime_brightness);
-    }
-
-    /**
-     * 设置白天亮度
-     *
-     * @param value
-     */
-    public static void setDaytimeBrightness(Context context, int value) {
-        getEditor(context).putInt(KEY_SP_DAYTIME_BRIGHTNESS, value).apply();
-    }
-
-    /**
-     * 获取晚上亮度
-     *
-     * @return
-     */
-    public static int getNightBrightness(Context context) {
-        return getSP(context).getInt(KEY_SP_NIGHT_BRIGHTNESS, night_brightness);
-    }
-
-    /**
-     * 设置晚上亮度
-     *
-     * @param value
-     */
-    public static void setNightBrightness(Context context, int value) {
-        getEditor(context).putInt(KEY_SP_NIGHT_BRIGHTNESS, value).apply();
-    }
-
-    /**
-     * 获取门口机白天系统音量
-     *
-     * @return
-     */
-    public static int getDoorDaytimeSystemVolume(Context context) {
-        return getSP(context).getInt(KEY_SP_DOOR_DAYTIME_SYSTEM_VOLUME, door_daytime_system_volume);
-    }
-
-    /**
-     * 设置门口机白天系统音量
-     *
-     * @param value
-     */
-    public static void setDoorDaytimeSystemVolume(Context context, int value) {
-        getEditor(context).putInt(KEY_SP_DOOR_DAYTIME_SYSTEM_VOLUME, value).apply();
-    }
-
-    /**
-     * 获取门口机晚上系统音量
-     *
-     * @return
-     */
-    public static int getDoorNightSystemVolume(Context context) {
-        return getSP(context).getInt(KEY_SP_DOOR_NIGHT_SYSTEM_VOLUME, door_night_system_volume);
-    }
-
-    /**
-     * 设置门口机晚上系统音量
-     *
-     * @param value
-     */
-    public static void setDoorNightSystemVolume(Context context, int value) {
-        getEditor(context).putInt(KEY_SP_DOOR_NIGHT_SYSTEM_VOLUME, value).apply();
-    }
-
-
-    /**
-     * 获取门口机通话音量
-     *
-     * @return
-     */
-    public static int getExtensionCallVolume(Context context) {
-        return getSP(context).getInt(KEY_SP_DOOR_CALL_VOLUME, door_call_volume);
-    }
-
-    /**
-     * 设置门口机通话音量
-     *
-     * @param value
-     */
-    public static void setExtensionCallVolume(Context context, int value) {
-        getEditor(context).putInt(KEY_SP_DOOR_CALL_VOLUME, value).apply();
-    }
-
-
-    /**
-     * 获取白昼设置白天的初始时间
-     *
-     * @return
-     */
-    public static String getInitialDayTime(Context context) {
-        return getSP(context).getString(KEY_SP_INITIAL_DAY_TIME, initial_day_time);
-    }
-
-    /**
-     * 设置白昼白天的初始时间
-     *
-     * @param value
-     */
-    public static void setInitialDayTime(Context context, String value) {
-        getEditor(context).putString(KEY_SP_INITIAL_DAY_TIME, value).apply();
-    }
-
-    /**
-     * 获取白昼设置白天的初始时间位置
-     *
-     * @return
-     */
-    public static String getInitialDayTimeLocation(Context context) {
-        return getSP(context).getString(KEY_SP_INITIAL_DAY_TIME_LOCATION, initial_day_time_location);
-    }
-
-    /**
-     * 设置白昼白天的初始时间位置
-     *
-     * @param value
-     */
-    public static void setInitialDayTimeLocation(Context context, String value) {
-        getEditor(context).putString(KEY_SP_INITIAL_DAY_TIME_LOCATION, value).apply();
-    }
-
-
-
-    /**
-     * 设置白昼白天的结束时间
-     *
-     * @param value
-     */
-    public static void setEndOfDay(Context context, String value) {
-        getEditor(context).putString(KEY_SP_END_OF_DAY, value).apply();
-    }
-
-    /**
-     * 获取白昼设置白天的结束时间
-     *
-     * @return
-     */
-    public static String getEndOfDay(Context context) {
-        return getSP(context).getString(KEY_SP_END_OF_DAY, end_of_day);
-    }
-
-    /**
-     * 设置白昼白天的结束时间位置
-     *
-     * @param value
-     */
-    public static void setEndOfDayLocation(Context context, String value) {
-        getEditor(context).putString(KEY_SP_END_OF_DAY_LOCATION, value).apply();
-    }
-
-    /**
-     * 获取白昼设置白天的结束时间位置
-     *
-     * @return
-     */
-    public static String getEndOfDayLocation(Context context) {
-        return getSP(context).getString(KEY_SP_END_OF_DAY_LOCATION, end_of_day_location);
-    }
-
-    /**
-     * 设置呼叫超时时间
-     *
-     * @param value
-     */
-    public static void setSipOverTime(Context context, int value) {
-        getEditor(context).putInt(KEY_SP_SIP_OVERTIME, value).apply();
-    }
-
-    /**
-     * 获取呼叫超时时间
-     *
-     * @return
-     */
-    public static int getSipOverTime(Context context) {
-        return getSP(context).getInt(KEY_SP_SIP_OVERTIME, sip_over_time);
-    }
-
-    /**
-     * 设置息屏时间
-     *
-     * @param value
-     */
-    public static void setSleepTime(Context context, int value) {
-        getEditor(context).putInt(KEY_SP_SLEEP_TIME, value).apply();
-    }
-
-    /**
-     * 获取息屏时间
-     *
-     * @return
-     */
-    public static int getSleepTime(Context context) {
-        return getSP(context).getInt(KEY_SP_SLEEP_TIME, sleep_time);
-    }
-
-    /**
-     * 获取网络异常重启次数
-     *
-     * @return
-     */
-    public static int getNetErrResetCount(Context context) {
-        return getSP(context).getInt(KEY_SP_NET_ERR_RESET_COUNT, 0);
-    }
-
-    /**
-     * 设置网络异常重启次数
-     *
-     * @param value
-     */
-    public static void setNetErrResetCount(Context context, int value) {
-        getEditor(context).putInt(KEY_SP_NET_ERR_RESET_COUNT, value).apply();
-    }
-
-    /**
-     * 设置App启动时间
-     *
-     * @param value
-     */
-    public static void setAppStartTime(Context context, String value) {
-        getEditor(context).putString(KEY_SP_APP_START_TIME, value).apply();
-    }
-
-    /**
-     * 获取App启动时间
-     *
-     * @return
-     */
-    public static String getAppStartTime(Context context) {
-        return getSP(context).getString(KEY_SP_APP_START_TIME, "Unknow");
-    }
-
-
-
-
-
-    private static SharedPreferences getSP(Context context) {
-        return context.getSharedPreferences(SP_NAME, Context.MODE_PRIVATE);
-    }
-
-    private static SharedPreferences.Editor getEditor(Context context) {
-        return getSP(context).edit();
-    }
-
-
-}

android_door/src/main/h10_a133_chile/java/com/wdkl/app/ncs/callingdoor/activity/AppUpdateActivity.kt

@@ -7,16 +7,15 @@ import android.text.TextUtils
 import android.util.Log
 import com.enation.javashop.android.jrouter.external.annotation.Router
 import com.enation.javashop.net.engine.model.NetState
-import com.example.yf_rk3288_api.YF_RK3288_API_Manager
-import com.wdkl.app.ncs.callingdoor.BuildConfig
 import com.wdkl.app.ncs.callingdoor.R
 import com.wdkl.app.ncs.callingdoor.databinding.UpdateLayBinding
 import com.wdkl.app.ncs.callingdoor.helper.AppUpdateHelper
 import com.wdkl.app.ncs.callingdoor.helper.HttpHelper
 import com.wdkl.app.ncs.callingdoor.helper.LocaleMangerUtils
 import com.wdkl.app.ncs.callingdoor.launch.CallingdoorLaunch
-import com.wdkl.app.ncs.callingdoor.settings.SettingConfig
+import com.wdkl.ncs.android.lib.BuildConfig
 import com.wdkl.ncs.android.lib.base.BaseActivity
+import com.wdkl.ncs.android.lib.settings.SettingConfig
 import com.wdkl.ncs.android.lib.utils.showMessage
 import com.wdkl.ncs.android.lib.vo.filter
 import com.wdkl.ncs.android.middleware.api.UrlManager

android_door/src/main/h10_a133_chile/java/com/wdkl/app/ncs/callingdoor/activity/CallingdoorActivity.kt

@@ -25,9 +25,9 @@ import com.wdkl.app.ncs.callingdoor.databinding.CallingdoorMainLayBinding
 import com.wdkl.app.ncs.callingdoor.fragment.*
 import com.wdkl.app.ncs.callingdoor.helper.*
 import com.wdkl.app.ncs.callingdoor.launch.CallingdoorLaunch
-import com.wdkl.app.ncs.callingdoor.settings.SettingConfig
 import com.wdkl.ncs.android.lib.base.BaseActivity
 import com.wdkl.ncs.android.lib.base.BaseApplication
+import com.wdkl.ncs.android.lib.settings.SettingConfig
 import com.wdkl.ncs.android.lib.utils.*
 import com.wdkl.ncs.android.lib.vo.filter
 import com.wdkl.ncs.android.lib.widget.MenuDialog

android_door/src/main/h10_a133_chile/java/com/wdkl/app/ncs/callingdoor/adapter/FrameRoomAdapter.kt

@@ -377,13 +377,26 @@ class FrameRoomAdapter : RecyclerView.Adapter<FrameRoomAdapter.BedViewHolder> {
         holder.nursingValue5.setText(configList[4].nurseOptionName)
     }
 
-    fun updateCallings(frameId: Int, flick: Boolean) {
-        if (flick) {
+    fun addFlickBedItem(frameId: Int) {
+        synchronized(callingFrameIds) {
             callingFrameIds.add(frameId)
-        } else {
-            callingFrameIds.remove(frameId)
+            notifyDataSetChanged()
+        }
+    }
+
+    fun removeFlickBedItem(frameId: Int) {
+        synchronized(callingFrameIds) {
+            if (callingFrameIds.size > 0) {
+                val iterator = callingFrameIds.iterator()
+                while (iterator.hasNext()) {
+                    val it = iterator.next()
+                    if (it == frameId) {
+                        iterator.remove()
+                    }
+                }
+            }
+            notifyDataSetChanged()
         }
-        notifyDataSetChanged()
     }
 
     class BedViewHolder: RecyclerView.ViewHolder {

android_door/src/main/h10_a133_chile/java/com/wdkl/app/ncs/callingdoor/fragment/BaseCallFragment.kt

@@ -10,8 +10,8 @@ import android.widget.TextView
 import androidx.fragment.app.Fragment
 import com.enation.javashop.utils.base.tool.BaseToolActivity
 import com.wdkl.app.ncs.callingdoor.R
-import com.wdkl.app.ncs.callingdoor.helper.RingPlayHelper
-import com.wdkl.app.ncs.callingdoor.settings.SettingConfig
+import com.wdkl.ncs.android.lib.utils.RingPlayHelper
+import com.wdkl.ncs.android.lib.settings.SettingConfig
 import com.wdkl.ncs.android.lib.utils.showMessage
 import com.wdkl.ncs.android.middleware.common.Constant
 import com.wdkl.ncs.android.middleware.common.MessageEvent

android_door/src/main/h10_a133_chile/java/com/wdkl/app/ncs/callingdoor/fragment/MainFragment.kt

@@ -10,13 +10,10 @@ import com.google.gson.Gson
 import com.wdkl.app.ncs.callingdoor.R
 import com.wdkl.app.ncs.callingdoor.adapter.FrameRoomAdapter
 import com.wdkl.app.ncs.callingdoor.databinding.MainViewLayoutBinding
-import com.wdkl.app.ncs.callingdoor.helper.DoorLightHelper
 import com.wdkl.app.ncs.callingdoor.helper.Utils
 import com.wdkl.app.ncs.callingdoor.launch.CallingdoorLaunch
-import com.wdkl.app.ncs.callingdoor.settings.SettingConfig
 import com.wdkl.ncs.android.lib.base.BaseApplication
 import com.wdkl.ncs.android.lib.base.BaseFragment
-import com.wdkl.ncs.android.lib.utils.errorLog
 import com.wdkl.ncs.android.lib.utils.showMessage
 import com.wdkl.ncs.android.lib.vo.filter
 import com.wdkl.ncs.android.lib.widget.OnegoGridLayoutManager
@@ -28,9 +25,7 @@ import com.wdkl.ncs.android.middleware.model.vo.FrameBedVO
 import com.wdkl.ncs.android.middleware.model.vo.FrameRoomVO
 import com.wdkl.ncs.android.middleware.model.vo.InteractionVO
 import com.wdkl.ncs.android.middleware.tcp.dto.TcpModel
-import com.wdkl.ncs.android.middleware.tcp.enums.DeviceTypeEnum
 import com.wdkl.ncs.android.middleware.tcp.enums.TcpAction
-import com.wdkl.ncs.android.middleware.utils.CommonUtils
 import kotlinx.android.synthetic.main.main_view_layout.*
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
@@ -170,9 +165,9 @@ class MainFragment: BaseFragment<MainFragmentPresenter, MainViewLayoutBinding>()
                     val interactionVO = Gson().fromJson(tcpModel.data.toString(), InteractionVO::class.java)
                     val bedFrameId = interactionVO.fromDeviceFrameId
                     if (tcpModel.action == TcpAction.SideAction.SHOW) {
-                        roomAdapter.updateCallings(bedFrameId, true)
+                        roomAdapter.addFlickBedItem(bedFrameId)
                     } else {
-                        roomAdapter.updateCallings(bedFrameId, false)
+                        roomAdapter.removeFlickBedItem(bedFrameId)
                     }
                 }
             }

android_door/src/main/h10_a133_chile/java/com/wdkl/app/ncs/callingdoor/fragment/SkyCallFragment.kt

@@ -4,7 +4,6 @@ import android.os.Build
 import android.os.Handler
 import android.os.Looper
 import android.os.SystemClock
-import android.text.TextUtils
 import android.util.Log
 import android.view.View
 import android.view.ViewGroup
@@ -13,10 +12,9 @@ import com.google.gson.Gson
 import com.wdkl.app.ncs.callingdoor.R
 import com.wdkl.app.ncs.callingdoor.activity.CallingdoorActivity
 import com.wdkl.app.ncs.callingdoor.helper.DoorLightHelper
-import com.wdkl.app.ncs.callingdoor.helper.RingPlayHelper
-import com.wdkl.app.ncs.callingdoor.helper.SerialPortHelper
+import com.wdkl.ncs.android.lib.utils.RingPlayHelper
 import com.wdkl.app.ncs.callingdoor.helper.VoiceManagerUtil
-import com.wdkl.app.ncs.callingdoor.settings.SettingConfig
+import com.wdkl.ncs.android.lib.settings.SettingConfig
 import com.wdkl.ncs.android.lib.utils.AppTool
 import com.wdkl.ncs.android.lib.utils.showMessage
 import com.wdkl.ncs.android.middleware.common.Constant

android_door/src/main/h10_a133_chile/java/com/wdkl/app/ncs/callingdoor/helper/CallDialogHelper.java

@@ -13,6 +13,7 @@ import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 
 import com.wdkl.app.ncs.callingdoor.R;
+import com.wdkl.ncs.android.lib.utils.AsyncPlayer;
 
 public class CallDialogHelper {
 

android_door/src/main/h10_a133_chile/java/com/wdkl/app/ncs/callingdoor/helper/DoorLightHelper.java

@@ -1,7 +1,7 @@
 package com.wdkl.app.ncs.callingdoor.helper;
 
-import com.wdkl.app.ncs.callingdoor.settings.SettingConfig;
 import com.wdkl.ncs.android.lib.base.BaseApplication;
+import com.wdkl.ncs.android.lib.settings.SettingConfig;
 import com.wdkl.ncs.android.middleware.common.Constant;
 import com.wdkl.ncs.android.middleware.tcp.dto.TcpModel;
 import com.wdkl.ncs.android.middleware.tcp.enums.TcpAction;

android_door/src/main/h10_a133_chile/java/com/wdkl/app/ncs/callingdoor/helper/LanguageSetDialogHelper.java

@@ -18,7 +18,7 @@ import android.widget.Spinner;
 import android.widget.Toast;
 
 import com.wdkl.app.ncs.callingdoor.R;
-import com.wdkl.app.ncs.callingdoor.settings.SettingConfig;
+import com.wdkl.ncs.android.lib.settings.SettingConfig;
 
 
 public class LanguageSetDialogHelper {

android_door/src/main/h10_a133_chile/java/com/wdkl/app/ncs/callingdoor/helper/LocaleMangerUtils.java

@@ -8,8 +8,8 @@ import android.util.DisplayMetrics;
 import android.util.Log;
 
 import com.wdkl.app.ncs.callingdoor.R;
-import com.wdkl.app.ncs.callingdoor.settings.SettingConfig;
 import com.wdkl.ncs.android.lib.base.BaseApplication;
+import com.wdkl.ncs.android.lib.settings.SettingConfig;
 
 import java.util.Locale;
 

android_door/src/main/h10_a133_chile/java/com/wdkl/app/ncs/callingdoor/helper/SOSHelper.java

@@ -1,12 +1,11 @@
 package com.wdkl.app.ncs.callingdoor.helper;
 
-import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
 
-import com.wdkl.app.ncs.callingdoor.settings.SettingConfig;
 import com.wdkl.ncs.android.lib.base.BaseApplication;
+import com.wdkl.ncs.android.lib.settings.SettingConfig;
 import com.wdkl.ncs.android.middleware.common.Constant;
 import com.wdkl.ncs.android.middleware.tcp.channel.OtherUtil;
 

android_door/src/main/h10_a133_chile/java/com/wdkl/app/ncs/callingdoor/settings/SettingConfig.java

@@ -1,362 +0,0 @@
-package com.wdkl.app.ncs.callingdoor.settings;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-
-
-public class SettingConfig {
-
-    private static final String SP_NAME = "SP_DOOR_FUNCTION";
-
-    //白昼设置白天的初始时间设置
-    private static final String KEY_SP_INITIAL_DAY_TIME = "KEY_SP_INITIAL_DAY_TIME";
-    private static final String initial_day_time = "07:00";
-    private static final String KEY_SP_INITIAL_DAY_TIME_LOCATION = "KEY_SP_INITIAL_DAY_TIME_LOCATION";
-    private static final String initial_day_time_location = "12";
-
-
-    //白昼设置白天的结束时间设置
-    private static final String KEY_SP_END_OF_DAY = "KEY_SP_END_OF_DAY";
-    private static final String end_of_day = "19:00";
-    //白昼设置白天的结束时间设置
-    private static final String KEY_SP_END_OF_DAY_LOCATION = "KEY_SP_END_OF_DAY_LOCATION";
-    private static final String end_of_day_location = "38";
-
-    //白天亮度
-    private static final String KEY_SP_DAYTIME_BRIGHTNESS = "KEY_SP_DAYTIME_BRIGHTNESS";
-    private static final int daytime_brightness = 80;
-    //晚上亮度
-    private static final String KEY_SP_NIGHT_BRIGHTNESS = "KEY_SP_NIGHT_BRIGHTNESS";
-    private static final int night_brightness = 50;
-
-    //门口机白天系统音量
-    private static final String KEY_SP_DOOR_DAYTIME_SYSTEM_VOLUME = "KEY_SP_DOOR_DAYTIME_SYSTEM_VOLUME";
-    private static final int door_daytime_system_volume = 100;
-    //门口机晚上系统音量
-    private static final String KEY_SP_DOOR_NIGHT_SYSTEM_VOLUME = "KEY_SP_DOOR_NIGHT_SYSTEM_VOLUME";
-    private static final int door_night_system_volume = 70;
-
-    //门口机通话音量
-    private static final String KEY_SP_DOOR_CALL_VOLUME = "KEY_SP_DOOR_CALL_VOLUME";
-    private static final int door_call_volume = 80;
-
-
-    //呼叫超时时间
-    private static final String KEY_SP_SIP_OVERTIME = "KEY_SP_SIP_OVERTIME";
-    private static final int sip_over_time = 30;
-
-    //息屏超时时间
-    private static final String KEY_SP_SLEEP_TIME = "KEY_SP_SLEEP_TIME";
-    private static final int sleep_time = 30;
-
-    //网络异常重启次数
-    private static final String KEY_SP_NET_ERR_RESET_COUNT = "KEY_SP_NET_ERR_RESET_COUNT";
-
-    //app上次启动时间
-    private static final String KEY_SP_APP_START_TIME = "KEY_SP_APP_START_TIME";
-
-    //默认语言
-    private static final String KEY_LANGUAGE_ID = "KEY_LANGUAGE_ID";
-    private static final String KEY_LANGUAGE_MODE = "KEY_LANGUAGE_MODE";
-
-    //护理状态
-    private static final String KEY_IN_NURSING = "KEY_IN_NURSING";
-    private static final String KEY_NURSING_ID = "KEY_NURSING_ID";
-
-    //呼叫时门灯是否持续亮，需要手动按护理按键切换
-    private static final String KEY_DOOR_LIGHT_ALWAYS_ON = "KEY_DOOR_LIGHT_ALWAYS_ON";
-
-    public static int getLanguageId(Context context) {
-        //0--auto, 1--English, 2--中文, 3--西班牙语, 4--俄语
-        return getSP(context).getInt(KEY_LANGUAGE_ID, 3);
-    }
-
-    public static void setLanguageId(Context context, int id) {
-        getEditor(context).putInt(KEY_LANGUAGE_ID, id).apply();
-    }
-
-    //0:同步服务器设置, 1:手动设置
-    public static int getLanguageMode(Context context) {
-        return getSP(context).getInt(KEY_LANGUAGE_MODE, 1);
-    }
-
-    public static void setLanguageMode(Context context, int mode) {
-        getEditor(context).putInt(KEY_LANGUAGE_MODE, mode).apply();
-    }
-
-    public static boolean getInNursing(Context context) {
-        return getSP(context).getBoolean(KEY_IN_NURSING, false);
-    }
-
-    public static void setInNursing(Context context, boolean nursing) {
-        getEditor(context).putBoolean(KEY_IN_NURSING, nursing).apply();
-    }
-
-    public static int getNursingId(Context context) {
-        return getSP(context).getInt(KEY_NURSING_ID, -1);
-    }
-
-    public static void setNursingId(Context context, int nursingId) {
-        getEditor(context).putInt(KEY_NURSING_ID, nursingId).apply();
-    }
-
-    public static int getDoorLightAlwaysOn(Context context) {
-        return getSP(context).getInt(KEY_DOOR_LIGHT_ALWAYS_ON, 0);
-    }
-
-    public static void setDoorLightAlwaysOn(Context context, int alwaysOn) {
-        getEditor(context).putInt(KEY_DOOR_LIGHT_ALWAYS_ON, alwaysOn).apply();
-    }
-
-    /**
-     * 获取白天亮度
-     *
-     * @return
-     */
-    public static int getDaytimeBrightness(Context context) {
-        return getSP(context).getInt(KEY_SP_DAYTIME_BRIGHTNESS, daytime_brightness);
-    }
-
-    /**
-     * 设置白天亮度
-     *
-     * @param value
-     */
-    public static void setDaytimeBrightness(Context context, int value) {
-        getEditor(context).putInt(KEY_SP_DAYTIME_BRIGHTNESS, value).apply();
-    }
-
-    /**
-     * 获取晚上亮度
-     *
-     * @return
-     */
-    public static int getNightBrightness(Context context) {
-        return getSP(context).getInt(KEY_SP_NIGHT_BRIGHTNESS, night_brightness);
-    }
-
-    /**
-     * 设置晚上亮度
-     *
-     * @param value
-     */
-    public static void setNightBrightness(Context context, int value) {
-        getEditor(context).putInt(KEY_SP_NIGHT_BRIGHTNESS, value).apply();
-    }
-
-    /**
-     * 获取门口机白天系统音量
-     *
-     * @return
-     */
-    public static int getDoorDaytimeSystemVolume(Context context) {
-        return getSP(context).getInt(KEY_SP_DOOR_DAYTIME_SYSTEM_VOLUME, door_daytime_system_volume);
-    }
-
-    /**
-     * 设置门口机白天系统音量
-     *
-     * @param value
-     */
-    public static void setDoorDaytimeSystemVolume(Context context, int value) {
-        getEditor(context).putInt(KEY_SP_DOOR_DAYTIME_SYSTEM_VOLUME, value).apply();
-    }
-
-    /**
-     * 获取门口机晚上系统音量
-     *
-     * @return
-     */
-    public static int getDoorNightSystemVolume(Context context) {
-        return getSP(context).getInt(KEY_SP_DOOR_NIGHT_SYSTEM_VOLUME, door_night_system_volume);
-    }
-
-    /**
-     * 设置门口机晚上系统音量
-     *
-     * @param value
-     */
-    public static void setDoorNightSystemVolume(Context context, int value) {
-        getEditor(context).putInt(KEY_SP_DOOR_NIGHT_SYSTEM_VOLUME, value).apply();
-    }
-
-
-    /**
-     * 获取门口机通话音量
-     *
-     * @return
-     */
-    public static int getExtensionCallVolume(Context context) {
-        return getSP(context).getInt(KEY_SP_DOOR_CALL_VOLUME, door_call_volume);
-    }
-
-    /**
-     * 设置门口机通话音量
-     *
-     * @param value
-     */
-    public static void setExtensionCallVolume(Context context, int value) {
-        getEditor(context).putInt(KEY_SP_DOOR_CALL_VOLUME, value).apply();
-    }
-
-
-    /**
-     * 获取白昼设置白天的初始时间
-     *
-     * @return
-     */
-    public static String getInitialDayTime(Context context) {
-        return getSP(context).getString(KEY_SP_INITIAL_DAY_TIME, initial_day_time);
-    }
-
-    /**
-     * 设置白昼白天的初始时间
-     *
-     * @param value
-     */
-    public static void setInitialDayTime(Context context, String value) {
-        getEditor(context).putString(KEY_SP_INITIAL_DAY_TIME, value).apply();
-    }
-
-    /**
-     * 获取白昼设置白天的初始时间位置
-     *
-     * @return
-     */
-    public static String getInitialDayTimeLocation(Context context) {
-        return getSP(context).getString(KEY_SP_INITIAL_DAY_TIME_LOCATION, initial_day_time_location);
-    }
-
-    /**
-     * 设置白昼白天的初始时间位置
-     *
-     * @param value
-     */
-    public static void setInitialDayTimeLocation(Context context, String value) {
-        getEditor(context).putString(KEY_SP_INITIAL_DAY_TIME_LOCATION, value).apply();
-    }
-
-
-
-    /**
-     * 设置白昼白天的结束时间
-     *
-     * @param value
-     */
-    public static void setEndOfDay(Context context, String value) {
-        getEditor(context).putString(KEY_SP_END_OF_DAY, value).apply();
-    }
-
-    /**
-     * 获取白昼设置白天的结束时间
-     *
-     * @return
-     */
-    public static String getEndOfDay(Context context) {
-        return getSP(context).getString(KEY_SP_END_OF_DAY, end_of_day);
-    }
-
-    /**
-     * 设置白昼白天的结束时间位置
-     *
-     * @param value
-     */
-    public static void setEndOfDayLocation(Context context, String value) {
-        getEditor(context).putString(KEY_SP_END_OF_DAY_LOCATION, value).apply();
-    }
-
-    /**
-     * 获取白昼设置白天的结束时间位置
-     *
-     * @return
-     */
-    public static String getEndOfDayLocation(Context context) {
-        return getSP(context).getString(KEY_SP_END_OF_DAY_LOCATION, end_of_day_location);
-    }
-
-    /**
-     * 设置呼叫超时时间
-     *
-     * @param value
-     */
-    public static void setSipOverTime(Context context, int value) {
-        getEditor(context).putInt(KEY_SP_SIP_OVERTIME, value).apply();
-    }
-
-    /**
-     * 获取呼叫超时时间
-     *
-     * @return
-     */
-    public static int getSipOverTime(Context context) {
-        return getSP(context).getInt(KEY_SP_SIP_OVERTIME, sip_over_time);
-    }
-
-    /**
-     * 设置息屏时间
-     *
-     * @param value
-     */
-    public static void setSleepTime(Context context, int value) {
-        getEditor(context).putInt(KEY_SP_SLEEP_TIME, value).apply();
-    }
-
-    /**
-     * 获取息屏时间
-     *
-     * @return
-     */
-    public static int getSleepTime(Context context) {
-        return getSP(context).getInt(KEY_SP_SLEEP_TIME, sleep_time);
-    }
-
-    /**
-     * 获取网络异常重启次数
-     *
-     * @return
-     */
-    public static int getNetErrResetCount(Context context) {
-        return getSP(context).getInt(KEY_SP_NET_ERR_RESET_COUNT, 0);
-    }
-
-    /**
-     * 设置网络异常重启次数
-     *
-     * @param value
-     */
-    public static void setNetErrResetCount(Context context, int value) {
-        getEditor(context).putInt(KEY_SP_NET_ERR_RESET_COUNT, value).apply();
-    }
-
-    /**
-     * 设置App启动时间
-     *
-     * @param value
-     */
-    public static void setAppStartTime(Context context, String value) {
-        getEditor(context).putString(KEY_SP_APP_START_TIME, value).apply();
-    }
-
-    /**
-     * 获取App启动时间
-     *
-     * @return
-     */
-    public static String getAppStartTime(Context context) {
-        return getSP(context).getString(KEY_SP_APP_START_TIME, "Unknow");
-    }
-
-
-
-
-
-    private static SharedPreferences getSP(Context context) {
-        return context.getSharedPreferences(SP_NAME, Context.MODE_PRIVATE);
-    }
-
-    private static SharedPreferences.Editor getEditor(Context context) {
-        return getSP(context).edit();
-    }
-
-
-}

app/src/main/code/com/wdkl/app/ncs/application/Application.kt

@@ -9,14 +9,14 @@ import com.wdkl.ncs.android.lib.base.BaseApplication
 import com.enation.javashop.net.engine.config.NetEngineConfig
 import com.enation.javashop.net.engine.plugin.exception.RestfulExceptionInterceptor
 import com.enation.javashop.utils.base.config.BaseConfig
-import com.wdkl.app.ncs.callingdoor.BuildConfig
 import com.wdkl.app.ncs.callingdoor.helper.LocaleMangerUtils
 //import com.enation.javashop.utils.base.config.BaseConfig
 //import com.wdkl.app.ncs.callingdoor.helper.AnrFcExceptionUtil
 import com.wdkl.app.ncs.callingdoor.helper.NetHelper
 import com.wdkl.app.ncs.callingdoor.helper.Utils
 import com.wdkl.app.ncs.callingdoor.helper.XCrashUtils
-import com.wdkl.app.ncs.callingdoor.settings.SettingConfig
+import com.wdkl.ncs.android.lib.BuildConfig
+import com.wdkl.ncs.android.lib.settings.SettingConfig
 import serialporttest.utils.SerialPortUtil
 import serialporttest.utils.SerialPortUtil433
 import java.io.PrintWriter

common/build.gradle

@@ -16,6 +16,8 @@ android {
         dataBinding {
             enabled = true
         }
+
+        buildConfigField "String", "APP_DEVICE_TYPE", "\""+app_device_type+"\""
     }
     lintOptions {
         abortOnError false

android_door/src/main/h10_3128/java/com/wdkl/app/ncs/callingdoor/settings/SettingConfig.java

@@ -1,8 +1,10 @@
-package com.wdkl.app.ncs.callingdoor.settings;
+package com.wdkl.ncs.android.lib.settings;
 
 import android.content.Context;
 import android.content.SharedPreferences;
 
+import com.wdkl.ncs.android.lib.BuildConfig;
+
 
 public class SettingConfig {
 
@@ -55,7 +57,6 @@ public class SettingConfig {
     //app上次启动时间
     private static final String KEY_SP_APP_START_TIME = "KEY_SP_APP_START_TIME";
 
-
     //默认语言
     private static final String KEY_LANGUAGE_ID = "KEY_LANGUAGE_ID";
     private static final String KEY_LANGUAGE_MODE = "KEY_LANGUAGE_MODE";
@@ -72,7 +73,12 @@ public class SettingConfig {
 
     public static int getLanguageId(Context context) {
         //0--auto, 1--English, 2--中文, 3--西班牙语, 4--俄语
-        return getSP(context).getInt(KEY_LANGUAGE_ID, 2);
+        if ("mk_h10_w_a133_1_chile".equals(BuildConfig.APP_DEVICE_TYPE)
+        || "mk_h10_z_3128_1_chile".equals(BuildConfig.APP_DEVICE_TYPE)) {
+            return getSP(context).getInt(KEY_LANGUAGE_ID, 3);
+        } else {
+            return getSP(context).getInt(KEY_LANGUAGE_ID, 2);
+        }
     }
 
     public static void setLanguageId(Context context, int id) {
@@ -81,7 +87,12 @@ public class SettingConfig {
 
     //0:同步服务器设置, 1:手动设置
     public static int getLanguageMode(Context context) {
-        return getSP(context).getInt(KEY_LANGUAGE_MODE, 0);
+        if ("mk_h10_w_a133_1_chile".equals(BuildConfig.APP_DEVICE_TYPE)
+        || "mk_h10_z_3128_1_chile".equals(BuildConfig.APP_DEVICE_TYPE)) {
+            return getSP(context).getInt(KEY_LANGUAGE_MODE, 1);
+        } else {
+            return getSP(context).getInt(KEY_LANGUAGE_MODE, 0);
+        }
     }
 
     public static void setLanguageMode(Context context, int mode) {
@@ -120,7 +131,6 @@ public class SettingConfig {
         getEditor(context).putBoolean(KEY_SP_SIP_ENABLE, enable).apply();
     }
 
-
     /**
      * 获取白天亮度
      *

android_door/src/main/h10_a133_chile/java/com/wdkl/app/ncs/callingdoor/helper/AsyncPlayer.java

@@ -1,4 +1,4 @@
-package com.wdkl.app.ncs.callingdoor.helper;
+package com.wdkl.ncs.android.lib.utils;
 
 import android.content.Context;
 import android.media.AudioDeviceInfo;
@@ -46,6 +46,13 @@ public class AsyncPlayer {
             player.setVolume(1.0f, 1.0f);
             //player.prepare();
             player.start();
+            player.setOnCompletionListener(new MediaPlayer.OnCompletionListener() {
+                @Override
+                public void onCompletion(MediaPlayer mp) {
+                    Log.w(mTag, "sound play complete ");
+                    mState = STOP;
+                }
+            });
             if (mPlayer != null) {
                 mPlayer.release();
             }
@@ -141,7 +148,7 @@ public class AsyncPlayer {
     }
 
     public boolean isPlay() {
-        return mState == PLAY;
+        return mState == PLAY ;
     }
 
     private void enqueueLocked(Command cmd) {

android_door/src/main/h10_a133_chile/java/com/wdkl/app/ncs/callingdoor/helper/RingPlayHelper.java

@@ -1,4 +1,4 @@
-package com.wdkl.app.ncs.callingdoor.helper;
+package com.wdkl.ncs.android.lib.utils;
 
 import android.content.Context;
 import android.media.AudioManager;