diff --git a/app/build.gradle b/app/build.gradle index 2f932a2..06c5c00 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,7 +10,7 @@ android { abortOnError false } defaultConfig { - applicationId "com.example.myapplication" + applicationId "com.yinuo.safetywatcher" ndk { //设置支持的SO库架构(开发者可以根据需要,选择一个或多个平台的so) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 55ffcd9..1e2eab9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="com.yinuo.safetywatcher"> @@ -36,7 +36,7 @@ @@ -52,7 +52,7 @@ diff --git a/app/src/main/java/com/example/myapplication/xls/Demo.kt b/app/src/main/java/com/example/myapplication/xls/Demo.kt deleted file mode 100644 index 2e7b48a..0000000 --- a/app/src/main/java/com/example/myapplication/xls/Demo.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.example.myapplication.xls - -data class Demo(val content:String) diff --git a/app/src/main/java/com/example/myapplication/MainActivity.java b/app/src/main/java/com/yinuo/safetywatcher/MainActivity.java similarity index 97% rename from app/src/main/java/com/example/myapplication/MainActivity.java rename to app/src/main/java/com/yinuo/safetywatcher/MainActivity.java index 3ea073a..5aa84e9 100644 --- a/app/src/main/java/com/example/myapplication/MainActivity.java +++ b/app/src/main/java/com/yinuo/safetywatcher/MainActivity.java @@ -1,16 +1,14 @@ -package com.example.myapplication; +package com.yinuo.safetywatcher; import androidx.lifecycle.Observer; import android.Manifest; -import android.content.ContextWrapper; import android.content.Intent; import android.content.pm.PackageManager; import android.graphics.SurfaceTexture; import android.media.projection.MediaProjectionManager; import android.os.Build; import android.os.Bundle; -import android.os.Environment; import android.preference.PreferenceManager; import androidx.annotation.Nullable; @@ -24,9 +22,8 @@ import android.widget.CompoundButton; import android.widget.TextView; import android.widget.Toast; -import com.example.myapplication.player.ProVideoActivity; -import com.example.myapplication.utils.ExcelUtils; -import com.example.myapplication.xls.Demo; +import com.yinuo.safetywatcher.utils.ExcelUtils; +import com.yinuo.safetywatcher.xls.Demo; import org.easydarwin.push.MediaStream; diff --git a/app/src/main/java/com/example/myapplication/RxHelper.java b/app/src/main/java/com/yinuo/safetywatcher/RxHelper.java similarity index 97% rename from app/src/main/java/com/example/myapplication/RxHelper.java rename to app/src/main/java/com/yinuo/safetywatcher/RxHelper.java index a3f6ed2..9914c31 100644 --- a/app/src/main/java/com/example/myapplication/RxHelper.java +++ b/app/src/main/java/com/yinuo/safetywatcher/RxHelper.java @@ -1,4 +1,4 @@ -package com.example.myapplication; +package com.yinuo.safetywatcher; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/app/src/main/java/com/example/myapplication/SurfaceTextureListenerWrapper.java b/app/src/main/java/com/yinuo/safetywatcher/SurfaceTextureListenerWrapper.java similarity index 94% rename from app/src/main/java/com/example/myapplication/SurfaceTextureListenerWrapper.java rename to app/src/main/java/com/yinuo/safetywatcher/SurfaceTextureListenerWrapper.java index 4fb97b3..4815ea3 100644 --- a/app/src/main/java/com/example/myapplication/SurfaceTextureListenerWrapper.java +++ b/app/src/main/java/com/yinuo/safetywatcher/SurfaceTextureListenerWrapper.java @@ -1,4 +1,4 @@ -package com.example.myapplication; +package com.yinuo.safetywatcher; import android.graphics.SurfaceTexture; import android.view.TextureView; diff --git a/app/src/main/java/com/example/myapplication/UVCActivity.java b/app/src/main/java/com/yinuo/safetywatcher/UVCActivity.java similarity index 99% rename from app/src/main/java/com/example/myapplication/UVCActivity.java rename to app/src/main/java/com/yinuo/safetywatcher/UVCActivity.java index a5d5b4b..b58741e 100644 --- a/app/src/main/java/com/example/myapplication/UVCActivity.java +++ b/app/src/main/java/com/yinuo/safetywatcher/UVCActivity.java @@ -1,4 +1,4 @@ -package com.example.myapplication; +package com.yinuo.safetywatcher; import androidx.lifecycle.Observer; import android.content.Intent; diff --git a/app/src/main/java/com/example/myapplication/player/ProVideoActivity.java b/app/src/main/java/com/yinuo/safetywatcher/player/ProVideoActivity.java similarity index 98% rename from app/src/main/java/com/example/myapplication/player/ProVideoActivity.java rename to app/src/main/java/com/yinuo/safetywatcher/player/ProVideoActivity.java index 12df891..3b5e3b8 100644 --- a/app/src/main/java/com/example/myapplication/player/ProVideoActivity.java +++ b/app/src/main/java/com/yinuo/safetywatcher/player/ProVideoActivity.java @@ -1,4 +1,4 @@ -package com.example.myapplication.player; +package com.yinuo.safetywatcher.player; /* * Copyright (C) 2015 Zhang Rui @@ -46,10 +46,10 @@ import androidx.core.view.ViewCompat; import androidx.core.view.ViewConfigurationCompat; import com.bumptech.glide.Glide; -import com.example.myapplication.BuildConfig; -import com.example.myapplication.databinding.ActivityMainProBinding; -import com.example.myapplication.player.utils.FileUtil; -import com.example.myapplication.player.utils.SPUtil; +import com.yinuo.safetywatcher.BuildConfig; +import com.yinuo.safetywatcher.databinding.ActivityMainProBinding; +import com.yinuo.safetywatcher.player.utils.FileUtil; +import com.yinuo.safetywatcher.player.utils.SPUtil; import java.io.File; import java.text.SimpleDateFormat; diff --git a/app/src/main/java/com/example/myapplication/player/ProVideoView.java b/app/src/main/java/com/yinuo/safetywatcher/player/ProVideoView.java similarity index 98% rename from app/src/main/java/com/example/myapplication/player/ProVideoView.java rename to app/src/main/java/com/yinuo/safetywatcher/player/ProVideoView.java index 59143c1..9e5696d 100644 --- a/app/src/main/java/com/example/myapplication/player/ProVideoView.java +++ b/app/src/main/java/com/yinuo/safetywatcher/player/ProVideoView.java @@ -1,4 +1,4 @@ -package com.example.myapplication.player; +package com.yinuo.safetywatcher.player; import static tv.danmaku.ijk.media.player.IjkMediaPlayer.native_active_days; @@ -11,7 +11,7 @@ import android.util.AttributeSet; import androidx.core.app.ActivityCompat; -import com.example.myapplication.player.utils.FileUtil; +import com.yinuo.safetywatcher.player.utils.FileUtil; import java.io.File; import java.text.SimpleDateFormat; diff --git a/app/src/main/java/com/example/myapplication/player/VideoControllerView.java b/app/src/main/java/com/yinuo/safetywatcher/player/VideoControllerView.java similarity index 99% rename from app/src/main/java/com/example/myapplication/player/VideoControllerView.java rename to app/src/main/java/com/yinuo/safetywatcher/player/VideoControllerView.java index 436b9af..99f68c4 100644 --- a/app/src/main/java/com/example/myapplication/player/VideoControllerView.java +++ b/app/src/main/java/com/yinuo/safetywatcher/player/VideoControllerView.java @@ -1,4 +1,4 @@ -package com.example.myapplication.player; +package com.yinuo.safetywatcher.player; import android.content.Context; import android.os.Handler; @@ -20,7 +20,7 @@ import android.widget.SeekBar; import android.widget.SeekBar.OnSeekBarChangeListener; import android.widget.TextView; -import com.example.myapplication.R; +import com.yinuo.safetywatcher.R; import java.lang.ref.WeakReference; import java.util.Formatter; diff --git a/app/src/main/java/com/example/myapplication/player/utils/FileUtil.java b/app/src/main/java/com/yinuo/safetywatcher/player/utils/FileUtil.java similarity index 94% rename from app/src/main/java/com/example/myapplication/player/utils/FileUtil.java rename to app/src/main/java/com/yinuo/safetywatcher/player/utils/FileUtil.java index b0736c8..1781524 100644 --- a/app/src/main/java/com/example/myapplication/player/utils/FileUtil.java +++ b/app/src/main/java/com/yinuo/safetywatcher/player/utils/FileUtil.java @@ -1,4 +1,4 @@ -package com.example.myapplication.player.utils; +package com.yinuo.safetywatcher.player.utils; import android.os.Environment; diff --git a/app/src/main/java/com/example/myapplication/player/utils/SPUtil.java b/app/src/main/java/com/yinuo/safetywatcher/player/utils/SPUtil.java similarity index 96% rename from app/src/main/java/com/example/myapplication/player/utils/SPUtil.java rename to app/src/main/java/com/yinuo/safetywatcher/player/utils/SPUtil.java index 31f4489..f80e117 100644 --- a/app/src/main/java/com/example/myapplication/player/utils/SPUtil.java +++ b/app/src/main/java/com/yinuo/safetywatcher/player/utils/SPUtil.java @@ -1,4 +1,4 @@ -package com.example.myapplication.player.utils; +package com.yinuo.safetywatcher.player.utils; import android.content.Context; import android.preference.PreferenceManager; diff --git a/app/src/main/java/com/example/myapplication/utils/ExcelUtils.kt b/app/src/main/java/com/yinuo/safetywatcher/utils/ExcelUtils.kt similarity index 98% rename from app/src/main/java/com/example/myapplication/utils/ExcelUtils.kt rename to app/src/main/java/com/yinuo/safetywatcher/utils/ExcelUtils.kt index 655af6a..361cc8c 100644 --- a/app/src/main/java/com/example/myapplication/utils/ExcelUtils.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/utils/ExcelUtils.kt @@ -1,12 +1,12 @@ -package com.example.myapplication.utils +package com.yinuo.safetywatcher.utils import android.content.Context import android.text.TextUtils import android.util.Log -import com.example.myapplication.xls.Constants -import com.example.myapplication.xls.Constants.COLUMN_NAME_MAP -import com.example.myapplication.xls.Demo -import com.example.myapplication.xls.ExcelLabelBean +import com.yinuo.safetywatcher.xls.Constants +import com.yinuo.safetywatcher.xls.Constants.COLUMN_NAME_MAP +import com.yinuo.safetywatcher.xls.Demo +import com.yinuo.safetywatcher.xls.ExcelLabelBean import jxl.Workbook import jxl.WorkbookSettings import jxl.write.Label diff --git a/app/src/main/java/com/example/myapplication/utils/PathUtils.kt b/app/src/main/java/com/yinuo/safetywatcher/utils/PathUtils.kt similarity index 96% rename from app/src/main/java/com/example/myapplication/utils/PathUtils.kt rename to app/src/main/java/com/yinuo/safetywatcher/utils/PathUtils.kt index a6198af..5cb0aa6 100644 --- a/app/src/main/java/com/example/myapplication/utils/PathUtils.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/utils/PathUtils.kt @@ -1,4 +1,4 @@ -package com.example.myapplication.utils +package com.yinuo.safetywatcher.utils import android.content.Context import android.os.Environment diff --git a/app/src/main/java/com/example/myapplication/xls/ColumnObject.kt b/app/src/main/java/com/yinuo/safetywatcher/xls/ColumnObject.kt similarity index 79% rename from app/src/main/java/com/example/myapplication/xls/ColumnObject.kt rename to app/src/main/java/com/yinuo/safetywatcher/xls/ColumnObject.kt index c33af17..2e495c0 100644 --- a/app/src/main/java/com/example/myapplication/xls/ColumnObject.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/xls/ColumnObject.kt @@ -1,4 +1,4 @@ -package com.example.myapplication.xls +package com.yinuo.safetywatcher.xls /** * excel到sql或者sql到excel列对象转化用 diff --git a/app/src/main/java/com/example/myapplication/xls/Constants.kt b/app/src/main/java/com/yinuo/safetywatcher/xls/Constants.kt similarity index 98% rename from app/src/main/java/com/example/myapplication/xls/Constants.kt rename to app/src/main/java/com/yinuo/safetywatcher/xls/Constants.kt index e8fefbc..fc4cb61 100644 --- a/app/src/main/java/com/example/myapplication/xls/Constants.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/xls/Constants.kt @@ -1,4 +1,4 @@ -package com.example.myapplication.xls +package com.yinuo.safetywatcher.xls object Constants { const val SAVE_EXPORT_EXCEL_PATH = "/WaterTransport/ExportExcel" diff --git a/app/src/main/java/com/yinuo/safetywatcher/xls/Demo.kt b/app/src/main/java/com/yinuo/safetywatcher/xls/Demo.kt new file mode 100644 index 0000000..c2ffac2 --- /dev/null +++ b/app/src/main/java/com/yinuo/safetywatcher/xls/Demo.kt @@ -0,0 +1,3 @@ +package com.yinuo.safetywatcher.xls + +data class Demo(val content:String) diff --git a/app/src/main/java/com/example/myapplication/xls/ExcelLabelBean.kt b/app/src/main/java/com/yinuo/safetywatcher/xls/ExcelLabelBean.kt similarity index 67% rename from app/src/main/java/com/example/myapplication/xls/ExcelLabelBean.kt rename to app/src/main/java/com/yinuo/safetywatcher/xls/ExcelLabelBean.kt index b46a7cc..bdbfbcc 100644 --- a/app/src/main/java/com/example/myapplication/xls/ExcelLabelBean.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/xls/ExcelLabelBean.kt @@ -1,3 +1,3 @@ -package com.example.myapplication.xls +package com.yinuo.safetywatcher.xls data class ExcelLabelBean(val excelLableContent:String, val isImage:Boolean) diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 653be7f..388238b 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context="com.example.myapplication.MainActivity"> + tools:context="com.yinuo.safetywatcher.MainActivity"> - - + tools:context="com.yinuo.safetywatcher.UVCActivity">