diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/App.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/App.kt index 4f014d1..89e287b 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/App.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/App.kt @@ -4,6 +4,7 @@ import com.common.commonlib.CommonApplication import com.common.commonlib.db.DBUtils import com.common.commonlib.db.dao.WarningDao import com.common.commonlib.db.entity.Warning +import com.lztek.toolkit.Lztek import com.yinuo.safetywatcher.TestUtils import com.yinuo.safetywatcher.watcher.constant.CAMERA_DNS import com.yinuo.safetywatcher.watcher.constant.CAMERA_GATEWAY diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/HomeActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/HomeActivity.kt index 8f9e857..b5bf738 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/HomeActivity.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/HomeActivity.kt @@ -2,6 +2,7 @@ package com.yinuo.safetywatcher.watcher.ui import android.content.Intent import android.os.Build +import android.os.Process import android.view.View import androidx.annotation.RequiresApi import com.common.commonlib.utils.NetworkHelper @@ -112,6 +113,7 @@ class HomeActivity : NoOptionsActivity() { SimHelper.release(this@HomeActivity) mBinding.root?.removeCallbacks(reStartCamera) mRender?.onDestoryed() + Process.killProcess(Process.myPid()) } override fun onResume() { diff --git a/library-vlc/src/main/java/com/yinuo/library/vlc/utils/BitmapUtil.java b/library-vlc/src/main/java/com/yinuo/library/vlc/utils/BitmapUtil.java index 3b33b30..dcd6757 100644 --- a/library-vlc/src/main/java/com/yinuo/library/vlc/utils/BitmapUtil.java +++ b/library-vlc/src/main/java/com/yinuo/library/vlc/utils/BitmapUtil.java @@ -29,6 +29,8 @@ public class BitmapUtil { cv.save();//保存 //store cv.restore();//存储 + // 回收内存 + backBitmap.recycle(); return newbmp; } }