desc:modify

app/src/main/java/com/yinuo/safetywatcher/player/ProVideoActivity.java

@@ -42,7 +42,6 @@ import androidx.core.view.ViewConfigurationCompat;
 
 import com.bumptech.glide.Glide;
 import com.yinuo.safetywatcher.databinding.ActivityMainProBinding;
-import com.yinuo.safetywatcher.player.utils.SPUtil;
 
 import tv.danmaku.ijk.media.player.IMediaPlayer;
 
@@ -115,9 +114,6 @@ public class ProVideoActivity extends AppCompatActivity {
                 }
             }
         }
-
-        SPUtil.setDefaultParams(this);
-
         mediaController = new VideoControllerView(this);
         mediaController.setMediaPlayer(mBinding.videoView);
         mVideoView = mBinding.videoView;

app/src/main/java/com/yinuo/safetywatcher/player/ProVideoView.java

@@ -1,20 +1,10 @@
 package com.yinuo.safetywatcher.player;
 
-import android.Manifest;
 import android.content.Context;
-import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 
-import androidx.core.app.ActivityCompat;
-
-import com.yinuo.safetywatcher.player.utils.FileUtil;
-
-import java.io.File;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
 import tv.danmaku.ijk.media.player.IjkMediaPlayer;
 import tv.danmaku.ijk.media.widget.media.IjkVideoView;
 
@@ -112,33 +102,6 @@ public class ProVideoView extends IjkVideoView implements VideoControllerView.Fu
 
     @Override
     public void toggleRecord() {
-        if (getContext() instanceof ProVideoActivity) {
-            ProVideoActivity pro = (ProVideoActivity) getContext();
-
-            if (ActivityCompat.checkSelfPermission(pro, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
-                ActivityCompat.requestPermissions(pro, new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, ProVideoActivity.REQUEST_WRITE_STORAGE + 1);
-                return;
-            }
-        }
-
-        if (!isRecording()) {
-            Uri uri = null;
-            if (uri == null)
-                return;
-
-            mRecordPath = "record_" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + ".mp4";
-            File directory = new File(FileUtil.getMoviePath());
-
-            try {
-                directory.mkdirs();
-                startRecord(directory + "/" + mRecordPath, 30);
-            } catch (Exception ex) {
-                ex.printStackTrace();
-                mRecordPath = null;
-            }
-        } else {
-            stopRecord();
-        }
     }
 
     @Override

app/src/main/java/com/yinuo/safetywatcher/player/utils/FileUtil.java

@@ -1,39 +0,0 @@
-package com.yinuo.safetywatcher.player.utils;
-
-import android.os.Environment;
-
-import java.io.File;
-
-public class FileUtil {
-
-    private static String path = Environment.getExternalStorageDirectory() +"/EasyPlayerRro";
-
-    public static String getPicturePath() {
-        return path + "/picture";
-    }
-
-    public static File getSnapshotFile(String url) {
-        File file = new File(getPicturePath() + urlDir(url));
-        file.mkdirs();
-
-        file = new File(file, "snapshot.jpg");
-
-        return file;
-    }
-
-    public static String getMoviePath() {
-        return path + "/movie";
-    }
-
-    private static String urlDir(String url) {
-        url = url.replace("://", "");
-        url = url.replace("/", "");
-        url = url.replace(".", "");
-
-        if (url.length() > 64) {
-            url.substring(0, 63);
-        }
-
-        return url;
-    }
-}

app/src/main/java/com/yinuo/safetywatcher/player/utils/SPUtil.java

@@ -1,44 +0,0 @@
-package com.yinuo.safetywatcher.player.utils;
-
-import android.content.Context;
-import android.preference.PreferenceManager;
-
-public class SPUtil {
-
-    /* ============================ 使用MediaCodec解码 ============================ */
-    private static final String KEY_SW_CODEC = "pref.using_media_codec";
-
-    public static boolean getMediaCodec(Context context) {
-        return PreferenceManager.getDefaultSharedPreferences(context)
-                .getBoolean(KEY_SW_CODEC, false);
-    }
-
-    public static void setMediaCodec(Context context, boolean isChecked) {
-        PreferenceManager.getDefaultSharedPreferences(context)
-                .edit()
-                .putBoolean(KEY_SW_CODEC, isChecked)
-                .apply();
-    }
-
-    /* ============================ KEY_UDP_MODE ============================ */
-    private static final String KEY_UDP_MODE = "USE_UDP_MODE";
-
-    public static boolean getUDPMode(Context context) {
-        return PreferenceManager.getDefaultSharedPreferences(context)
-                .getBoolean(KEY_UDP_MODE, false);
-    }
-
-    public static void setUDPMode(Context context, boolean isChecked) {
-        PreferenceManager.getDefaultSharedPreferences(context)
-                .edit()
-                .putBoolean(KEY_UDP_MODE, isChecked)
-                .apply();
-    }
-
-    public static void setDefaultParams(Context context) {
-        PreferenceManager.getDefaultSharedPreferences(context).edit()
-                .putInt("timeout", 5)
-                .putLong("analyzeduration", 21000000L)
-                .apply();
-    }
-}

app/src/main/java/com/yinuo/safetywatcher/watcher/App.kt

@@ -15,7 +15,8 @@ import kotlinx.coroutines.launch
 class App : CommonApplication() {
     override fun onCreate() {
         super.onCreate()
-        //LztekUtil.setObject(Lztek.create(this))
+        LztekUtil.setObject(Lztek.create(this))
+        ipConfig()
         tryFixDbData()
         TestUtils.insertData()
     }