From 05b019981906ce835ada52328e6abeb3e9752e87 Mon Sep 17 00:00:00 2001 From: Matthew Date: Sat, 21 Oct 2023 12:04:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9package=20id=E4=B8=BA?= =?UTF-8?q?=EF=BC=9A=20com.xypower.mpapp?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 4 ++-- .../mpapp}/ExampleInstrumentedTest.java | 2 +- app/src/main/cpp/MicroPhoto.cpp | 22 +++++++++---------- .../mpapp}/DeviceUtil.java | 2 +- .../mpapp}/FileDownloader.java | 2 +- .../mpapp}/FloatingWindow.java | 7 +----- .../mpapp}/LocationUtils.java | 2 +- .../mpapp}/MainActivity.java | 12 +++------- .../mpapp}/MicroPhotoService.java | 2 +- .../mpapp}/PositionManager.java | 6 +---- .../mpapp}/ScreenActionReceiver.java | 2 +- .../mpapp}/SmsReceiver.java | 5 +---- .../request/ExponentialBackOffRetry.java | 0 .../mpapp}/request/INettyMessageListener.java | 0 .../mpapp}/request/NettyChatClient.java | 0 .../mpapp}/request/ReconnectHandler.java | 0 .../mpapp}/request/RetryPolicy.java | 0 .../mpapp}/ExampleUnitTest.java | 2 +- 18 files changed, 26 insertions(+), 44 deletions(-) rename app/src/androidTest/java/com/{xinyingpower/microphoto => xypower/mpapp}/ExampleInstrumentedTest.java (95%) rename app/src/main/java/com/{xinyingpower/microphoto => xypower/mpapp}/DeviceUtil.java (99%) rename app/src/main/java/com/{xinyingpower/microphoto => xypower/mpapp}/FileDownloader.java (98%) rename app/src/main/java/com/{xinyingpower/microphoto => xypower/mpapp}/FloatingWindow.java (97%) rename app/src/main/java/com/{xinyingpower/microphoto => xypower/mpapp}/LocationUtils.java (99%) rename app/src/main/java/com/{xinyingpower/microphoto => xypower/mpapp}/MainActivity.java (98%) rename app/src/main/java/com/{xinyingpower/microphoto => xypower/mpapp}/MicroPhotoService.java (99%) rename app/src/main/java/com/{xinyingpower/microphoto => xypower/mpapp}/PositionManager.java (75%) rename app/src/main/java/com/{xinyingpower/microphoto => xypower/mpapp}/ScreenActionReceiver.java (98%) rename app/src/main/java/com/{xinyingpower/microphoto => xypower/mpapp}/SmsReceiver.java (94%) rename app/src/main/java/com/{xinyingpower/microphoto => xypower/mpapp}/request/ExponentialBackOffRetry.java (100%) rename app/src/main/java/com/{xinyingpower/microphoto => xypower/mpapp}/request/INettyMessageListener.java (100%) rename app/src/main/java/com/{xinyingpower/microphoto => xypower/mpapp}/request/NettyChatClient.java (100%) rename app/src/main/java/com/{xinyingpower/microphoto => xypower/mpapp}/request/ReconnectHandler.java (100%) rename app/src/main/java/com/{xinyingpower/microphoto => xypower/mpapp}/request/RetryPolicy.java (100%) rename app/src/test/java/com/{xinyingpower/microphoto => xypower/mpapp}/ExampleUnitTest.java (90%) diff --git a/app/build.gradle b/app/build.gradle index 54bb5cf0..8d221689 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,11 +6,11 @@ def AppVersionName = "1.0.14" def AppVersionCode = ((1 * 100 + 1) * 100 + 0) * 10 + 14 android { - namespace 'com.xinyingpower.microphoto' + namespace 'com.xypower.mpapp' compileSdk 33 defaultConfig { - applicationId "com.xinyingpower.microphoto" + applicationId "com.xypower.mpapp" minSdk 28 //noinspection ExpiredTargetSdkVersion targetSdk 28 diff --git a/app/src/androidTest/java/com/xinyingpower/microphoto/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/xypower/mpapp/ExampleInstrumentedTest.java similarity index 95% rename from app/src/androidTest/java/com/xinyingpower/microphoto/ExampleInstrumentedTest.java rename to app/src/androidTest/java/com/xypower/mpapp/ExampleInstrumentedTest.java index dc0f7e6d..6fb2269b 100644 --- a/app/src/androidTest/java/com/xinyingpower/microphoto/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/com/xypower/mpapp/ExampleInstrumentedTest.java @@ -1,4 +1,4 @@ -package com.xinyingpower.microphoto; +package com.xypower.mpapp; import android.content.Context; import androidx.test.platform.app.InstrumentationRegistry; diff --git a/app/src/main/cpp/MicroPhoto.cpp b/app/src/main/cpp/MicroPhoto.cpp index cae7cdb4..fc4b2c82 100644 --- a/app/src/main/cpp/MicroPhoto.cpp +++ b/app/src/main/cpp/MicroPhoto.cpp @@ -42,7 +42,7 @@ bool GetJniEnv(JavaVM *vm, JNIEnv **env, bool& didAttachThread) // #include "client/linux/handler/minidump_descriptor.h" extern "C" JNIEXPORT jstring JNICALL -Java_com_xinyingpower_microphoto_MainActivity_stringFromJNI( +Java_com_xypower_microphoto_MainActivity_stringFromJNI( JNIEnv* env, jobject /* this */) { std::string hello = "Hello from C++"; @@ -50,7 +50,7 @@ Java_com_xinyingpower_microphoto_MainActivity_stringFromJNI( } extern "C" JNIEXPORT jboolean JNICALL -Java_com_xinyingpower_microphoto_MainActivity_takePhoto( +Java_com_xypower_microphoto_MainActivity_takePhoto( JNIEnv* env, jobject pThis, jint channel, jint preset, jstring path, jstring fileName) { @@ -88,7 +88,7 @@ Java_com_xinyingpower_microphoto_MainActivity_takePhoto( } extern "C" JNIEXPORT jlong JNICALL -Java_com_xinyingpower_microphoto_MicroPhotoService_init( +Java_com_xypower_microphoto_MicroPhotoService_init( JNIEnv* env, jobject pThis, jstring appPath, jstring ip, jint port, jstring cmdid, jint protocol, jint networkProtocol) { @@ -134,7 +134,7 @@ Java_com_xinyingpower_microphoto_MicroPhotoService_init( } extern "C" JNIEXPORT jboolean JNICALL -Java_com_xinyingpower_microphoto_MicroPhotoService_notifyToTakePhoto( +Java_com_xypower_microphoto_MicroPhotoService_notifyToTakePhoto( JNIEnv* env, jobject pThis, jlong handler, jint channel, jint preset, jlong scheduleTime, jstring path, jstring fileName, jboolean sendToCma) { @@ -154,7 +154,7 @@ Java_com_xinyingpower_microphoto_MicroPhotoService_notifyToTakePhoto( } extern "C" JNIEXPORT jboolean JNICALL -Java_com_xinyingpower_microphoto_MicroPhotoService_sendHeartbeat( +Java_com_xypower_microphoto_MicroPhotoService_sendHeartbeat( JNIEnv* env, jobject pThis, jlong handler) { @@ -171,7 +171,7 @@ Java_com_xinyingpower_microphoto_MicroPhotoService_sendHeartbeat( } extern "C" JNIEXPORT jboolean JNICALL -Java_com_xinyingpower_microphoto_MicroPhotoService_fireTimeout( +Java_com_xypower_microphoto_MicroPhotoService_fireTimeout( JNIEnv* env, jobject pThis, jlong handler, jlong uid, jlong times) { @@ -187,7 +187,7 @@ Java_com_xinyingpower_microphoto_MicroPhotoService_fireTimeout( } extern "C" JNIEXPORT void JNICALL -Java_com_xinyingpower_microphoto_MicroPhotoService_updatePosition( +Java_com_xypower_microphoto_MicroPhotoService_updatePosition( JNIEnv* env, jobject pThis, jlong handler, jdouble lon, jdouble lat, jlong ts) { @@ -203,7 +203,7 @@ Java_com_xinyingpower_microphoto_MicroPhotoService_updatePosition( } extern "C" JNIEXPORT jboolean JNICALL -Java_com_xinyingpower_microphoto_MicroPhotoService_uninit( +Java_com_xypower_microphoto_MicroPhotoService_uninit( JNIEnv* env, jobject pThis, jlong handler) { @@ -222,7 +222,7 @@ Java_com_xinyingpower_microphoto_MicroPhotoService_uninit( } extern "C" JNIEXPORT jlong JNICALL -Java_com_xinyingpower_microphoto_MicroPhotoService_getHeartbeatDuration( +Java_com_xypower_microphoto_MicroPhotoService_getHeartbeatDuration( JNIEnv* env, jobject pThis, jlong handler) { @@ -236,7 +236,7 @@ Java_com_xinyingpower_microphoto_MicroPhotoService_getHeartbeatDuration( } extern "C" JNIEXPORT jlongArray JNICALL -Java_com_xinyingpower_microphoto_MicroPhotoService_getPhotoTimeData( +Java_com_xypower_microphoto_MicroPhotoService_getPhotoTimeData( JNIEnv* env, jobject pThis, jlong handler) { @@ -302,7 +302,7 @@ Java_com_xinyingpower_microphoto_MicroPhotoService_getPhotoTimeData( /* extern "C" JNIEXPORT jlongArray JNICALL -Java_com_xinyingpower_microphoto_MicroPhotoService_getNextScheduleItem( +Java_com_xypower_microphoto_MicroPhotoService_getNextScheduleItem( JNIEnv* env, jobject pThis, jlong handler) { diff --git a/app/src/main/java/com/xinyingpower/microphoto/DeviceUtil.java b/app/src/main/java/com/xypower/mpapp/DeviceUtil.java similarity index 99% rename from app/src/main/java/com/xinyingpower/microphoto/DeviceUtil.java rename to app/src/main/java/com/xypower/mpapp/DeviceUtil.java index c548da2e..1af1e0a9 100644 --- a/app/src/main/java/com/xinyingpower/microphoto/DeviceUtil.java +++ b/app/src/main/java/com/xypower/mpapp/DeviceUtil.java @@ -1,4 +1,4 @@ -package com.xinyingpower.microphoto; +package com.xypower.mpapp; import android.app.AlarmManager; import android.content.Context; diff --git a/app/src/main/java/com/xinyingpower/microphoto/FileDownloader.java b/app/src/main/java/com/xypower/mpapp/FileDownloader.java similarity index 98% rename from app/src/main/java/com/xinyingpower/microphoto/FileDownloader.java rename to app/src/main/java/com/xypower/mpapp/FileDownloader.java index 114518e3..e43d93e1 100644 --- a/app/src/main/java/com/xinyingpower/microphoto/FileDownloader.java +++ b/app/src/main/java/com/xypower/mpapp/FileDownloader.java @@ -1,4 +1,4 @@ -package com.xinyingpower.microphoto; +package com.xypower.mpapp; import android.text.TextUtils; import android.util.Log; diff --git a/app/src/main/java/com/xinyingpower/microphoto/FloatingWindow.java b/app/src/main/java/com/xypower/mpapp/FloatingWindow.java similarity index 97% rename from app/src/main/java/com/xinyingpower/microphoto/FloatingWindow.java rename to app/src/main/java/com/xypower/mpapp/FloatingWindow.java index 0bb9e56b..7b3c8407 100644 --- a/app/src/main/java/com/xinyingpower/microphoto/FloatingWindow.java +++ b/app/src/main/java/com/xypower/mpapp/FloatingWindow.java @@ -1,19 +1,14 @@ -package com.xinyingpower.microphoto; +package com.xypower.mpapp; import android.app.Service; import android.content.Context; import android.content.Intent; -import android.graphics.PixelFormat; import android.graphics.Rect; -import android.os.Build; import android.os.IBinder; import android.text.Editable; import android.text.TextWatcher; -import android.util.DisplayMetrics; import android.util.Log; -import android.view.Gravity; import android.view.LayoutInflater; -import android.view.MotionEvent; import android.view.View; import android.view.WindowManager; import android.view.inputmethod.InputMethodManager; diff --git a/app/src/main/java/com/xinyingpower/microphoto/LocationUtils.java b/app/src/main/java/com/xypower/mpapp/LocationUtils.java similarity index 99% rename from app/src/main/java/com/xinyingpower/microphoto/LocationUtils.java rename to app/src/main/java/com/xypower/mpapp/LocationUtils.java index fad7265d..d3d20deb 100644 --- a/app/src/main/java/com/xinyingpower/microphoto/LocationUtils.java +++ b/app/src/main/java/com/xypower/mpapp/LocationUtils.java @@ -1,4 +1,4 @@ -package com.xinyingpower.microphoto; +package com.xypower.mpapp; import android.Manifest; import android.content.Context; diff --git a/app/src/main/java/com/xinyingpower/microphoto/MainActivity.java b/app/src/main/java/com/xypower/mpapp/MainActivity.java similarity index 98% rename from app/src/main/java/com/xinyingpower/microphoto/MainActivity.java rename to app/src/main/java/com/xypower/mpapp/MainActivity.java index 9fdb18d7..57ae5e83 100644 --- a/app/src/main/java/com/xinyingpower/microphoto/MainActivity.java +++ b/app/src/main/java/com/xypower/mpapp/MainActivity.java @@ -1,21 +1,17 @@ -package com.xinyingpower.microphoto; +package com.xypower.mpapp; import android.Manifest; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; -import android.graphics.Path; import android.graphics.SurfaceTexture; import android.hardware.Camera; import android.location.Location; import android.location.LocationListener; import android.location.LocationManager; -import android.media.MediaRecorder; import android.os.Build; import android.os.Environment; import android.os.Handler; -import android.os.PowerManager; import android.os.SystemClock; import androidx.appcompat.app.ActionBar; @@ -33,7 +29,7 @@ import android.view.WindowManager; import android.widget.Toast; import com.dowse.camera.client.DSCameraManager; -import com.xinyingpower.microphoto.databinding.ActivityMainBinding; +import com.xypower.mpapp.databinding.ActivityMainBinding; //import com.xinyingpower.microphoto.request.INettyMessageListener; //import com.xinyingpower.microphoto.request.NettyChatClient; @@ -49,9 +45,6 @@ import java.lang.reflect.Method; import java.text.SimpleDateFormat; import java.util.Date; -import android.content.SharedPreferences; - -import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; @@ -687,6 +680,7 @@ public class MainActivity extends AppCompatActivity { } } + public static String getVersionName(Context context) { String verName = ""; try { verName = context.getPackageManager(). diff --git a/app/src/main/java/com/xinyingpower/microphoto/MicroPhotoService.java b/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java similarity index 99% rename from app/src/main/java/com/xinyingpower/microphoto/MicroPhotoService.java rename to app/src/main/java/com/xypower/mpapp/MicroPhotoService.java index 0c3dc7ba..00b8dec5 100644 --- a/app/src/main/java/com/xinyingpower/microphoto/MicroPhotoService.java +++ b/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java @@ -1,4 +1,4 @@ -package com.xinyingpower.microphoto; +package com.xypower.mpapp; import android.app.AlarmManager; import android.app.Notification; diff --git a/app/src/main/java/com/xinyingpower/microphoto/PositionManager.java b/app/src/main/java/com/xypower/mpapp/PositionManager.java similarity index 75% rename from app/src/main/java/com/xinyingpower/microphoto/PositionManager.java rename to app/src/main/java/com/xypower/mpapp/PositionManager.java index 3a50dd47..d9a13db9 100644 --- a/app/src/main/java/com/xinyingpower/microphoto/PositionManager.java +++ b/app/src/main/java/com/xypower/mpapp/PositionManager.java @@ -1,11 +1,7 @@ -package com.xinyingpower.microphoto; +package com.xypower.mpapp; import android.content.Context; -import android.location.Location; -import android.location.LocationListener; import android.location.LocationManager; -import android.location.LocationProvider; -import android.os.Bundle; public class PositionManager { private static final String GPS_LOCATION_NAME = android.location.LocationManager.GPS_PROVIDER; diff --git a/app/src/main/java/com/xinyingpower/microphoto/ScreenActionReceiver.java b/app/src/main/java/com/xypower/mpapp/ScreenActionReceiver.java similarity index 98% rename from app/src/main/java/com/xinyingpower/microphoto/ScreenActionReceiver.java rename to app/src/main/java/com/xypower/mpapp/ScreenActionReceiver.java index 7575058c..28c3ace5 100644 --- a/app/src/main/java/com/xinyingpower/microphoto/ScreenActionReceiver.java +++ b/app/src/main/java/com/xypower/mpapp/ScreenActionReceiver.java @@ -1,4 +1,4 @@ -package com.xinyingpower.microphoto; +package com.xypower.mpapp; import android.content.BroadcastReceiver; import android.content.Context; diff --git a/app/src/main/java/com/xinyingpower/microphoto/SmsReceiver.java b/app/src/main/java/com/xypower/mpapp/SmsReceiver.java similarity index 94% rename from app/src/main/java/com/xinyingpower/microphoto/SmsReceiver.java rename to app/src/main/java/com/xypower/mpapp/SmsReceiver.java index 5b6a014d..407ed700 100644 --- a/app/src/main/java/com/xinyingpower/microphoto/SmsReceiver.java +++ b/app/src/main/java/com/xypower/mpapp/SmsReceiver.java @@ -1,14 +1,11 @@ -package com.xinyingpower.microphoto; +package com.xypower.mpapp; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; -import android.content.IntentFilter; -import android.os.Build; import android.os.Bundle; import android.telephony.SmsMessage; import android.util.Log; -import android.widget.Toast; import java.text.SimpleDateFormat; import java.util.Date; diff --git a/app/src/main/java/com/xinyingpower/microphoto/request/ExponentialBackOffRetry.java b/app/src/main/java/com/xypower/mpapp/request/ExponentialBackOffRetry.java similarity index 100% rename from app/src/main/java/com/xinyingpower/microphoto/request/ExponentialBackOffRetry.java rename to app/src/main/java/com/xypower/mpapp/request/ExponentialBackOffRetry.java diff --git a/app/src/main/java/com/xinyingpower/microphoto/request/INettyMessageListener.java b/app/src/main/java/com/xypower/mpapp/request/INettyMessageListener.java similarity index 100% rename from app/src/main/java/com/xinyingpower/microphoto/request/INettyMessageListener.java rename to app/src/main/java/com/xypower/mpapp/request/INettyMessageListener.java diff --git a/app/src/main/java/com/xinyingpower/microphoto/request/NettyChatClient.java b/app/src/main/java/com/xypower/mpapp/request/NettyChatClient.java similarity index 100% rename from app/src/main/java/com/xinyingpower/microphoto/request/NettyChatClient.java rename to app/src/main/java/com/xypower/mpapp/request/NettyChatClient.java diff --git a/app/src/main/java/com/xinyingpower/microphoto/request/ReconnectHandler.java b/app/src/main/java/com/xypower/mpapp/request/ReconnectHandler.java similarity index 100% rename from app/src/main/java/com/xinyingpower/microphoto/request/ReconnectHandler.java rename to app/src/main/java/com/xypower/mpapp/request/ReconnectHandler.java diff --git a/app/src/main/java/com/xinyingpower/microphoto/request/RetryPolicy.java b/app/src/main/java/com/xypower/mpapp/request/RetryPolicy.java similarity index 100% rename from app/src/main/java/com/xinyingpower/microphoto/request/RetryPolicy.java rename to app/src/main/java/com/xypower/mpapp/request/RetryPolicy.java diff --git a/app/src/test/java/com/xinyingpower/microphoto/ExampleUnitTest.java b/app/src/test/java/com/xypower/mpapp/ExampleUnitTest.java similarity index 90% rename from app/src/test/java/com/xinyingpower/microphoto/ExampleUnitTest.java rename to app/src/test/java/com/xypower/mpapp/ExampleUnitTest.java index c47c3e06..61348fbe 100644 --- a/app/src/test/java/com/xinyingpower/microphoto/ExampleUnitTest.java +++ b/app/src/test/java/com/xypower/mpapp/ExampleUnitTest.java @@ -1,4 +1,4 @@ -package com.xinyingpower.microphoto; +package com.xypower.mpapp; import org.junit.Test;