瀏覽代碼

<修改udp广播地址192.168.255.255,修改APP无响应时设备重启,优化sip>

weizhengliang 4 年之前
父節點
當前提交
63a85e845a

+ 1 - 0
AmDemo_R/src/com/vvsip/ansip/IVvsipService.java

@@ -17,6 +17,7 @@ public interface IVvsipService {
 	public void initiateOutgoingCall(String target,String macStr);
     public void addListener(IVvsipServiceListener listener); 
     public void removeListener(IVvsipServiceListener listener);
+    public void clearListener();
     public void setAudioNormalMode();
     public void setAudioInCallMode();
     public void setSpeakerModeOff();

+ 9 - 0
AmDemo_R/src/com/vvsip/ansip/VvsipService.java

@@ -115,6 +115,15 @@ public class VvsipService extends Service implements IVvsipService {
     }
 
     @Override
+    public void clearListener() {
+        if (mListeners != null) {
+            synchronized (mListeners) {
+                mListeners.clear();
+            }
+        }
+    }
+
+    @Override
     public void onCreate() {
         Log.i(mTag, "lifecycle // onCreate");
         neighborsList = new ArrayList<VvsipNeighbor>();

+ 1 - 1
app/build.gradle

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

+ 6 - 0
app/src/main/java/com/wdkl/callingdoor/ui/APPUpdateActivity.java

@@ -57,6 +57,12 @@ public class APPUpdateActivity extends BaseActivity implements SilentUpdateUtil.
         }
     }
 
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        updateAPPHandler.removeCallbacksAndMessages(null);
+    }
+
     /**
      * 下载APK包
      */

+ 1 - 0
app/src/main/java/com/wdkl/callingdoor/ui/CallingDoorActivity.java

@@ -2073,6 +2073,7 @@ public class CallingDoorActivity extends BaseActivity implements SerialPortUtil.
         super.onDestroy();
         //=======================释放广播=====================//
         MediaPlayerManger.getInstance().releaseMediaPlayer();
+        handler.removeCallbacksAndMessages(null);
 
         callNurseWindow = callDoctorWindow = null;
 

+ 1 - 0
app/src/main/java/com/wdkl/callingdoor/ui/InitActivity.java

@@ -148,6 +148,7 @@ public class InitActivity extends BaseActivity implements SerialPortUtil.IForBro
     @Override
     protected void onDestroy() {
         super.onDestroy();
+        updateHandler.removeCallbacksAndMessages(null);
         updateHandler = null;
         animationDrawable.stop();
         animationDrawable = null;

+ 8 - 2
app/src/main/java/com/wdkl/callingdoor/util/SipUtil/SipHelperUtil.java

@@ -153,9 +153,13 @@ public class SipHelperUtil implements EthernetWifiCallBack {
 //        LogUtil.i(SipInfoTag, "lifecycle // onDestroy");
 
         IVvsipService sipservice = VvsipService.getService();
-        if (contexts instanceof IVvsipServiceListener && sipservice != null) {
-            sipservice.removeListener((IVvsipServiceListener) contexts);
+        //if (contexts instanceof IVvsipServiceListener && sipservice != null) {
+        //    sipservice.removeListener((IVvsipServiceListener) contexts);
+        //}
+        if (sipservice != null) {
+            sipservice.clearListener();
         }
+
         getSipServiceStartHandler().removeCallbacks(getSipServiceStartRunnable());
         sipRegisterHandler.removeCallbacks(sipRegisterRunnable);
         if (getSipServiceConnection() != null && isRegister) {
@@ -186,6 +190,7 @@ public class SipHelperUtil implements EthernetWifiCallBack {
         }
         IVvsipService sipService = VvsipService.getService();
         if (sipService != null) {
+            sipService.clearListener();
             sipService.addListener((IVvsipServiceListener) contexts);
             sipService.setMessageHandler(messageHandler);
         } else {
@@ -563,6 +568,7 @@ public class SipHelperUtil implements EthernetWifiCallBack {
                     public void onServiceConnected(ComponentName name, IBinder service) {
                         IVvsipService sipservice = ((VvsipServiceBinder) service).getService();
                         if (contexts instanceof IVvsipServiceListener) {
+                            sipservice.clearListener();
                             sipservice.addListener((IVvsipServiceListener) contexts);
 //                            LogUtil.i(SipInfoTag, "Connected!");
                             SipHelperUtil.getInstance(contexts).obtainSipInfo();//Sip信息获取

+ 1 - 1
app/src/main/java/com/wdkl/callingdoor/util/UdpHelper.java

@@ -77,7 +77,7 @@ public class UdpHelper implements Runnable {
         }
         InetAddress local = null;
         try {
-            local = InetAddress.getByName("255.255.255.255");
+            local = InetAddress.getByName("192.168.255.255");
         } catch (UnknownHostException e) {
             e.printStackTrace();
         }

+ 4 - 2
app/src/main/java/com/wdkl/callingdoor/util/anrfcutil/AnrFcExceptionUtil.java

@@ -189,7 +189,7 @@ public class AnrFcExceptionUtil implements Thread.UncaughtExceptionHandler {
         }).setIgnoreDebugger(true).setANRListener(new ANRWatchDog.ANRListener() {
             @Override
             public void onAppNotResponding(ANRError error) {
-                try {
+                /*try {
                     Intent mStartActivity = new Intent(application.getApplicationContext(), Constants.ANR_FC);
                     int mPendingIntentId = 123456;
                     PendingIntent mPendingIntent = PendingIntent.getActivity(application.getApplicationContext(), mPendingIntentId, mStartActivity, PendingIntent.FLAG_CANCEL_CURRENT);
@@ -199,8 +199,10 @@ public class AnrFcExceptionUtil implements Thread.UncaughtExceptionHandler {
                     e.printStackTrace();
                 }
 
-                android.os.Process.killProcess(android.os.Process.myPid());
+                android.os.Process.killProcess(android.os.Process.myPid());*/
 
+                //重启设备
+                AutoRebootUtil.reboot();
 
             }
         }).start();

+ 1 - 1
app/src/main/res/layout/activity_calling_door_layout.xml

@@ -98,7 +98,7 @@
                                 android:focusableInTouchMode="true"
                                 android:marqueeRepeatLimit="marquee_forever"
                                 android:singleLine="true"
-                                android:text="000"
+                                android:text="---"
                                 android:textColor="@color/white"
                                 android:textSize="172sp"
                                 android:textStyle="bold" />