修复退出崩溃逻辑问题

Author: neilyhe

app/src/main/java/com/example/ivdemo/BaseIPCActivity.kt

@@ -40,6 +40,15 @@ abstract class BaseIPCActivity<VB : ViewBinding> : AppCompatActivity(), IvDevice
     private val region = "china"
     private val isUserCongestionCtrl = true
 
+    @Volatile
+    protected var sysInitResCode = -1
+
+    @Volatile
+    protected var dmInitResCode = -1
+
+    @Volatile
+    protected var avtInitResCode = -1
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         if (!checkPerformCreate()) return
@@ -63,10 +72,18 @@ abstract class BaseIPCActivity<VB : ViewBinding> : AppCompatActivity(), IvDevice
         // start run JNI iot_video_demo
         checkDefaultThreadActiveAndExecuteTask {
             val sysInitInfo = SysInitInfo(productId, deviceName, deviceKey, region)
-            val sysInit = VideoNativeInterface.getInstance().initIvSystem(sysInitInfo, this)
-            Log.d(TAG, "initIvSystem,resCode:$sysInit")
-            val dmInit = VideoNativeInterface.getInstance().initIvDm()
-            Log.d(TAG, "initIvDm,resCode:$dmInit")
+            sysInitResCode = VideoNativeInterface.getInstance().initIvSystem(sysInitInfo, this)
+            Log.d(TAG, "initIvSystem,resCode:$sysInitResCode")
+            if (sysInitResCode != 0) {
+                showToast("initIvSystem fail,resCode:$sysInitResCode")
+                return@checkDefaultThreadActiveAndExecuteTask
+            }
+            dmInitResCode = VideoNativeInterface.getInstance().initIvDm()
+            Log.d(TAG, "initIvDm,resCode:$dmInitResCode")
+            if (dmInitResCode != 0) {
+                showToast("initIvDm fail,resCode:$dmInitResCode")
+                return@checkDefaultThreadActiveAndExecuteTask
+            }
             val congestion = CongestionCtrlInfo()
             if (isUserCongestionCtrl) { //启用水位告警以及告警的有高中低三挡水位值，当 p2p 内部缓存的水位到达这个值的时候会收到 onNotify回调
                 congestion.lowMark = 200 * 1024
@@ -79,8 +96,12 @@ abstract class BaseIPCActivity<VB : ViewBinding> : AppCompatActivity(), IvDevice
             }
             val avtInitInfo = AvtInitInfo()
             avtInitInfo.congestion = congestion
-            val avtInit = VideoNativeInterface.getInstance().initIvAvt(avtInitInfo, this)
-            Log.d(TAG, "initIvAvt,resCode:$avtInit")
+            avtInitResCode = VideoNativeInterface.getInstance().initIvAvt(avtInitInfo, this)
+            Log.d(TAG, "initIvAvt,resCode:$avtInitResCode")
+            if (avtInitResCode != 0) {
+                showToast("initIvDm fail,resCode:$avtInitResCode")
+                return@checkDefaultThreadActiveAndExecuteTask
+            }
         }
     }
 
@@ -91,12 +112,18 @@ abstract class BaseIPCActivity<VB : ViewBinding> : AppCompatActivity(), IvDevice
     override fun onDestroy() {
         super.onDestroy()
         checkDefaultThreadActiveAndExecuteTask {
-            val exitIvAvt = VideoNativeInterface.getInstance().exitIvAvt()
-            Log.d(TAG, "exit avt resCode:$exitIvAvt")
-            val exitIvDm = VideoNativeInterface.getInstance().exitIvDm()
-            Log.d(TAG, "exit dm resCode:$exitIvDm")
-            val exitIvSys = VideoNativeInterface.getInstance().exitIvSys()
-            Log.d(TAG, "exit sys resCode:$exitIvSys")
+            if (avtInitResCode == 0) {
+                val exitIvAvt = VideoNativeInterface.getInstance().exitIvAvt()
+                Log.d(TAG, "exit avt resCode:$exitIvAvt")
+            }
+            if (dmInitResCode == 0) {
+                val exitIvDm = VideoNativeInterface.getInstance().exitIvDm()
+                Log.d(TAG, "exit dm resCode:$exitIvDm")
+            }
+            if (sysInitResCode == 0) {
+                val exitIvSys = VideoNativeInterface.getInstance().exitIvSys()
+                Log.d(TAG, "exit sys resCode:$exitIvSys")
+            }
             defaultThread.shutdown()
         }
     }

app/src/main/java/com/example/ivdemo/TweCallActivity.kt

@@ -38,6 +38,7 @@ private const val DATA_PATH = "/storage/emulated/0/"
 
 class TweCallActivity : BaseIPCActivity<ActivityTweCallBinding>(), IvVoipCallback {
 
+    @Volatile
     private var initStatus = -1 // 未初始化 -1， 初始化成功 0， 其他
 
     private var condition1 = false
@@ -204,7 +205,7 @@ class TweCallActivity : BaseIPCActivity<ActivityTweCallBinding>(), IvVoipCallbac
             } else {
                 showToast("twecall初始化成功")
                 val activeDeviceInfo = VideoNativeInterface.getInstance().voipActiveDeviceInfoV2
-                if (activeDeviceInfo == null || activeDeviceInfo.expireTime < System.currentTimeMillis()/1000) {
+                if (activeDeviceInfo == null || activeDeviceInfo.expireTime < System.currentTimeMillis() / 1000) {
                     val activateRes = VideoNativeInterface.getInstance()
                         .activateVoipLicenseV2(VoipActivateType.VOIP_ACT_IPC)
                     if (activateRes == 0) {
@@ -393,8 +394,10 @@ class TweCallActivity : BaseIPCActivity<ActivityTweCallBinding>(), IvVoipCallbac
         Log.d(TAG, "destory")
         checkDefaultThreadActiveAndExecuteTask {
 //            VideoNativeInterface.getInstance().exitWxCloudVoip()
-            VideoNativeInterface.getInstance().exitWxCloudVoipV2()
-            Log.d(TAG, "exit twecall v2")
+            if (initStatus == 0) {
+                VideoNativeInterface.getInstance().exitWxCloudVoipV2()
+                Log.d(TAG, "exit twecall v2")
+            }
         }
         super.onDestroy()
     }