diff --git a/FlycoTabLayoutZ_Lib/build.gradle b/FlycoTabLayoutZ_Lib/build.gradle index 0f43451..d809150 100644 --- a/FlycoTabLayoutZ_Lib/build.gradle +++ b/FlycoTabLayoutZ_Lib/build.gradle @@ -12,9 +12,8 @@ android { versionCode 5 versionName version } + buildTypes { - M50T60Debug {} - M50T60Release {} debug {} release {} } diff --git a/app/build.gradle b/app/build.gradle index eb6a7cf..bc02692 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,11 +12,11 @@ android { compileSdkVersion 29 defaultConfig { - applicationId "com.xxpatx.os" + applicationId "com.vscool.os" minSdkVersion 24 targetSdkVersion 29 - versionCode 1042 - versionName "1.4.2" + versionCode 1 + versionName "1.0.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -26,26 +26,28 @@ android { // 还可以添加 'armeabi', 'armeabi-v7a', 'x86', 'x86_64', 'mips', 'mips64' } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } - } + dataBinding { + enabled true + } - dataBinding { - enabled true - } + lintOptions { + checkReleaseBuilds false + // Or, if you prefer, you can continue to check for errors in release builds, + // but continue the build even when errors are found: + abortOnError false + } - lintOptions { - checkReleaseBuilds false - // Or, if you prefer, you can continue to check for errors in release builds, - // but continue the build even when errors are found: - abortOnError false - } + aaptOptions.cruncherEnabled = false + aaptOptions.useNewCruncher = false - aaptOptions.cruncherEnabled = false - aaptOptions.useNewCruncher = false - - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + manifestPlaceholders = [ + AMAP_KEY: "565d9142787653544ded10f3f58c48f7" + ] } signingConfigs { @@ -57,53 +59,12 @@ android { v1SigningEnabled true v2SigningEnabled true } - - tuixin { - storeFile file("keystore/tuixin.jks") - storePassword "123456" - keyAlias "universal" - keyPassword "123456" - v1SigningEnabled true - v2SigningEnabled true - } - - M50T60 { - storeFile file("keystore/T40Air.jks") - storePassword "123456" - keyAlias "T40Air" - keyPassword "123456" - v1SigningEnabled true - v2SigningEnabled true - } } buildTypes { - M50T60Debug.initWith(debug) - M50T60Debug { - manifestPlaceholders = [ - AMAP_KEY: "aa85f12a2b0060a687c1755e08161875" - ] - buildConfigField "String", "platform", '"M50"' - versionNameSuffix "-debug" - debuggable true - signingConfig signingConfigs.M50T60 - } - - M50T60Release.initWith(release) - M50T60Release { - manifestPlaceholders = [ - AMAP_KEY: "aa85f12a2b0060a687c1755e08161875" - ] - buildConfigField "String", "platform", '"M50"' - signingConfig signingConfigs.M50T60 - } - debug { - manifestPlaceholders = [ - AMAP_KEY: "963a156c0e1b525856d9b1d304666fe9" - ] - buildConfigField "String", "platform", '"MTK01"' - versionNameSuffix "-debug" + buildConfigField "String", "platform", '"NMMTK"' + versionNameSuffix "_debug" //Zipalign优化 zipAlignEnabled true // shrinkResources true @@ -124,10 +85,7 @@ android { } release { - manifestPlaceholders = [ - AMAP_KEY: "963a156c0e1b525856d9b1d304666fe9" - ] - buildConfigField "String", "platform", '"MTK01"' + buildConfigField "String", "platform", '"NMMTK"' //Zipalign优化 zipAlignEnabled true shrinkResources true @@ -149,6 +107,7 @@ android { } } } + } dependencies { diff --git a/app/keystore/T40Air.jks b/app/keystore/T40Air.jks deleted file mode 100644 index 04a061a..0000000 Binary files a/app/keystore/T40Air.jks and /dev/null differ diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index f0cab74..e9a5393 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -185,18 +185,18 @@ -keep class **.bean.** { *; } #----------------------------- 实体类不可混淆 ------------------------------------------ --dontwarn com.xxpatx.os.bean.** --keep class com.xxpatx.os.bean.**{*;} +-dontwarn com.vscool.os.bean.** +-keep class com.vscool.os.bean.**{*;} --keep class com.xxpatx.os.utils.AppUsedTimeUtils { *; } --keep class com.xxpatx.os.utils.AppUsedTimeUtils$AppTimeinfo { *; } --keepclassmembers class com.xxpatx.os.utils.AppUsedTimeUtils.AppTimeinfo { +-keep class com.vscool.os.utils.AppUsedTimeUtils { *; } +-keep class com.vscool.os.utils.AppUsedTimeUtils$AppTimeinfo { *; } +-keepclassmembers class com.vscool.os.utils.AppUsedTimeUtils.AppTimeinfo { ; ; } --keep class com.xxpatx.os.alarm.AlarmClockData { *; } --keepclassmembers class com.xxpatx.os.alarm.AlarmClockData { +-keep class com.vscool.os.alarm.AlarmClockData { *; } +-keepclassmembers class com.vscool.os.alarm.AlarmClockData { ; ; } diff --git a/app/src/androidTest/java/com/xxpatx/os/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/vscool/os/ExampleInstrumentedTest.java similarity index 82% rename from app/src/androidTest/java/com/xxpatx/os/ExampleInstrumentedTest.java rename to app/src/androidTest/java/com/vscool/os/ExampleInstrumentedTest.java index c1bc3cc..5ef4d2a 100644 --- a/app/src/androidTest/java/com/xxpatx/os/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/com/vscool/os/ExampleInstrumentedTest.java @@ -1,14 +1,14 @@ -package com.xxpatx.os; +package com.vscool.os; import android.content.Context; -import androidx.test.platform.app.InstrumentationRegistry; import androidx.test.ext.junit.runners.AndroidJUnit4; +import androidx.test.platform.app.InstrumentationRegistry; import org.junit.Test; import org.junit.runner.RunWith; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; /** * Instrumented test, which will execute on an Android device. @@ -22,6 +22,6 @@ public class ExampleInstrumentedTest { // Context of the app under test. Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); - assertEquals("com.xxpatx.os", appContext.getPackageName()); + assertEquals("com.vscool.os", appContext.getPackageName()); } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 238d9cb..6de01da 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ @@ -393,11 +393,11 @@ + android:value="335298663" /> + android:value="ae1918a4eb5949a69dcea97e0e1036d8" /> diff --git a/app/src/main/java/com/xxpatx/os/activity/APPListActivity.java b/app/src/main/java/com/vscool/os/activity/APPListActivity.java similarity index 91% rename from app/src/main/java/com/xxpatx/os/activity/APPListActivity.java rename to app/src/main/java/com/vscool/os/activity/APPListActivity.java index a040dfb..e95df00 100644 --- a/app/src/main/java/com/xxpatx/os/activity/APPListActivity.java +++ b/app/src/main/java/com/vscool/os/activity/APPListActivity.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.activity; +package com.vscool.os.activity; import android.content.Context; import android.content.pm.ApplicationInfo; @@ -13,14 +13,14 @@ import androidx.databinding.DataBindingUtil; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.xxpatx.os.R; -import com.xxpatx.os.adapter.APPListAdapter; -import com.xxpatx.os.base.BaseDataBindingActivity; -import com.xxpatx.os.bean.AppListInfo; -import com.xxpatx.os.custom.RecyclerViewSpacesItemDecoration; -import com.xxpatx.os.service.NotificationService; -import com.xxpatx.os.utils.ApkUtils; -import com.xxpatx.os.utils.BitmapUtils; +import com.vscool.os.R; +import com.vscool.os.adapter.APPListAdapter; +import com.vscool.os.base.BaseDataBindingActivity; +import com.vscool.os.bean.AppListInfo; +import com.vscool.os.custom.RecyclerViewSpacesItemDecoration; +import com.vscool.os.service.NotificationService; +import com.vscool.os.utils.ApkUtils; +import com.vscool.os.utils.BitmapUtils; import java.util.ArrayList; import java.util.HashMap; diff --git a/app/src/main/java/com/xxpatx/os/activity/FlashlightActivity.java b/app/src/main/java/com/vscool/os/activity/FlashlightActivity.java similarity index 96% rename from app/src/main/java/com/xxpatx/os/activity/FlashlightActivity.java rename to app/src/main/java/com/vscool/os/activity/FlashlightActivity.java index 60ffb08..7591351 100644 --- a/app/src/main/java/com/xxpatx/os/activity/FlashlightActivity.java +++ b/app/src/main/java/com/vscool/os/activity/FlashlightActivity.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.activity; +package com.vscool.os.activity; import android.content.Context; import android.content.pm.PackageManager; @@ -14,9 +14,9 @@ import android.view.View; import androidx.databinding.DataBindingUtil; import com.hjq.toast.Toaster; -import com.xxpatx.os.R; -import com.xxpatx.os.base.BaseDataBindingActivity; -import com.xxpatx.os.databinding.ActivityFlashlightBinding; +import com.vscool.os.R; +import com.vscool.os.base.BaseDataBindingActivity; +import com.vscool.os.databinding.ActivityFlashlightBinding; import com.zackratos.ultimatebarx.ultimatebarx.java.UltimateBarX; public class FlashlightActivity extends BaseDataBindingActivity { diff --git a/app/src/main/java/com/xxpatx/os/activity/ImeiActivity.java b/app/src/main/java/com/vscool/os/activity/ImeiActivity.java similarity index 85% rename from app/src/main/java/com/xxpatx/os/activity/ImeiActivity.java rename to app/src/main/java/com/vscool/os/activity/ImeiActivity.java index 972570b..43459fa 100644 --- a/app/src/main/java/com/xxpatx/os/activity/ImeiActivity.java +++ b/app/src/main/java/com/vscool/os/activity/ImeiActivity.java @@ -1,14 +1,14 @@ -package com.xxpatx.os.activity; +package com.vscool.os.activity; import android.view.Gravity; import android.view.View; import androidx.databinding.DataBindingUtil; -import com.xxpatx.os.R; -import com.xxpatx.os.base.BaseDataBindingActivity; -import com.xxpatx.os.databinding.ActivityImeiBinding; -import com.xxpatx.os.utils.Utils; +import com.vscool.os.R; +import com.vscool.os.base.BaseDataBindingActivity; +import com.vscool.os.databinding.ActivityImeiBinding; +import com.vscool.os.utils.Utils; public class ImeiActivity extends BaseDataBindingActivity { private static final String TAG = "ImeiActivity"; diff --git a/app/src/main/java/com/xxpatx/os/activity/InformationDetailsActivity.java b/app/src/main/java/com/vscool/os/activity/InformationDetailsActivity.java similarity index 79% rename from app/src/main/java/com/xxpatx/os/activity/InformationDetailsActivity.java rename to app/src/main/java/com/vscool/os/activity/InformationDetailsActivity.java index 087bd0a..f85a4dc 100644 --- a/app/src/main/java/com/xxpatx/os/activity/InformationDetailsActivity.java +++ b/app/src/main/java/com/vscool/os/activity/InformationDetailsActivity.java @@ -1,13 +1,13 @@ -package com.xxpatx.os.activity; +package com.vscool.os.activity; import android.content.Intent; import androidx.databinding.DataBindingUtil; -import com.xxpatx.os.R; -import com.xxpatx.os.base.BaseDataBindingActivity; -import com.xxpatx.os.bean.ArticleInfo; -import com.xxpatx.os.databinding.ActivityInfoDetailsBinding; +import com.vscool.os.R; +import com.vscool.os.base.BaseDataBindingActivity; +import com.vscool.os.bean.ArticleInfo; +import com.vscool.os.databinding.ActivityInfoDetailsBinding; public class InformationDetailsActivity extends BaseDataBindingActivity { diff --git a/app/src/main/java/com/xxpatx/os/activity/NetworkActivity.java b/app/src/main/java/com/vscool/os/activity/NetworkActivity.java similarity index 95% rename from app/src/main/java/com/xxpatx/os/activity/NetworkActivity.java rename to app/src/main/java/com/vscool/os/activity/NetworkActivity.java index ebc03e8..a6b23f7 100644 --- a/app/src/main/java/com/xxpatx/os/activity/NetworkActivity.java +++ b/app/src/main/java/com/vscool/os/activity/NetworkActivity.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.activity; +package com.vscool.os.activity; import android.content.Context; import android.telephony.SubscriptionManager; @@ -10,10 +10,10 @@ import androidx.databinding.DataBindingUtil; import com.blankj.utilcode.util.NetworkUtils; import com.hjq.toast.Toaster; -import com.xxpatx.os.R; -import com.xxpatx.os.base.BaseDataBindingActivity; -import com.xxpatx.os.databinding.ActivityNetworkBinding; -import com.xxpatx.os.utils.Utils; +import com.vscool.os.R; +import com.vscool.os.base.BaseDataBindingActivity; +import com.vscool.os.databinding.ActivityNetworkBinding; +import com.vscool.os.utils.Utils; import com.zackratos.ultimatebarx.ultimatebarx.java.UltimateBarX; public class NetworkActivity extends BaseDataBindingActivity implements NetworkUtils.OnNetworkStatusChangedListener { diff --git a/app/src/main/java/com/xxpatx/os/activity/activation/ActivationActivity.java b/app/src/main/java/com/vscool/os/activity/activation/ActivationActivity.java similarity index 82% rename from app/src/main/java/com/xxpatx/os/activity/activation/ActivationActivity.java rename to app/src/main/java/com/vscool/os/activity/activation/ActivationActivity.java index 3d3e347..2c84748 100644 --- a/app/src/main/java/com/xxpatx/os/activity/activation/ActivationActivity.java +++ b/app/src/main/java/com/vscool/os/activity/activation/ActivationActivity.java @@ -1,14 +1,14 @@ -package com.xxpatx.os.activity.activation; +package com.vscool.os.activity.activation; import android.content.Intent; import android.provider.Settings; import android.view.KeyEvent; import android.view.View; -import com.xxpatx.os.R; -import com.xxpatx.os.base.mvvm.BaseMvvmActivity; -import com.xxpatx.os.databinding.ActivityActivationBinding; -import com.xxpatx.os.utils.ApkUtils; +import com.vscool.os.R; +import com.vscool.os.base.mvvm.BaseMvvmActivity; +import com.vscool.os.databinding.ActivityActivationBinding; +import com.vscool.os.utils.ApkUtils; public class ActivationActivity extends BaseMvvmActivity { private static final String TAG = "ActivationActivity"; @@ -55,7 +55,7 @@ public class ActivationActivity extends BaseMvvmActivity { diff --git a/app/src/main/java/com/xxpatx/os/activity/alarm/add/AlarmAddActivity.java b/app/src/main/java/com/vscool/os/activity/alarm/add/AlarmAddActivity.java similarity index 95% rename from app/src/main/java/com/xxpatx/os/activity/alarm/add/AlarmAddActivity.java rename to app/src/main/java/com/vscool/os/activity/alarm/add/AlarmAddActivity.java index d12e121..fff75d8 100644 --- a/app/src/main/java/com/xxpatx/os/activity/alarm/add/AlarmAddActivity.java +++ b/app/src/main/java/com/vscool/os/activity/alarm/add/AlarmAddActivity.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.activity.alarm.add; +package com.vscool.os.activity.alarm.add; import android.content.Intent; import android.content.res.ColorStateList; @@ -19,17 +19,17 @@ import com.luck.picture.lib.basic.PictureSelector; import com.luck.picture.lib.config.SelectMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.interfaces.OnResultCallbackListener; -import com.xxpatx.os.R; -import com.xxpatx.os.alarm.AlarmClockData; -import com.xxpatx.os.alarm.AlarmUtils; -import com.xxpatx.os.base.mvvm.BaseMvvmActivity; -import com.xxpatx.os.custom.GlideEngine; -import com.xxpatx.os.databinding.ActivityAlarmAddBinding; -import com.xxpatx.os.service.main.MainService; -import com.xxpatx.os.utils.FFmpegUtils; -import com.xxpatx.os.utils.FileUtil; -import com.xxpatx.os.utils.ScreenUtil; -import com.xxpatx.os.utils.TimeUtils; +import com.vscool.os.R; +import com.vscool.os.alarm.AlarmClockData; +import com.vscool.os.alarm.AlarmUtils; +import com.vscool.os.base.mvvm.BaseMvvmActivity; +import com.vscool.os.custom.GlideEngine; +import com.vscool.os.databinding.ActivityAlarmAddBinding; +import com.vscool.os.service.main.MainService; +import com.vscool.os.utils.FFmpegUtils; +import com.vscool.os.utils.FileUtil; +import com.vscool.os.utils.ScreenUtil; +import com.vscool.os.utils.TimeUtils; import java.io.File; import java.text.SimpleDateFormat; diff --git a/app/src/main/java/com/xxpatx/os/activity/alarm/add/AlarmAddViewModel.java b/app/src/main/java/com/vscool/os/activity/alarm/add/AlarmAddViewModel.java similarity index 67% rename from app/src/main/java/com/xxpatx/os/activity/alarm/add/AlarmAddViewModel.java rename to app/src/main/java/com/vscool/os/activity/alarm/add/AlarmAddViewModel.java index 7a5fefe..ca6d952 100644 --- a/app/src/main/java/com/xxpatx/os/activity/alarm/add/AlarmAddViewModel.java +++ b/app/src/main/java/com/vscool/os/activity/alarm/add/AlarmAddViewModel.java @@ -1,8 +1,8 @@ -package com.xxpatx.os.activity.alarm.add; +package com.vscool.os.activity.alarm.add; import com.trello.rxlifecycle4.android.ActivityEvent; -import com.xxpatx.os.base.mvvm.BaseViewModel; -import com.xxpatx.os.databinding.ActivityAlarmAddBinding; +import com.vscool.os.base.mvvm.BaseViewModel; +import com.vscool.os.databinding.ActivityAlarmAddBinding; public class AlarmAddViewModel extends BaseViewModel { diff --git a/app/src/main/java/com/xxpatx/os/activity/alarm/edit/AlarmEditActivity.java b/app/src/main/java/com/vscool/os/activity/alarm/edit/AlarmEditActivity.java similarity index 96% rename from app/src/main/java/com/xxpatx/os/activity/alarm/edit/AlarmEditActivity.java rename to app/src/main/java/com/vscool/os/activity/alarm/edit/AlarmEditActivity.java index e025fad..b413dbc 100644 --- a/app/src/main/java/com/xxpatx/os/activity/alarm/edit/AlarmEditActivity.java +++ b/app/src/main/java/com/vscool/os/activity/alarm/edit/AlarmEditActivity.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.activity.alarm.edit; +package com.vscool.os.activity.alarm.edit; import android.content.Intent; import android.content.res.ColorStateList; @@ -22,20 +22,20 @@ import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.interfaces.OnResultCallbackListener; import com.trello.rxlifecycle4.RxLifecycle; import com.trello.rxlifecycle4.android.ActivityEvent; -import com.xxpatx.os.R; -import com.xxpatx.os.alarm.AlarmClockData; -import com.xxpatx.os.alarm.AlarmUtils; -import com.xxpatx.os.base.mvvm.BaseMvvmActivity; -import com.xxpatx.os.bean.BaseResponse; -import com.xxpatx.os.custom.GlideEngine; -import com.xxpatx.os.databinding.ActivityAlarmEditBinding; -import com.xxpatx.os.network.NetInterfaceManager; -import com.xxpatx.os.utils.FFmpegUtils; -import com.xxpatx.os.utils.FileUtil; -import com.xxpatx.os.utils.GlideLoadUtils; -import com.xxpatx.os.utils.ScreenUtil; -import com.xxpatx.os.utils.TimeUtils; -import com.xxpatx.os.utils.Utils; +import com.vscool.os.R; +import com.vscool.os.alarm.AlarmClockData; +import com.vscool.os.alarm.AlarmUtils; +import com.vscool.os.base.mvvm.BaseMvvmActivity; +import com.vscool.os.bean.BaseResponse; +import com.vscool.os.custom.GlideEngine; +import com.vscool.os.databinding.ActivityAlarmEditBinding; +import com.vscool.os.network.NetInterfaceManager; +import com.vscool.os.utils.FFmpegUtils; +import com.vscool.os.utils.FileUtil; +import com.vscool.os.utils.GlideLoadUtils; +import com.vscool.os.utils.ScreenUtil; +import com.vscool.os.utils.TimeUtils; +import com.vscool.os.utils.Utils; import java.io.File; import java.text.SimpleDateFormat; diff --git a/app/src/main/java/com/xxpatx/os/activity/alarm/edit/AlarmEditViewModel.java b/app/src/main/java/com/vscool/os/activity/alarm/edit/AlarmEditViewModel.java similarity index 67% rename from app/src/main/java/com/xxpatx/os/activity/alarm/edit/AlarmEditViewModel.java rename to app/src/main/java/com/vscool/os/activity/alarm/edit/AlarmEditViewModel.java index 57b181b..0cd87dc 100644 --- a/app/src/main/java/com/xxpatx/os/activity/alarm/edit/AlarmEditViewModel.java +++ b/app/src/main/java/com/vscool/os/activity/alarm/edit/AlarmEditViewModel.java @@ -1,8 +1,8 @@ -package com.xxpatx.os.activity.alarm.edit; +package com.vscool.os.activity.alarm.edit; import com.trello.rxlifecycle4.android.ActivityEvent; -import com.xxpatx.os.base.mvvm.BaseViewModel; -import com.xxpatx.os.databinding.ActivityAlarmEditBinding; +import com.vscool.os.base.mvvm.BaseViewModel; +import com.vscool.os.databinding.ActivityAlarmEditBinding; public class AlarmEditViewModel extends BaseViewModel { diff --git a/app/src/main/java/com/xxpatx/os/activity/alarm/list/AlarmListActivity.java b/app/src/main/java/com/vscool/os/activity/alarm/list/AlarmListActivity.java similarity index 94% rename from app/src/main/java/com/xxpatx/os/activity/alarm/list/AlarmListActivity.java rename to app/src/main/java/com/vscool/os/activity/alarm/list/AlarmListActivity.java index ea86dab..ccb8f77 100644 --- a/app/src/main/java/com/xxpatx/os/activity/alarm/list/AlarmListActivity.java +++ b/app/src/main/java/com/vscool/os/activity/alarm/list/AlarmListActivity.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.activity.alarm.list; +package com.vscool.os.activity.alarm.list; import android.content.BroadcastReceiver; import android.content.Context; @@ -16,18 +16,18 @@ import com.hjq.toast.Toaster; import com.tencent.mmkv.MMKV; import com.trello.rxlifecycle4.RxLifecycle; import com.trello.rxlifecycle4.android.ActivityEvent; -import com.xxpatx.os.R; -import com.xxpatx.os.activity.alarm.add.AlarmAddActivity; -import com.xxpatx.os.alarm.AlarmAdapter; -import com.xxpatx.os.alarm.AlarmClockData; -import com.xxpatx.os.alarm.AlarmUtils; -import com.xxpatx.os.base.mvvm.BaseMvvmActivity; -import com.xxpatx.os.bean.BaseResponse; -import com.xxpatx.os.config.CommonConfig; -import com.xxpatx.os.databinding.ActivityAlarmListBinding; -import com.xxpatx.os.dialog.DeleteDialog; -import com.xxpatx.os.network.NetInterfaceManager; -import com.xxpatx.os.push.PushManager; +import com.vscool.os.R; +import com.vscool.os.activity.alarm.add.AlarmAddActivity; +import com.vscool.os.alarm.AlarmAdapter; +import com.vscool.os.alarm.AlarmClockData; +import com.vscool.os.alarm.AlarmUtils; +import com.vscool.os.base.mvvm.BaseMvvmActivity; +import com.vscool.os.bean.BaseResponse; +import com.vscool.os.config.CommonConfig; +import com.vscool.os.databinding.ActivityAlarmListBinding; +import com.vscool.os.dialog.DeleteDialog; +import com.vscool.os.network.NetInterfaceManager; +import com.vscool.os.push.PushManager; import java.util.List; diff --git a/app/src/main/java/com/xxpatx/os/activity/alarm/list/AlarmListViewModel.java b/app/src/main/java/com/vscool/os/activity/alarm/list/AlarmListViewModel.java similarity index 90% rename from app/src/main/java/com/xxpatx/os/activity/alarm/list/AlarmListViewModel.java rename to app/src/main/java/com/vscool/os/activity/alarm/list/AlarmListViewModel.java index 7b63cb3..f643f46 100644 --- a/app/src/main/java/com/xxpatx/os/activity/alarm/list/AlarmListViewModel.java +++ b/app/src/main/java/com/vscool/os/activity/alarm/list/AlarmListViewModel.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.activity.alarm.list; +package com.vscool.os.activity.alarm.list; import android.util.Log; @@ -6,11 +6,11 @@ import androidx.lifecycle.MutableLiveData; import com.hjq.toast.Toaster; import com.trello.rxlifecycle4.android.ActivityEvent; -import com.xxpatx.os.alarm.AlarmClockData; -import com.xxpatx.os.base.mvvm.BaseViewModel; -import com.xxpatx.os.bean.BaseResponse; -import com.xxpatx.os.databinding.ActivityAlarmListBinding; -import com.xxpatx.os.network.NetInterfaceManager; +import com.vscool.os.alarm.AlarmClockData; +import com.vscool.os.base.mvvm.BaseViewModel; +import com.vscool.os.bean.BaseResponse; +import com.vscool.os.databinding.ActivityAlarmListBinding; +import com.vscool.os.network.NetInterfaceManager; import java.util.List; diff --git a/app/src/main/java/com/xxpatx/os/activity/callwechat/CallWechatActivity.java b/app/src/main/java/com/vscool/os/activity/callwechat/CallWechatActivity.java similarity index 92% rename from app/src/main/java/com/xxpatx/os/activity/callwechat/CallWechatActivity.java rename to app/src/main/java/com/vscool/os/activity/callwechat/CallWechatActivity.java index 1220afa..368b393 100644 --- a/app/src/main/java/com/xxpatx/os/activity/callwechat/CallWechatActivity.java +++ b/app/src/main/java/com/vscool/os/activity/callwechat/CallWechatActivity.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.activity.callwechat; +package com.vscool.os.activity.callwechat; import android.content.Intent; import android.net.Uri; @@ -9,12 +9,12 @@ import android.view.View; import android.widget.Toast; import com.hjq.toast.Toaster; -import com.xxpatx.os.R; -import com.xxpatx.os.base.mvvm.BaseMvvmActivity; -import com.xxpatx.os.bean.Contact; -import com.xxpatx.os.databinding.ActivityWechatCallBinding; -import com.xxpatx.os.service.WeAccessibilityService; -import com.xxpatx.os.utils.AccessibilityUtils; +import com.vscool.os.R; +import com.vscool.os.base.mvvm.BaseMvvmActivity; +import com.vscool.os.bean.Contact; +import com.vscool.os.databinding.ActivityWechatCallBinding; +import com.vscool.os.service.WeAccessibilityService; +import com.vscool.os.utils.AccessibilityUtils; public class CallWechatActivity extends BaseMvvmActivity { diff --git a/app/src/main/java/com/xxpatx/os/activity/callwechat/CallWechatViewModel.java b/app/src/main/java/com/vscool/os/activity/callwechat/CallWechatViewModel.java similarity index 67% rename from app/src/main/java/com/xxpatx/os/activity/callwechat/CallWechatViewModel.java rename to app/src/main/java/com/vscool/os/activity/callwechat/CallWechatViewModel.java index b19d5ef..6465df5 100644 --- a/app/src/main/java/com/xxpatx/os/activity/callwechat/CallWechatViewModel.java +++ b/app/src/main/java/com/vscool/os/activity/callwechat/CallWechatViewModel.java @@ -1,8 +1,8 @@ -package com.xxpatx.os.activity.callwechat; +package com.vscool.os.activity.callwechat; import com.trello.rxlifecycle4.android.ActivityEvent; -import com.xxpatx.os.base.mvvm.BaseViewModel; -import com.xxpatx.os.databinding.ActivityWechatCallBinding; +import com.vscool.os.base.mvvm.BaseViewModel; +import com.vscool.os.databinding.ActivityWechatCallBinding; public class CallWechatViewModel extends BaseViewModel { diff --git a/app/src/main/java/com/xxpatx/os/activity/contact/AddContactActivity.java b/app/src/main/java/com/vscool/os/activity/contact/AddContactActivity.java similarity index 96% rename from app/src/main/java/com/xxpatx/os/activity/contact/AddContactActivity.java rename to app/src/main/java/com/vscool/os/activity/contact/AddContactActivity.java index 585c5ad..1a3f089 100644 --- a/app/src/main/java/com/xxpatx/os/activity/contact/AddContactActivity.java +++ b/app/src/main/java/com/vscool/os/activity/contact/AddContactActivity.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.activity.contact; +package com.vscool.os.activity.contact; import android.content.ContentResolver; import android.content.ContentUris; @@ -25,18 +25,18 @@ import com.luck.picture.lib.config.SelectMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.interfaces.OnResultCallbackListener; import com.tencent.mmkv.MMKV; +import com.vscool.os.BuildConfig; +import com.vscool.os.R; +import com.vscool.os.base.mvvm.BaseMvvmActivity; +import com.vscool.os.bean.Contact; +import com.vscool.os.config.CommonConfig; +import com.vscool.os.custom.GlideEngine; +import com.vscool.os.databinding.ActivityAddContactBinding; +import com.vscool.os.db.ContactCacheUtils; +import com.vscool.os.utils.ContactsUtils; +import com.vscool.os.utils.LocalContactUtils; +import com.vscool.os.utils.ScreenUtil; import com.xiasuhuei321.loadingdialog.view.LoadingDialog; -import com.xxpatx.os.BuildConfig; -import com.xxpatx.os.R; -import com.xxpatx.os.base.mvvm.BaseMvvmActivity; -import com.xxpatx.os.bean.Contact; -import com.xxpatx.os.config.CommonConfig; -import com.xxpatx.os.custom.GlideEngine; -import com.xxpatx.os.databinding.ActivityAddContactBinding; -import com.xxpatx.os.db.ContactCacheUtils; -import com.xxpatx.os.utils.ContactsUtils; -import com.xxpatx.os.utils.LocalContactUtils; -import com.xxpatx.os.utils.ScreenUtil; import com.zackratos.ultimatebarx.ultimatebarx.UltimateBarXKt; import com.zackratos.ultimatebarx.ultimatebarx.java.UltimateBarX; diff --git a/app/src/main/java/com/xxpatx/os/activity/contact/AddContactViewModel.java b/app/src/main/java/com/vscool/os/activity/contact/AddContactViewModel.java similarity index 93% rename from app/src/main/java/com/xxpatx/os/activity/contact/AddContactViewModel.java rename to app/src/main/java/com/vscool/os/activity/contact/AddContactViewModel.java index 18dd01d..14cfcb9 100644 --- a/app/src/main/java/com/xxpatx/os/activity/contact/AddContactViewModel.java +++ b/app/src/main/java/com/vscool/os/activity/contact/AddContactViewModel.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.activity.contact; +package com.vscool.os.activity.contact; import android.net.Uri; import android.text.TextUtils; @@ -9,14 +9,14 @@ import androidx.lifecycle.MutableLiveData; import com.hjq.toast.Toaster; import com.trello.rxlifecycle4.RxLifecycle; import com.trello.rxlifecycle4.android.ActivityEvent; -import com.xxpatx.os.R; -import com.xxpatx.os.base.mvvm.BaseViewModel; -import com.xxpatx.os.bean.BaseResponse; -import com.xxpatx.os.bean.Contact; -import com.xxpatx.os.databinding.ActivityAddContactBinding; -import com.xxpatx.os.network.NetInterfaceManager; -import com.xxpatx.os.utils.FileUtil; -import com.xxpatx.os.utils.Utils; +import com.vscool.os.R; +import com.vscool.os.base.mvvm.BaseViewModel; +import com.vscool.os.bean.BaseResponse; +import com.vscool.os.bean.Contact; +import com.vscool.os.databinding.ActivityAddContactBinding; +import com.vscool.os.network.NetInterfaceManager; +import com.vscool.os.utils.FileUtil; +import com.vscool.os.utils.Utils; import java.io.File; import java.util.HashMap; diff --git a/app/src/main/java/com/xxpatx/os/activity/contact/ContactListActivity.java b/app/src/main/java/com/vscool/os/activity/contact/ContactListActivity.java similarity index 94% rename from app/src/main/java/com/xxpatx/os/activity/contact/ContactListActivity.java rename to app/src/main/java/com/vscool/os/activity/contact/ContactListActivity.java index c84c963..358f00c 100644 --- a/app/src/main/java/com/xxpatx/os/activity/contact/ContactListActivity.java +++ b/app/src/main/java/com/vscool/os/activity/contact/ContactListActivity.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.activity.contact; +package com.vscool.os.activity.contact; import android.content.ContentResolver; import android.content.Intent; @@ -14,15 +14,15 @@ import androidx.recyclerview.widget.LinearLayoutManager; import com.hjq.toast.Toaster; import com.tencent.mmkv.MMKV; -import com.xxpatx.os.R; -import com.xxpatx.os.adapter.ContactAdapter; -import com.xxpatx.os.adapter.WechatContactAdapter; -import com.xxpatx.os.base.mvvm.BaseMvvmActivity; -import com.xxpatx.os.bean.BaseResponse; -import com.xxpatx.os.bean.Contact; -import com.xxpatx.os.config.CommonConfig; -import com.xxpatx.os.databinding.ActivityContactListBinding; -import com.xxpatx.os.dialog.EditContactDialog; +import com.vscool.os.R; +import com.vscool.os.adapter.ContactAdapter; +import com.vscool.os.adapter.WechatContactAdapter; +import com.vscool.os.base.mvvm.BaseMvvmActivity; +import com.vscool.os.bean.BaseResponse; +import com.vscool.os.bean.Contact; +import com.vscool.os.config.CommonConfig; +import com.vscool.os.databinding.ActivityContactListBinding; +import com.vscool.os.dialog.EditContactDialog; import com.zackratos.ultimatebarx.ultimatebarx.java.UltimateBarX; import java.util.ArrayList; diff --git a/app/src/main/java/com/xxpatx/os/activity/contact/ContactListViewModel.java b/app/src/main/java/com/vscool/os/activity/contact/ContactListViewModel.java similarity index 92% rename from app/src/main/java/com/xxpatx/os/activity/contact/ContactListViewModel.java rename to app/src/main/java/com/vscool/os/activity/contact/ContactListViewModel.java index 5099847..129d1b4 100644 --- a/app/src/main/java/com/xxpatx/os/activity/contact/ContactListViewModel.java +++ b/app/src/main/java/com/vscool/os/activity/contact/ContactListViewModel.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.activity.contact; +package com.vscool.os.activity.contact; import android.text.TextUtils; import android.util.Log; @@ -10,14 +10,14 @@ import com.google.gson.reflect.TypeToken; import com.tencent.mmkv.MMKV; import com.trello.rxlifecycle4.RxLifecycle; import com.trello.rxlifecycle4.android.ActivityEvent; -import com.xxpatx.os.base.mvvm.BaseViewModel; -import com.xxpatx.os.bean.BaseResponse; -import com.xxpatx.os.bean.Contact; -import com.xxpatx.os.config.CommonConfig; -import com.xxpatx.os.databinding.ActivityContactListBinding; -import com.xxpatx.os.gson.GsonUtils; -import com.xxpatx.os.network.NetInterfaceManager; -import com.xxpatx.os.network.UrlAddress; +import com.vscool.os.base.mvvm.BaseViewModel; +import com.vscool.os.bean.BaseResponse; +import com.vscool.os.bean.Contact; +import com.vscool.os.config.CommonConfig; +import com.vscool.os.databinding.ActivityContactListBinding; +import com.vscool.os.gson.GsonUtils; +import com.vscool.os.network.NetInterfaceManager; +import com.vscool.os.network.UrlAddress; import java.lang.reflect.Type; import java.util.ArrayList; diff --git a/app/src/main/java/com/xxpatx/os/activity/contact/EditContactActivity.java b/app/src/main/java/com/vscool/os/activity/contact/EditContactActivity.java similarity index 94% rename from app/src/main/java/com/xxpatx/os/activity/contact/EditContactActivity.java rename to app/src/main/java/com/vscool/os/activity/contact/EditContactActivity.java index 127483a..faddde3 100644 --- a/app/src/main/java/com/xxpatx/os/activity/contact/EditContactActivity.java +++ b/app/src/main/java/com/vscool/os/activity/contact/EditContactActivity.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.activity.contact; +package com.vscool.os.activity.contact; import android.content.Intent; import android.graphics.Bitmap; @@ -21,16 +21,16 @@ import com.luck.picture.lib.basic.PictureSelector; import com.luck.picture.lib.config.SelectMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.interfaces.OnResultCallbackListener; +import com.vscool.os.R; +import com.vscool.os.base.mvvm.BaseMvvmActivity; +import com.vscool.os.bean.BaseResponse; +import com.vscool.os.bean.Contact; +import com.vscool.os.custom.GlideEngine; +import com.vscool.os.databinding.ActivityEditContactBinding; +import com.vscool.os.utils.FileUtil; +import com.vscool.os.utils.ScreenUtil; +import com.vscool.os.utils.Utils; import com.xiasuhuei321.loadingdialog.view.LoadingDialog; -import com.xxpatx.os.R; -import com.xxpatx.os.base.mvvm.BaseMvvmActivity; -import com.xxpatx.os.bean.BaseResponse; -import com.xxpatx.os.bean.Contact; -import com.xxpatx.os.custom.GlideEngine; -import com.xxpatx.os.databinding.ActivityEditContactBinding; -import com.xxpatx.os.utils.FileUtil; -import com.xxpatx.os.utils.ScreenUtil; -import com.xxpatx.os.utils.Utils; import java.io.File; import java.util.ArrayList; diff --git a/app/src/main/java/com/xxpatx/os/activity/contact/EditContactViewModel.java b/app/src/main/java/com/vscool/os/activity/contact/EditContactViewModel.java similarity index 90% rename from app/src/main/java/com/xxpatx/os/activity/contact/EditContactViewModel.java rename to app/src/main/java/com/vscool/os/activity/contact/EditContactViewModel.java index bac480b..344c634 100644 --- a/app/src/main/java/com/xxpatx/os/activity/contact/EditContactViewModel.java +++ b/app/src/main/java/com/vscool/os/activity/contact/EditContactViewModel.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.activity.contact; +package com.vscool.os.activity.contact; import android.util.Log; @@ -6,10 +6,10 @@ import androidx.lifecycle.MutableLiveData; import com.trello.rxlifecycle4.RxLifecycle; import com.trello.rxlifecycle4.android.ActivityEvent; -import com.xxpatx.os.base.mvvm.BaseViewModel; -import com.xxpatx.os.bean.BaseResponse; -import com.xxpatx.os.databinding.ActivityEditContactBinding; -import com.xxpatx.os.network.NetInterfaceManager; +import com.vscool.os.base.mvvm.BaseViewModel; +import com.vscool.os.bean.BaseResponse; +import com.vscool.os.databinding.ActivityEditContactBinding; +import com.vscool.os.network.NetInterfaceManager; import java.util.Map; diff --git a/app/src/main/java/com/xxpatx/os/activity/control/ControlActivity.java b/app/src/main/java/com/vscool/os/activity/control/ControlActivity.java similarity index 99% rename from app/src/main/java/com/xxpatx/os/activity/control/ControlActivity.java rename to app/src/main/java/com/vscool/os/activity/control/ControlActivity.java index 3f318b0..41eb058 100644 --- a/app/src/main/java/com/xxpatx/os/activity/control/ControlActivity.java +++ b/app/src/main/java/com/vscool/os/activity/control/ControlActivity.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.activity.control; +package com.vscool.os.activity.control; import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothDevice; @@ -25,12 +25,12 @@ import android.widget.SeekBar; import com.hjq.toast.Toaster; import com.tencent.mmkv.MMKV; -import com.xxpatx.os.R; -import com.xxpatx.os.base.mvvm.BaseMvvmActivity; -import com.xxpatx.os.config.CommonConfig; -import com.xxpatx.os.databinding.ActivityControlBinding; -import com.xxpatx.os.manager.AmapManager; -import com.xxpatx.os.utils.BrightnessUtils; +import com.vscool.os.R; +import com.vscool.os.base.mvvm.BaseMvvmActivity; +import com.vscool.os.config.CommonConfig; +import com.vscool.os.databinding.ActivityControlBinding; +import com.vscool.os.manager.AmapManager; +import com.vscool.os.utils.BrightnessUtils; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/app/src/main/java/com/xxpatx/os/activity/control/ControlViewModel.java b/app/src/main/java/com/vscool/os/activity/control/ControlViewModel.java similarity index 67% rename from app/src/main/java/com/xxpatx/os/activity/control/ControlViewModel.java rename to app/src/main/java/com/vscool/os/activity/control/ControlViewModel.java index 558df84..63360f8 100644 --- a/app/src/main/java/com/xxpatx/os/activity/control/ControlViewModel.java +++ b/app/src/main/java/com/vscool/os/activity/control/ControlViewModel.java @@ -1,8 +1,8 @@ -package com.xxpatx.os.activity.control; +package com.vscool.os.activity.control; import com.trello.rxlifecycle4.android.ActivityEvent; -import com.xxpatx.os.base.mvvm.BaseViewModel; -import com.xxpatx.os.databinding.ActivityControlBinding; +import com.vscool.os.base.mvvm.BaseViewModel; +import com.vscool.os.databinding.ActivityControlBinding; public class ControlViewModel extends BaseViewModel { diff --git a/app/src/main/java/com/xxpatx/os/activity/dailyapp/DailyAppActivity.java b/app/src/main/java/com/vscool/os/activity/dailyapp/DailyAppActivity.java similarity index 86% rename from app/src/main/java/com/xxpatx/os/activity/dailyapp/DailyAppActivity.java rename to app/src/main/java/com/vscool/os/activity/dailyapp/DailyAppActivity.java index 1fd9313..0246f7c 100644 --- a/app/src/main/java/com/xxpatx/os/activity/dailyapp/DailyAppActivity.java +++ b/app/src/main/java/com/vscool/os/activity/dailyapp/DailyAppActivity.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.activity.dailyapp; +package com.vscool.os.activity.dailyapp; import android.content.res.Configuration; import android.view.View; @@ -6,13 +6,13 @@ import android.view.View; import androidx.lifecycle.Observer; import androidx.recyclerview.widget.GridLayoutManager; -import com.xxpatx.os.R; -import com.xxpatx.os.adapter.DailyAppAdapter; -import com.xxpatx.os.base.mvvm.BaseMvvmActivity; -import com.xxpatx.os.bean.DailyAppBean; -import com.xxpatx.os.databinding.ActivityDailyappBinding; -import com.xxpatx.os.service.NotificationService; -import com.xxpatx.os.view.GridSpaceItemDecoration; +import com.vscool.os.R; +import com.vscool.os.adapter.DailyAppAdapter; +import com.vscool.os.base.mvvm.BaseMvvmActivity; +import com.vscool.os.bean.DailyAppBean; +import com.vscool.os.databinding.ActivityDailyappBinding; +import com.vscool.os.service.NotificationService; +import com.vscool.os.view.GridSpaceItemDecoration; import java.util.List; diff --git a/app/src/main/java/com/xxpatx/os/activity/dailyapp/DailyAppViewModel.java b/app/src/main/java/com/vscool/os/activity/dailyapp/DailyAppViewModel.java similarity index 73% rename from app/src/main/java/com/xxpatx/os/activity/dailyapp/DailyAppViewModel.java rename to app/src/main/java/com/vscool/os/activity/dailyapp/DailyAppViewModel.java index 6c256a2..8d01110 100644 --- a/app/src/main/java/com/xxpatx/os/activity/dailyapp/DailyAppViewModel.java +++ b/app/src/main/java/com/vscool/os/activity/dailyapp/DailyAppViewModel.java @@ -1,12 +1,12 @@ -package com.xxpatx.os.activity.dailyapp; +package com.vscool.os.activity.dailyapp; import androidx.lifecycle.MutableLiveData; import com.trello.rxlifecycle4.android.ActivityEvent; -import com.xxpatx.os.base.mvvm.BaseViewModel; -import com.xxpatx.os.bean.DailyAppBean; -import com.xxpatx.os.databinding.ActivityDailyappBinding; -import com.xxpatx.os.manager.AppStatusManager; +import com.vscool.os.base.mvvm.BaseViewModel; +import com.vscool.os.bean.DailyAppBean; +import com.vscool.os.databinding.ActivityDailyappBinding; +import com.vscool.os.manager.AppStatusManager; import java.util.List; diff --git a/app/src/main/java/com/xxpatx/os/activity/dock/DockActivity.java b/app/src/main/java/com/vscool/os/activity/dock/DockActivity.java similarity index 90% rename from app/src/main/java/com/xxpatx/os/activity/dock/DockActivity.java rename to app/src/main/java/com/vscool/os/activity/dock/DockActivity.java index 22b4470..13f325b 100644 --- a/app/src/main/java/com/xxpatx/os/activity/dock/DockActivity.java +++ b/app/src/main/java/com/vscool/os/activity/dock/DockActivity.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.activity.dock; +package com.vscool.os.activity.dock; import android.text.TextUtils; import android.util.Log; @@ -10,13 +10,13 @@ import androidx.recyclerview.widget.GridLayoutManager; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.tencent.mmkv.MMKV; -import com.xxpatx.os.R; -import com.xxpatx.os.adapter.DockAppSelectedAdapter; -import com.xxpatx.os.base.mvvm.BaseMvvmActivity; -import com.xxpatx.os.bean.DockApp; -import com.xxpatx.os.config.CommonConfig; -import com.xxpatx.os.databinding.ActivityDockBinding; -import com.xxpatx.os.view.GridSpaceItemDecoration; +import com.vscool.os.R; +import com.vscool.os.adapter.DockAppSelectedAdapter; +import com.vscool.os.base.mvvm.BaseMvvmActivity; +import com.vscool.os.bean.DockApp; +import com.vscool.os.config.CommonConfig; +import com.vscool.os.databinding.ActivityDockBinding; +import com.vscool.os.view.GridSpaceItemDecoration; import java.lang.reflect.Type; import java.util.ArrayList; diff --git a/app/src/main/java/com/xxpatx/os/activity/dock/DockViewModel.java b/app/src/main/java/com/vscool/os/activity/dock/DockViewModel.java similarity index 90% rename from app/src/main/java/com/xxpatx/os/activity/dock/DockViewModel.java rename to app/src/main/java/com/vscool/os/activity/dock/DockViewModel.java index 480843b..87b8fdc 100644 --- a/app/src/main/java/com/xxpatx/os/activity/dock/DockViewModel.java +++ b/app/src/main/java/com/vscool/os/activity/dock/DockViewModel.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.activity.dock; +package com.vscool.os.activity.dock; import android.content.Intent; import android.content.pm.PackageManager; @@ -7,10 +7,10 @@ import android.util.Log; import androidx.lifecycle.MutableLiveData; -import com.xxpatx.os.base.mvvm.BaseViewModel; -import com.xxpatx.os.bean.DockApp; -import com.xxpatx.os.databinding.ActivityDockBinding; -import com.xxpatx.os.utils.ApkUtils; +import com.vscool.os.base.mvvm.BaseViewModel; +import com.vscool.os.bean.DockApp; +import com.vscool.os.databinding.ActivityDockBinding; +import com.vscool.os.utils.ApkUtils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/xxpatx/os/activity/emergency/EmergencyActivity.java b/app/src/main/java/com/vscool/os/activity/emergency/EmergencyActivity.java similarity index 95% rename from app/src/main/java/com/xxpatx/os/activity/emergency/EmergencyActivity.java rename to app/src/main/java/com/vscool/os/activity/emergency/EmergencyActivity.java index 3c7b6c3..94c7e02 100644 --- a/app/src/main/java/com/xxpatx/os/activity/emergency/EmergencyActivity.java +++ b/app/src/main/java/com/vscool/os/activity/emergency/EmergencyActivity.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.activity.emergency; +package com.vscool.os.activity.emergency; import android.content.Intent; import android.net.Uri; @@ -11,15 +11,15 @@ import com.hjq.toast.Toaster; import com.tencent.mmkv.MMKV; import com.trello.rxlifecycle4.RxLifecycle; import com.trello.rxlifecycle4.android.ActivityEvent; -import com.xxpatx.os.R; -import com.xxpatx.os.adapter.EmergencyContactAdapter; -import com.xxpatx.os.base.mvvm.BaseMvvmActivity; -import com.xxpatx.os.bean.BaseResponse; -import com.xxpatx.os.bean.Contact; -import com.xxpatx.os.config.CommonConfig; -import com.xxpatx.os.databinding.ActivityEmergencyBinding; -import com.xxpatx.os.manager.AmapManager; -import com.xxpatx.os.network.NetInterfaceManager; +import com.vscool.os.R; +import com.vscool.os.adapter.EmergencyContactAdapter; +import com.vscool.os.base.mvvm.BaseMvvmActivity; +import com.vscool.os.bean.BaseResponse; +import com.vscool.os.bean.Contact; +import com.vscool.os.config.CommonConfig; +import com.vscool.os.databinding.ActivityEmergencyBinding; +import com.vscool.os.manager.AmapManager; +import com.vscool.os.network.NetInterfaceManager; import java.util.List; import java.util.concurrent.TimeUnit; @@ -62,7 +62,7 @@ public class EmergencyActivity extends BaseMvvmActivity { diff --git a/app/src/main/java/com/xxpatx/os/activity/phone/PhoneActivity.java b/app/src/main/java/com/vscool/os/activity/phone/PhoneActivity.java similarity index 90% rename from app/src/main/java/com/xxpatx/os/activity/phone/PhoneActivity.java rename to app/src/main/java/com/vscool/os/activity/phone/PhoneActivity.java index 30cccca..6ed6e90 100644 --- a/app/src/main/java/com/xxpatx/os/activity/phone/PhoneActivity.java +++ b/app/src/main/java/com/vscool/os/activity/phone/PhoneActivity.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.activity.phone; +package com.vscool.os.activity.phone; import android.content.ContentValues; import android.database.Cursor; @@ -9,13 +9,13 @@ import android.view.View; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; -import com.xxpatx.os.R; -import com.xxpatx.os.base.mvvm.BaseMvvmActivity; -import com.xxpatx.os.databinding.ActivityPhoneBinding; -import com.xxpatx.os.fragment.phone.contact.ContactFragment; -import com.xxpatx.os.fragment.phone.dialer.DialerFragment; -import com.xxpatx.os.fragment.phone.record.RecordFragment; -import com.xxpatx.os.view.CustomPagerAdapter; +import com.vscool.os.R; +import com.vscool.os.base.mvvm.BaseMvvmActivity; +import com.vscool.os.databinding.ActivityPhoneBinding; +import com.vscool.os.fragment.phone.contact.ContactFragment; +import com.vscool.os.fragment.phone.dialer.DialerFragment; +import com.vscool.os.fragment.phone.record.RecordFragment; +import com.vscool.os.view.CustomPagerAdapter; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/xxpatx/os/activity/phone/PhoneViewModel.java b/app/src/main/java/com/vscool/os/activity/phone/PhoneViewModel.java similarity index 67% rename from app/src/main/java/com/xxpatx/os/activity/phone/PhoneViewModel.java rename to app/src/main/java/com/vscool/os/activity/phone/PhoneViewModel.java index d75a3dc..0e6cc51 100644 --- a/app/src/main/java/com/xxpatx/os/activity/phone/PhoneViewModel.java +++ b/app/src/main/java/com/vscool/os/activity/phone/PhoneViewModel.java @@ -1,8 +1,8 @@ -package com.xxpatx.os.activity.phone; +package com.vscool.os.activity.phone; import com.trello.rxlifecycle4.android.ActivityEvent; -import com.xxpatx.os.base.mvvm.BaseViewModel; -import com.xxpatx.os.databinding.ActivityPhoneBinding; +import com.vscool.os.base.mvvm.BaseViewModel; +import com.vscool.os.databinding.ActivityPhoneBinding; public class PhoneViewModel extends BaseViewModel { @Override diff --git a/app/src/main/java/com/xxpatx/os/activity/quickapp/QuickAppActivity.java b/app/src/main/java/com/vscool/os/activity/quickapp/QuickAppActivity.java similarity index 88% rename from app/src/main/java/com/xxpatx/os/activity/quickapp/QuickAppActivity.java rename to app/src/main/java/com/vscool/os/activity/quickapp/QuickAppActivity.java index b671364..d6f97ac 100644 --- a/app/src/main/java/com/xxpatx/os/activity/quickapp/QuickAppActivity.java +++ b/app/src/main/java/com/vscool/os/activity/quickapp/QuickAppActivity.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.activity.quickapp; +package com.vscool.os.activity.quickapp; import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; @@ -7,13 +7,13 @@ import android.content.res.Configuration; import androidx.recyclerview.widget.GridLayoutManager; -import com.xxpatx.os.BuildConfig; -import com.xxpatx.os.R; -import com.xxpatx.os.adapter.AppSelectedAdapter; -import com.xxpatx.os.base.mvvm.BaseMvvmActivity; -import com.xxpatx.os.bean.AppSelectBean; -import com.xxpatx.os.databinding.ActivityQuickAppBinding; -import com.xxpatx.os.view.GridSpaceItemDecoration; +import com.vscool.os.BuildConfig; +import com.vscool.os.R; +import com.vscool.os.adapter.AppSelectedAdapter; +import com.vscool.os.base.mvvm.BaseMvvmActivity; +import com.vscool.os.bean.AppSelectBean; +import com.vscool.os.databinding.ActivityQuickAppBinding; +import com.vscool.os.view.GridSpaceItemDecoration; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/xxpatx/os/activity/quickapp/QuickAppViewModel.java b/app/src/main/java/com/vscool/os/activity/quickapp/QuickAppViewModel.java similarity index 67% rename from app/src/main/java/com/xxpatx/os/activity/quickapp/QuickAppViewModel.java rename to app/src/main/java/com/vscool/os/activity/quickapp/QuickAppViewModel.java index 23990e3..5dc5ba6 100644 --- a/app/src/main/java/com/xxpatx/os/activity/quickapp/QuickAppViewModel.java +++ b/app/src/main/java/com/vscool/os/activity/quickapp/QuickAppViewModel.java @@ -1,8 +1,8 @@ -package com.xxpatx.os.activity.quickapp; +package com.vscool.os.activity.quickapp; import com.trello.rxlifecycle4.android.ActivityEvent; -import com.xxpatx.os.base.mvvm.BaseViewModel; -import com.xxpatx.os.databinding.ActivityQuickAppBinding; +import com.vscool.os.base.mvvm.BaseViewModel; +import com.vscool.os.databinding.ActivityQuickAppBinding; public class QuickAppViewModel extends BaseViewModel { diff --git a/app/src/main/java/com/xxpatx/os/activity/screenlock/ScreenLockActivity.java b/app/src/main/java/com/vscool/os/activity/screenlock/ScreenLockActivity.java similarity index 96% rename from app/src/main/java/com/xxpatx/os/activity/screenlock/ScreenLockActivity.java rename to app/src/main/java/com/vscool/os/activity/screenlock/ScreenLockActivity.java index e2aeedf..352dd1d 100644 --- a/app/src/main/java/com/xxpatx/os/activity/screenlock/ScreenLockActivity.java +++ b/app/src/main/java/com/vscool/os/activity/screenlock/ScreenLockActivity.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.activity.screenlock; +package com.vscool.os.activity.screenlock; import android.content.Context; import android.media.AudioAttributes; @@ -15,10 +15,10 @@ import android.view.inputmethod.InputMethodManager; import androidx.annotation.Nullable; import com.tuo.customview.VerificationCodeView; -import com.xxpatx.os.R; -import com.xxpatx.os.base.mvvm.BaseMvvmActivity; -import com.xxpatx.os.config.CommonConfig; -import com.xxpatx.os.databinding.ActivityScreenLockBinding; +import com.vscool.os.R; +import com.vscool.os.base.mvvm.BaseMvvmActivity; +import com.vscool.os.config.CommonConfig; +import com.vscool.os.databinding.ActivityScreenLockBinding; public class ScreenLockActivity extends BaseMvvmActivity { private static final String TAG = "ScreenLockActivity"; diff --git a/app/src/main/java/com/xxpatx/os/activity/screenlock/ScreenLockViewModel.java b/app/src/main/java/com/vscool/os/activity/screenlock/ScreenLockViewModel.java similarity index 67% rename from app/src/main/java/com/xxpatx/os/activity/screenlock/ScreenLockViewModel.java rename to app/src/main/java/com/vscool/os/activity/screenlock/ScreenLockViewModel.java index 859dfb1..12d76ca 100644 --- a/app/src/main/java/com/xxpatx/os/activity/screenlock/ScreenLockViewModel.java +++ b/app/src/main/java/com/vscool/os/activity/screenlock/ScreenLockViewModel.java @@ -1,8 +1,8 @@ -package com.xxpatx.os.activity.screenlock; +package com.vscool.os.activity.screenlock; import com.trello.rxlifecycle4.android.ActivityEvent; -import com.xxpatx.os.base.mvvm.BaseViewModel; -import com.xxpatx.os.databinding.ActivityScreenLockBinding; +import com.vscool.os.base.mvvm.BaseViewModel; +import com.vscool.os.databinding.ActivityScreenLockBinding; public class ScreenLockViewModel extends BaseViewModel { diff --git a/app/src/main/java/com/xxpatx/os/activity/selectnumber/SelectNumberActivity.java b/app/src/main/java/com/vscool/os/activity/selectnumber/SelectNumberActivity.java similarity index 94% rename from app/src/main/java/com/xxpatx/os/activity/selectnumber/SelectNumberActivity.java rename to app/src/main/java/com/vscool/os/activity/selectnumber/SelectNumberActivity.java index 37bc548..4006b06 100644 --- a/app/src/main/java/com/xxpatx/os/activity/selectnumber/SelectNumberActivity.java +++ b/app/src/main/java/com/vscool/os/activity/selectnumber/SelectNumberActivity.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.activity.selectnumber; +package com.vscool.os.activity.selectnumber; import android.content.Context; import android.content.Intent; @@ -16,12 +16,12 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import com.tencent.mmkv.MMKV; -import com.xxpatx.os.R; -import com.xxpatx.os.adapter.PhoneAdapter; -import com.xxpatx.os.base.mvvm.BaseMvvmActivity; -import com.xxpatx.os.config.CommonConfig; -import com.xxpatx.os.databinding.ActivitySelectNumberBinding; -import com.xxpatx.os.utils.MobileNetworkUtils; +import com.vscool.os.R; +import com.vscool.os.adapter.PhoneAdapter; +import com.vscool.os.base.mvvm.BaseMvvmActivity; +import com.vscool.os.config.CommonConfig; +import com.vscool.os.databinding.ActivitySelectNumberBinding; +import com.vscool.os.utils.MobileNetworkUtils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/xxpatx/os/activity/selectnumber/SelectNumberViewModel.java b/app/src/main/java/com/vscool/os/activity/selectnumber/SelectNumberViewModel.java similarity index 67% rename from app/src/main/java/com/xxpatx/os/activity/selectnumber/SelectNumberViewModel.java rename to app/src/main/java/com/vscool/os/activity/selectnumber/SelectNumberViewModel.java index b41a28c..b939e53 100644 --- a/app/src/main/java/com/xxpatx/os/activity/selectnumber/SelectNumberViewModel.java +++ b/app/src/main/java/com/vscool/os/activity/selectnumber/SelectNumberViewModel.java @@ -1,8 +1,8 @@ -package com.xxpatx.os.activity.selectnumber; +package com.vscool.os.activity.selectnumber; import com.trello.rxlifecycle4.android.ActivityEvent; -import com.xxpatx.os.base.mvvm.BaseViewModel; -import com.xxpatx.os.databinding.ActivitySelectNumberBinding; +import com.vscool.os.base.mvvm.BaseViewModel; +import com.vscool.os.databinding.ActivitySelectNumberBinding; public class SelectNumberViewModel extends BaseViewModel { diff --git a/app/src/main/java/com/xxpatx/os/activity/service/ServiceActivity.java b/app/src/main/java/com/vscool/os/activity/service/ServiceActivity.java similarity index 84% rename from app/src/main/java/com/xxpatx/os/activity/service/ServiceActivity.java rename to app/src/main/java/com/vscool/os/activity/service/ServiceActivity.java index b43caf3..b3eeea7 100644 --- a/app/src/main/java/com/xxpatx/os/activity/service/ServiceActivity.java +++ b/app/src/main/java/com/vscool/os/activity/service/ServiceActivity.java @@ -1,12 +1,11 @@ -package com.xxpatx.os.activity.service; +package com.vscool.os.activity.service; import android.view.Gravity; import android.view.View; -import com.xxpatx.os.R; -import com.xxpatx.os.base.mvvm.BaseMvvmActivity; -import com.xxpatx.os.databinding.ActivityServiceBinding; -import com.xxpatx.os.fragment.settings.SettingsFragment; +import com.vscool.os.R; +import com.vscool.os.base.mvvm.BaseMvvmActivity; +import com.vscool.os.databinding.ActivityServiceBinding; public class ServiceActivity extends BaseMvvmActivity { @Override diff --git a/app/src/main/java/com/xxpatx/os/activity/service/ServiceModelView.java b/app/src/main/java/com/vscool/os/activity/service/ServiceModelView.java similarity index 67% rename from app/src/main/java/com/xxpatx/os/activity/service/ServiceModelView.java rename to app/src/main/java/com/vscool/os/activity/service/ServiceModelView.java index 4fb818c..81276ef 100644 --- a/app/src/main/java/com/xxpatx/os/activity/service/ServiceModelView.java +++ b/app/src/main/java/com/vscool/os/activity/service/ServiceModelView.java @@ -1,8 +1,8 @@ -package com.xxpatx.os.activity.service; +package com.vscool.os.activity.service; import com.trello.rxlifecycle4.android.ActivityEvent; -import com.xxpatx.os.base.mvvm.BaseViewModel; -import com.xxpatx.os.databinding.ActivityServiceBinding; +import com.vscool.os.base.mvvm.BaseViewModel; +import com.vscool.os.databinding.ActivityServiceBinding; public class ServiceModelView extends BaseViewModel { diff --git a/app/src/main/java/com/xxpatx/os/activity/setting/SettingActivity.java b/app/src/main/java/com/vscool/os/activity/setting/SettingActivity.java similarity index 95% rename from app/src/main/java/com/xxpatx/os/activity/setting/SettingActivity.java rename to app/src/main/java/com/vscool/os/activity/setting/SettingActivity.java index 50a313a..58de006 100644 --- a/app/src/main/java/com/xxpatx/os/activity/setting/SettingActivity.java +++ b/app/src/main/java/com/vscool/os/activity/setting/SettingActivity.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.activity.setting; +package com.vscool.os.activity.setting; import android.Manifest; import android.app.AppOpsManager; @@ -19,21 +19,21 @@ import androidx.lifecycle.Observer; import com.hjq.toast.Toaster; import com.tencent.mmkv.MMKV; -import com.xxpatx.os.BuildConfig; -import com.xxpatx.os.R; -import com.xxpatx.os.activity.dock.DockActivity; -import com.xxpatx.os.activity.sim.SimCardActivity; -import com.xxpatx.os.activity.tts.TtsActivity; -import com.xxpatx.os.activity.update.UpdateActivity; -import com.xxpatx.os.base.mvvm.BaseMvvmActivity; -import com.xxpatx.os.bean.AppInfo; -import com.xxpatx.os.bean.SystemSettings; -import com.xxpatx.os.config.CommonConfig; -import com.xxpatx.os.databinding.ActivitySettingBinding; -import com.xxpatx.os.service.WeAccessibilityService; -import com.xxpatx.os.service.main.MainService; -import com.xxpatx.os.utils.AccessibilityUtils; -import com.xxpatx.os.utils.ApkUtils; +import com.vscool.os.BuildConfig; +import com.vscool.os.R; +import com.vscool.os.activity.dock.DockActivity; +import com.vscool.os.activity.sim.SimCardActivity; +import com.vscool.os.activity.tts.TtsActivity; +import com.vscool.os.activity.update.UpdateActivity; +import com.vscool.os.base.mvvm.BaseMvvmActivity; +import com.vscool.os.bean.AppInfo; +import com.vscool.os.bean.SystemSettings; +import com.vscool.os.config.CommonConfig; +import com.vscool.os.databinding.ActivitySettingBinding; +import com.vscool.os.service.WeAccessibilityService; +import com.vscool.os.service.main.MainService; +import com.vscool.os.utils.AccessibilityUtils; +import com.vscool.os.utils.ApkUtils; import java.lang.reflect.Field; import java.lang.reflect.Method; diff --git a/app/src/main/java/com/xxpatx/os/activity/setting/SettingViewModel.java b/app/src/main/java/com/vscool/os/activity/setting/SettingViewModel.java similarity index 91% rename from app/src/main/java/com/xxpatx/os/activity/setting/SettingViewModel.java rename to app/src/main/java/com/vscool/os/activity/setting/SettingViewModel.java index f658620..360c73b 100644 --- a/app/src/main/java/com/xxpatx/os/activity/setting/SettingViewModel.java +++ b/app/src/main/java/com/vscool/os/activity/setting/SettingViewModel.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.activity.setting; +package com.vscool.os.activity.setting; import android.util.Log; @@ -6,12 +6,12 @@ import androidx.lifecycle.MutableLiveData; import com.trello.rxlifecycle4.RxLifecycle; import com.trello.rxlifecycle4.android.ActivityEvent; -import com.xxpatx.os.base.mvvm.BaseViewModel; -import com.xxpatx.os.bean.AppInfo; -import com.xxpatx.os.bean.BaseResponse; -import com.xxpatx.os.bean.SystemSettings; -import com.xxpatx.os.databinding.ActivitySettingBinding; -import com.xxpatx.os.network.NetInterfaceManager; +import com.vscool.os.base.mvvm.BaseViewModel; +import com.vscool.os.bean.AppInfo; +import com.vscool.os.bean.BaseResponse; +import com.vscool.os.bean.SystemSettings; +import com.vscool.os.databinding.ActivitySettingBinding; +import com.vscool.os.network.NetInterfaceManager; import io.reactivex.rxjava3.annotations.NonNull; import io.reactivex.rxjava3.core.Observer; diff --git a/app/src/main/java/com/xxpatx/os/activity/setting/SettingsActivity.java b/app/src/main/java/com/vscool/os/activity/setting/SettingsActivity.java similarity index 91% rename from app/src/main/java/com/xxpatx/os/activity/setting/SettingsActivity.java rename to app/src/main/java/com/vscool/os/activity/setting/SettingsActivity.java index 743e909..35632b5 100644 --- a/app/src/main/java/com/xxpatx/os/activity/setting/SettingsActivity.java +++ b/app/src/main/java/com/vscool/os/activity/setting/SettingsActivity.java @@ -1,12 +1,12 @@ -package com.xxpatx.os.activity.setting; +package com.vscool.os.activity.setting; import android.os.Bundle; import androidx.appcompat.app.ActionBar; import androidx.preference.PreferenceFragmentCompat; -import com.xxpatx.os.R; -import com.xxpatx.os.base.mvvm.BaseMvvmActivity; +import com.vscool.os.R; +import com.vscool.os.base.mvvm.BaseMvvmActivity; public class SettingsActivity extends BaseMvvmActivity { diff --git a/app/src/main/java/com/xxpatx/os/activity/setting/TouchActivity.java b/app/src/main/java/com/vscool/os/activity/setting/TouchActivity.java similarity index 92% rename from app/src/main/java/com/xxpatx/os/activity/setting/TouchActivity.java rename to app/src/main/java/com/vscool/os/activity/setting/TouchActivity.java index ce0fb03..17d29df 100644 --- a/app/src/main/java/com/xxpatx/os/activity/setting/TouchActivity.java +++ b/app/src/main/java/com/vscool/os/activity/setting/TouchActivity.java @@ -1,13 +1,13 @@ -package com.xxpatx.os.activity.setting; +package com.vscool.os.activity.setting; import android.util.Log; import android.view.View; import com.tencent.mmkv.MMKV; -import com.xxpatx.os.R; -import com.xxpatx.os.base.mvvm.BaseMvvmActivity; -import com.xxpatx.os.config.CommonConfig; -import com.xxpatx.os.databinding.ActivityTouchBinding; +import com.vscool.os.R; +import com.vscool.os.base.mvvm.BaseMvvmActivity; +import com.vscool.os.config.CommonConfig; +import com.vscool.os.databinding.ActivityTouchBinding; public class TouchActivity extends BaseMvvmActivity { private static final String TAG = "TouchActivity"; diff --git a/app/src/main/java/com/xxpatx/os/activity/setting/TouchViewModel.java b/app/src/main/java/com/vscool/os/activity/setting/TouchViewModel.java similarity index 67% rename from app/src/main/java/com/xxpatx/os/activity/setting/TouchViewModel.java rename to app/src/main/java/com/vscool/os/activity/setting/TouchViewModel.java index fa2584f..e143895 100644 --- a/app/src/main/java/com/xxpatx/os/activity/setting/TouchViewModel.java +++ b/app/src/main/java/com/vscool/os/activity/setting/TouchViewModel.java @@ -1,8 +1,8 @@ -package com.xxpatx.os.activity.setting; +package com.vscool.os.activity.setting; import com.trello.rxlifecycle4.android.ActivityEvent; -import com.xxpatx.os.base.mvvm.BaseViewModel; -import com.xxpatx.os.databinding.ActivityTouchBinding; +import com.vscool.os.base.mvvm.BaseViewModel; +import com.vscool.os.databinding.ActivityTouchBinding; public class TouchViewModel extends BaseViewModel { diff --git a/app/src/main/java/com/xxpatx/os/activity/sim/SimCardActivity.java b/app/src/main/java/com/vscool/os/activity/sim/SimCardActivity.java similarity index 92% rename from app/src/main/java/com/xxpatx/os/activity/sim/SimCardActivity.java rename to app/src/main/java/com/vscool/os/activity/sim/SimCardActivity.java index 3f1bc4a..fcc4704 100644 --- a/app/src/main/java/com/xxpatx/os/activity/sim/SimCardActivity.java +++ b/app/src/main/java/com/vscool/os/activity/sim/SimCardActivity.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.activity.sim; +package com.vscool.os.activity.sim; import android.content.Context; import android.telecom.TelecomManager; @@ -11,11 +11,11 @@ import android.view.View; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.xxpatx.os.BuildConfig; -import com.xxpatx.os.R; -import com.xxpatx.os.adapter.PhoneSetAdapter; -import com.xxpatx.os.base.mvvm.BaseMvvmActivity; -import com.xxpatx.os.databinding.ActivitySimCardBinding; +import com.vscool.os.BuildConfig; +import com.vscool.os.R; +import com.vscool.os.adapter.PhoneSetAdapter; +import com.vscool.os.base.mvvm.BaseMvvmActivity; +import com.vscool.os.databinding.ActivitySimCardBinding; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/xxpatx/os/activity/sim/SimCardViewModel.java b/app/src/main/java/com/vscool/os/activity/sim/SimCardViewModel.java similarity index 68% rename from app/src/main/java/com/xxpatx/os/activity/sim/SimCardViewModel.java rename to app/src/main/java/com/vscool/os/activity/sim/SimCardViewModel.java index ab85502..02fa9f7 100644 --- a/app/src/main/java/com/xxpatx/os/activity/sim/SimCardViewModel.java +++ b/app/src/main/java/com/vscool/os/activity/sim/SimCardViewModel.java @@ -1,8 +1,8 @@ -package com.xxpatx.os.activity.sim; +package com.vscool.os.activity.sim; import com.trello.rxlifecycle4.android.ActivityEvent; -import com.xxpatx.os.base.mvvm.BaseViewModel; -import com.xxpatx.os.databinding.ActivitySimCardBinding; +import com.vscool.os.base.mvvm.BaseViewModel; +import com.vscool.os.databinding.ActivitySimCardBinding; public class SimCardViewModel extends BaseViewModel { diff --git a/app/src/main/java/com/xxpatx/os/activity/tts/TtsActivity.java b/app/src/main/java/com/vscool/os/activity/tts/TtsActivity.java similarity index 94% rename from app/src/main/java/com/xxpatx/os/activity/tts/TtsActivity.java rename to app/src/main/java/com/vscool/os/activity/tts/TtsActivity.java index 21ca0b3..2f9fd4c 100644 --- a/app/src/main/java/com/xxpatx/os/activity/tts/TtsActivity.java +++ b/app/src/main/java/com/vscool/os/activity/tts/TtsActivity.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.activity.tts; +package com.vscool.os.activity.tts; import android.content.Intent; import android.speech.tts.TextToSpeech; @@ -7,9 +7,9 @@ import android.util.Log; import android.view.View; import com.hjq.toast.Toaster; -import com.xxpatx.os.R; -import com.xxpatx.os.base.mvvm.BaseMvvmActivity; -import com.xxpatx.os.databinding.ActivityTtsBinding; +import com.vscool.os.R; +import com.vscool.os.base.mvvm.BaseMvvmActivity; +import com.vscool.os.databinding.ActivityTtsBinding; import java.util.Locale; diff --git a/app/src/main/java/com/xxpatx/os/activity/tts/TtsViewModel.java b/app/src/main/java/com/vscool/os/activity/tts/TtsViewModel.java similarity index 68% rename from app/src/main/java/com/xxpatx/os/activity/tts/TtsViewModel.java rename to app/src/main/java/com/vscool/os/activity/tts/TtsViewModel.java index 7d49772..7d80732 100644 --- a/app/src/main/java/com/xxpatx/os/activity/tts/TtsViewModel.java +++ b/app/src/main/java/com/vscool/os/activity/tts/TtsViewModel.java @@ -1,8 +1,8 @@ -package com.xxpatx.os.activity.tts; +package com.vscool.os.activity.tts; import com.trello.rxlifecycle4.android.ActivityEvent; -import com.xxpatx.os.base.mvvm.BaseViewModel; -import com.xxpatx.os.databinding.ActivityTtsBinding; +import com.vscool.os.base.mvvm.BaseViewModel; +import com.vscool.os.databinding.ActivityTtsBinding; public class TtsViewModel extends BaseViewModel { diff --git a/app/src/main/java/com/xxpatx/os/activity/update/UpdateActivity.java b/app/src/main/java/com/vscool/os/activity/update/UpdateActivity.java similarity index 89% rename from app/src/main/java/com/xxpatx/os/activity/update/UpdateActivity.java rename to app/src/main/java/com/vscool/os/activity/update/UpdateActivity.java index 8d8f70b..6712adc 100644 --- a/app/src/main/java/com/xxpatx/os/activity/update/UpdateActivity.java +++ b/app/src/main/java/com/vscool/os/activity/update/UpdateActivity.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.activity.update; +package com.vscool.os.activity.update; import android.content.Intent; import android.view.View; @@ -6,12 +6,12 @@ import android.view.View; import com.arialyy.aria.core.Aria; import com.arialyy.aria.core.download.DownloadEntity; import com.hjq.toast.Toaster; -import com.xxpatx.os.R; -import com.xxpatx.os.base.mvvm.BaseMvvmActivity; -import com.xxpatx.os.bean.AppInfo; -import com.xxpatx.os.databinding.ActivityUpdateBinding; -import com.xxpatx.os.service.main.MainService; -import com.xxpatx.os.utils.ApkUtils; +import com.vscool.os.R; +import com.vscool.os.base.mvvm.BaseMvvmActivity; +import com.vscool.os.bean.AppInfo; +import com.vscool.os.databinding.ActivityUpdateBinding; +import com.vscool.os.service.main.MainService; +import com.vscool.os.utils.ApkUtils; import static com.arialyy.aria.core.inf.IEntity.STATE_RUNNING; diff --git a/app/src/main/java/com/xxpatx/os/activity/update/UpdateViewModel.java b/app/src/main/java/com/vscool/os/activity/update/UpdateViewModel.java similarity index 67% rename from app/src/main/java/com/xxpatx/os/activity/update/UpdateViewModel.java rename to app/src/main/java/com/vscool/os/activity/update/UpdateViewModel.java index e7960c9..f0f2d09 100644 --- a/app/src/main/java/com/xxpatx/os/activity/update/UpdateViewModel.java +++ b/app/src/main/java/com/vscool/os/activity/update/UpdateViewModel.java @@ -1,8 +1,8 @@ -package com.xxpatx.os.activity.update; +package com.vscool.os.activity.update; import com.trello.rxlifecycle4.android.ActivityEvent; -import com.xxpatx.os.base.mvvm.BaseViewModel; -import com.xxpatx.os.databinding.ActivityUpdateBinding; +import com.vscool.os.base.mvvm.BaseViewModel; +import com.vscool.os.databinding.ActivityUpdateBinding; public class UpdateViewModel extends BaseViewModel { diff --git a/app/src/main/java/com/xxpatx/os/activity/weather/WeatherActivity.java b/app/src/main/java/com/vscool/os/activity/weather/WeatherActivity.java similarity index 94% rename from app/src/main/java/com/xxpatx/os/activity/weather/WeatherActivity.java rename to app/src/main/java/com/vscool/os/activity/weather/WeatherActivity.java index 967b90c..b0bfba1 100644 --- a/app/src/main/java/com/xxpatx/os/activity/weather/WeatherActivity.java +++ b/app/src/main/java/com/vscool/os/activity/weather/WeatherActivity.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.activity.weather; +package com.vscool.os.activity.weather; import android.app.Activity; import android.content.Context; @@ -26,19 +26,19 @@ import com.qweather.sdk.bean.base.Code; import com.qweather.sdk.bean.weather.WeatherDailyBean; import com.qweather.sdk.bean.weather.WeatherNowBean; import com.tencent.mmkv.MMKV; -import com.xxpatx.os.R; -import com.xxpatx.os.activity.location.LocationAcivity; -import com.xxpatx.os.adapter.WeatherDayApdapterPort; -import com.xxpatx.os.base.mvvm.BaseMvvmActivity; -import com.xxpatx.os.bean.JsonBean; -import com.xxpatx.os.bean.QweatherLocation; -import com.xxpatx.os.config.CommonConfig; -import com.xxpatx.os.databinding.ActivityWeatherBinding; -import com.xxpatx.os.manager.AmapManager; -import com.xxpatx.os.utils.DataUtil; -import com.xxpatx.os.utils.DayUtils; -import com.xxpatx.os.view.FadeInOutAnimator; -import com.xxpatx.os.view.HorizontalItemDecoration; +import com.vscool.os.R; +import com.vscool.os.activity.location.LocationAcivity; +import com.vscool.os.adapter.WeatherDayApdapterPort; +import com.vscool.os.base.mvvm.BaseMvvmActivity; +import com.vscool.os.bean.JsonBean; +import com.vscool.os.bean.QweatherLocation; +import com.vscool.os.config.CommonConfig; +import com.vscool.os.databinding.ActivityWeatherBinding; +import com.vscool.os.manager.AmapManager; +import com.vscool.os.utils.DataUtil; +import com.vscool.os.utils.DayUtils; +import com.vscool.os.view.FadeInOutAnimator; +import com.vscool.os.view.HorizontalItemDecoration; import java.util.ArrayList; import java.util.Date; diff --git a/app/src/main/java/com/xxpatx/os/activity/weather/WeatherViewModel.java b/app/src/main/java/com/vscool/os/activity/weather/WeatherViewModel.java similarity index 94% rename from app/src/main/java/com/xxpatx/os/activity/weather/WeatherViewModel.java rename to app/src/main/java/com/vscool/os/activity/weather/WeatherViewModel.java index 94ecbf7..af7c3ef 100644 --- a/app/src/main/java/com/xxpatx/os/activity/weather/WeatherViewModel.java +++ b/app/src/main/java/com/vscool/os/activity/weather/WeatherViewModel.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.activity.weather; +package com.vscool.os.activity.weather; import android.util.Log; @@ -16,16 +16,16 @@ import com.qweather.sdk.view.QWeather; import com.tencent.mmkv.MMKV; import com.trello.rxlifecycle4.RxLifecycle; import com.trello.rxlifecycle4.android.ActivityEvent; -import com.xxpatx.os.base.mvvm.BaseViewModel; -import com.xxpatx.os.bean.MapGeoResult; -import com.xxpatx.os.bean.QweatherLocation; -import com.xxpatx.os.bean.QweatherLookup; -import com.xxpatx.os.config.CommonConfig; -import com.xxpatx.os.databinding.ActivityWeatherBinding; -import com.xxpatx.os.manager.AmapManager; -import com.xxpatx.os.network.NetInterfaceManager; -import com.xxpatx.os.utils.ActivationUtil; -import com.xxpatx.os.utils.WiFiUtils; +import com.vscool.os.base.mvvm.BaseViewModel; +import com.vscool.os.bean.MapGeoResult; +import com.vscool.os.bean.QweatherLocation; +import com.vscool.os.bean.QweatherLookup; +import com.vscool.os.config.CommonConfig; +import com.vscool.os.databinding.ActivityWeatherBinding; +import com.vscool.os.manager.AmapManager; +import com.vscool.os.network.NetInterfaceManager; +import com.vscool.os.utils.ActivationUtil; +import com.vscool.os.utils.WiFiUtils; import java.lang.reflect.Type; import java.util.List; diff --git a/app/src/main/java/com/xxpatx/os/adapter/APPListAdapter.java b/app/src/main/java/com/vscool/os/adapter/APPListAdapter.java similarity index 93% rename from app/src/main/java/com/xxpatx/os/adapter/APPListAdapter.java rename to app/src/main/java/com/vscool/os/adapter/APPListAdapter.java index ea8173a..f1acda2 100644 --- a/app/src/main/java/com/xxpatx/os/adapter/APPListAdapter.java +++ b/app/src/main/java/com/vscool/os/adapter/APPListAdapter.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.adapter; +package com.vscool.os.adapter; import android.content.Context; import android.view.LayoutInflater; @@ -11,11 +11,10 @@ import androidx.annotation.NonNull; import androidx.constraintlayout.widget.ConstraintLayout; import androidx.recyclerview.widget.RecyclerView; - -import com.xxpatx.os.R; -import com.xxpatx.os.bean.AppListInfo; -import com.xxpatx.os.service.NotificationService; -import com.xxpatx.os.utils.ApkUtils; +import com.vscool.os.R; +import com.vscool.os.bean.AppListInfo; +import com.vscool.os.service.NotificationService; +import com.vscool.os.utils.ApkUtils; import java.util.List; diff --git a/app/src/main/java/com/xxpatx/os/adapter/AlarmClockAdapter.java b/app/src/main/java/com/vscool/os/adapter/AlarmClockAdapter.java similarity index 94% rename from app/src/main/java/com/xxpatx/os/adapter/AlarmClockAdapter.java rename to app/src/main/java/com/vscool/os/adapter/AlarmClockAdapter.java index 839d9c9..aa8ac0b 100644 --- a/app/src/main/java/com/xxpatx/os/adapter/AlarmClockAdapter.java +++ b/app/src/main/java/com/vscool/os/adapter/AlarmClockAdapter.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.adapter; +package com.vscool.os.adapter; import android.view.LayoutInflater; import android.view.View; @@ -8,8 +8,8 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; -import com.xxpatx.os.R; -import com.xxpatx.os.bean.AlarmItem; +import com.vscool.os.R; +import com.vscool.os.bean.AlarmItem; import java.util.List; diff --git a/app/src/main/java/com/xxpatx/os/adapter/AppSelectedAdapter.java b/app/src/main/java/com/vscool/os/adapter/AppSelectedAdapter.java similarity index 96% rename from app/src/main/java/com/xxpatx/os/adapter/AppSelectedAdapter.java rename to app/src/main/java/com/vscool/os/adapter/AppSelectedAdapter.java index 8d72889..3381670 100644 --- a/app/src/main/java/com/xxpatx/os/adapter/AppSelectedAdapter.java +++ b/app/src/main/java/com/vscool/os/adapter/AppSelectedAdapter.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.adapter; +package com.vscool.os.adapter; import android.content.Context; import android.util.Log; @@ -14,10 +14,10 @@ import androidx.recyclerview.widget.RecyclerView; import com.hjq.toast.Toaster; import com.tencent.mmkv.MMKV; -import com.xxpatx.os.R; -import com.xxpatx.os.activity.quickapp.QuickAppActivity; -import com.xxpatx.os.bean.AppSelectBean; -import com.xxpatx.os.config.CommonConfig; +import com.vscool.os.R; +import com.vscool.os.activity.quickapp.QuickAppActivity; +import com.vscool.os.bean.AppSelectBean; +import com.vscool.os.config.CommonConfig; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/xxpatx/os/adapter/CallRecordAdapter.java b/app/src/main/java/com/vscool/os/adapter/CallRecordAdapter.java similarity index 95% rename from app/src/main/java/com/xxpatx/os/adapter/CallRecordAdapter.java rename to app/src/main/java/com/vscool/os/adapter/CallRecordAdapter.java index ca09fd6..b307044 100644 --- a/app/src/main/java/com/xxpatx/os/adapter/CallRecordAdapter.java +++ b/app/src/main/java/com/vscool/os/adapter/CallRecordAdapter.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.adapter; +package com.vscool.os.adapter; import android.content.Context; import android.content.Intent; @@ -16,13 +16,13 @@ import androidx.constraintlayout.widget.ConstraintLayout; import androidx.recyclerview.widget.RecyclerView; import com.shehuan.niv.NiceImageView; -import com.xxpatx.os.R; -import com.xxpatx.os.activity.selectnumber.SelectNumberActivity; -import com.xxpatx.os.bean.Contact; -import com.xxpatx.os.bean.RecordsInfo; -import com.xxpatx.os.dialog.CallPhoneDialog; -import com.xxpatx.os.utils.GlideLoadUtils; -import com.xxpatx.os.utils.Utils; +import com.vscool.os.R; +import com.vscool.os.activity.selectnumber.SelectNumberActivity; +import com.vscool.os.bean.Contact; +import com.vscool.os.bean.RecordsInfo; +import com.vscool.os.dialog.CallPhoneDialog; +import com.vscool.os.utils.GlideLoadUtils; +import com.vscool.os.utils.Utils; import java.text.SimpleDateFormat; import java.util.Date; diff --git a/app/src/main/java/com/xxpatx/os/adapter/CityAdapter.java b/app/src/main/java/com/vscool/os/adapter/CityAdapter.java similarity index 95% rename from app/src/main/java/com/xxpatx/os/adapter/CityAdapter.java rename to app/src/main/java/com/vscool/os/adapter/CityAdapter.java index cce4bd5..9529515 100644 --- a/app/src/main/java/com/xxpatx/os/adapter/CityAdapter.java +++ b/app/src/main/java/com/vscool/os/adapter/CityAdapter.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.adapter; +package com.vscool.os.adapter; import android.content.Context; import android.view.LayoutInflater; @@ -10,8 +10,8 @@ import androidx.annotation.NonNull; import androidx.constraintlayout.widget.ConstraintLayout; import androidx.recyclerview.widget.RecyclerView; -import com.xxpatx.os.R; -import com.xxpatx.os.bean.AddressBean; +import com.vscool.os.R; +import com.vscool.os.bean.AddressBean; import java.util.List; diff --git a/app/src/main/java/com/xxpatx/os/adapter/ContactAdapter.java b/app/src/main/java/com/vscool/os/adapter/ContactAdapter.java similarity index 96% rename from app/src/main/java/com/xxpatx/os/adapter/ContactAdapter.java rename to app/src/main/java/com/vscool/os/adapter/ContactAdapter.java index 95dc18b..35e0f54 100644 --- a/app/src/main/java/com/xxpatx/os/adapter/ContactAdapter.java +++ b/app/src/main/java/com/vscool/os/adapter/ContactAdapter.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.adapter; +package com.vscool.os.adapter; import android.content.Context; import android.content.Intent; @@ -18,12 +18,12 @@ import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.hjq.toast.Toaster; import com.shehuan.niv.NiceImageView; -import com.xxpatx.os.R; -import com.xxpatx.os.activity.contact.AddContactActivity; -import com.xxpatx.os.activity.selectnumber.SelectNumberActivity; -import com.xxpatx.os.bean.Contact; -import com.xxpatx.os.utils.GlideLoadUtils; -import com.xxpatx.os.utils.Utils; +import com.vscool.os.R; +import com.vscool.os.activity.contact.AddContactActivity; +import com.vscool.os.activity.selectnumber.SelectNumberActivity; +import com.vscool.os.bean.Contact; +import com.vscool.os.utils.GlideLoadUtils; +import com.vscool.os.utils.Utils; import java.util.List; diff --git a/app/src/main/java/com/xxpatx/os/adapter/DailyAppAdapter.java b/app/src/main/java/com/vscool/os/adapter/DailyAppAdapter.java similarity index 90% rename from app/src/main/java/com/xxpatx/os/adapter/DailyAppAdapter.java rename to app/src/main/java/com/vscool/os/adapter/DailyAppAdapter.java index b72cf2f..7587150 100644 --- a/app/src/main/java/com/xxpatx/os/adapter/DailyAppAdapter.java +++ b/app/src/main/java/com/vscool/os/adapter/DailyAppAdapter.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.adapter; +package com.vscool.os.adapter; import android.content.Context; import android.content.Intent; @@ -14,17 +14,17 @@ import androidx.constraintlayout.widget.ConstraintLayout; import androidx.recyclerview.widget.RecyclerView; import com.hjq.toast.Toaster; -import com.xxpatx.os.R; -import com.xxpatx.os.activity.contact.ContactListActivity; -import com.xxpatx.os.activity.service.ServiceActivity; -import com.xxpatx.os.bean.DailyAppBean; -import com.xxpatx.os.config.CommonConfig; -import com.xxpatx.os.dialog.DailyAppDialog; -import com.xxpatx.os.manager.AppManager; -import com.xxpatx.os.manager.AppStatusManager; -import com.xxpatx.os.service.NotificationService; -import com.xxpatx.os.utils.ApkUtils; -import com.xxpatx.os.utils.AppUsedTimeUtils; +import com.vscool.os.R; +import com.vscool.os.activity.contact.ContactListActivity; +import com.vscool.os.activity.service.ServiceActivity; +import com.vscool.os.bean.DailyAppBean; +import com.vscool.os.config.CommonConfig; +import com.vscool.os.dialog.DailyAppDialog; +import com.vscool.os.manager.AppManager; +import com.vscool.os.manager.AppStatusManager; +import com.vscool.os.service.NotificationService; +import com.vscool.os.utils.ApkUtils; +import com.vscool.os.utils.AppUsedTimeUtils; import java.util.List; diff --git a/app/src/main/java/com/xxpatx/os/adapter/DistrictAdapter.java b/app/src/main/java/com/vscool/os/adapter/DistrictAdapter.java similarity index 95% rename from app/src/main/java/com/xxpatx/os/adapter/DistrictAdapter.java rename to app/src/main/java/com/vscool/os/adapter/DistrictAdapter.java index fbcbc21..f2d3870 100644 --- a/app/src/main/java/com/xxpatx/os/adapter/DistrictAdapter.java +++ b/app/src/main/java/com/vscool/os/adapter/DistrictAdapter.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.adapter; +package com.vscool.os.adapter; import android.content.Context; import android.view.LayoutInflater; @@ -10,8 +10,8 @@ import androidx.annotation.NonNull; import androidx.constraintlayout.widget.ConstraintLayout; import androidx.recyclerview.widget.RecyclerView; -import com.xxpatx.os.R; -import com.xxpatx.os.bean.AddressBean; +import com.vscool.os.R; +import com.vscool.os.bean.AddressBean; import java.util.List; diff --git a/app/src/main/java/com/xxpatx/os/adapter/DockAppAdapter.java b/app/src/main/java/com/vscool/os/adapter/DockAppAdapter.java similarity index 93% rename from app/src/main/java/com/xxpatx/os/adapter/DockAppAdapter.java rename to app/src/main/java/com/vscool/os/adapter/DockAppAdapter.java index f38395b..4b6c50d 100644 --- a/app/src/main/java/com/xxpatx/os/adapter/DockAppAdapter.java +++ b/app/src/main/java/com/vscool/os/adapter/DockAppAdapter.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.adapter; +package com.vscool.os.adapter; import android.content.Context; import android.view.LayoutInflater; @@ -11,10 +11,10 @@ import androidx.annotation.NonNull; import androidx.constraintlayout.widget.ConstraintLayout; import androidx.recyclerview.widget.RecyclerView; -import com.xxpatx.os.R; -import com.xxpatx.os.bean.DockApp; -import com.xxpatx.os.service.NotificationService; -import com.xxpatx.os.utils.ApkUtils; +import com.vscool.os.R; +import com.vscool.os.bean.DockApp; +import com.vscool.os.service.NotificationService; +import com.vscool.os.utils.ApkUtils; import java.util.List; diff --git a/app/src/main/java/com/xxpatx/os/adapter/DockAppGridAdapter.java b/app/src/main/java/com/vscool/os/adapter/DockAppGridAdapter.java similarity index 88% rename from app/src/main/java/com/xxpatx/os/adapter/DockAppGridAdapter.java rename to app/src/main/java/com/vscool/os/adapter/DockAppGridAdapter.java index ae7e80f..3f24a43 100644 --- a/app/src/main/java/com/xxpatx/os/adapter/DockAppGridAdapter.java +++ b/app/src/main/java/com/vscool/os/adapter/DockAppGridAdapter.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.adapter; +package com.vscool.os.adapter; import android.content.Context; import android.content.Intent; @@ -14,11 +14,11 @@ import android.widget.TextView; import androidx.constraintlayout.widget.ConstraintLayout; -import com.xxpatx.os.R; -import com.xxpatx.os.activity.phone.PhoneActivity; -import com.xxpatx.os.bean.DockApp; -import com.xxpatx.os.service.NotificationService; -import com.xxpatx.os.utils.ApkUtils; +import com.vscool.os.R; +import com.vscool.os.activity.phone.PhoneActivity; +import com.vscool.os.bean.DockApp; +import com.vscool.os.service.NotificationService; +import com.vscool.os.utils.ApkUtils; import java.util.List; @@ -77,7 +77,13 @@ public class DockAppGridAdapter extends BaseAdapter { holder.iv_icon.setImageDrawable(mContext.getDrawable(R.drawable.home_icon_dialer)); break; case "com.mediatek.camera": - holder.iv_icon.setImageDrawable(mContext.getDrawable(R.drawable.com_android_camera)); + holder.iv_icon.setImageDrawable(mContext.getDrawable(R.drawable.home_icon_camera)); + break; + case "com.ss.android.ugc.aweme": + holder.iv_icon.setImageDrawable(mContext.getDrawable(R.drawable.home_icon_tiktok)); + break; + case "com.tencent.mm": + holder.iv_icon.setImageDrawable(mContext.getDrawable(R.drawable.home_icon_wechat)); break; case "com.android.mms": holder.iv_icon.setImageDrawable(mContext.getDrawable(R.drawable.com_android_mms_ui)); diff --git a/app/src/main/java/com/xxpatx/os/adapter/DockAppSelectedAdapter.java b/app/src/main/java/com/vscool/os/adapter/DockAppSelectedAdapter.java similarity index 95% rename from app/src/main/java/com/xxpatx/os/adapter/DockAppSelectedAdapter.java rename to app/src/main/java/com/vscool/os/adapter/DockAppSelectedAdapter.java index ae55e28..624ecdb 100644 --- a/app/src/main/java/com/xxpatx/os/adapter/DockAppSelectedAdapter.java +++ b/app/src/main/java/com/vscool/os/adapter/DockAppSelectedAdapter.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.adapter; +package com.vscool.os.adapter; import android.content.Context; import android.util.Log; @@ -14,12 +14,12 @@ import androidx.recyclerview.widget.RecyclerView; import com.hjq.toast.Toaster; import com.tencent.mmkv.MMKV; -import com.xxpatx.os.R; -import com.xxpatx.os.activity.dock.DockActivity; -import com.xxpatx.os.bean.DockApp; -import com.xxpatx.os.config.CommonConfig; -import com.xxpatx.os.gson.GsonUtils; -import com.xxpatx.os.utils.ApkUtils; +import com.vscool.os.R; +import com.vscool.os.activity.dock.DockActivity; +import com.vscool.os.bean.DockApp; +import com.vscool.os.config.CommonConfig; +import com.vscool.os.gson.GsonUtils; +import com.vscool.os.utils.ApkUtils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/xxpatx/os/adapter/EmergencyContactAdapter.java b/app/src/main/java/com/vscool/os/adapter/EmergencyContactAdapter.java similarity index 94% rename from app/src/main/java/com/xxpatx/os/adapter/EmergencyContactAdapter.java rename to app/src/main/java/com/vscool/os/adapter/EmergencyContactAdapter.java index 4a1c515..8dab00d 100644 --- a/app/src/main/java/com/xxpatx/os/adapter/EmergencyContactAdapter.java +++ b/app/src/main/java/com/vscool/os/adapter/EmergencyContactAdapter.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.adapter; +package com.vscool.os.adapter; import android.content.Context; import android.content.Intent; @@ -13,9 +13,9 @@ import androidx.constraintlayout.widget.ConstraintLayout; import androidx.recyclerview.widget.RecyclerView; import com.shehuan.niv.NiceImageView; -import com.xxpatx.os.R; -import com.xxpatx.os.bean.Contact; -import com.xxpatx.os.utils.GlideLoadUtils; +import com.vscool.os.R; +import com.vscool.os.bean.Contact; +import com.vscool.os.utils.GlideLoadUtils; import java.util.List; diff --git a/app/src/main/java/com/xxpatx/os/adapter/PhoneAdapter.java b/app/src/main/java/com/vscool/os/adapter/PhoneAdapter.java similarity index 97% rename from app/src/main/java/com/xxpatx/os/adapter/PhoneAdapter.java rename to app/src/main/java/com/vscool/os/adapter/PhoneAdapter.java index fa12a17..02c5cf0 100644 --- a/app/src/main/java/com/xxpatx/os/adapter/PhoneAdapter.java +++ b/app/src/main/java/com/vscool/os/adapter/PhoneAdapter.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.adapter; +package com.vscool.os.adapter; import android.content.Context; import android.content.Intent; @@ -14,8 +14,8 @@ import androidx.annotation.NonNull; import androidx.constraintlayout.widget.ConstraintLayout; import androidx.recyclerview.widget.RecyclerView; -import com.xxpatx.os.R; -import com.xxpatx.os.utils.MobileNumberUtils; +import com.vscool.os.R; +import com.vscool.os.utils.MobileNumberUtils; import java.util.List; diff --git a/app/src/main/java/com/xxpatx/os/adapter/PhoneSetAdapter.java b/app/src/main/java/com/vscool/os/adapter/PhoneSetAdapter.java similarity index 95% rename from app/src/main/java/com/xxpatx/os/adapter/PhoneSetAdapter.java rename to app/src/main/java/com/vscool/os/adapter/PhoneSetAdapter.java index 2fd7873..3816d2e 100644 --- a/app/src/main/java/com/xxpatx/os/adapter/PhoneSetAdapter.java +++ b/app/src/main/java/com/vscool/os/adapter/PhoneSetAdapter.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.adapter; +package com.vscool.os.adapter; import android.content.Context; import android.util.Log; @@ -13,9 +13,9 @@ import androidx.constraintlayout.widget.ConstraintLayout; import androidx.recyclerview.widget.RecyclerView; import com.tencent.mmkv.MMKV; -import com.xxpatx.os.R; -import com.xxpatx.os.config.CommonConfig; -import com.xxpatx.os.utils.MobileNumberUtils; +import com.vscool.os.R; +import com.vscool.os.config.CommonConfig; +import com.vscool.os.utils.MobileNumberUtils; import java.util.List; import java.util.Objects; diff --git a/app/src/main/java/com/xxpatx/os/adapter/SosNnmberAdapter.java b/app/src/main/java/com/vscool/os/adapter/SosNnmberAdapter.java similarity index 90% rename from app/src/main/java/com/xxpatx/os/adapter/SosNnmberAdapter.java rename to app/src/main/java/com/vscool/os/adapter/SosNnmberAdapter.java index ae93b8e..5b5a8d6 100644 --- a/app/src/main/java/com/xxpatx/os/adapter/SosNnmberAdapter.java +++ b/app/src/main/java/com/vscool/os/adapter/SosNnmberAdapter.java @@ -1,7 +1,6 @@ -package com.xxpatx.os.adapter; +package com.vscool.os.adapter; import android.content.Context; -import android.content.Intent; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -11,9 +10,8 @@ import androidx.annotation.NonNull; import androidx.constraintlayout.widget.ConstraintLayout; import androidx.recyclerview.widget.RecyclerView; -import com.xxpatx.os.R; -import com.xxpatx.os.activity.emergency.EmergencyActivity; -import com.xxpatx.os.bean.Contact; +import com.vscool.os.R; +import com.vscool.os.bean.Contact; import java.util.List; diff --git a/app/src/main/java/com/xxpatx/os/adapter/WeatherDayApdapterPort.java b/app/src/main/java/com/vscool/os/adapter/WeatherDayApdapterPort.java similarity index 98% rename from app/src/main/java/com/xxpatx/os/adapter/WeatherDayApdapterPort.java rename to app/src/main/java/com/vscool/os/adapter/WeatherDayApdapterPort.java index 7f7ecd3..64ade67 100644 --- a/app/src/main/java/com/xxpatx/os/adapter/WeatherDayApdapterPort.java +++ b/app/src/main/java/com/vscool/os/adapter/WeatherDayApdapterPort.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.adapter; +package com.vscool.os.adapter; import android.content.Context; import android.graphics.drawable.Drawable; @@ -13,7 +13,7 @@ import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; import com.qweather.sdk.bean.weather.WeatherDailyBean; -import com.xxpatx.os.R; +import com.vscool.os.R; import java.text.ParseException; import java.text.SimpleDateFormat; diff --git a/app/src/main/java/com/xxpatx/os/adapter/WechatContactAdapter.java b/app/src/main/java/com/vscool/os/adapter/WechatContactAdapter.java similarity index 74% rename from app/src/main/java/com/xxpatx/os/adapter/WechatContactAdapter.java rename to app/src/main/java/com/vscool/os/adapter/WechatContactAdapter.java index 2b5fac6..4729f47 100644 --- a/app/src/main/java/com/xxpatx/os/adapter/WechatContactAdapter.java +++ b/app/src/main/java/com/vscool/os/adapter/WechatContactAdapter.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.adapter; +package com.vscool.os.adapter; import android.content.Context; import android.content.Intent; @@ -17,11 +17,11 @@ import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.shehuan.niv.NiceImageView; -import com.xxpatx.os.R; -import com.xxpatx.os.activity.callwechat.CallWechatActivity; -import com.xxpatx.os.activity.contact.AddContactActivity; -import com.xxpatx.os.bean.Contact; -import com.xxpatx.os.utils.AccessibilityUtils; +import com.vscool.os.R; +import com.vscool.os.activity.callwechat.CallWechatActivity; +import com.vscool.os.activity.contact.AddContactActivity; +import com.vscool.os.bean.Contact; +import com.vscool.os.utils.AccessibilityUtils; import java.util.List; @@ -64,28 +64,28 @@ public class WechatContactAdapter extends RecyclerView.Adapter { diff --git a/app/src/main/java/com/xxpatx/os/base/mvp/BaseView.java b/app/src/main/java/com/vscool/os/base/mvp/BaseView.java similarity index 57% rename from app/src/main/java/com/xxpatx/os/base/mvp/BaseView.java rename to app/src/main/java/com/vscool/os/base/mvp/BaseView.java index 43775f5..78bcdb8 100644 --- a/app/src/main/java/com/xxpatx/os/base/mvp/BaseView.java +++ b/app/src/main/java/com/vscool/os/base/mvp/BaseView.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.base.mvp; +package com.vscool.os.base.mvp; @Deprecated public interface BaseView { diff --git a/app/src/main/java/com/xxpatx/os/base/mvvm/BaseMvvmActivity.java b/app/src/main/java/com/vscool/os/base/mvvm/BaseMvvmActivity.java similarity index 95% rename from app/src/main/java/com/xxpatx/os/base/mvvm/BaseMvvmActivity.java rename to app/src/main/java/com/vscool/os/base/mvvm/BaseMvvmActivity.java index ccd7615..e8ff9fc 100644 --- a/app/src/main/java/com/xxpatx/os/base/mvvm/BaseMvvmActivity.java +++ b/app/src/main/java/com/vscool/os/base/mvvm/BaseMvvmActivity.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.base.mvvm; +package com.vscool.os.base.mvvm; import android.os.Bundle; import android.util.Log; @@ -9,7 +9,7 @@ import androidx.databinding.ViewDataBinding; import androidx.lifecycle.ViewModel; import androidx.lifecycle.ViewModelProvider; -import com.xxpatx.os.base.BaseTransparentActivity; +import com.vscool.os.base.BaseTransparentActivity; import java.lang.reflect.Modifier; import java.lang.reflect.ParameterizedType; diff --git a/app/src/main/java/com/xxpatx/os/base/mvvm/BaseViewModel.java b/app/src/main/java/com/vscool/os/base/mvvm/BaseViewModel.java similarity index 97% rename from app/src/main/java/com/xxpatx/os/base/mvvm/BaseViewModel.java rename to app/src/main/java/com/vscool/os/base/mvvm/BaseViewModel.java index 29382f3..f2c0acb 100644 --- a/app/src/main/java/com/xxpatx/os/base/mvvm/BaseViewModel.java +++ b/app/src/main/java/com/vscool/os/base/mvvm/BaseViewModel.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.base.mvvm; +package com.vscool.os.base.mvvm; import android.content.Context; diff --git a/app/src/main/java/com/xxpatx/os/base/mvvm/ViewDataBindingCallback.java b/app/src/main/java/com/vscool/os/base/mvvm/ViewDataBindingCallback.java similarity index 94% rename from app/src/main/java/com/xxpatx/os/base/mvvm/ViewDataBindingCallback.java rename to app/src/main/java/com/vscool/os/base/mvvm/ViewDataBindingCallback.java index f78285a..ffc8ab9 100644 --- a/app/src/main/java/com/xxpatx/os/base/mvvm/ViewDataBindingCallback.java +++ b/app/src/main/java/com/vscool/os/base/mvvm/ViewDataBindingCallback.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.base.mvvm; +package com.vscool.os.base.mvvm; import android.content.Context; diff --git a/app/src/main/java/com/xxpatx/os/base/mvvm/fragment/BaseMvvmDialogFragment.java b/app/src/main/java/com/vscool/os/base/mvvm/fragment/BaseMvvmDialogFragment.java similarity index 99% rename from app/src/main/java/com/xxpatx/os/base/mvvm/fragment/BaseMvvmDialogFragment.java rename to app/src/main/java/com/vscool/os/base/mvvm/fragment/BaseMvvmDialogFragment.java index 4b8fb6b..7968a57 100644 --- a/app/src/main/java/com/xxpatx/os/base/mvvm/fragment/BaseMvvmDialogFragment.java +++ b/app/src/main/java/com/vscool/os/base/mvvm/fragment/BaseMvvmDialogFragment.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.base.mvvm.fragment; +package com.vscool.os.base.mvvm.fragment; import android.app.Activity; import android.content.Context; diff --git a/app/src/main/java/com/xxpatx/os/base/mvvm/fragment/BaseMvvmFragment.java b/app/src/main/java/com/vscool/os/base/mvvm/fragment/BaseMvvmFragment.java similarity index 99% rename from app/src/main/java/com/xxpatx/os/base/mvvm/fragment/BaseMvvmFragment.java rename to app/src/main/java/com/vscool/os/base/mvvm/fragment/BaseMvvmFragment.java index a57e0ea..180e771 100644 --- a/app/src/main/java/com/xxpatx/os/base/mvvm/fragment/BaseMvvmFragment.java +++ b/app/src/main/java/com/vscool/os/base/mvvm/fragment/BaseMvvmFragment.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.base.mvvm.fragment; +package com.vscool.os.base.mvvm.fragment; import android.app.Activity; import android.content.Context; @@ -19,7 +19,7 @@ import androidx.databinding.ViewDataBinding; import androidx.lifecycle.ViewModel; import androidx.lifecycle.ViewModelProvider; -import com.xxpatx.os.base.BaseFragment; +import com.vscool.os.base.BaseFragment; import java.lang.ref.WeakReference; import java.lang.reflect.ParameterizedType; diff --git a/app/src/main/java/com/xxpatx/os/base/rx/BaseRxActivity.java b/app/src/main/java/com/vscool/os/base/rx/BaseRxActivity.java similarity index 98% rename from app/src/main/java/com/xxpatx/os/base/rx/BaseRxActivity.java rename to app/src/main/java/com/vscool/os/base/rx/BaseRxActivity.java index a2af925..623db52 100644 --- a/app/src/main/java/com/xxpatx/os/base/rx/BaseRxActivity.java +++ b/app/src/main/java/com/vscool/os/base/rx/BaseRxActivity.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.base.rx; +package com.vscool.os.base.rx; import android.os.Bundle; diff --git a/app/src/main/java/com/xxpatx/os/base/rx/BaseRxFragment.java b/app/src/main/java/com/vscool/os/base/rx/BaseRxFragment.java similarity index 99% rename from app/src/main/java/com/xxpatx/os/base/rx/BaseRxFragment.java rename to app/src/main/java/com/vscool/os/base/rx/BaseRxFragment.java index 3879206..d619f03 100644 --- a/app/src/main/java/com/xxpatx/os/base/rx/BaseRxFragment.java +++ b/app/src/main/java/com/vscool/os/base/rx/BaseRxFragment.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.base.rx; +package com.vscool.os.base.rx; import android.os.Bundle; import android.view.View; diff --git a/app/src/main/java/com/xxpatx/os/base/rx/BaseRxService.java b/app/src/main/java/com/vscool/os/base/rx/BaseRxService.java similarity index 98% rename from app/src/main/java/com/xxpatx/os/base/rx/BaseRxService.java rename to app/src/main/java/com/vscool/os/base/rx/BaseRxService.java index 86ee68f..c6e402c 100644 --- a/app/src/main/java/com/xxpatx/os/base/rx/BaseRxService.java +++ b/app/src/main/java/com/vscool/os/base/rx/BaseRxService.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.base.rx; +package com.vscool.os.base.rx; import android.app.Service; import android.content.Intent; diff --git a/app/src/main/java/com/xxpatx/os/bean/ActivationBean.java b/app/src/main/java/com/vscool/os/bean/ActivationBean.java similarity index 97% rename from app/src/main/java/com/xxpatx/os/bean/ActivationBean.java rename to app/src/main/java/com/vscool/os/bean/ActivationBean.java index 93c8c14..bdc096e 100644 --- a/app/src/main/java/com/xxpatx/os/bean/ActivationBean.java +++ b/app/src/main/java/com/vscool/os/bean/ActivationBean.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.bean; +package com.vscool.os.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/xxpatx/os/bean/ActivityBean.java b/app/src/main/java/com/vscool/os/bean/ActivityBean.java similarity index 99% rename from app/src/main/java/com/xxpatx/os/bean/ActivityBean.java rename to app/src/main/java/com/vscool/os/bean/ActivityBean.java index 1fc3efa..e696817 100644 --- a/app/src/main/java/com/xxpatx/os/bean/ActivityBean.java +++ b/app/src/main/java/com/vscool/os/bean/ActivityBean.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.bean; +package com.vscool.os.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/xxpatx/os/bean/AddressBean.java b/app/src/main/java/com/vscool/os/bean/AddressBean.java similarity index 97% rename from app/src/main/java/com/xxpatx/os/bean/AddressBean.java rename to app/src/main/java/com/vscool/os/bean/AddressBean.java index a1cce88..87a883c 100644 --- a/app/src/main/java/com/xxpatx/os/bean/AddressBean.java +++ b/app/src/main/java/com/vscool/os/bean/AddressBean.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.bean; +package com.vscool.os.bean; import android.text.TextUtils; diff --git a/app/src/main/java/com/xxpatx/os/bean/AddressInfo.java b/app/src/main/java/com/vscool/os/bean/AddressInfo.java similarity index 98% rename from app/src/main/java/com/xxpatx/os/bean/AddressInfo.java rename to app/src/main/java/com/vscool/os/bean/AddressInfo.java index 766b5a3..db6e073 100644 --- a/app/src/main/java/com/xxpatx/os/bean/AddressInfo.java +++ b/app/src/main/java/com/vscool/os/bean/AddressInfo.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.bean; +package com.vscool.os.bean; import com.google.gson.Gson; import com.google.gson.JsonParser; diff --git a/app/src/main/java/com/xxpatx/os/bean/AdminInfo.java b/app/src/main/java/com/vscool/os/bean/AdminInfo.java similarity index 94% rename from app/src/main/java/com/xxpatx/os/bean/AdminInfo.java rename to app/src/main/java/com/vscool/os/bean/AdminInfo.java index 951ebb8..0cee3c1 100644 --- a/app/src/main/java/com/xxpatx/os/bean/AdminInfo.java +++ b/app/src/main/java/com/vscool/os/bean/AdminInfo.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.bean; +package com.vscool.os.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/xxpatx/os/bean/AlarmClockId.java b/app/src/main/java/com/vscool/os/bean/AlarmClockId.java similarity index 90% rename from app/src/main/java/com/xxpatx/os/bean/AlarmClockId.java rename to app/src/main/java/com/vscool/os/bean/AlarmClockId.java index 44ee89e..28c7a06 100644 --- a/app/src/main/java/com/xxpatx/os/bean/AlarmClockId.java +++ b/app/src/main/java/com/vscool/os/bean/AlarmClockId.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.bean; +package com.vscool.os.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/xxpatx/os/bean/AlarmItem.java b/app/src/main/java/com/vscool/os/bean/AlarmItem.java similarity index 95% rename from app/src/main/java/com/xxpatx/os/bean/AlarmItem.java rename to app/src/main/java/com/vscool/os/bean/AlarmItem.java index 313203e..1008d3f 100644 --- a/app/src/main/java/com/xxpatx/os/bean/AlarmItem.java +++ b/app/src/main/java/com/vscool/os/bean/AlarmItem.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.bean; +package com.vscool.os.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/xxpatx/os/bean/AppInfo.java b/app/src/main/java/com/vscool/os/bean/AppInfo.java similarity index 99% rename from app/src/main/java/com/xxpatx/os/bean/AppInfo.java rename to app/src/main/java/com/vscool/os/bean/AppInfo.java index 90fbef4..0a38ebd 100644 --- a/app/src/main/java/com/xxpatx/os/bean/AppInfo.java +++ b/app/src/main/java/com/vscool/os/bean/AppInfo.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.bean; +package com.vscool.os.bean; import androidx.annotation.NonNull; diff --git a/app/src/main/java/com/xxpatx/os/bean/AppListInfo.java b/app/src/main/java/com/vscool/os/bean/AppListInfo.java similarity index 96% rename from app/src/main/java/com/xxpatx/os/bean/AppListInfo.java rename to app/src/main/java/com/vscool/os/bean/AppListInfo.java index 10b6a93..e88cad0 100644 --- a/app/src/main/java/com/xxpatx/os/bean/AppListInfo.java +++ b/app/src/main/java/com/vscool/os/bean/AppListInfo.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.bean; +package com.vscool.os.bean; import android.graphics.Bitmap; diff --git a/app/src/main/java/com/xxpatx/os/bean/AppSelectBean.java b/app/src/main/java/com/vscool/os/bean/AppSelectBean.java similarity index 96% rename from app/src/main/java/com/xxpatx/os/bean/AppSelectBean.java rename to app/src/main/java/com/vscool/os/bean/AppSelectBean.java index 10ac228..a34291d 100644 --- a/app/src/main/java/com/xxpatx/os/bean/AppSelectBean.java +++ b/app/src/main/java/com/vscool/os/bean/AppSelectBean.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.bean; +package com.vscool.os.bean; import android.graphics.drawable.Drawable; diff --git a/app/src/main/java/com/xxpatx/os/bean/ArticleDetails.java b/app/src/main/java/com/vscool/os/bean/ArticleDetails.java similarity index 96% rename from app/src/main/java/com/xxpatx/os/bean/ArticleDetails.java rename to app/src/main/java/com/vscool/os/bean/ArticleDetails.java index 5018c4e..a7a7826 100644 --- a/app/src/main/java/com/xxpatx/os/bean/ArticleDetails.java +++ b/app/src/main/java/com/vscool/os/bean/ArticleDetails.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.bean; +package com.vscool.os.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/xxpatx/os/bean/ArticleInfo.java b/app/src/main/java/com/vscool/os/bean/ArticleInfo.java similarity index 98% rename from app/src/main/java/com/xxpatx/os/bean/ArticleInfo.java rename to app/src/main/java/com/vscool/os/bean/ArticleInfo.java index 7f7a832..5c314ce 100644 --- a/app/src/main/java/com/xxpatx/os/bean/ArticleInfo.java +++ b/app/src/main/java/com/vscool/os/bean/ArticleInfo.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.bean; +package com.vscool.os.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/xxpatx/os/bean/ArticleList.java b/app/src/main/java/com/vscool/os/bean/ArticleList.java similarity index 95% rename from app/src/main/java/com/xxpatx/os/bean/ArticleList.java rename to app/src/main/java/com/vscool/os/bean/ArticleList.java index 1bc7b62..e22bcf0 100644 --- a/app/src/main/java/com/xxpatx/os/bean/ArticleList.java +++ b/app/src/main/java/com/vscool/os/bean/ArticleList.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.bean; +package com.vscool.os.bean; import java.io.Serializable; import java.util.List; diff --git a/app/src/main/java/com/xxpatx/os/bean/BaiduMapGeoBean.java b/app/src/main/java/com/vscool/os/bean/BaiduMapGeoBean.java similarity index 96% rename from app/src/main/java/com/xxpatx/os/bean/BaiduMapGeoBean.java rename to app/src/main/java/com/vscool/os/bean/BaiduMapGeoBean.java index 82667e9..4d720cd 100644 --- a/app/src/main/java/com/xxpatx/os/bean/BaiduMapGeoBean.java +++ b/app/src/main/java/com/vscool/os/bean/BaiduMapGeoBean.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.bean; +package com.vscool.os.bean; import androidx.annotation.NonNull; diff --git a/app/src/main/java/com/xxpatx/os/bean/BaseResponse.java b/app/src/main/java/com/vscool/os/bean/BaseResponse.java similarity index 94% rename from app/src/main/java/com/xxpatx/os/bean/BaseResponse.java rename to app/src/main/java/com/vscool/os/bean/BaseResponse.java index db727c7..d0db8dc 100644 --- a/app/src/main/java/com/xxpatx/os/bean/BaseResponse.java +++ b/app/src/main/java/com/vscool/os/bean/BaseResponse.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.bean; +package com.vscool.os.bean; import androidx.annotation.NonNull; diff --git a/app/src/main/java/com/xxpatx/os/bean/CategoryBean.java b/app/src/main/java/com/vscool/os/bean/CategoryBean.java similarity index 93% rename from app/src/main/java/com/xxpatx/os/bean/CategoryBean.java rename to app/src/main/java/com/vscool/os/bean/CategoryBean.java index 97cf83b..6340c04 100644 --- a/app/src/main/java/com/xxpatx/os/bean/CategoryBean.java +++ b/app/src/main/java/com/vscool/os/bean/CategoryBean.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.bean; +package com.vscool.os.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/xxpatx/os/bean/Contact.java b/app/src/main/java/com/vscool/os/bean/Contact.java similarity index 98% rename from app/src/main/java/com/xxpatx/os/bean/Contact.java rename to app/src/main/java/com/vscool/os/bean/Contact.java index 63f8dbd..4f1a9cf 100644 --- a/app/src/main/java/com/xxpatx/os/bean/Contact.java +++ b/app/src/main/java/com/vscool/os/bean/Contact.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.bean; +package com.vscool.os.bean; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/app/src/main/java/com/xxpatx/os/bean/ContactId.java b/app/src/main/java/com/vscool/os/bean/ContactId.java similarity index 97% rename from app/src/main/java/com/xxpatx/os/bean/ContactId.java rename to app/src/main/java/com/vscool/os/bean/ContactId.java index 2cad440..e78bc0c 100644 --- a/app/src/main/java/com/xxpatx/os/bean/ContactId.java +++ b/app/src/main/java/com/vscool/os/bean/ContactId.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.bean; +package com.vscool.os.bean; import androidx.annotation.NonNull; diff --git a/app/src/main/java/com/xxpatx/os/bean/DailyAppBean.java b/app/src/main/java/com/vscool/os/bean/DailyAppBean.java similarity index 95% rename from app/src/main/java/com/xxpatx/os/bean/DailyAppBean.java rename to app/src/main/java/com/vscool/os/bean/DailyAppBean.java index 1bd794e..7790379 100644 --- a/app/src/main/java/com/xxpatx/os/bean/DailyAppBean.java +++ b/app/src/main/java/com/vscool/os/bean/DailyAppBean.java @@ -1,12 +1,12 @@ -package com.xxpatx.os.bean; +package com.vscool.os.bean; import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.graphics.drawable.Drawable; -import com.xxpatx.os.BuildConfig; -import com.xxpatx.os.utils.IconUtils; +import com.vscool.os.BuildConfig; +import com.vscool.os.utils.IconUtils; import java.io.Serializable; diff --git a/app/src/main/java/com/xxpatx/os/bean/DemandBean.java b/app/src/main/java/com/vscool/os/bean/DemandBean.java similarity index 98% rename from app/src/main/java/com/xxpatx/os/bean/DemandBean.java rename to app/src/main/java/com/vscool/os/bean/DemandBean.java index 4848ab1..8ca3d7f 100644 --- a/app/src/main/java/com/xxpatx/os/bean/DemandBean.java +++ b/app/src/main/java/com/vscool/os/bean/DemandBean.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.bean; +package com.vscool.os.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/xxpatx/os/bean/DesktopIcon.java b/app/src/main/java/com/vscool/os/bean/DesktopIcon.java similarity index 96% rename from app/src/main/java/com/xxpatx/os/bean/DesktopIcon.java rename to app/src/main/java/com/vscool/os/bean/DesktopIcon.java index 6d330c8..d30ced8 100644 --- a/app/src/main/java/com/xxpatx/os/bean/DesktopIcon.java +++ b/app/src/main/java/com/vscool/os/bean/DesktopIcon.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.bean; +package com.vscool.os.bean; import android.content.Context; import android.content.pm.ApplicationInfo; @@ -12,10 +12,10 @@ import androidx.annotation.NonNull; import com.google.gson.Gson; import com.google.gson.JsonParser; -import com.xxpatx.os.BuildConfig; -import com.xxpatx.os.R; -import com.xxpatx.os.manager.AppManager; -import com.xxpatx.os.utils.IconUtils; +import com.vscool.os.BuildConfig; +import com.vscool.os.R; +import com.vscool.os.manager.AppManager; +import com.vscool.os.utils.IconUtils; import java.io.Serializable; diff --git a/app/src/main/java/com/xxpatx/os/bean/DockApp.java b/app/src/main/java/com/vscool/os/bean/DockApp.java similarity index 98% rename from app/src/main/java/com/xxpatx/os/bean/DockApp.java rename to app/src/main/java/com/vscool/os/bean/DockApp.java index 1b16c0a..015277b 100644 --- a/app/src/main/java/com/xxpatx/os/bean/DockApp.java +++ b/app/src/main/java/com/vscool/os/bean/DockApp.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.bean; +package com.vscool.os.bean; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/app/src/main/java/com/xxpatx/os/bean/ExpressData.java b/app/src/main/java/com/vscool/os/bean/ExpressData.java similarity index 97% rename from app/src/main/java/com/xxpatx/os/bean/ExpressData.java rename to app/src/main/java/com/vscool/os/bean/ExpressData.java index 3abd3d9..990d458 100644 --- a/app/src/main/java/com/xxpatx/os/bean/ExpressData.java +++ b/app/src/main/java/com/vscool/os/bean/ExpressData.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.bean; +package com.vscool.os.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/xxpatx/os/bean/ExpressInfo.java b/app/src/main/java/com/vscool/os/bean/ExpressInfo.java similarity index 94% rename from app/src/main/java/com/xxpatx/os/bean/ExpressInfo.java rename to app/src/main/java/com/vscool/os/bean/ExpressInfo.java index 4ab6dc6..cf01371 100644 --- a/app/src/main/java/com/xxpatx/os/bean/ExpressInfo.java +++ b/app/src/main/java/com/vscool/os/bean/ExpressInfo.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.bean; +package com.vscool.os.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/xxpatx/os/bean/FamilyAddress.java b/app/src/main/java/com/vscool/os/bean/FamilyAddress.java similarity index 92% rename from app/src/main/java/com/xxpatx/os/bean/FamilyAddress.java rename to app/src/main/java/com/vscool/os/bean/FamilyAddress.java index 9b1fd40..8e914d7 100644 --- a/app/src/main/java/com/xxpatx/os/bean/FamilyAddress.java +++ b/app/src/main/java/com/vscool/os/bean/FamilyAddress.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.bean; +package com.vscool.os.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/xxpatx/os/bean/GoodsDetails.java b/app/src/main/java/com/vscool/os/bean/GoodsDetails.java similarity index 98% rename from app/src/main/java/com/xxpatx/os/bean/GoodsDetails.java rename to app/src/main/java/com/vscool/os/bean/GoodsDetails.java index 9950203..cca50af 100644 --- a/app/src/main/java/com/xxpatx/os/bean/GoodsDetails.java +++ b/app/src/main/java/com/vscool/os/bean/GoodsDetails.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.bean; +package com.vscool.os.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/xxpatx/os/bean/GoodsInfo.java b/app/src/main/java/com/vscool/os/bean/GoodsInfo.java similarity index 99% rename from app/src/main/java/com/xxpatx/os/bean/GoodsInfo.java rename to app/src/main/java/com/vscool/os/bean/GoodsInfo.java index 8e8a314..edf843d 100644 --- a/app/src/main/java/com/xxpatx/os/bean/GoodsInfo.java +++ b/app/src/main/java/com/vscool/os/bean/GoodsInfo.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.bean; +package com.vscool.os.bean; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/xxpatx/os/bean/GoodsList.java b/app/src/main/java/com/vscool/os/bean/GoodsList.java similarity index 95% rename from app/src/main/java/com/xxpatx/os/bean/GoodsList.java rename to app/src/main/java/com/vscool/os/bean/GoodsList.java index 9f653b5..cbf1bf9 100644 --- a/app/src/main/java/com/xxpatx/os/bean/GoodsList.java +++ b/app/src/main/java/com/vscool/os/bean/GoodsList.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.bean; +package com.vscool.os.bean; import java.io.Serializable; import java.util.List; diff --git a/app/src/main/java/com/xxpatx/os/bean/GoodsType.java b/app/src/main/java/com/vscool/os/bean/GoodsType.java similarity index 93% rename from app/src/main/java/com/xxpatx/os/bean/GoodsType.java rename to app/src/main/java/com/vscool/os/bean/GoodsType.java index 4c57ffe..dfa1b0a 100644 --- a/app/src/main/java/com/xxpatx/os/bean/GoodsType.java +++ b/app/src/main/java/com/vscool/os/bean/GoodsType.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.bean; +package com.vscool.os.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/xxpatx/os/bean/HealthCode.java b/app/src/main/java/com/vscool/os/bean/HealthCode.java similarity index 93% rename from app/src/main/java/com/xxpatx/os/bean/HealthCode.java rename to app/src/main/java/com/vscool/os/bean/HealthCode.java index e7f00c0..12ed4c8 100644 --- a/app/src/main/java/com/xxpatx/os/bean/HealthCode.java +++ b/app/src/main/java/com/vscool/os/bean/HealthCode.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.bean; +package com.vscool.os.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/xxpatx/os/bean/JsonBean.java b/app/src/main/java/com/vscool/os/bean/JsonBean.java similarity index 98% rename from app/src/main/java/com/xxpatx/os/bean/JsonBean.java rename to app/src/main/java/com/vscool/os/bean/JsonBean.java index d01992e..cca1c45 100644 --- a/app/src/main/java/com/xxpatx/os/bean/JsonBean.java +++ b/app/src/main/java/com/vscool/os/bean/JsonBean.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.bean; +package com.vscool.os.bean; import com.contrarywind.interfaces.IPickerViewData; diff --git a/app/src/main/java/com/xxpatx/os/bean/LogisticsTrace.java b/app/src/main/java/com/vscool/os/bean/LogisticsTrace.java similarity index 98% rename from app/src/main/java/com/xxpatx/os/bean/LogisticsTrace.java rename to app/src/main/java/com/vscool/os/bean/LogisticsTrace.java index f3fe85e..f46bfc2 100644 --- a/app/src/main/java/com/xxpatx/os/bean/LogisticsTrace.java +++ b/app/src/main/java/com/vscool/os/bean/LogisticsTrace.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.bean; +package com.vscool.os.bean; import java.io.Serializable; import java.util.List; diff --git a/app/src/main/java/com/xxpatx/os/bean/LogisticsTraceDeta.java b/app/src/main/java/com/vscool/os/bean/LogisticsTraceDeta.java similarity index 97% rename from app/src/main/java/com/xxpatx/os/bean/LogisticsTraceDeta.java rename to app/src/main/java/com/vscool/os/bean/LogisticsTraceDeta.java index fc1db51..b4af9f7 100644 --- a/app/src/main/java/com/xxpatx/os/bean/LogisticsTraceDeta.java +++ b/app/src/main/java/com/vscool/os/bean/LogisticsTraceDeta.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.bean; +package com.vscool.os.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/xxpatx/os/bean/MapBean.java b/app/src/main/java/com/vscool/os/bean/MapBean.java similarity index 98% rename from app/src/main/java/com/xxpatx/os/bean/MapBean.java rename to app/src/main/java/com/vscool/os/bean/MapBean.java index c601961..49cfba6 100644 --- a/app/src/main/java/com/xxpatx/os/bean/MapBean.java +++ b/app/src/main/java/com/vscool/os/bean/MapBean.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.bean; +package com.vscool.os.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/xxpatx/os/bean/MapGeoLocation.java b/app/src/main/java/com/vscool/os/bean/MapGeoLocation.java similarity index 95% rename from app/src/main/java/com/xxpatx/os/bean/MapGeoLocation.java rename to app/src/main/java/com/vscool/os/bean/MapGeoLocation.java index ac8fe17..65766eb 100644 --- a/app/src/main/java/com/xxpatx/os/bean/MapGeoLocation.java +++ b/app/src/main/java/com/vscool/os/bean/MapGeoLocation.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.bean; +package com.vscool.os.bean; import androidx.annotation.NonNull; diff --git a/app/src/main/java/com/xxpatx/os/bean/MapGeoResult.java b/app/src/main/java/com/vscool/os/bean/MapGeoResult.java similarity index 97% rename from app/src/main/java/com/xxpatx/os/bean/MapGeoResult.java rename to app/src/main/java/com/vscool/os/bean/MapGeoResult.java index de5311c..3c00206 100644 --- a/app/src/main/java/com/xxpatx/os/bean/MapGeoResult.java +++ b/app/src/main/java/com/vscool/os/bean/MapGeoResult.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.bean; +package com.vscool.os.bean; import androidx.annotation.NonNull; diff --git a/app/src/main/java/com/xxpatx/os/bean/NetDesktopIcon.java b/app/src/main/java/com/vscool/os/bean/NetDesktopIcon.java similarity index 97% rename from app/src/main/java/com/xxpatx/os/bean/NetDesktopIcon.java rename to app/src/main/java/com/vscool/os/bean/NetDesktopIcon.java index 1bbb07a..c890e93 100644 --- a/app/src/main/java/com/xxpatx/os/bean/NetDesktopIcon.java +++ b/app/src/main/java/com/vscool/os/bean/NetDesktopIcon.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.bean; +package com.vscool.os.bean; import android.graphics.Bitmap; diff --git a/app/src/main/java/com/xxpatx/os/bean/OrderBean.java b/app/src/main/java/com/vscool/os/bean/OrderBean.java similarity index 95% rename from app/src/main/java/com/xxpatx/os/bean/OrderBean.java rename to app/src/main/java/com/vscool/os/bean/OrderBean.java index 8ebaa38..74a1e5d 100644 --- a/app/src/main/java/com/xxpatx/os/bean/OrderBean.java +++ b/app/src/main/java/com/vscool/os/bean/OrderBean.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.bean; +package com.vscool.os.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/xxpatx/os/bean/OrderGoods.java b/app/src/main/java/com/vscool/os/bean/OrderGoods.java similarity index 98% rename from app/src/main/java/com/xxpatx/os/bean/OrderGoods.java rename to app/src/main/java/com/vscool/os/bean/OrderGoods.java index eb5d2f9..d68eaf4 100644 --- a/app/src/main/java/com/xxpatx/os/bean/OrderGoods.java +++ b/app/src/main/java/com/vscool/os/bean/OrderGoods.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.bean; +package com.vscool.os.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/xxpatx/os/bean/OrderIndexBean.java b/app/src/main/java/com/vscool/os/bean/OrderIndexBean.java similarity index 99% rename from app/src/main/java/com/xxpatx/os/bean/OrderIndexBean.java rename to app/src/main/java/com/vscool/os/bean/OrderIndexBean.java index da4250e..e13b27b 100644 --- a/app/src/main/java/com/xxpatx/os/bean/OrderIndexBean.java +++ b/app/src/main/java/com/vscool/os/bean/OrderIndexBean.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.bean; +package com.vscool.os.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/xxpatx/os/bean/OrderIndexData.java b/app/src/main/java/com/vscool/os/bean/OrderIndexData.java similarity index 95% rename from app/src/main/java/com/xxpatx/os/bean/OrderIndexData.java rename to app/src/main/java/com/vscool/os/bean/OrderIndexData.java index ef16688..2072ec2 100644 --- a/app/src/main/java/com/xxpatx/os/bean/OrderIndexData.java +++ b/app/src/main/java/com/vscool/os/bean/OrderIndexData.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.bean; +package com.vscool.os.bean; import java.io.Serializable; import java.util.List; diff --git a/app/src/main/java/com/xxpatx/os/bean/QweatherLocation.java b/app/src/main/java/com/vscool/os/bean/QweatherLocation.java similarity index 98% rename from app/src/main/java/com/xxpatx/os/bean/QweatherLocation.java rename to app/src/main/java/com/vscool/os/bean/QweatherLocation.java index 2487286..eae9772 100644 --- a/app/src/main/java/com/xxpatx/os/bean/QweatherLocation.java +++ b/app/src/main/java/com/vscool/os/bean/QweatherLocation.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.bean; +package com.vscool.os.bean; import androidx.annotation.NonNull; diff --git a/app/src/main/java/com/xxpatx/os/bean/QweatherLookup.java b/app/src/main/java/com/vscool/os/bean/QweatherLookup.java similarity index 96% rename from app/src/main/java/com/xxpatx/os/bean/QweatherLookup.java rename to app/src/main/java/com/vscool/os/bean/QweatherLookup.java index 9bda4d7..b388eeb 100644 --- a/app/src/main/java/com/xxpatx/os/bean/QweatherLookup.java +++ b/app/src/main/java/com/vscool/os/bean/QweatherLookup.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.bean; +package com.vscool.os.bean; import androidx.annotation.NonNull; diff --git a/app/src/main/java/com/xxpatx/os/bean/RecordsInfo.java b/app/src/main/java/com/vscool/os/bean/RecordsInfo.java similarity index 97% rename from app/src/main/java/com/xxpatx/os/bean/RecordsInfo.java rename to app/src/main/java/com/vscool/os/bean/RecordsInfo.java index 1a3cde7..6fcd55f 100644 --- a/app/src/main/java/com/xxpatx/os/bean/RecordsInfo.java +++ b/app/src/main/java/com/vscool/os/bean/RecordsInfo.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.bean; +package com.vscool.os.bean; import androidx.annotation.NonNull; diff --git a/app/src/main/java/com/xxpatx/os/bean/RegionInfo.java b/app/src/main/java/com/vscool/os/bean/RegionInfo.java similarity index 95% rename from app/src/main/java/com/xxpatx/os/bean/RegionInfo.java rename to app/src/main/java/com/vscool/os/bean/RegionInfo.java index 883adbd..081216c 100644 --- a/app/src/main/java/com/xxpatx/os/bean/RegionInfo.java +++ b/app/src/main/java/com/vscool/os/bean/RegionInfo.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.bean; +package com.vscool.os.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/xxpatx/os/bean/ServeBean.java b/app/src/main/java/com/vscool/os/bean/ServeBean.java similarity index 95% rename from app/src/main/java/com/xxpatx/os/bean/ServeBean.java rename to app/src/main/java/com/vscool/os/bean/ServeBean.java index 52cce92..35fe49e 100644 --- a/app/src/main/java/com/xxpatx/os/bean/ServeBean.java +++ b/app/src/main/java/com/vscool/os/bean/ServeBean.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.bean; +package com.vscool.os.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/xxpatx/os/bean/SnInfo.java b/app/src/main/java/com/vscool/os/bean/SnInfo.java similarity index 99% rename from app/src/main/java/com/xxpatx/os/bean/SnInfo.java rename to app/src/main/java/com/vscool/os/bean/SnInfo.java index a260ff9..4ea2bdf 100644 --- a/app/src/main/java/com/xxpatx/os/bean/SnInfo.java +++ b/app/src/main/java/com/vscool/os/bean/SnInfo.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.bean; +package com.vscool.os.bean; import androidx.annotation.NonNull; diff --git a/app/src/main/java/com/xxpatx/os/bean/SystemSettings.java b/app/src/main/java/com/vscool/os/bean/SystemSettings.java similarity index 99% rename from app/src/main/java/com/xxpatx/os/bean/SystemSettings.java rename to app/src/main/java/com/vscool/os/bean/SystemSettings.java index 1d8a2ec..f1e565a 100644 --- a/app/src/main/java/com/xxpatx/os/bean/SystemSettings.java +++ b/app/src/main/java/com/vscool/os/bean/SystemSettings.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.bean; +package com.vscool.os.bean; import com.google.gson.Gson; diff --git a/app/src/main/java/com/xxpatx/os/bean/TestAppInfo.java b/app/src/main/java/com/vscool/os/bean/TestAppInfo.java similarity index 98% rename from app/src/main/java/com/xxpatx/os/bean/TestAppInfo.java rename to app/src/main/java/com/vscool/os/bean/TestAppInfo.java index afed542..b6d4bf3 100644 --- a/app/src/main/java/com/xxpatx/os/bean/TestAppInfo.java +++ b/app/src/main/java/com/vscool/os/bean/TestAppInfo.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.bean; +package com.vscool.os.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/xxpatx/os/bean/UserAvatarInfo.java b/app/src/main/java/com/vscool/os/bean/UserAvatarInfo.java similarity index 97% rename from app/src/main/java/com/xxpatx/os/bean/UserAvatarInfo.java rename to app/src/main/java/com/vscool/os/bean/UserAvatarInfo.java index 3413aac..e84b08d 100644 --- a/app/src/main/java/com/xxpatx/os/bean/UserAvatarInfo.java +++ b/app/src/main/java/com/vscool/os/bean/UserAvatarInfo.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.bean; +package com.vscool.os.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/xxpatx/os/bean/UserId.java b/app/src/main/java/com/vscool/os/bean/UserId.java similarity index 91% rename from app/src/main/java/com/xxpatx/os/bean/UserId.java rename to app/src/main/java/com/vscool/os/bean/UserId.java index e6f371d..3429bf8 100644 --- a/app/src/main/java/com/xxpatx/os/bean/UserId.java +++ b/app/src/main/java/com/vscool/os/bean/UserId.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.bean; +package com.vscool.os.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/xxpatx/os/bean/WeatherDailyJson.java b/app/src/main/java/com/vscool/os/bean/WeatherDailyJson.java similarity index 99% rename from app/src/main/java/com/xxpatx/os/bean/WeatherDailyJson.java rename to app/src/main/java/com/vscool/os/bean/WeatherDailyJson.java index 8700914..d0574a0 100644 --- a/app/src/main/java/com/xxpatx/os/bean/WeatherDailyJson.java +++ b/app/src/main/java/com/vscool/os/bean/WeatherDailyJson.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.bean; +package com.vscool.os.bean; import com.qweather.sdk.bean.Basic; import com.qweather.sdk.bean.Refer; diff --git a/app/src/main/java/com/xxpatx/os/bean/WechatInfo.java b/app/src/main/java/com/vscool/os/bean/WechatInfo.java similarity index 98% rename from app/src/main/java/com/xxpatx/os/bean/WechatInfo.java rename to app/src/main/java/com/vscool/os/bean/WechatInfo.java index d1fda9e..9183760 100644 --- a/app/src/main/java/com/xxpatx/os/bean/WechatInfo.java +++ b/app/src/main/java/com/vscool/os/bean/WechatInfo.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.bean; +package com.vscool.os.bean; import androidx.annotation.NonNull; diff --git a/app/src/main/java/com/xxpatx/os/bean/WiFiInfo.java b/app/src/main/java/com/vscool/os/bean/WiFiInfo.java similarity index 97% rename from app/src/main/java/com/xxpatx/os/bean/WiFiInfo.java rename to app/src/main/java/com/vscool/os/bean/WiFiInfo.java index 4cf794b..32e2df7 100644 --- a/app/src/main/java/com/xxpatx/os/bean/WiFiInfo.java +++ b/app/src/main/java/com/vscool/os/bean/WiFiInfo.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.bean; +package com.vscool.os.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/xxpatx/os/bean/WxpayBean.java b/app/src/main/java/com/vscool/os/bean/WxpayBean.java similarity index 98% rename from app/src/main/java/com/xxpatx/os/bean/WxpayBean.java rename to app/src/main/java/com/vscool/os/bean/WxpayBean.java index 109ef6c..81bef1d 100644 --- a/app/src/main/java/com/xxpatx/os/bean/WxpayBean.java +++ b/app/src/main/java/com/vscool/os/bean/WxpayBean.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.bean; +package com.vscool.os.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/xxpatx/os/config/CommonConfig.java b/app/src/main/java/com/vscool/os/config/CommonConfig.java similarity index 99% rename from app/src/main/java/com/xxpatx/os/config/CommonConfig.java rename to app/src/main/java/com/vscool/os/config/CommonConfig.java index f73f796..510ce1f 100644 --- a/app/src/main/java/com/xxpatx/os/config/CommonConfig.java +++ b/app/src/main/java/com/vscool/os/config/CommonConfig.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.config; +package com.vscool.os.config; public class CommonConfig { public static final String MMKV_ID = "InterProcessKV"; diff --git a/app/src/main/java/com/xxpatx/os/config/MyGlideModule.java b/app/src/main/java/com/vscool/os/config/MyGlideModule.java similarity index 98% rename from app/src/main/java/com/xxpatx/os/config/MyGlideModule.java rename to app/src/main/java/com/vscool/os/config/MyGlideModule.java index 6f52e3f..a3413b0 100644 --- a/app/src/main/java/com/xxpatx/os/config/MyGlideModule.java +++ b/app/src/main/java/com/vscool/os/config/MyGlideModule.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.config; +package com.vscool.os.config; import android.content.Context; @@ -9,7 +9,7 @@ import com.bumptech.glide.integration.okhttp3.OkHttpUrlLoader; import com.bumptech.glide.load.engine.cache.DiskLruCacheFactory; import com.bumptech.glide.load.model.GlideUrl; import com.bumptech.glide.module.AppGlideModule; -import com.xxpatx.os.utils.Utils; +import com.vscool.os.utils.Utils; import java.io.InputStream; import java.security.cert.CertificateException; diff --git a/app/src/main/java/com/xxpatx/os/custom/CustomContent.java b/app/src/main/java/com/vscool/os/custom/CustomContent.java similarity index 98% rename from app/src/main/java/com/xxpatx/os/custom/CustomContent.java rename to app/src/main/java/com/vscool/os/custom/CustomContent.java index ff1b5f3..a5f559a 100644 --- a/app/src/main/java/com/xxpatx/os/custom/CustomContent.java +++ b/app/src/main/java/com/vscool/os/custom/CustomContent.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.custom; +package com.vscool.os.custom; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/xxpatx/os/custom/CustomContentCallbacks.java b/app/src/main/java/com/vscool/os/custom/CustomContentCallbacks.java similarity index 95% rename from app/src/main/java/com/xxpatx/os/custom/CustomContentCallbacks.java rename to app/src/main/java/com/vscool/os/custom/CustomContentCallbacks.java index 1b255d7..89ad0ba 100644 --- a/app/src/main/java/com/xxpatx/os/custom/CustomContentCallbacks.java +++ b/app/src/main/java/com/vscool/os/custom/CustomContentCallbacks.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.custom; +package com.vscool.os.custom; // add by codemx.cn ---- 20190712 ---plus- start diff --git a/app/src/main/java/com/xxpatx/os/custom/GlideEngine.java b/app/src/main/java/com/vscool/os/custom/GlideEngine.java similarity index 98% rename from app/src/main/java/com/xxpatx/os/custom/GlideEngine.java rename to app/src/main/java/com/vscool/os/custom/GlideEngine.java index c2a7659..7e7ffbd 100644 --- a/app/src/main/java/com/xxpatx/os/custom/GlideEngine.java +++ b/app/src/main/java/com/vscool/os/custom/GlideEngine.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.custom; +package com.vscool.os.custom; import android.content.Context; import android.widget.ImageView; @@ -10,7 +10,7 @@ import com.bumptech.glide.load.resource.bitmap.CenterCrop; import com.bumptech.glide.load.resource.bitmap.RoundedCorners; import com.luck.picture.lib.engine.ImageEngine; import com.luck.picture.lib.utils.ActivityCompatHelper; -import com.xxpatx.os.R; +import com.vscool.os.R; /** * @author：luck diff --git a/app/src/main/java/com/xxpatx/os/custom/ImageViewAdapter.java b/app/src/main/java/com/vscool/os/custom/ImageViewAdapter.java similarity index 93% rename from app/src/main/java/com/xxpatx/os/custom/ImageViewAdapter.java rename to app/src/main/java/com/vscool/os/custom/ImageViewAdapter.java index 084b36e..95f7bde 100644 --- a/app/src/main/java/com/xxpatx/os/custom/ImageViewAdapter.java +++ b/app/src/main/java/com/vscool/os/custom/ImageViewAdapter.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.custom; +package com.vscool.os.custom; import android.content.Context; import android.graphics.Bitmap; @@ -10,9 +10,9 @@ import android.widget.TextView; import androidx.databinding.BindingAdapter; import com.bumptech.glide.Glide; -import com.xxpatx.os.R; -import com.xxpatx.os.utils.GlideLoadUtils; -import com.xxpatx.os.utils.TimeUtils; +import com.vscool.os.R; +import com.vscool.os.utils.GlideLoadUtils; +import com.vscool.os.utils.TimeUtils; public class ImageViewAdapter { @BindingAdapter("android:src") diff --git a/app/src/main/java/com/xxpatx/os/custom/RecyclerItemDecoration.java b/app/src/main/java/com/vscool/os/custom/RecyclerItemDecoration.java similarity index 97% rename from app/src/main/java/com/xxpatx/os/custom/RecyclerItemDecoration.java rename to app/src/main/java/com/vscool/os/custom/RecyclerItemDecoration.java index 02dc523..6b0e6cf 100644 --- a/app/src/main/java/com/xxpatx/os/custom/RecyclerItemDecoration.java +++ b/app/src/main/java/com/vscool/os/custom/RecyclerItemDecoration.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.custom; +package com.vscool.os.custom; import android.graphics.Rect; import android.view.View; diff --git a/app/src/main/java/com/xxpatx/os/custom/RecyclerViewSpacesItemDecoration.java b/app/src/main/java/com/vscool/os/custom/RecyclerViewSpacesItemDecoration.java similarity index 97% rename from app/src/main/java/com/xxpatx/os/custom/RecyclerViewSpacesItemDecoration.java rename to app/src/main/java/com/vscool/os/custom/RecyclerViewSpacesItemDecoration.java index 725607f..e44f512 100644 --- a/app/src/main/java/com/xxpatx/os/custom/RecyclerViewSpacesItemDecoration.java +++ b/app/src/main/java/com/vscool/os/custom/RecyclerViewSpacesItemDecoration.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.custom; +package com.vscool.os.custom; import android.graphics.Rect; import android.view.View; diff --git a/app/src/main/java/com/xxpatx/os/custom/ViewPager2Adapter.java b/app/src/main/java/com/vscool/os/custom/ViewPager2Adapter.java similarity index 99% rename from app/src/main/java/com/xxpatx/os/custom/ViewPager2Adapter.java rename to app/src/main/java/com/vscool/os/custom/ViewPager2Adapter.java index cd539c0..b276f65 100644 --- a/app/src/main/java/com/xxpatx/os/custom/ViewPager2Adapter.java +++ b/app/src/main/java/com/vscool/os/custom/ViewPager2Adapter.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.custom; +package com.vscool.os.custom; import android.util.SparseArray; diff --git a/app/src/main/java/com/xxpatx/os/db/ContactCacheHelper.java b/app/src/main/java/com/vscool/os/db/ContactCacheHelper.java similarity index 98% rename from app/src/main/java/com/xxpatx/os/db/ContactCacheHelper.java rename to app/src/main/java/com/vscool/os/db/ContactCacheHelper.java index e1c7f18..a5913d7 100644 --- a/app/src/main/java/com/xxpatx/os/db/ContactCacheHelper.java +++ b/app/src/main/java/com/vscool/os/db/ContactCacheHelper.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.db; +package com.vscool.os.db; import android.content.Context; import android.database.sqlite.SQLiteDatabase; diff --git a/app/src/main/java/com/xxpatx/os/db/ContactCacheUtils.java b/app/src/main/java/com/vscool/os/db/ContactCacheUtils.java similarity index 98% rename from app/src/main/java/com/xxpatx/os/db/ContactCacheUtils.java rename to app/src/main/java/com/vscool/os/db/ContactCacheUtils.java index 3293bfb..db1cc49 100644 --- a/app/src/main/java/com/xxpatx/os/db/ContactCacheUtils.java +++ b/app/src/main/java/com/vscool/os/db/ContactCacheUtils.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.db; +package com.vscool.os.db; import android.content.ContentValues; import android.content.Context; @@ -7,8 +7,8 @@ import android.database.sqlite.SQLiteDatabase; import android.os.Environment; import android.util.Log; -import com.xxpatx.os.BuildConfig; -import com.xxpatx.os.bean.Contact; +import com.vscool.os.BuildConfig; +import com.vscool.os.bean.Contact; import java.io.File; import java.util.ArrayList; diff --git a/app/src/main/java/com/xxpatx/os/db/WechatContactDbHelper.java b/app/src/main/java/com/vscool/os/db/WechatContactDbHelper.java similarity index 98% rename from app/src/main/java/com/xxpatx/os/db/WechatContactDbHelper.java rename to app/src/main/java/com/vscool/os/db/WechatContactDbHelper.java index 0f26b06..3dad744 100644 --- a/app/src/main/java/com/xxpatx/os/db/WechatContactDbHelper.java +++ b/app/src/main/java/com/vscool/os/db/WechatContactDbHelper.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.db; +package com.vscool.os.db; import android.content.Context; import android.database.DatabaseErrorHandler; diff --git a/app/src/main/java/com/xxpatx/os/db/WechatContactManager.java b/app/src/main/java/com/vscool/os/db/WechatContactManager.java similarity index 98% rename from app/src/main/java/com/xxpatx/os/db/WechatContactManager.java rename to app/src/main/java/com/vscool/os/db/WechatContactManager.java index f2a4d93..2b02a07 100644 --- a/app/src/main/java/com/xxpatx/os/db/WechatContactManager.java +++ b/app/src/main/java/com/vscool/os/db/WechatContactManager.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.db; +package com.vscool.os.db; import android.annotation.SuppressLint; import android.content.ContentValues; @@ -7,7 +7,7 @@ import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; import android.util.Log; -import com.xxpatx.os.bean.WechatInfo; +import com.vscool.os.bean.WechatInfo; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/xxpatx/os/dialog/CallPhoneDialog.java b/app/src/main/java/com/vscool/os/dialog/CallPhoneDialog.java similarity index 97% rename from app/src/main/java/com/xxpatx/os/dialog/CallPhoneDialog.java rename to app/src/main/java/com/vscool/os/dialog/CallPhoneDialog.java index 086f479..102f949 100644 --- a/app/src/main/java/com/xxpatx/os/dialog/CallPhoneDialog.java +++ b/app/src/main/java/com/vscool/os/dialog/CallPhoneDialog.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.dialog; +package com.vscool.os.dialog; import android.content.Context; import android.os.Bundle; @@ -9,7 +9,7 @@ import android.widget.ImageView; import androidx.appcompat.app.AlertDialog; -import com.xxpatx.os.R; +import com.vscool.os.R; public class CallPhoneDialog extends AlertDialog { diff --git a/app/src/main/java/com/xxpatx/os/dialog/CustomDialog.java b/app/src/main/java/com/vscool/os/dialog/CustomDialog.java similarity index 99% rename from app/src/main/java/com/xxpatx/os/dialog/CustomDialog.java rename to app/src/main/java/com/vscool/os/dialog/CustomDialog.java index 2ac953a..19577d0 100644 --- a/app/src/main/java/com/xxpatx/os/dialog/CustomDialog.java +++ b/app/src/main/java/com/vscool/os/dialog/CustomDialog.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.dialog; +package com.vscool.os.dialog; import android.content.Context; @@ -10,7 +10,7 @@ import android.widget.TextView; import androidx.appcompat.app.AlertDialog; -import com.xxpatx.os.R; +import com.vscool.os.R; /** diff --git a/app/src/main/java/com/xxpatx/os/dialog/DailyAppDialog.java b/app/src/main/java/com/vscool/os/dialog/DailyAppDialog.java similarity index 98% rename from app/src/main/java/com/xxpatx/os/dialog/DailyAppDialog.java rename to app/src/main/java/com/vscool/os/dialog/DailyAppDialog.java index c5d67ca..ebb3bde 100644 --- a/app/src/main/java/com/xxpatx/os/dialog/DailyAppDialog.java +++ b/app/src/main/java/com/vscool/os/dialog/DailyAppDialog.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.dialog; +package com.vscool.os.dialog; import android.content.Context; @@ -11,7 +11,7 @@ import android.widget.TextView; import androidx.appcompat.app.AlertDialog; -import com.xxpatx.os.R; +import com.vscool.os.R; /** diff --git a/app/src/main/java/com/xxpatx/os/dialog/DeleWifiDialog.java b/app/src/main/java/com/vscool/os/dialog/DeleWifiDialog.java similarity index 99% rename from app/src/main/java/com/xxpatx/os/dialog/DeleWifiDialog.java rename to app/src/main/java/com/vscool/os/dialog/DeleWifiDialog.java index 6cbcdbf..7530d37 100644 --- a/app/src/main/java/com/xxpatx/os/dialog/DeleWifiDialog.java +++ b/app/src/main/java/com/vscool/os/dialog/DeleWifiDialog.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.dialog; +package com.vscool.os.dialog; import android.content.Context; @@ -11,7 +11,7 @@ import android.widget.TextView; import androidx.appcompat.app.AlertDialog; -import com.xxpatx.os.R; +import com.vscool.os.R; /** diff --git a/app/src/main/java/com/xxpatx/os/dialog/DeleteContactDialog.java b/app/src/main/java/com/vscool/os/dialog/DeleteContactDialog.java similarity index 99% rename from app/src/main/java/com/xxpatx/os/dialog/DeleteContactDialog.java rename to app/src/main/java/com/vscool/os/dialog/DeleteContactDialog.java index ca66c45..00597ee 100644 --- a/app/src/main/java/com/xxpatx/os/dialog/DeleteContactDialog.java +++ b/app/src/main/java/com/vscool/os/dialog/DeleteContactDialog.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.dialog; +package com.vscool.os.dialog; import android.content.Context; @@ -10,7 +10,7 @@ import android.widget.TextView; import androidx.appcompat.app.AlertDialog; -import com.xxpatx.os.R; +import com.vscool.os.R; /** diff --git a/app/src/main/java/com/xxpatx/os/dialog/DeleteDialog.java b/app/src/main/java/com/vscool/os/dialog/DeleteDialog.java similarity index 99% rename from app/src/main/java/com/xxpatx/os/dialog/DeleteDialog.java rename to app/src/main/java/com/vscool/os/dialog/DeleteDialog.java index 1c81434..301bb30 100644 --- a/app/src/main/java/com/xxpatx/os/dialog/DeleteDialog.java +++ b/app/src/main/java/com/vscool/os/dialog/DeleteDialog.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.dialog; +package com.vscool.os.dialog; import android.content.Context; @@ -10,7 +10,7 @@ import android.widget.TextView; import androidx.appcompat.app.AlertDialog; -import com.xxpatx.os.R; +import com.vscool.os.R; /** diff --git a/app/src/main/java/com/xxpatx/os/dialog/EditContactDialog.java b/app/src/main/java/com/vscool/os/dialog/EditContactDialog.java similarity index 98% rename from app/src/main/java/com/xxpatx/os/dialog/EditContactDialog.java rename to app/src/main/java/com/vscool/os/dialog/EditContactDialog.java index 5362fb0..1df6bef 100644 --- a/app/src/main/java/com/xxpatx/os/dialog/EditContactDialog.java +++ b/app/src/main/java/com/vscool/os/dialog/EditContactDialog.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.dialog; +package com.vscool.os.dialog; import android.content.Context; import android.os.Bundle; @@ -10,7 +10,7 @@ import android.widget.TextView; import androidx.appcompat.app.AlertDialog; import androidx.constraintlayout.widget.ConstraintLayout; -import com.xxpatx.os.R; +import com.vscool.os.R; public class EditContactDialog extends AlertDialog { diff --git a/app/src/main/java/com/xxpatx/os/dialog/PasswordDialog.java b/app/src/main/java/com/vscool/os/dialog/PasswordDialog.java similarity index 99% rename from app/src/main/java/com/xxpatx/os/dialog/PasswordDialog.java rename to app/src/main/java/com/vscool/os/dialog/PasswordDialog.java index c96ac56..67f8786 100644 --- a/app/src/main/java/com/xxpatx/os/dialog/PasswordDialog.java +++ b/app/src/main/java/com/vscool/os/dialog/PasswordDialog.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.dialog; +package com.vscool.os.dialog; import android.content.Context; @@ -12,7 +12,7 @@ import android.widget.TextView; import androidx.appcompat.app.AlertDialog; -import com.xxpatx.os.R; +import com.vscool.os.R; /** diff --git a/app/src/main/java/com/xxpatx/os/dialog/ShortcutDialog.java b/app/src/main/java/com/vscool/os/dialog/ShortcutDialog.java similarity index 99% rename from app/src/main/java/com/xxpatx/os/dialog/ShortcutDialog.java rename to app/src/main/java/com/vscool/os/dialog/ShortcutDialog.java index 783a5ea..b5753a3 100644 --- a/app/src/main/java/com/xxpatx/os/dialog/ShortcutDialog.java +++ b/app/src/main/java/com/vscool/os/dialog/ShortcutDialog.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.dialog; +package com.vscool.os.dialog; import android.content.Context; @@ -11,7 +11,7 @@ import android.widget.TextView; import androidx.appcompat.app.AlertDialog; -import com.xxpatx.os.R; +import com.vscool.os.R; /** diff --git a/app/src/main/java/com/xxpatx/os/dialog/SingleDialog.java b/app/src/main/java/com/vscool/os/dialog/SingleDialog.java similarity index 99% rename from app/src/main/java/com/xxpatx/os/dialog/SingleDialog.java rename to app/src/main/java/com/vscool/os/dialog/SingleDialog.java index 2e7cb03..c1b78f7 100644 --- a/app/src/main/java/com/xxpatx/os/dialog/SingleDialog.java +++ b/app/src/main/java/com/vscool/os/dialog/SingleDialog.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.dialog; +package com.vscool.os.dialog; import android.content.Context; @@ -10,7 +10,7 @@ import android.widget.TextView; import androidx.appcompat.app.AlertDialog; -import com.xxpatx.os.R; +import com.vscool.os.R; /** diff --git a/app/src/main/java/com/xxpatx/os/dialog/WifiDialog.java b/app/src/main/java/com/vscool/os/dialog/WifiDialog.java similarity index 99% rename from app/src/main/java/com/xxpatx/os/dialog/WifiDialog.java rename to app/src/main/java/com/vscool/os/dialog/WifiDialog.java index 4b659db..765863b 100644 --- a/app/src/main/java/com/xxpatx/os/dialog/WifiDialog.java +++ b/app/src/main/java/com/vscool/os/dialog/WifiDialog.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.dialog; +package com.vscool.os.dialog; import android.content.Context; @@ -14,7 +14,7 @@ import android.widget.TextView; import androidx.appcompat.app.AlertDialog; -import com.xxpatx.os.R; +import com.vscool.os.R; /** diff --git a/app/src/main/java/com/xxpatx/os/disklrucache/CacheHelper.java b/app/src/main/java/com/vscool/os/disklrucache/CacheHelper.java similarity index 99% rename from app/src/main/java/com/xxpatx/os/disklrucache/CacheHelper.java rename to app/src/main/java/com/vscool/os/disklrucache/CacheHelper.java index 5c58b60..4c834c2 100644 --- a/app/src/main/java/com/xxpatx/os/disklrucache/CacheHelper.java +++ b/app/src/main/java/com/vscool/os/disklrucache/CacheHelper.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.disklrucache; +package com.vscool.os.disklrucache; import android.content.Context; import android.graphics.Bitmap; @@ -9,7 +9,7 @@ import android.util.Log; import com.jakewharton.disklrucache.DiskLruCache; import com.tencent.mmkv.BuildConfig; import com.tencent.mmkv.MMKV; -import com.xxpatx.os.config.CommonConfig; +import com.vscool.os.config.CommonConfig; import org.json.JSONArray; import org.json.JSONException; diff --git a/app/src/main/java/com/xxpatx/os/disklrucache/Utils.java b/app/src/main/java/com/vscool/os/disklrucache/Utils.java similarity index 98% rename from app/src/main/java/com/xxpatx/os/disklrucache/Utils.java rename to app/src/main/java/com/vscool/os/disklrucache/Utils.java index 7660b18..a6e50d2 100644 --- a/app/src/main/java/com/xxpatx/os/disklrucache/Utils.java +++ b/app/src/main/java/com/vscool/os/disklrucache/Utils.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.disklrucache; +package com.vscool.os.disklrucache; import android.content.Context; import android.content.pm.PackageInfo; diff --git a/app/src/main/java/com/xxpatx/os/fragment/app/AppListFragment.java b/app/src/main/java/com/vscool/os/fragment/app/AppListFragment.java similarity index 88% rename from app/src/main/java/com/xxpatx/os/fragment/app/AppListFragment.java rename to app/src/main/java/com/vscool/os/fragment/app/AppListFragment.java index 5809c7d..86fff07 100644 --- a/app/src/main/java/com/xxpatx/os/fragment/app/AppListFragment.java +++ b/app/src/main/java/com/vscool/os/fragment/app/AppListFragment.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.fragment.app; +package com.vscool.os.fragment.app; import android.app.ActivityOptions; import android.content.Context; @@ -25,29 +25,29 @@ import com.google.gson.JsonObject; import com.hjq.toast.Toaster; import com.trello.rxlifecycle4.RxLifecycle; import com.trello.rxlifecycle4.android.FragmentEvent; -import com.xxpatx.os.BuildConfig; -import com.xxpatx.os.R; -import com.xxpatx.os.activity.contact.ContactListActivity; -import com.xxpatx.os.activity.dailyapp.DailyAppActivity; -import com.xxpatx.os.activity.screenlock.ScreenLockActivity; -import com.xxpatx.os.activity.service.ServiceActivity; -import com.xxpatx.os.base.BaseFragment; -import com.xxpatx.os.bean.BaseResponse; -import com.xxpatx.os.bean.DesktopIcon; -import com.xxpatx.os.config.CommonConfig; -import com.xxpatx.os.dialog.DailyAppDialog; -import com.xxpatx.os.dialog.ShortcutDialog; -import com.xxpatx.os.manager.AppManager; -import com.xxpatx.os.manager.AppStatusManager; -import com.xxpatx.os.network.NetInterfaceManager; -import com.xxpatx.os.service.NotificationService; -import com.xxpatx.os.shortcut.ShortcutPkgInfo; -import com.xxpatx.os.shortcut.ShortcutUtils; -import com.xxpatx.os.utils.ApkUtils; -import com.xxpatx.os.utils.AppUsedTimeUtils; -import com.xxpatx.os.utils.IconUtils; -import com.xxpatx.os.utils.Utils; -import com.xxpatx.os.view.MyGridLayout; +import com.vscool.os.BuildConfig; +import com.vscool.os.R; +import com.vscool.os.activity.contact.ContactListActivity; +import com.vscool.os.activity.dailyapp.DailyAppActivity; +import com.vscool.os.activity.screenlock.ScreenLockActivity; +import com.vscool.os.activity.service.ServiceActivity; +import com.vscool.os.base.BaseFragment; +import com.vscool.os.bean.BaseResponse; +import com.vscool.os.bean.DesktopIcon; +import com.vscool.os.config.CommonConfig; +import com.vscool.os.dialog.DailyAppDialog; +import com.vscool.os.dialog.ShortcutDialog; +import com.vscool.os.manager.AppManager; +import com.vscool.os.manager.AppStatusManager; +import com.vscool.os.network.NetInterfaceManager; +import com.vscool.os.service.NotificationService; +import com.vscool.os.shortcut.ShortcutPkgInfo; +import com.vscool.os.shortcut.ShortcutUtils; +import com.vscool.os.utils.ApkUtils; +import com.vscool.os.utils.AppUsedTimeUtils; +import com.vscool.os.utils.IconUtils; +import com.vscool.os.utils.Utils; +import com.vscool.os.view.MyGridLayout; import java.util.ArrayList; @@ -149,28 +149,28 @@ public class AppListFragment extends BaseFragment { TextView tv = view.findViewById(R.id.tv); TextView bg = view.findViewById(R.id.bg); ConstraintLayout constraintLayout = view.findViewById(R.id.btn_booktag); - switch (index % 6) { - case 0: - constraintLayout.setBackground(mContext.getDrawable(R.drawable.contact_card_backround1)); - break; - case 1: - constraintLayout.setBackground(mContext.getDrawable(R.drawable.contact_card_backround2)); - break; - case 2: - constraintLayout.setBackground(mContext.getDrawable(R.drawable.contact_card_backround3)); - break; - case 3: - constraintLayout.setBackground(mContext.getDrawable(R.drawable.contact_card_backround4)); - break; - case 4: - constraintLayout.setBackground(mContext.getDrawable(R.drawable.contact_card_backround5)); - break; - case 5: - constraintLayout.setBackground(mContext.getDrawable(R.drawable.contact_card_backround6)); - break; - default: - constraintLayout.setBackground(mContext.getDrawable(R.drawable.contact_card_backround1)); - } +// switch (index % 6) { +// case 0: +// constraintLayout.setBackground(mContext.getDrawable(R.drawable.contact_card_backround1)); +// break; +// case 1: +// constraintLayout.setBackground(mContext.getDrawable(R.drawable.contact_card_backround2)); +// break; +// case 2: +// constraintLayout.setBackground(mContext.getDrawable(R.drawable.contact_card_backround3)); +// break; +// case 3: +// constraintLayout.setBackground(mContext.getDrawable(R.drawable.contact_card_backround4)); +// break; +// case 4: +// constraintLayout.setBackground(mContext.getDrawable(R.drawable.contact_card_backround5)); +// break; +// case 5: +// constraintLayout.setBackground(mContext.getDrawable(R.drawable.contact_card_backround6)); +// break; +// default: +// constraintLayout.setBackground(mContext.getDrawable(R.drawable.contact_card_backround1)); +// } DesktopIcon desktopIcon = mDesktopIcons.get(index); if (desktopIcon != null) { @@ -276,7 +276,7 @@ public class AppListFragment extends BaseFragment { ApkUtils.openApp(mContext, "com.uiui.videoplayer"); break; case "aios.appstore": - ApkUtils.openApp(mContext, "com.xxpatx.store"); + ApkUtils.openApp(mContext, "com.vscool.store"); break; case "com.android.dialer": // int aole_call_forbid = Settings.System.getInt(mContext.getContentResolver(), "aole_call_forbid", 0); @@ -290,9 +290,9 @@ public class AppListFragment extends BaseFragment { // SendRunningApp(mContext); // } break; - case "com.xxpatx.os": - case "com.xxpatx.sn": - case "com.xxpatx.store": + case "com.vscool.os": + case "com.vscool.shbd": + case "com.vscool.store": case "com.uiuios.browser": ApkUtils.openPackage(v.getContext(), desktopIcon.getPackage(), desktopIcon.getClazz()); AppUsedTimeUtils.getInstance().setAppPackageName(desktopIcon.getPackage()); @@ -330,7 +330,7 @@ public class AppListFragment extends BaseFragment { } switch (pkg) { case "aios.exit": - case "com.xxpatx.sn": + case "com.vscool.shbd": case "aios.daily.app": case "aios.appstore": case AppManager.EXIT_DESKTOP: diff --git a/app/src/main/java/com/xxpatx/os/fragment/app/AppListViewModel.java b/app/src/main/java/com/vscool/os/fragment/app/AppListViewModel.java similarity index 68% rename from app/src/main/java/com/xxpatx/os/fragment/app/AppListViewModel.java rename to app/src/main/java/com/vscool/os/fragment/app/AppListViewModel.java index 5e1e233..158072e 100644 --- a/app/src/main/java/com/xxpatx/os/fragment/app/AppListViewModel.java +++ b/app/src/main/java/com/vscool/os/fragment/app/AppListViewModel.java @@ -1,8 +1,8 @@ -package com.xxpatx.os.fragment.app; +package com.vscool.os.fragment.app; import com.trello.rxlifecycle4.android.FragmentEvent; -import com.xxpatx.os.base.mvvm.BaseViewModel; -import com.xxpatx.os.databinding.FragmentApplistBinding; +import com.vscool.os.base.mvvm.BaseViewModel; +import com.vscool.os.databinding.FragmentApplistBinding; public class AppListViewModel extends BaseViewModel { @Override diff --git a/app/src/main/java/com/xxpatx/os/fragment/contact/ContactFragment.java b/app/src/main/java/com/vscool/os/fragment/contact/ContactFragment.java similarity index 94% rename from app/src/main/java/com/xxpatx/os/fragment/contact/ContactFragment.java rename to app/src/main/java/com/vscool/os/fragment/contact/ContactFragment.java index f62a297..de970df 100644 --- a/app/src/main/java/com/xxpatx/os/fragment/contact/ContactFragment.java +++ b/app/src/main/java/com/vscool/os/fragment/contact/ContactFragment.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.fragment.contact; +package com.vscool.os.fragment.contact; import android.content.ContentResolver; import android.content.Intent; @@ -20,20 +20,20 @@ import com.hjq.toast.Toaster; import com.jeremyliao.liveeventbus.LiveEventBus; import com.qweather.sdk.bean.weather.WeatherNowBean; import com.tencent.mmkv.MMKV; -import com.xxpatx.os.R; -import com.xxpatx.os.activity.contact.AddContactActivity; -import com.xxpatx.os.activity.contact.EditContactActivity; -import com.xxpatx.os.activity.weather.WeatherActivity; -import com.xxpatx.os.adapter.WechatContactAdapter; -import com.xxpatx.os.base.mvvm.fragment.BaseMvvmFragment; -import com.xxpatx.os.bean.BaseResponse; -import com.xxpatx.os.bean.Contact; -import com.xxpatx.os.bean.MapBean; -import com.xxpatx.os.config.CommonConfig; -import com.xxpatx.os.databinding.FragmentContactHomeBinding; -import com.xxpatx.os.dialog.EditContactDialog; -import com.xxpatx.os.utils.DayUtils; -import com.xxpatx.os.utils.TimeUtils; +import com.vscool.os.R; +import com.vscool.os.activity.contact.AddContactActivity; +import com.vscool.os.activity.contact.EditContactActivity; +import com.vscool.os.activity.weather.WeatherActivity; +import com.vscool.os.adapter.WechatContactAdapter; +import com.vscool.os.base.mvvm.fragment.BaseMvvmFragment; +import com.vscool.os.bean.BaseResponse; +import com.vscool.os.bean.Contact; +import com.vscool.os.bean.MapBean; +import com.vscool.os.config.CommonConfig; +import com.vscool.os.databinding.FragmentContactHomeBinding; +import com.vscool.os.dialog.EditContactDialog; +import com.vscool.os.utils.DayUtils; +import com.vscool.os.utils.TimeUtils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/xxpatx/os/fragment/contact/ContactViewModel.java b/app/src/main/java/com/vscool/os/fragment/contact/ContactViewModel.java similarity index 91% rename from app/src/main/java/com/xxpatx/os/fragment/contact/ContactViewModel.java rename to app/src/main/java/com/vscool/os/fragment/contact/ContactViewModel.java index c4f0e00..00e9e03 100644 --- a/app/src/main/java/com/xxpatx/os/fragment/contact/ContactViewModel.java +++ b/app/src/main/java/com/vscool/os/fragment/contact/ContactViewModel.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.fragment.contact; +package com.vscool.os.fragment.contact; import android.text.TextUtils; import android.util.Log; @@ -10,16 +10,16 @@ import com.google.gson.reflect.TypeToken; import com.tencent.mmkv.MMKV; import com.trello.rxlifecycle4.RxLifecycle; import com.trello.rxlifecycle4.android.FragmentEvent; -import com.xxpatx.os.base.mvvm.BaseViewModel; -import com.xxpatx.os.bean.BaseResponse; -import com.xxpatx.os.bean.Contact; -import com.xxpatx.os.config.CommonConfig; -import com.xxpatx.os.databinding.FragmentContactHomeBinding; -import com.xxpatx.os.db.ContactCacheUtils; -import com.xxpatx.os.gson.GsonUtils; -import com.xxpatx.os.network.NetInterfaceManager; -import com.xxpatx.os.network.UrlAddress; -import com.xxpatx.os.utils.ContactsUtils; +import com.vscool.os.base.mvvm.BaseViewModel; +import com.vscool.os.bean.BaseResponse; +import com.vscool.os.bean.Contact; +import com.vscool.os.config.CommonConfig; +import com.vscool.os.databinding.FragmentContactHomeBinding; +import com.vscool.os.db.ContactCacheUtils; +import com.vscool.os.gson.GsonUtils; +import com.vscool.os.network.NetInterfaceManager; +import com.vscool.os.network.UrlAddress; +import com.vscool.os.utils.ContactsUtils; import java.lang.reflect.Type; import java.util.ArrayList; diff --git a/app/src/main/java/com/xxpatx/os/fragment/control/ControlFragment.java b/app/src/main/java/com/vscool/os/fragment/control/ControlFragment.java similarity index 98% rename from app/src/main/java/com/xxpatx/os/fragment/control/ControlFragment.java rename to app/src/main/java/com/vscool/os/fragment/control/ControlFragment.java index 6d166ef..72b8897 100644 --- a/app/src/main/java/com/xxpatx/os/fragment/control/ControlFragment.java +++ b/app/src/main/java/com/vscool/os/fragment/control/ControlFragment.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.fragment.control; +package com.vscool.os.fragment.control; import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothDevice; @@ -27,8 +27,6 @@ import android.provider.Settings; import android.text.TextUtils; import android.util.Log; import android.view.View; -import android.view.Window; -import android.view.WindowManager; import android.widget.SeekBar; import androidx.annotation.NonNull; @@ -36,14 +34,14 @@ import androidx.fragment.app.Fragment; import androidx.lifecycle.Observer; import com.tencent.mmkv.MMKV; -import com.xxpatx.os.R; -import com.xxpatx.os.activity.setting.SettingActivity; -import com.xxpatx.os.base.mvvm.fragment.BaseMvvmFragment; -import com.xxpatx.os.bean.FamilyAddress; -import com.xxpatx.os.config.CommonConfig; -import com.xxpatx.os.databinding.PhoneFragmentControlBinding; -import com.xxpatx.os.manager.AmapManager; -import com.xxpatx.os.utils.BrightnessUtils; +import com.vscool.os.R; +import com.vscool.os.activity.setting.SettingActivity; +import com.vscool.os.base.mvvm.fragment.BaseMvvmFragment; +import com.vscool.os.bean.FamilyAddress; +import com.vscool.os.config.CommonConfig; +import com.vscool.os.databinding.PhoneFragmentControlBinding; +import com.vscool.os.manager.AmapManager; +import com.vscool.os.utils.BrightnessUtils; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/app/src/main/java/com/xxpatx/os/fragment/control/ControlViewModel.java b/app/src/main/java/com/vscool/os/fragment/control/ControlViewModel.java similarity index 87% rename from app/src/main/java/com/xxpatx/os/fragment/control/ControlViewModel.java rename to app/src/main/java/com/vscool/os/fragment/control/ControlViewModel.java index 7058254..8652bb9 100644 --- a/app/src/main/java/com/xxpatx/os/fragment/control/ControlViewModel.java +++ b/app/src/main/java/com/vscool/os/fragment/control/ControlViewModel.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.fragment.control; +package com.vscool.os.fragment.control; import android.util.Log; @@ -7,12 +7,12 @@ import androidx.lifecycle.MutableLiveData; import com.tencent.mmkv.MMKV; import com.trello.rxlifecycle4.RxLifecycle; import com.trello.rxlifecycle4.android.FragmentEvent; -import com.xxpatx.os.base.mvvm.BaseViewModel; -import com.xxpatx.os.bean.BaseResponse; -import com.xxpatx.os.bean.FamilyAddress; -import com.xxpatx.os.config.CommonConfig; -import com.xxpatx.os.databinding.PhoneFragmentControlBinding; -import com.xxpatx.os.network.NetInterfaceManager; +import com.vscool.os.base.mvvm.BaseViewModel; +import com.vscool.os.bean.BaseResponse; +import com.vscool.os.bean.FamilyAddress; +import com.vscool.os.config.CommonConfig; +import com.vscool.os.databinding.PhoneFragmentControlBinding; +import com.vscool.os.network.NetInterfaceManager; import io.reactivex.rxjava3.annotations.NonNull; import io.reactivex.rxjava3.core.Observer; diff --git a/app/src/main/java/com/xxpatx/os/fragment/home/HomeFragment.java b/app/src/main/java/com/vscool/os/fragment/home/HomeFragment.java similarity index 92% rename from app/src/main/java/com/xxpatx/os/fragment/home/HomeFragment.java rename to app/src/main/java/com/vscool/os/fragment/home/HomeFragment.java index a27ed22..744c21b 100644 --- a/app/src/main/java/com/xxpatx/os/fragment/home/HomeFragment.java +++ b/app/src/main/java/com/vscool/os/fragment/home/HomeFragment.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.fragment.home; +package com.vscool.os.fragment.home; import android.content.BroadcastReceiver; import android.content.Context; @@ -23,25 +23,27 @@ import com.qweather.sdk.bean.weather.WeatherDailyBean; import com.qweather.sdk.bean.weather.WeatherHourlyBean; import com.qweather.sdk.bean.weather.WeatherNowBean; import com.tencent.mmkv.MMKV; -import com.xxpatx.os.BuildConfig; -import com.xxpatx.os.R; -import com.xxpatx.os.activity.FlashlightActivity; -import com.xxpatx.os.activity.NetworkActivity; -import com.xxpatx.os.activity.contact.AddContactActivity; -import com.xxpatx.os.activity.setting.SettingActivity; -import com.xxpatx.os.activity.weather.WeatherActivity; -import com.xxpatx.os.alarm.AlarmClockData; -import com.xxpatx.os.alarm.AlarmUtils; -import com.xxpatx.os.base.mvvm.fragment.BaseMvvmFragment; -import com.xxpatx.os.bean.DesktopIcon; -import com.xxpatx.os.bean.MapBean; -import com.xxpatx.os.config.CommonConfig; -import com.xxpatx.os.databinding.FragmentHomeBinding; -import com.xxpatx.os.dialog.SingleDialog; -import com.xxpatx.os.push.PushManager; -import com.xxpatx.os.utils.ApkUtils; -import com.xxpatx.os.utils.DayUtils; -import com.xxpatx.os.utils.TimeUtils; +import com.vscool.os.BuildConfig; +import com.vscool.os.R; +import com.vscool.os.activity.FlashlightActivity; +import com.vscool.os.activity.NetworkActivity; +import com.vscool.os.activity.alarm.list.AlarmListActivity; +import com.vscool.os.activity.contact.AddContactActivity; +import com.vscool.os.activity.emergency.EmergencyActivity; +import com.vscool.os.activity.setting.SettingActivity; +import com.vscool.os.activity.weather.WeatherActivity; +import com.vscool.os.alarm.AlarmClockData; +import com.vscool.os.alarm.AlarmUtils; +import com.vscool.os.base.mvvm.fragment.BaseMvvmFragment; +import com.vscool.os.bean.DesktopIcon; +import com.vscool.os.bean.MapBean; +import com.vscool.os.config.CommonConfig; +import com.vscool.os.databinding.FragmentHomeBinding; +import com.vscool.os.dialog.SingleDialog; +import com.vscool.os.push.PushManager; +import com.vscool.os.utils.ApkUtils; +import com.vscool.os.utils.DayUtils; +import com.vscool.os.utils.TimeUtils; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -454,7 +456,7 @@ public class HomeFragment extends BaseMvvmFragment { @Override diff --git a/app/src/main/java/com/xxpatx/os/fragment/phone/record/RecordFragment.java b/app/src/main/java/com/vscool/os/fragment/phone/record/RecordFragment.java similarity index 94% rename from app/src/main/java/com/xxpatx/os/fragment/phone/record/RecordFragment.java rename to app/src/main/java/com/vscool/os/fragment/phone/record/RecordFragment.java index 1932795..3e81999 100644 --- a/app/src/main/java/com/xxpatx/os/fragment/phone/record/RecordFragment.java +++ b/app/src/main/java/com/vscool/os/fragment/phone/record/RecordFragment.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.fragment.phone.record; +package com.vscool.os.fragment.phone.record; import android.content.Context; import android.content.Intent; @@ -12,15 +12,15 @@ import androidx.fragment.app.Fragment; import androidx.lifecycle.Observer; import androidx.recyclerview.widget.LinearLayoutManager; -import com.xxpatx.os.R; -import com.xxpatx.os.activity.selectnumber.SelectNumberActivity; -import com.xxpatx.os.adapter.CallRecordAdapter; -import com.xxpatx.os.base.mvvm.fragment.BaseMvvmFragment; -import com.xxpatx.os.bean.Contact; -import com.xxpatx.os.bean.RecordsInfo; -import com.xxpatx.os.databinding.FragmentRecordBinding; -import com.xxpatx.os.dialog.DeleteDialog; -import com.xxpatx.os.utils.Utils; +import com.vscool.os.R; +import com.vscool.os.activity.selectnumber.SelectNumberActivity; +import com.vscool.os.adapter.CallRecordAdapter; +import com.vscool.os.base.mvvm.fragment.BaseMvvmFragment; +import com.vscool.os.bean.Contact; +import com.vscool.os.bean.RecordsInfo; +import com.vscool.os.databinding.FragmentRecordBinding; +import com.vscool.os.dialog.DeleteDialog; +import com.vscool.os.utils.Utils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/xxpatx/os/fragment/phone/record/RecordViewModel.java b/app/src/main/java/com/vscool/os/fragment/phone/record/RecordViewModel.java similarity index 94% rename from app/src/main/java/com/xxpatx/os/fragment/phone/record/RecordViewModel.java rename to app/src/main/java/com/vscool/os/fragment/phone/record/RecordViewModel.java index 21b84f1..f35127b 100644 --- a/app/src/main/java/com/xxpatx/os/fragment/phone/record/RecordViewModel.java +++ b/app/src/main/java/com/vscool/os/fragment/phone/record/RecordViewModel.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.fragment.phone.record; +package com.vscool.os.fragment.phone.record; import android.content.ContentResolver; import android.database.Cursor; @@ -11,12 +11,12 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.tencent.mmkv.MMKV; import com.trello.rxlifecycle4.android.FragmentEvent; -import com.xxpatx.os.base.mvvm.BaseViewModel; -import com.xxpatx.os.bean.Contact; -import com.xxpatx.os.bean.RecordsInfo; -import com.xxpatx.os.config.CommonConfig; -import com.xxpatx.os.databinding.FragmentRecordBinding; -import com.xxpatx.os.network.UrlAddress; +import com.vscool.os.base.mvvm.BaseViewModel; +import com.vscool.os.bean.Contact; +import com.vscool.os.bean.RecordsInfo; +import com.vscool.os.config.CommonConfig; +import com.vscool.os.databinding.FragmentRecordBinding; +import com.vscool.os.network.UrlAddress; import java.lang.reflect.Type; import java.util.ArrayList; diff --git a/app/src/main/java/com/xxpatx/os/fragment/settings/SettingsFragment.java b/app/src/main/java/com/vscool/os/fragment/settings/SettingsFragment.java similarity index 82% rename from app/src/main/java/com/xxpatx/os/fragment/settings/SettingsFragment.java rename to app/src/main/java/com/vscool/os/fragment/settings/SettingsFragment.java index 03fddf5..17bfdae 100644 --- a/app/src/main/java/com/xxpatx/os/fragment/settings/SettingsFragment.java +++ b/app/src/main/java/com/vscool/os/fragment/settings/SettingsFragment.java @@ -1,9 +1,10 @@ -package com.xxpatx.os.fragment.settings; +package com.vscool.os.fragment.settings; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; +import android.content.pm.ResolveInfo; import android.os.Bundle; import android.provider.Settings; import android.text.TextUtils; @@ -22,23 +23,25 @@ import com.qweather.sdk.bean.weather.WeatherDailyBean; import com.qweather.sdk.bean.weather.WeatherHourlyBean; import com.qweather.sdk.bean.weather.WeatherNowBean; import com.tencent.mmkv.MMKV; -import com.xxpatx.os.R; -import com.xxpatx.os.activity.alarm.list.AlarmListActivity; -import com.xxpatx.os.activity.dailyapp.DailyAppActivity; -import com.xxpatx.os.activity.emergency.EmergencyActivity; -import com.xxpatx.os.activity.setting.SettingActivity; -import com.xxpatx.os.activity.weather.WeatherActivity; -import com.xxpatx.os.base.mvvm.fragment.BaseMvvmFragment; -import com.xxpatx.os.bean.MapBean; -import com.xxpatx.os.bean.SystemSettings; -import com.xxpatx.os.config.CommonConfig; -import com.xxpatx.os.databinding.FragmentSettingsBinding; -import com.xxpatx.os.manager.AmapManager; -import com.xxpatx.os.utils.ApkUtils; -import com.xxpatx.os.utils.DayUtils; -import com.xxpatx.os.utils.TimeUtils; +import com.vscool.os.R; +import com.vscool.os.activity.alarm.list.AlarmListActivity; +import com.vscool.os.activity.contact.ContactListActivity; +import com.vscool.os.activity.dailyapp.DailyAppActivity; +import com.vscool.os.activity.emergency.EmergencyActivity; +import com.vscool.os.activity.setting.SettingActivity; +import com.vscool.os.activity.weather.WeatherActivity; +import com.vscool.os.base.mvvm.fragment.BaseMvvmFragment; +import com.vscool.os.bean.MapBean; +import com.vscool.os.bean.SystemSettings; +import com.vscool.os.config.CommonConfig; +import com.vscool.os.databinding.FragmentSettingsBinding; +import com.vscool.os.manager.AmapManager; +import com.vscool.os.utils.ApkUtils; +import com.vscool.os.utils.DayUtils; -import static com.xxpatx.os.config.CommonConfig.UIUIAIOS_DESKTOP_LOCATION_STATUS; +import java.util.List; + +import static com.vscool.os.config.CommonConfig.UIUIAIOS_DESKTOP_LOCATION_STATUS; /** * A simple {@link Fragment} subclass. @@ -109,7 +112,6 @@ public class SettingsFragment extends BaseMvvmFragment() { - @Override - public void onChanged(@Nullable String s) { - mViewDataBinding.tvTime.setText(s); - } - }); - - LiveEventBus - .get("date", String.class) - .observe(this, new Observer() { - @Override - public void onChanged(@Nullable String s) { - mViewDataBinding.tvData.setText(s); - } - }); - - LiveEventBus - .get("week", String.class) - .observe(this, new Observer() { - @Override - public void onChanged(@Nullable String s) { - mViewDataBinding.tvWeek.setText(s); - } - }); - LiveEventBus.get(CommonConfig.AMAP_LOCATION_MAP_BEAN, MapBean.class) .observe(this, new Observer() { @Override @@ -215,12 +190,6 @@ public class SettingsFragment extends BaseMvvmFragment resolveInfos = mContext.getPackageManager().queryIntentActivities(smsIntent, 0); + Log.e(TAG, "getDefaultMsmPackageName: " + resolveInfos); + if (!resolveInfos.isEmpty()) { + return resolveInfos.get(0).activityInfo.packageName; + } + return "com.android.mms"; // 没有找到相机应用 } } diff --git a/app/src/main/java/com/xxpatx/os/fragment/settings/SettingsViewModel.java b/app/src/main/java/com/vscool/os/fragment/settings/SettingsViewModel.java similarity index 87% rename from app/src/main/java/com/xxpatx/os/fragment/settings/SettingsViewModel.java rename to app/src/main/java/com/vscool/os/fragment/settings/SettingsViewModel.java index b9996a4..e46ba01 100644 --- a/app/src/main/java/com/xxpatx/os/fragment/settings/SettingsViewModel.java +++ b/app/src/main/java/com/vscool/os/fragment/settings/SettingsViewModel.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.fragment.settings; +package com.vscool.os.fragment.settings; import android.util.Log; @@ -7,12 +7,12 @@ import androidx.lifecycle.MutableLiveData; import com.tencent.mmkv.MMKV; import com.trello.rxlifecycle4.RxLifecycle; import com.trello.rxlifecycle4.android.FragmentEvent; -import com.xxpatx.os.base.mvvm.BaseViewModel; -import com.xxpatx.os.bean.BaseResponse; -import com.xxpatx.os.bean.SystemSettings; -import com.xxpatx.os.config.CommonConfig; -import com.xxpatx.os.databinding.FragmentSettingsBinding; -import com.xxpatx.os.network.NetInterfaceManager; +import com.vscool.os.base.mvvm.BaseViewModel; +import com.vscool.os.bean.BaseResponse; +import com.vscool.os.bean.SystemSettings; +import com.vscool.os.config.CommonConfig; +import com.vscool.os.databinding.FragmentSettingsBinding; +import com.vscool.os.network.NetInterfaceManager; import io.reactivex.rxjava3.annotations.NonNull; import io.reactivex.rxjava3.core.Observer; diff --git a/app/src/main/java/com/xxpatx/os/gson/GetJsonDataUtil.java b/app/src/main/java/com/vscool/os/gson/GetJsonDataUtil.java similarity index 96% rename from app/src/main/java/com/xxpatx/os/gson/GetJsonDataUtil.java rename to app/src/main/java/com/vscool/os/gson/GetJsonDataUtil.java index 6c4147b..4e585ae 100644 --- a/app/src/main/java/com/xxpatx/os/gson/GetJsonDataUtil.java +++ b/app/src/main/java/com/vscool/os/gson/GetJsonDataUtil.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.gson; +package com.vscool.os.gson; import android.content.Context; import android.content.res.AssetManager; diff --git a/app/src/main/java/com/xxpatx/os/gson/GsonUtils.java b/app/src/main/java/com/vscool/os/gson/GsonUtils.java similarity index 99% rename from app/src/main/java/com/xxpatx/os/gson/GsonUtils.java rename to app/src/main/java/com/vscool/os/gson/GsonUtils.java index b1bf5a4..239b7f3 100644 --- a/app/src/main/java/com/xxpatx/os/gson/GsonUtils.java +++ b/app/src/main/java/com/vscool/os/gson/GsonUtils.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.gson; +package com.vscool.os.gson; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/app/src/main/java/com/xxpatx/os/gson/IntegerDefault0Adapter.java b/app/src/main/java/com/vscool/os/gson/IntegerDefault0Adapter.java similarity index 97% rename from app/src/main/java/com/xxpatx/os/gson/IntegerDefault0Adapter.java rename to app/src/main/java/com/vscool/os/gson/IntegerDefault0Adapter.java index eb95403..af9ee13 100644 --- a/app/src/main/java/com/xxpatx/os/gson/IntegerDefault0Adapter.java +++ b/app/src/main/java/com/vscool/os/gson/IntegerDefault0Adapter.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.gson; +package com.vscool.os.gson; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonDeserializer; diff --git a/app/src/main/java/com/xxpatx/os/gson/NullStringToEmptyAdapterFactory.java b/app/src/main/java/com/vscool/os/gson/NullStringToEmptyAdapterFactory.java similarity index 97% rename from app/src/main/java/com/xxpatx/os/gson/NullStringToEmptyAdapterFactory.java rename to app/src/main/java/com/vscool/os/gson/NullStringToEmptyAdapterFactory.java index 7ccde05..f12f25e 100644 --- a/app/src/main/java/com/xxpatx/os/gson/NullStringToEmptyAdapterFactory.java +++ b/app/src/main/java/com/vscool/os/gson/NullStringToEmptyAdapterFactory.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.gson; +package com.vscool.os.gson; import com.google.gson.Gson; import com.google.gson.TypeAdapter; diff --git a/app/src/main/java/com/xxpatx/os/iconpostition/IconPositionDBHelper.java b/app/src/main/java/com/vscool/os/iconpostition/IconPositionDBHelper.java similarity index 92% rename from app/src/main/java/com/xxpatx/os/iconpostition/IconPositionDBHelper.java rename to app/src/main/java/com/vscool/os/iconpostition/IconPositionDBHelper.java index e817ec5..f09e1cc 100644 --- a/app/src/main/java/com/xxpatx/os/iconpostition/IconPositionDBHelper.java +++ b/app/src/main/java/com/vscool/os/iconpostition/IconPositionDBHelper.java @@ -1,14 +1,11 @@ -package com.xxpatx.os.iconpostition; +package com.vscool.os.iconpostition; import android.content.Context; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; -import android.os.Environment; import androidx.annotation.Nullable; -import java.io.File; - public class IconPositionDBHelper extends SQLiteOpenHelper { public static final String DATABASE_NAME = "IconPosition.db"; public static final int DATABASE_VERSION = 1; diff --git a/app/src/main/java/com/xxpatx/os/iconpostition/IconPositionManager.java b/app/src/main/java/com/vscool/os/iconpostition/IconPositionManager.java similarity index 97% rename from app/src/main/java/com/xxpatx/os/iconpostition/IconPositionManager.java rename to app/src/main/java/com/vscool/os/iconpostition/IconPositionManager.java index 7e2cf8e..e164e8c 100644 --- a/app/src/main/java/com/xxpatx/os/iconpostition/IconPositionManager.java +++ b/app/src/main/java/com/vscool/os/iconpostition/IconPositionManager.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.iconpostition; +package com.vscool.os.iconpostition; import android.annotation.SuppressLint; import android.content.ContentValues; @@ -6,8 +6,8 @@ import android.content.Context; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; -import com.xxpatx.os.bean.NetDesktopIcon; -import com.xxpatx.os.utils.ApkUtils; +import com.vscool.os.bean.NetDesktopIcon; +import com.vscool.os.utils.ApkUtils; import java.util.ArrayList; import java.util.HashMap; diff --git a/app/src/main/java/com/xxpatx/os/iconpostition/IconUtils.java b/app/src/main/java/com/vscool/os/iconpostition/IconUtils.java similarity index 97% rename from app/src/main/java/com/xxpatx/os/iconpostition/IconUtils.java rename to app/src/main/java/com/vscool/os/iconpostition/IconUtils.java index ed41297..0018dfc 100644 --- a/app/src/main/java/com/xxpatx/os/iconpostition/IconUtils.java +++ b/app/src/main/java/com/vscool/os/iconpostition/IconUtils.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.iconpostition; +package com.vscool.os.iconpostition; import android.content.Context; import android.content.pm.ApplicationInfo; diff --git a/app/src/main/java/com/xxpatx/os/manager/AmapManager.java b/app/src/main/java/com/vscool/os/manager/AmapManager.java similarity index 96% rename from app/src/main/java/com/xxpatx/os/manager/AmapManager.java rename to app/src/main/java/com/vscool/os/manager/AmapManager.java index 05a88e5..30ae188 100644 --- a/app/src/main/java/com/xxpatx/os/manager/AmapManager.java +++ b/app/src/main/java/com/vscool/os/manager/AmapManager.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.manager; +package com.vscool.os.manager; import android.annotation.SuppressLint; import android.content.Context; @@ -13,12 +13,12 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.jeremyliao.liveeventbus.LiveEventBus; import com.tencent.mmkv.MMKV; -import com.xxpatx.os.bean.BaseResponse; -import com.xxpatx.os.bean.MapBean; -import com.xxpatx.os.config.CommonConfig; -import com.xxpatx.os.gson.GsonUtils; -import com.xxpatx.os.network.NetInterfaceManager; -import com.xxpatx.os.utils.ActivationUtil; +import com.vscool.os.bean.BaseResponse; +import com.vscool.os.bean.MapBean; +import com.vscool.os.config.CommonConfig; +import com.vscool.os.gson.GsonUtils; +import com.vscool.os.network.NetInterfaceManager; +import com.vscool.os.utils.ActivationUtil; import java.lang.reflect.Type; diff --git a/app/src/main/java/com/xxpatx/os/manager/AppManager.java b/app/src/main/java/com/vscool/os/manager/AppManager.java similarity index 98% rename from app/src/main/java/com/xxpatx/os/manager/AppManager.java rename to app/src/main/java/com/vscool/os/manager/AppManager.java index a9a58a3..0724de3 100644 --- a/app/src/main/java/com/xxpatx/os/manager/AppManager.java +++ b/app/src/main/java/com/vscool/os/manager/AppManager.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.manager; +package com.vscool.os.manager; import android.annotation.SuppressLint; import android.content.Context; @@ -11,9 +11,9 @@ import android.text.TextUtils; import android.util.Log; import com.tencent.mmkv.MMKV; -import com.xxpatx.os.bean.DesktopIcon; -import com.xxpatx.os.config.CommonConfig; -import com.xxpatx.os.utils.ApkUtils; +import com.vscool.os.bean.DesktopIcon; +import com.vscool.os.config.CommonConfig; +import com.vscool.os.utils.ApkUtils; import java.text.Collator; import java.util.ArrayList; diff --git a/app/src/main/java/com/xxpatx/os/manager/AppStatusManager.java b/app/src/main/java/com/vscool/os/manager/AppStatusManager.java similarity index 96% rename from app/src/main/java/com/xxpatx/os/manager/AppStatusManager.java rename to app/src/main/java/com/vscool/os/manager/AppStatusManager.java index 7d92bae..1f0ff0b 100644 --- a/app/src/main/java/com/xxpatx/os/manager/AppStatusManager.java +++ b/app/src/main/java/com/vscool/os/manager/AppStatusManager.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.manager; +package com.vscool.os.manager; import android.annotation.SuppressLint; import android.content.Context; @@ -8,10 +8,10 @@ import android.content.pm.ResolveInfo; import android.util.Log; import com.tencent.mmkv.MMKV; -import com.xxpatx.os.activity.main.MainActivity; -import com.xxpatx.os.bean.DailyAppBean; -import com.xxpatx.os.config.CommonConfig; -import com.xxpatx.os.utils.ApkUtils; +import com.vscool.os.activity.main.MainActivity; +import com.vscool.os.bean.DailyAppBean; +import com.vscool.os.config.CommonConfig; +import com.vscool.os.utils.ApkUtils; import java.util.ArrayList; import java.util.HashSet; diff --git a/app/src/main/java/com/xxpatx/os/manager/ConnectManager.java b/app/src/main/java/com/vscool/os/manager/ConnectManager.java similarity index 97% rename from app/src/main/java/com/xxpatx/os/manager/ConnectManager.java rename to app/src/main/java/com/vscool/os/manager/ConnectManager.java index 47f648a..93c705d 100644 --- a/app/src/main/java/com/xxpatx/os/manager/ConnectManager.java +++ b/app/src/main/java/com/vscool/os/manager/ConnectManager.java @@ -1,12 +1,12 @@ -package com.xxpatx.os.manager; +package com.vscool.os.manager; import android.annotation.SuppressLint; import android.content.Context; import android.util.Log; import com.tencent.mmkv.MMKV; -import com.xxpatx.os.config.CommonConfig; -import com.xxpatx.os.utils.TimeUtils; +import com.vscool.os.config.CommonConfig; +import com.vscool.os.utils.TimeUtils; public class ConnectManager { private static final String TAG = "ConnectManager"; diff --git a/app/src/main/java/com/xxpatx/os/manager/ConnectMode.java b/app/src/main/java/com/vscool/os/manager/ConnectMode.java similarity index 82% rename from app/src/main/java/com/xxpatx/os/manager/ConnectMode.java rename to app/src/main/java/com/vscool/os/manager/ConnectMode.java index 8f829c9..e205a87 100644 --- a/app/src/main/java/com/xxpatx/os/manager/ConnectMode.java +++ b/app/src/main/java/com/vscool/os/manager/ConnectMode.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.manager; +package com.vscool.os.manager; public enum ConnectMode { DEFAULT, diff --git a/app/src/main/java/com/xxpatx/os/manager/DesktopIconManager.java b/app/src/main/java/com/vscool/os/manager/DesktopIconManager.java similarity index 95% rename from app/src/main/java/com/xxpatx/os/manager/DesktopIconManager.java rename to app/src/main/java/com/vscool/os/manager/DesktopIconManager.java index cc8d8b1..f6b3d59 100644 --- a/app/src/main/java/com/xxpatx/os/manager/DesktopIconManager.java +++ b/app/src/main/java/com/vscool/os/manager/DesktopIconManager.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.manager; +package com.vscool.os.manager; import android.annotation.SuppressLint; import android.content.Context; @@ -8,8 +8,8 @@ import android.provider.MediaStore; import android.util.Log; import com.tencent.mmkv.MMKV; -import com.xxpatx.os.bean.DockApp; -import com.xxpatx.os.config.CommonConfig; +import com.vscool.os.bean.DockApp; +import com.vscool.os.config.CommonConfig; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/xxpatx/os/network/NetInterfaceManager.java b/app/src/main/java/com/vscool/os/network/NetInterfaceManager.java similarity index 93% rename from app/src/main/java/com/xxpatx/os/network/NetInterfaceManager.java rename to app/src/main/java/com/vscool/os/network/NetInterfaceManager.java index 306f130..e96b290 100644 --- a/app/src/main/java/com/xxpatx/os/network/NetInterfaceManager.java +++ b/app/src/main/java/com/vscool/os/network/NetInterfaceManager.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.network; +package com.vscool.os.network; import android.annotation.SuppressLint; import android.content.Context; @@ -11,88 +11,88 @@ import com.tencent.mmkv.MMKV; import com.trello.rxlifecycle4.RxLifecycle; import com.trello.rxlifecycle4.android.ActivityEvent; import com.trello.rxlifecycle4.android.FragmentEvent; -import com.xxpatx.os.BuildConfig; -import com.xxpatx.os.alarm.AlarmClockData; -import com.xxpatx.os.alarm.AlarmUtils; -import com.xxpatx.os.bean.ActivationBean; -import com.xxpatx.os.bean.ActivityBean; -import com.xxpatx.os.bean.AddressInfo; -import com.xxpatx.os.bean.AlarmClockId; -import com.xxpatx.os.bean.AppInfo; -import com.xxpatx.os.bean.ArticleList; -import com.xxpatx.os.bean.BaseResponse; -import com.xxpatx.os.bean.Contact; -import com.xxpatx.os.bean.DemandBean; -import com.xxpatx.os.bean.ExpressData; -import com.xxpatx.os.bean.FamilyAddress; -import com.xxpatx.os.bean.GoodsList; -import com.xxpatx.os.bean.GoodsType; -import com.xxpatx.os.bean.HealthCode; -import com.xxpatx.os.bean.NetDesktopIcon; -import com.xxpatx.os.bean.OrderBean; -import com.xxpatx.os.bean.OrderIndexData; -import com.xxpatx.os.bean.QweatherLookup; -import com.xxpatx.os.bean.RegionInfo; -import com.xxpatx.os.bean.ServeBean; -import com.xxpatx.os.bean.SnInfo; -import com.xxpatx.os.bean.SystemSettings; -import com.xxpatx.os.bean.TestAppInfo; -import com.xxpatx.os.bean.UserAvatarInfo; -import com.xxpatx.os.bean.UserId; -import com.xxpatx.os.bean.WxpayBean; -import com.xxpatx.os.config.CommonConfig; -import com.xxpatx.os.disklrucache.CacheHelper; -import com.xxpatx.os.gson.GsonUtils; -import com.xxpatx.os.manager.ConnectManager; -import com.xxpatx.os.manager.ConnectMode; -import com.xxpatx.os.network.api.qweather.LookupApi; -import com.xxpatx.os.network.api.uiui.ActivityListApi; -import com.xxpatx.os.network.api.uiui.AddressIndexApi; -import com.xxpatx.os.network.api.uiui.AppUpdate; -import com.xxpatx.os.network.api.uiui.AppUsageRecordApi; -import com.xxpatx.os.network.api.uiui.ArticleCategorysListApi; -import com.xxpatx.os.network.api.uiui.ArticleListApi; -import com.xxpatx.os.network.api.uiui.DemandListApi; -import com.xxpatx.os.network.api.uiui.GetAdminSnSettingApi; -import com.xxpatx.os.network.api.uiui.GetMailList; -import com.xxpatx.os.network.api.uiui.GetUserIDApi; -import com.xxpatx.os.network.api.uiui.GoodsListApi; -import com.xxpatx.os.network.api.uiui.GoodsTypeApi; -import com.xxpatx.os.network.api.uiui.GoodsTypeListApi; -import com.xxpatx.os.network.api.uiui.HealthCodeApi; -import com.xxpatx.os.network.api.uiui.RegionListApi; -import com.xxpatx.os.network.api.uiui.RegionListCall; -import com.xxpatx.os.network.api.uiui.ServeApi; -import com.xxpatx.os.network.api.uiui.SnIsActivationApi; -import com.xxpatx.os.network.api.uiui.TestAppApi; -import com.xxpatx.os.network.api.uiui.UpdateAppIconApi; -import com.xxpatx.os.network.api.uiui.UserInfoControl; -import com.xxpatx.os.network.api.uiui.alarmclock.AlarmClockAddApi; -import com.xxpatx.os.network.api.uiui.alarmclock.AlarmClockDeleteApi; -import com.xxpatx.os.network.api.uiui.alarmclock.AlarmClockEditApi; -import com.xxpatx.os.network.api.uiui.alarmclock.AlarmClockGetApi; -import com.xxpatx.os.network.api.uiui.alarmclock.AlarmClockQueryApi; -import com.xxpatx.os.network.api.uiui.alarmclock.AlarmClockUpdateApi; -import com.xxpatx.os.network.api.uiui.app.RunNewApp; -import com.xxpatx.os.network.api.uiui.contact.MailListAddApi; -import com.xxpatx.os.network.api.uiui.contact.MailListDeleteApi; -import com.xxpatx.os.network.api.uiui.contact.MailListEditApi; -import com.xxpatx.os.network.api.uiui.desktop.GetDesktopApi; -import com.xxpatx.os.network.api.uiui.desktop.UpdateDesktopApi; -import com.xxpatx.os.network.api.uiui.order.AllOrderApi; -import com.xxpatx.os.network.api.uiui.order.OrderExpressApi; -import com.xxpatx.os.network.api.uiui.order.OrderIndexApi; -import com.xxpatx.os.network.api.uiui.pay.GoodsBuyApi; -import com.xxpatx.os.network.api.uiui.pay.OrderPayApi; -import com.xxpatx.os.network.api.uiui.pay.OrderPayCheckApi; -import com.xxpatx.os.network.api.uiui.sn.FamilyAddressApi; -import com.xxpatx.os.network.api.uiui.sn.SendScreenshotApi; -import com.xxpatx.os.network.api.uiui.sn.SettingApi; -import com.xxpatx.os.network.api.uiui.sn.SnInfoApi; -import com.xxpatx.os.network.api.uiui.sn.SosRecordApi; -import com.xxpatx.os.network.api.uiui.sn.UpdateAddressApi; -import com.xxpatx.os.network.interceptor.RepeatRequestInterceptor; -import com.xxpatx.os.utils.Utils; +import com.vscool.os.BuildConfig; +import com.vscool.os.alarm.AlarmClockData; +import com.vscool.os.alarm.AlarmUtils; +import com.vscool.os.bean.ActivationBean; +import com.vscool.os.bean.ActivityBean; +import com.vscool.os.bean.AddressInfo; +import com.vscool.os.bean.AlarmClockId; +import com.vscool.os.bean.AppInfo; +import com.vscool.os.bean.ArticleList; +import com.vscool.os.bean.BaseResponse; +import com.vscool.os.bean.Contact; +import com.vscool.os.bean.DemandBean; +import com.vscool.os.bean.ExpressData; +import com.vscool.os.bean.FamilyAddress; +import com.vscool.os.bean.GoodsList; +import com.vscool.os.bean.GoodsType; +import com.vscool.os.bean.HealthCode; +import com.vscool.os.bean.NetDesktopIcon; +import com.vscool.os.bean.OrderBean; +import com.vscool.os.bean.OrderIndexData; +import com.vscool.os.bean.QweatherLookup; +import com.vscool.os.bean.RegionInfo; +import com.vscool.os.bean.ServeBean; +import com.vscool.os.bean.SnInfo; +import com.vscool.os.bean.SystemSettings; +import com.vscool.os.bean.TestAppInfo; +import com.vscool.os.bean.UserAvatarInfo; +import com.vscool.os.bean.UserId; +import com.vscool.os.bean.WxpayBean; +import com.vscool.os.config.CommonConfig; +import com.vscool.os.disklrucache.CacheHelper; +import com.vscool.os.gson.GsonUtils; +import com.vscool.os.manager.ConnectManager; +import com.vscool.os.manager.ConnectMode; +import com.vscool.os.network.api.qweather.LookupApi; +import com.vscool.os.network.api.uiui.ActivityListApi; +import com.vscool.os.network.api.uiui.AddressIndexApi; +import com.vscool.os.network.api.uiui.AppUpdate; +import com.vscool.os.network.api.uiui.AppUsageRecordApi; +import com.vscool.os.network.api.uiui.ArticleCategorysListApi; +import com.vscool.os.network.api.uiui.ArticleListApi; +import com.vscool.os.network.api.uiui.DemandListApi; +import com.vscool.os.network.api.uiui.GetAdminSnSettingApi; +import com.vscool.os.network.api.uiui.GetMailList; +import com.vscool.os.network.api.uiui.GetUserIDApi; +import com.vscool.os.network.api.uiui.GoodsListApi; +import com.vscool.os.network.api.uiui.GoodsTypeApi; +import com.vscool.os.network.api.uiui.GoodsTypeListApi; +import com.vscool.os.network.api.uiui.HealthCodeApi; +import com.vscool.os.network.api.uiui.RegionListApi; +import com.vscool.os.network.api.uiui.RegionListCall; +import com.vscool.os.network.api.uiui.ServeApi; +import com.vscool.os.network.api.uiui.SnIsActivationApi; +import com.vscool.os.network.api.uiui.TestAppApi; +import com.vscool.os.network.api.uiui.UpdateAppIconApi; +import com.vscool.os.network.api.uiui.UserInfoControl; +import com.vscool.os.network.api.uiui.alarmclock.AlarmClockAddApi; +import com.vscool.os.network.api.uiui.alarmclock.AlarmClockDeleteApi; +import com.vscool.os.network.api.uiui.alarmclock.AlarmClockEditApi; +import com.vscool.os.network.api.uiui.alarmclock.AlarmClockGetApi; +import com.vscool.os.network.api.uiui.alarmclock.AlarmClockQueryApi; +import com.vscool.os.network.api.uiui.alarmclock.AlarmClockUpdateApi; +import com.vscool.os.network.api.uiui.app.RunNewApp; +import com.vscool.os.network.api.uiui.contact.MailListAddApi; +import com.vscool.os.network.api.uiui.contact.MailListDeleteApi; +import com.vscool.os.network.api.uiui.contact.MailListEditApi; +import com.vscool.os.network.api.uiui.desktop.GetDesktopApi; +import com.vscool.os.network.api.uiui.desktop.UpdateDesktopApi; +import com.vscool.os.network.api.uiui.order.AllOrderApi; +import com.vscool.os.network.api.uiui.order.OrderExpressApi; +import com.vscool.os.network.api.uiui.order.OrderIndexApi; +import com.vscool.os.network.api.uiui.pay.GoodsBuyApi; +import com.vscool.os.network.api.uiui.pay.OrderPayApi; +import com.vscool.os.network.api.uiui.pay.OrderPayCheckApi; +import com.vscool.os.network.api.uiui.sn.FamilyAddressApi; +import com.vscool.os.network.api.uiui.sn.SendScreenshotApi; +import com.vscool.os.network.api.uiui.sn.SettingApi; +import com.vscool.os.network.api.uiui.sn.SnInfoApi; +import com.vscool.os.network.api.uiui.sn.SosRecordApi; +import com.vscool.os.network.api.uiui.sn.UpdateAddressApi; +import com.vscool.os.network.interceptor.RepeatRequestInterceptor; +import com.vscool.os.utils.Utils; import java.io.File; import java.lang.reflect.Type; diff --git a/app/src/main/java/com/xxpatx/os/network/UrlAddress.java b/app/src/main/java/com/vscool/os/network/UrlAddress.java similarity index 99% rename from app/src/main/java/com/xxpatx/os/network/UrlAddress.java rename to app/src/main/java/com/vscool/os/network/UrlAddress.java index 4dc4fca..fdf3d75 100644 --- a/app/src/main/java/com/xxpatx/os/network/UrlAddress.java +++ b/app/src/main/java/com/vscool/os/network/UrlAddress.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.network; +package com.vscool.os.network; public class UrlAddress { public static final String ROOT_URL = "https://ghapi.mdmsaas.cn/android/"; diff --git a/app/src/main/java/com/xxpatx/os/network/api/qweather/LookupApi.java b/app/src/main/java/com/vscool/os/network/api/qweather/LookupApi.java similarity index 70% rename from app/src/main/java/com/xxpatx/os/network/api/qweather/LookupApi.java rename to app/src/main/java/com/vscool/os/network/api/qweather/LookupApi.java index 68c0c4b..64e1e00 100644 --- a/app/src/main/java/com/xxpatx/os/network/api/qweather/LookupApi.java +++ b/app/src/main/java/com/vscool/os/network/api/qweather/LookupApi.java @@ -1,7 +1,7 @@ -package com.xxpatx.os.network.api.qweather; +package com.vscool.os.network.api.qweather; -import com.xxpatx.os.bean.QweatherLookup; -import com.xxpatx.os.network.UrlAddress; +import com.vscool.os.bean.QweatherLookup; +import com.vscool.os.network.UrlAddress; import io.reactivex.rxjava3.core.Observable; import retrofit2.http.GET; diff --git a/app/src/main/java/com/xxpatx/os/network/api/uiui/ActivityListApi.java b/app/src/main/java/com/vscool/os/network/api/uiui/ActivityListApi.java similarity index 73% rename from app/src/main/java/com/xxpatx/os/network/api/uiui/ActivityListApi.java rename to app/src/main/java/com/vscool/os/network/api/uiui/ActivityListApi.java index 65e67dc..85f78eb 100644 --- a/app/src/main/java/com/xxpatx/os/network/api/uiui/ActivityListApi.java +++ b/app/src/main/java/com/vscool/os/network/api/uiui/ActivityListApi.java @@ -1,8 +1,8 @@ -package com.xxpatx.os.network.api.uiui; +package com.vscool.os.network.api.uiui; -import com.xxpatx.os.bean.ActivityBean; -import com.xxpatx.os.bean.BaseResponse; -import com.xxpatx.os.network.UrlAddress; +import com.vscool.os.bean.ActivityBean; +import com.vscool.os.bean.BaseResponse; +import com.vscool.os.network.UrlAddress; import java.util.List; diff --git a/app/src/main/java/com/xxpatx/os/network/api/uiui/AddressIndexApi.java b/app/src/main/java/com/vscool/os/network/api/uiui/AddressIndexApi.java similarity index 65% rename from app/src/main/java/com/xxpatx/os/network/api/uiui/AddressIndexApi.java rename to app/src/main/java/com/vscool/os/network/api/uiui/AddressIndexApi.java index 73849da..b181ede 100644 --- a/app/src/main/java/com/xxpatx/os/network/api/uiui/AddressIndexApi.java +++ b/app/src/main/java/com/vscool/os/network/api/uiui/AddressIndexApi.java @@ -1,8 +1,8 @@ -package com.xxpatx.os.network.api.uiui; +package com.vscool.os.network.api.uiui; -import com.xxpatx.os.bean.AddressInfo; -import com.xxpatx.os.bean.BaseResponse; -import com.xxpatx.os.network.UrlAddress; +import com.vscool.os.bean.AddressInfo; +import com.vscool.os.bean.BaseResponse; +import com.vscool.os.network.UrlAddress; import java.util.List; diff --git a/app/src/main/java/com/xxpatx/os/network/api/uiui/AppUpdate.java b/app/src/main/java/com/vscool/os/network/api/uiui/AppUpdate.java similarity index 70% rename from app/src/main/java/com/xxpatx/os/network/api/uiui/AppUpdate.java rename to app/src/main/java/com/vscool/os/network/api/uiui/AppUpdate.java index 330e47a..9695eb2 100644 --- a/app/src/main/java/com/xxpatx/os/network/api/uiui/AppUpdate.java +++ b/app/src/main/java/com/vscool/os/network/api/uiui/AppUpdate.java @@ -1,8 +1,8 @@ -package com.xxpatx.os.network.api.uiui; +package com.vscool.os.network.api.uiui; -import com.xxpatx.os.bean.AppInfo; -import com.xxpatx.os.bean.BaseResponse; -import com.xxpatx.os.network.UrlAddress; +import com.vscool.os.bean.AppInfo; +import com.vscool.os.bean.BaseResponse; +import com.vscool.os.network.UrlAddress; import io.reactivex.rxjava3.core.Observable; import retrofit2.http.GET; diff --git a/app/src/main/java/com/xxpatx/os/network/api/uiui/AppUsageRecordApi.java b/app/src/main/java/com/vscool/os/network/api/uiui/AppUsageRecordApi.java similarity index 81% rename from app/src/main/java/com/xxpatx/os/network/api/uiui/AppUsageRecordApi.java rename to app/src/main/java/com/vscool/os/network/api/uiui/AppUsageRecordApi.java index 02f53f2..97d1a4b 100644 --- a/app/src/main/java/com/xxpatx/os/network/api/uiui/AppUsageRecordApi.java +++ b/app/src/main/java/com/vscool/os/network/api/uiui/AppUsageRecordApi.java @@ -1,7 +1,7 @@ -package com.xxpatx.os.network.api.uiui; +package com.vscool.os.network.api.uiui; -import com.xxpatx.os.bean.BaseResponse; -import com.xxpatx.os.network.UrlAddress; +import com.vscool.os.bean.BaseResponse; +import com.vscool.os.network.UrlAddress; import io.reactivex.rxjava3.core.Observable; import retrofit2.http.Field; diff --git a/app/src/main/java/com/xxpatx/os/network/api/uiui/ArticleCategorysListApi.java b/app/src/main/java/com/vscool/os/network/api/uiui/ArticleCategorysListApi.java similarity index 67% rename from app/src/main/java/com/xxpatx/os/network/api/uiui/ArticleCategorysListApi.java rename to app/src/main/java/com/vscool/os/network/api/uiui/ArticleCategorysListApi.java index e7c669a..01e4fdd 100644 --- a/app/src/main/java/com/xxpatx/os/network/api/uiui/ArticleCategorysListApi.java +++ b/app/src/main/java/com/vscool/os/network/api/uiui/ArticleCategorysListApi.java @@ -1,8 +1,8 @@ -package com.xxpatx.os.network.api.uiui; +package com.vscool.os.network.api.uiui; -import com.xxpatx.os.bean.ArticleList; -import com.xxpatx.os.bean.BaseResponse; -import com.xxpatx.os.network.UrlAddress; +import com.vscool.os.bean.ArticleList; +import com.vscool.os.bean.BaseResponse; +import com.vscool.os.network.UrlAddress; import io.reactivex.rxjava3.core.Observable; import retrofit2.http.GET; diff --git a/app/src/main/java/com/xxpatx/os/network/api/uiui/ArticleDetailsApi.java b/app/src/main/java/com/vscool/os/network/api/uiui/ArticleDetailsApi.java similarity index 63% rename from app/src/main/java/com/xxpatx/os/network/api/uiui/ArticleDetailsApi.java rename to app/src/main/java/com/vscool/os/network/api/uiui/ArticleDetailsApi.java index 00f5d6f..7eb2351 100644 --- a/app/src/main/java/com/xxpatx/os/network/api/uiui/ArticleDetailsApi.java +++ b/app/src/main/java/com/vscool/os/network/api/uiui/ArticleDetailsApi.java @@ -1,8 +1,8 @@ -package com.xxpatx.os.network.api.uiui; +package com.vscool.os.network.api.uiui; -import com.xxpatx.os.bean.ArticleDetails; -import com.xxpatx.os.bean.BaseResponse; -import com.xxpatx.os.network.UrlAddress; +import com.vscool.os.bean.ArticleDetails; +import com.vscool.os.bean.BaseResponse; +import com.vscool.os.network.UrlAddress; import io.reactivex.rxjava3.core.Observable; import retrofit2.http.GET; diff --git a/app/src/main/java/com/xxpatx/os/network/api/uiui/ArticleListApi.java b/app/src/main/java/com/vscool/os/network/api/uiui/ArticleListApi.java similarity index 63% rename from app/src/main/java/com/xxpatx/os/network/api/uiui/ArticleListApi.java rename to app/src/main/java/com/vscool/os/network/api/uiui/ArticleListApi.java index aa17f07..5171920 100644 --- a/app/src/main/java/com/xxpatx/os/network/api/uiui/ArticleListApi.java +++ b/app/src/main/java/com/vscool/os/network/api/uiui/ArticleListApi.java @@ -1,8 +1,8 @@ -package com.xxpatx.os.network.api.uiui; +package com.vscool.os.network.api.uiui; -import com.xxpatx.os.bean.ArticleList; -import com.xxpatx.os.bean.BaseResponse; -import com.xxpatx.os.network.UrlAddress; +import com.vscool.os.bean.ArticleList; +import com.vscool.os.bean.BaseResponse; +import com.vscool.os.network.UrlAddress; import io.reactivex.rxjava3.core.Observable; import retrofit2.http.GET; diff --git a/app/src/main/java/com/xxpatx/os/network/api/uiui/DemandListApi.java b/app/src/main/java/com/vscool/os/network/api/uiui/DemandListApi.java similarity index 73% rename from app/src/main/java/com/xxpatx/os/network/api/uiui/DemandListApi.java rename to app/src/main/java/com/vscool/os/network/api/uiui/DemandListApi.java index e101a4e..1838235 100644 --- a/app/src/main/java/com/xxpatx/os/network/api/uiui/DemandListApi.java +++ b/app/src/main/java/com/vscool/os/network/api/uiui/DemandListApi.java @@ -1,8 +1,8 @@ -package com.xxpatx.os.network.api.uiui; +package com.vscool.os.network.api.uiui; -import com.xxpatx.os.bean.BaseResponse; -import com.xxpatx.os.bean.DemandBean; -import com.xxpatx.os.network.UrlAddress; +import com.vscool.os.bean.BaseResponse; +import com.vscool.os.bean.DemandBean; +import com.vscool.os.network.UrlAddress; import java.util.List; diff --git a/app/src/main/java/com/xxpatx/os/network/api/uiui/GetAdminSnSettingApi.java b/app/src/main/java/com/vscool/os/network/api/uiui/GetAdminSnSettingApi.java similarity index 69% rename from app/src/main/java/com/xxpatx/os/network/api/uiui/GetAdminSnSettingApi.java rename to app/src/main/java/com/vscool/os/network/api/uiui/GetAdminSnSettingApi.java index a92ea5a..8cd9489 100644 --- a/app/src/main/java/com/xxpatx/os/network/api/uiui/GetAdminSnSettingApi.java +++ b/app/src/main/java/com/vscool/os/network/api/uiui/GetAdminSnSettingApi.java @@ -1,7 +1,7 @@ -package com.xxpatx.os.network.api.uiui; +package com.vscool.os.network.api.uiui; -import com.xxpatx.os.bean.BaseResponse; -import com.xxpatx.os.network.UrlAddress; +import com.vscool.os.bean.BaseResponse; +import com.vscool.os.network.UrlAddress; import io.reactivex.rxjava3.core.Observable; import retrofit2.http.GET; diff --git a/app/src/main/java/com/xxpatx/os/network/api/uiui/GetMailList.java b/app/src/main/java/com/vscool/os/network/api/uiui/GetMailList.java similarity index 65% rename from app/src/main/java/com/xxpatx/os/network/api/uiui/GetMailList.java rename to app/src/main/java/com/vscool/os/network/api/uiui/GetMailList.java index cb32918..eee958f 100644 --- a/app/src/main/java/com/xxpatx/os/network/api/uiui/GetMailList.java +++ b/app/src/main/java/com/vscool/os/network/api/uiui/GetMailList.java @@ -1,8 +1,8 @@ -package com.xxpatx.os.network.api.uiui; +package com.vscool.os.network.api.uiui; -import com.xxpatx.os.bean.BaseResponse; -import com.xxpatx.os.bean.Contact; -import com.xxpatx.os.network.UrlAddress; +import com.vscool.os.bean.BaseResponse; +import com.vscool.os.bean.Contact; +import com.vscool.os.network.UrlAddress; import java.util.List; diff --git a/app/src/main/java/com/xxpatx/os/network/api/uiui/GetUserIDApi.java b/app/src/main/java/com/vscool/os/network/api/uiui/GetUserIDApi.java similarity index 62% rename from app/src/main/java/com/xxpatx/os/network/api/uiui/GetUserIDApi.java rename to app/src/main/java/com/vscool/os/network/api/uiui/GetUserIDApi.java index cfafabb..891306b 100644 --- a/app/src/main/java/com/xxpatx/os/network/api/uiui/GetUserIDApi.java +++ b/app/src/main/java/com/vscool/os/network/api/uiui/GetUserIDApi.java @@ -1,8 +1,8 @@ -package com.xxpatx.os.network.api.uiui; +package com.vscool.os.network.api.uiui; -import com.xxpatx.os.bean.BaseResponse; -import com.xxpatx.os.bean.UserId; -import com.xxpatx.os.network.UrlAddress; +import com.vscool.os.bean.BaseResponse; +import com.vscool.os.bean.UserId; +import com.vscool.os.network.UrlAddress; import io.reactivex.rxjava3.core.Observable; import retrofit2.http.GET; diff --git a/app/src/main/java/com/xxpatx/os/network/api/uiui/GoodsDetailsApi.java b/app/src/main/java/com/vscool/os/network/api/uiui/GoodsDetailsApi.java similarity index 63% rename from app/src/main/java/com/xxpatx/os/network/api/uiui/GoodsDetailsApi.java rename to app/src/main/java/com/vscool/os/network/api/uiui/GoodsDetailsApi.java index 7aec44f..c3c87ae 100644 --- a/app/src/main/java/com/xxpatx/os/network/api/uiui/GoodsDetailsApi.java +++ b/app/src/main/java/com/vscool/os/network/api/uiui/GoodsDetailsApi.java @@ -1,8 +1,8 @@ -package com.xxpatx.os.network.api.uiui; +package com.vscool.os.network.api.uiui; -import com.xxpatx.os.bean.BaseResponse; -import com.xxpatx.os.bean.GoodsDetails; -import com.xxpatx.os.network.UrlAddress; +import com.vscool.os.bean.BaseResponse; +import com.vscool.os.bean.GoodsDetails; +import com.vscool.os.network.UrlAddress; import io.reactivex.rxjava3.core.Observable; import retrofit2.http.GET; diff --git a/app/src/main/java/com/xxpatx/os/network/api/uiui/GoodsListApi.java b/app/src/main/java/com/vscool/os/network/api/uiui/GoodsListApi.java similarity index 63% rename from app/src/main/java/com/xxpatx/os/network/api/uiui/GoodsListApi.java rename to app/src/main/java/com/vscool/os/network/api/uiui/GoodsListApi.java index b7210c3..4f29c52 100644 --- a/app/src/main/java/com/xxpatx/os/network/api/uiui/GoodsListApi.java +++ b/app/src/main/java/com/vscool/os/network/api/uiui/GoodsListApi.java @@ -1,8 +1,8 @@ -package com.xxpatx.os.network.api.uiui; +package com.vscool.os.network.api.uiui; -import com.xxpatx.os.bean.BaseResponse; -import com.xxpatx.os.bean.GoodsList; -import com.xxpatx.os.network.UrlAddress; +import com.vscool.os.bean.BaseResponse; +import com.vscool.os.bean.GoodsList; +import com.vscool.os.network.UrlAddress; import io.reactivex.rxjava3.core.Observable; import retrofit2.http.GET; diff --git a/app/src/main/java/com/xxpatx/os/network/api/uiui/GoodsTypeApi.java b/app/src/main/java/com/vscool/os/network/api/uiui/GoodsTypeApi.java similarity index 60% rename from app/src/main/java/com/xxpatx/os/network/api/uiui/GoodsTypeApi.java rename to app/src/main/java/com/vscool/os/network/api/uiui/GoodsTypeApi.java index 8554ee7..3cde2e4 100644 --- a/app/src/main/java/com/xxpatx/os/network/api/uiui/GoodsTypeApi.java +++ b/app/src/main/java/com/vscool/os/network/api/uiui/GoodsTypeApi.java @@ -1,8 +1,8 @@ -package com.xxpatx.os.network.api.uiui; +package com.vscool.os.network.api.uiui; -import com.xxpatx.os.bean.BaseResponse; -import com.xxpatx.os.bean.GoodsType; -import com.xxpatx.os.network.UrlAddress; +import com.vscool.os.bean.BaseResponse; +import com.vscool.os.bean.GoodsType; +import com.vscool.os.network.UrlAddress; import java.util.List; diff --git a/app/src/main/java/com/xxpatx/os/network/api/uiui/GoodsTypeListApi.java b/app/src/main/java/com/vscool/os/network/api/uiui/GoodsTypeListApi.java similarity index 67% rename from app/src/main/java/com/xxpatx/os/network/api/uiui/GoodsTypeListApi.java rename to app/src/main/java/com/vscool/os/network/api/uiui/GoodsTypeListApi.java index ac83e1e..007d6b4 100644 --- a/app/src/main/java/com/xxpatx/os/network/api/uiui/GoodsTypeListApi.java +++ b/app/src/main/java/com/vscool/os/network/api/uiui/GoodsTypeListApi.java @@ -1,8 +1,8 @@ -package com.xxpatx.os.network.api.uiui; +package com.vscool.os.network.api.uiui; -import com.xxpatx.os.bean.BaseResponse; -import com.xxpatx.os.bean.GoodsList; -import com.xxpatx.os.network.UrlAddress; +import com.vscool.os.bean.BaseResponse; +import com.vscool.os.bean.GoodsList; +import com.vscool.os.network.UrlAddress; import io.reactivex.rxjava3.core.Observable; import retrofit2.http.GET; diff --git a/app/src/main/java/com/xxpatx/os/network/api/uiui/HealthCodeApi.java b/app/src/main/java/com/vscool/os/network/api/uiui/HealthCodeApi.java similarity index 65% rename from app/src/main/java/com/xxpatx/os/network/api/uiui/HealthCodeApi.java rename to app/src/main/java/com/vscool/os/network/api/uiui/HealthCodeApi.java index 5f891b5..6c67e45 100644 --- a/app/src/main/java/com/xxpatx/os/network/api/uiui/HealthCodeApi.java +++ b/app/src/main/java/com/vscool/os/network/api/uiui/HealthCodeApi.java @@ -1,8 +1,8 @@ -package com.xxpatx.os.network.api.uiui; +package com.vscool.os.network.api.uiui; -import com.xxpatx.os.bean.BaseResponse; -import com.xxpatx.os.bean.HealthCode; -import com.xxpatx.os.network.UrlAddress; +import com.vscool.os.bean.BaseResponse; +import com.vscool.os.bean.HealthCode; +import com.vscool.os.network.UrlAddress; import java.util.List; diff --git a/app/src/main/java/com/xxpatx/os/network/api/uiui/RegionListApi.java b/app/src/main/java/com/vscool/os/network/api/uiui/RegionListApi.java similarity index 66% rename from app/src/main/java/com/xxpatx/os/network/api/uiui/RegionListApi.java rename to app/src/main/java/com/vscool/os/network/api/uiui/RegionListApi.java index 4a56244..01bd88e 100644 --- a/app/src/main/java/com/xxpatx/os/network/api/uiui/RegionListApi.java +++ b/app/src/main/java/com/vscool/os/network/api/uiui/RegionListApi.java @@ -1,8 +1,8 @@ -package com.xxpatx.os.network.api.uiui; +package com.vscool.os.network.api.uiui; -import com.xxpatx.os.bean.BaseResponse; -import com.xxpatx.os.bean.RegionInfo; -import com.xxpatx.os.network.UrlAddress; +import com.vscool.os.bean.BaseResponse; +import com.vscool.os.bean.RegionInfo; +import com.vscool.os.network.UrlAddress; import java.util.List; diff --git a/app/src/main/java/com/xxpatx/os/network/api/uiui/RegionListCall.java b/app/src/main/java/com/vscool/os/network/api/uiui/RegionListCall.java similarity index 66% rename from app/src/main/java/com/xxpatx/os/network/api/uiui/RegionListCall.java rename to app/src/main/java/com/vscool/os/network/api/uiui/RegionListCall.java index 7d28a29..88e0558 100644 --- a/app/src/main/java/com/xxpatx/os/network/api/uiui/RegionListCall.java +++ b/app/src/main/java/com/vscool/os/network/api/uiui/RegionListCall.java @@ -1,8 +1,8 @@ -package com.xxpatx.os.network.api.uiui; +package com.vscool.os.network.api.uiui; -import com.xxpatx.os.bean.BaseResponse; -import com.xxpatx.os.bean.RegionInfo; -import com.xxpatx.os.network.UrlAddress; +import com.vscool.os.bean.BaseResponse; +import com.vscool.os.bean.RegionInfo; +import com.vscool.os.network.UrlAddress; import java.util.List; diff --git a/app/src/main/java/com/xxpatx/os/network/api/uiui/ServeApi.java b/app/src/main/java/com/vscool/os/network/api/uiui/ServeApi.java similarity index 61% rename from app/src/main/java/com/xxpatx/os/network/api/uiui/ServeApi.java rename to app/src/main/java/com/vscool/os/network/api/uiui/ServeApi.java index 9aac9b9..1b316a0 100644 --- a/app/src/main/java/com/xxpatx/os/network/api/uiui/ServeApi.java +++ b/app/src/main/java/com/vscool/os/network/api/uiui/ServeApi.java @@ -1,8 +1,8 @@ -package com.xxpatx.os.network.api.uiui; +package com.vscool.os.network.api.uiui; -import com.xxpatx.os.bean.BaseResponse; -import com.xxpatx.os.bean.ServeBean; -import com.xxpatx.os.network.UrlAddress; +import com.vscool.os.bean.BaseResponse; +import com.vscool.os.bean.ServeBean; +import com.vscool.os.network.UrlAddress; import io.reactivex.rxjava3.core.Observable; import retrofit2.http.GET; diff --git a/app/src/main/java/com/xxpatx/os/network/api/uiui/SnIsActivationApi.java b/app/src/main/java/com/vscool/os/network/api/uiui/SnIsActivationApi.java similarity index 64% rename from app/src/main/java/com/xxpatx/os/network/api/uiui/SnIsActivationApi.java rename to app/src/main/java/com/vscool/os/network/api/uiui/SnIsActivationApi.java index 747dd19..99dc2ed 100644 --- a/app/src/main/java/com/xxpatx/os/network/api/uiui/SnIsActivationApi.java +++ b/app/src/main/java/com/vscool/os/network/api/uiui/SnIsActivationApi.java @@ -1,8 +1,8 @@ -package com.xxpatx.os.network.api.uiui; +package com.vscool.os.network.api.uiui; -import com.xxpatx.os.bean.ActivationBean; -import com.xxpatx.os.bean.BaseResponse; -import com.xxpatx.os.network.UrlAddress; +import com.vscool.os.bean.ActivationBean; +import com.vscool.os.bean.BaseResponse; +import com.vscool.os.network.UrlAddress; import io.reactivex.rxjava3.core.Observable; import retrofit2.http.GET; diff --git a/app/src/main/java/com/xxpatx/os/network/api/uiui/TestAppApi.java b/app/src/main/java/com/vscool/os/network/api/uiui/TestAppApi.java similarity index 69% rename from app/src/main/java/com/xxpatx/os/network/api/uiui/TestAppApi.java rename to app/src/main/java/com/vscool/os/network/api/uiui/TestAppApi.java index 95bdb8e..82d9cdd 100644 --- a/app/src/main/java/com/xxpatx/os/network/api/uiui/TestAppApi.java +++ b/app/src/main/java/com/vscool/os/network/api/uiui/TestAppApi.java @@ -1,8 +1,8 @@ -package com.xxpatx.os.network.api.uiui; +package com.vscool.os.network.api.uiui; -import com.xxpatx.os.bean.BaseResponse; -import com.xxpatx.os.bean.TestAppInfo; -import com.xxpatx.os.network.UrlAddress; +import com.vscool.os.bean.BaseResponse; +import com.vscool.os.bean.TestAppInfo; +import com.vscool.os.network.UrlAddress; import io.reactivex.rxjava3.core.Observable; import retrofit2.http.GET; diff --git a/app/src/main/java/com/xxpatx/os/network/api/uiui/UpdateAppIconApi.java b/app/src/main/java/com/vscool/os/network/api/uiui/UpdateAppIconApi.java similarity index 80% rename from app/src/main/java/com/xxpatx/os/network/api/uiui/UpdateAppIconApi.java rename to app/src/main/java/com/vscool/os/network/api/uiui/UpdateAppIconApi.java index 4c423c3..bbd8642 100644 --- a/app/src/main/java/com/xxpatx/os/network/api/uiui/UpdateAppIconApi.java +++ b/app/src/main/java/com/vscool/os/network/api/uiui/UpdateAppIconApi.java @@ -1,7 +1,7 @@ -package com.xxpatx.os.network.api.uiui; +package com.vscool.os.network.api.uiui; -import com.xxpatx.os.bean.BaseResponse; -import com.xxpatx.os.network.UrlAddress; +import com.vscool.os.bean.BaseResponse; +import com.vscool.os.network.UrlAddress; import io.reactivex.rxjava3.core.Observable; import retrofit2.http.Field; diff --git a/app/src/main/java/com/xxpatx/os/network/api/uiui/UserInfoControl.java b/app/src/main/java/com/vscool/os/network/api/uiui/UserInfoControl.java similarity index 68% rename from app/src/main/java/com/xxpatx/os/network/api/uiui/UserInfoControl.java rename to app/src/main/java/com/vscool/os/network/api/uiui/UserInfoControl.java index 86479c1..45e2173 100644 --- a/app/src/main/java/com/xxpatx/os/network/api/uiui/UserInfoControl.java +++ b/app/src/main/java/com/vscool/os/network/api/uiui/UserInfoControl.java @@ -1,9 +1,9 @@ -package com.xxpatx.os.network.api.uiui; +package com.vscool.os.network.api.uiui; -import com.xxpatx.os.bean.BaseResponse; -import com.xxpatx.os.bean.UserAvatarInfo; -import com.xxpatx.os.network.UrlAddress; +import com.vscool.os.bean.BaseResponse; +import com.vscool.os.bean.UserAvatarInfo; +import com.vscool.os.network.UrlAddress; import io.reactivex.rxjava3.core.Observable; import retrofit2.http.Field; diff --git a/app/src/main/java/com/xxpatx/os/network/api/uiui/alarmclock/AlarmClockAddApi.java b/app/src/main/java/com/vscool/os/network/api/uiui/alarmclock/AlarmClockAddApi.java similarity index 78% rename from app/src/main/java/com/xxpatx/os/network/api/uiui/alarmclock/AlarmClockAddApi.java rename to app/src/main/java/com/vscool/os/network/api/uiui/alarmclock/AlarmClockAddApi.java index 23de0ea..5b80058 100644 --- a/app/src/main/java/com/xxpatx/os/network/api/uiui/alarmclock/AlarmClockAddApi.java +++ b/app/src/main/java/com/vscool/os/network/api/uiui/alarmclock/AlarmClockAddApi.java @@ -1,8 +1,8 @@ -package com.xxpatx.os.network.api.uiui.alarmclock; +package com.vscool.os.network.api.uiui.alarmclock; -import com.xxpatx.os.bean.AlarmClockId; -import com.xxpatx.os.bean.BaseResponse; -import com.xxpatx.os.network.UrlAddress; +import com.vscool.os.bean.AlarmClockId; +import com.vscool.os.bean.BaseResponse; +import com.vscool.os.network.UrlAddress; import java.util.Map; diff --git a/app/src/main/java/com/xxpatx/os/network/api/uiui/alarmclock/AlarmClockDeleteApi.java b/app/src/main/java/com/vscool/os/network/api/uiui/alarmclock/AlarmClockDeleteApi.java similarity index 73% rename from app/src/main/java/com/xxpatx/os/network/api/uiui/alarmclock/AlarmClockDeleteApi.java rename to app/src/main/java/com/vscool/os/network/api/uiui/alarmclock/AlarmClockDeleteApi.java index 3c66499..8600652 100644 --- a/app/src/main/java/com/xxpatx/os/network/api/uiui/alarmclock/AlarmClockDeleteApi.java +++ b/app/src/main/java/com/vscool/os/network/api/uiui/alarmclock/AlarmClockDeleteApi.java @@ -1,7 +1,7 @@ -package com.xxpatx.os.network.api.uiui.alarmclock; +package com.vscool.os.network.api.uiui.alarmclock; -import com.xxpatx.os.bean.BaseResponse; -import com.xxpatx.os.network.UrlAddress; +import com.vscool.os.bean.BaseResponse; +import com.vscool.os.network.UrlAddress; import io.reactivex.rxjava3.core.Observable; import retrofit2.http.Field; diff --git a/app/src/main/java/com/xxpatx/os/network/api/uiui/alarmclock/AlarmClockEditApi.java b/app/src/main/java/com/vscool/os/network/api/uiui/alarmclock/AlarmClockEditApi.java similarity index 77% rename from app/src/main/java/com/xxpatx/os/network/api/uiui/alarmclock/AlarmClockEditApi.java rename to app/src/main/java/com/vscool/os/network/api/uiui/alarmclock/AlarmClockEditApi.java index 591ce78..dbc9bde 100644 --- a/app/src/main/java/com/xxpatx/os/network/api/uiui/alarmclock/AlarmClockEditApi.java +++ b/app/src/main/java/com/vscool/os/network/api/uiui/alarmclock/AlarmClockEditApi.java @@ -1,7 +1,7 @@ -package com.xxpatx.os.network.api.uiui.alarmclock; +package com.vscool.os.network.api.uiui.alarmclock; -import com.xxpatx.os.bean.BaseResponse; -import com.xxpatx.os.network.UrlAddress; +import com.vscool.os.bean.BaseResponse; +import com.vscool.os.network.UrlAddress; import java.util.Map; diff --git a/app/src/main/java/com/xxpatx/os/network/api/uiui/alarmclock/AlarmClockGetApi.java b/app/src/main/java/com/vscool/os/network/api/uiui/alarmclock/AlarmClockGetApi.java similarity index 66% rename from app/src/main/java/com/xxpatx/os/network/api/uiui/alarmclock/AlarmClockGetApi.java rename to app/src/main/java/com/vscool/os/network/api/uiui/alarmclock/AlarmClockGetApi.java index ac34a37..c94603e 100644 --- a/app/src/main/java/com/xxpatx/os/network/api/uiui/alarmclock/AlarmClockGetApi.java +++ b/app/src/main/java/com/vscool/os/network/api/uiui/alarmclock/AlarmClockGetApi.java @@ -1,8 +1,8 @@ -package com.xxpatx.os.network.api.uiui.alarmclock; +package com.vscool.os.network.api.uiui.alarmclock; -import com.xxpatx.os.alarm.AlarmClockData; -import com.xxpatx.os.bean.BaseResponse; -import com.xxpatx.os.network.UrlAddress; +import com.vscool.os.alarm.AlarmClockData; +import com.vscool.os.bean.BaseResponse; +import com.vscool.os.network.UrlAddress; import java.util.List; diff --git a/app/src/main/java/com/xxpatx/os/network/api/uiui/alarmclock/AlarmClockQueryApi.java b/app/src/main/java/com/vscool/os/network/api/uiui/alarmclock/AlarmClockQueryApi.java similarity index 64% rename from app/src/main/java/com/xxpatx/os/network/api/uiui/alarmclock/AlarmClockQueryApi.java rename to app/src/main/java/com/vscool/os/network/api/uiui/alarmclock/AlarmClockQueryApi.java index 5aa1d1e..cdd2244 100644 --- a/app/src/main/java/com/xxpatx/os/network/api/uiui/alarmclock/AlarmClockQueryApi.java +++ b/app/src/main/java/com/vscool/os/network/api/uiui/alarmclock/AlarmClockQueryApi.java @@ -1,8 +1,8 @@ -package com.xxpatx.os.network.api.uiui.alarmclock; +package com.vscool.os.network.api.uiui.alarmclock; -import com.xxpatx.os.alarm.AlarmClockData; -import com.xxpatx.os.bean.BaseResponse; -import com.xxpatx.os.network.UrlAddress; +import com.vscool.os.alarm.AlarmClockData; +import com.vscool.os.bean.BaseResponse; +import com.vscool.os.network.UrlAddress; import io.reactivex.rxjava3.core.Observable; import retrofit2.http.GET; diff --git a/app/src/main/java/com/xxpatx/os/network/api/uiui/alarmclock/AlarmClockUpdateApi.java b/app/src/main/java/com/vscool/os/network/api/uiui/alarmclock/AlarmClockUpdateApi.java similarity index 73% rename from app/src/main/java/com/xxpatx/os/network/api/uiui/alarmclock/AlarmClockUpdateApi.java rename to app/src/main/java/com/vscool/os/network/api/uiui/alarmclock/AlarmClockUpdateApi.java index f631eba..9923e54 100644 --- a/app/src/main/java/com/xxpatx/os/network/api/uiui/alarmclock/AlarmClockUpdateApi.java +++ b/app/src/main/java/com/vscool/os/network/api/uiui/alarmclock/AlarmClockUpdateApi.java @@ -1,7 +1,7 @@ -package com.xxpatx.os.network.api.uiui.alarmclock; +package com.vscool.os.network.api.uiui.alarmclock; -import com.xxpatx.os.bean.BaseResponse; -import com.xxpatx.os.network.UrlAddress; +import com.vscool.os.bean.BaseResponse; +import com.vscool.os.network.UrlAddress; import io.reactivex.rxjava3.core.Observable; import retrofit2.http.Field; diff --git a/app/src/main/java/com/xxpatx/os/network/api/uiui/app/RunNewApp.java b/app/src/main/java/com/vscool/os/network/api/uiui/app/RunNewApp.java similarity index 73% rename from app/src/main/java/com/xxpatx/os/network/api/uiui/app/RunNewApp.java rename to app/src/main/java/com/vscool/os/network/api/uiui/app/RunNewApp.java index 63383fb..d033eae 100644 --- a/app/src/main/java/com/xxpatx/os/network/api/uiui/app/RunNewApp.java +++ b/app/src/main/java/com/vscool/os/network/api/uiui/app/RunNewApp.java @@ -1,7 +1,7 @@ -package com.xxpatx.os.network.api.uiui.app; +package com.vscool.os.network.api.uiui.app; -import com.xxpatx.os.bean.BaseResponse; -import com.xxpatx.os.network.UrlAddress; +import com.vscool.os.bean.BaseResponse; +import com.vscool.os.network.UrlAddress; import io.reactivex.rxjava3.core.Observable; import retrofit2.http.Field; diff --git a/app/src/main/java/com/xxpatx/os/network/api/uiui/contact/MailListAddApi.java b/app/src/main/java/com/vscool/os/network/api/uiui/contact/MailListAddApi.java similarity index 77% rename from app/src/main/java/com/xxpatx/os/network/api/uiui/contact/MailListAddApi.java rename to app/src/main/java/com/vscool/os/network/api/uiui/contact/MailListAddApi.java index f42a1d3..91fe739 100644 --- a/app/src/main/java/com/xxpatx/os/network/api/uiui/contact/MailListAddApi.java +++ b/app/src/main/java/com/vscool/os/network/api/uiui/contact/MailListAddApi.java @@ -1,7 +1,7 @@ -package com.xxpatx.os.network.api.uiui.contact; +package com.vscool.os.network.api.uiui.contact; -import com.xxpatx.os.bean.BaseResponse; -import com.xxpatx.os.network.UrlAddress; +import com.vscool.os.bean.BaseResponse; +import com.vscool.os.network.UrlAddress; import java.util.Map; diff --git a/app/src/main/java/com/xxpatx/os/network/api/uiui/contact/MailListDeleteApi.java b/app/src/main/java/com/vscool/os/network/api/uiui/contact/MailListDeleteApi.java similarity index 73% rename from app/src/main/java/com/xxpatx/os/network/api/uiui/contact/MailListDeleteApi.java rename to app/src/main/java/com/vscool/os/network/api/uiui/contact/MailListDeleteApi.java index 493ef72..6ffdcc6 100644 --- a/app/src/main/java/com/xxpatx/os/network/api/uiui/contact/MailListDeleteApi.java +++ b/app/src/main/java/com/vscool/os/network/api/uiui/contact/MailListDeleteApi.java @@ -1,7 +1,7 @@ -package com.xxpatx.os.network.api.uiui.contact; +package com.vscool.os.network.api.uiui.contact; -import com.xxpatx.os.bean.BaseResponse; -import com.xxpatx.os.network.UrlAddress; +import com.vscool.os.bean.BaseResponse; +import com.vscool.os.network.UrlAddress; import io.reactivex.rxjava3.core.Observable; import retrofit2.http.Field; diff --git a/app/src/main/java/com/xxpatx/os/network/api/uiui/contact/MailListEditApi.java b/app/src/main/java/com/vscool/os/network/api/uiui/contact/MailListEditApi.java similarity index 77% rename from app/src/main/java/com/xxpatx/os/network/api/uiui/contact/MailListEditApi.java rename to app/src/main/java/com/vscool/os/network/api/uiui/contact/MailListEditApi.java index 807b67e..19affec 100644 --- a/app/src/main/java/com/xxpatx/os/network/api/uiui/contact/MailListEditApi.java +++ b/app/src/main/java/com/vscool/os/network/api/uiui/contact/MailListEditApi.java @@ -1,7 +1,7 @@ -package com.xxpatx.os.network.api.uiui.contact; +package com.vscool.os.network.api.uiui.contact; -import com.xxpatx.os.bean.BaseResponse; -import com.xxpatx.os.network.UrlAddress; +import com.vscool.os.bean.BaseResponse; +import com.vscool.os.network.UrlAddress; import java.util.Map; diff --git a/app/src/main/java/com/xxpatx/os/network/api/uiui/desktop/GetDesktopApi.java b/app/src/main/java/com/vscool/os/network/api/uiui/desktop/GetDesktopApi.java similarity index 64% rename from app/src/main/java/com/xxpatx/os/network/api/uiui/desktop/GetDesktopApi.java rename to app/src/main/java/com/vscool/os/network/api/uiui/desktop/GetDesktopApi.java index 87ad3be..68a670c 100644 --- a/app/src/main/java/com/xxpatx/os/network/api/uiui/desktop/GetDesktopApi.java +++ b/app/src/main/java/com/vscool/os/network/api/uiui/desktop/GetDesktopApi.java @@ -1,8 +1,8 @@ -package com.xxpatx.os.network.api.uiui.desktop; +package com.vscool.os.network.api.uiui.desktop; -import com.xxpatx.os.bean.BaseResponse; -import com.xxpatx.os.bean.NetDesktopIcon; -import com.xxpatx.os.network.UrlAddress; +import com.vscool.os.bean.BaseResponse; +import com.vscool.os.bean.NetDesktopIcon; +import com.vscool.os.network.UrlAddress; import java.util.List; diff --git a/app/src/main/java/com/xxpatx/os/network/api/uiui/desktop/UpdateDesktopApi.java b/app/src/main/java/com/vscool/os/network/api/uiui/desktop/UpdateDesktopApi.java similarity index 74% rename from app/src/main/java/com/xxpatx/os/network/api/uiui/desktop/UpdateDesktopApi.java rename to app/src/main/java/com/vscool/os/network/api/uiui/desktop/UpdateDesktopApi.java index 7fa56b7..048f864 100644 --- a/app/src/main/java/com/xxpatx/os/network/api/uiui/desktop/UpdateDesktopApi.java +++ b/app/src/main/java/com/vscool/os/network/api/uiui/desktop/UpdateDesktopApi.java @@ -1,7 +1,7 @@ -package com.xxpatx.os.network.api.uiui.desktop; +package com.vscool.os.network.api.uiui.desktop; -import com.xxpatx.os.bean.BaseResponse; -import com.xxpatx.os.network.UrlAddress; +import com.vscool.os.bean.BaseResponse; +import com.vscool.os.network.UrlAddress; import io.reactivex.rxjava3.core.Observable; import retrofit2.http.Field; diff --git a/app/src/main/java/com/xxpatx/os/network/api/uiui/order/AllOrderApi.java b/app/src/main/java/com/vscool/os/network/api/uiui/order/AllOrderApi.java similarity index 61% rename from app/src/main/java/com/xxpatx/os/network/api/uiui/order/AllOrderApi.java rename to app/src/main/java/com/vscool/os/network/api/uiui/order/AllOrderApi.java index a2ffaed..6827b77 100644 --- a/app/src/main/java/com/xxpatx/os/network/api/uiui/order/AllOrderApi.java +++ b/app/src/main/java/com/vscool/os/network/api/uiui/order/AllOrderApi.java @@ -1,8 +1,8 @@ -package com.xxpatx.os.network.api.uiui.order; +package com.vscool.os.network.api.uiui.order; -import com.xxpatx.os.bean.BaseResponse; -import com.xxpatx.os.bean.OrderIndexData; -import com.xxpatx.os.network.UrlAddress; +import com.vscool.os.bean.BaseResponse; +import com.vscool.os.bean.OrderIndexData; +import com.vscool.os.network.UrlAddress; import io.reactivex.rxjava3.core.Observable; import retrofit2.http.GET; diff --git a/app/src/main/java/com/xxpatx/os/network/api/uiui/order/OrderExpressApi.java b/app/src/main/java/com/vscool/os/network/api/uiui/order/OrderExpressApi.java similarity index 69% rename from app/src/main/java/com/xxpatx/os/network/api/uiui/order/OrderExpressApi.java rename to app/src/main/java/com/vscool/os/network/api/uiui/order/OrderExpressApi.java index 583ab78..71ae689 100644 --- a/app/src/main/java/com/xxpatx/os/network/api/uiui/order/OrderExpressApi.java +++ b/app/src/main/java/com/vscool/os/network/api/uiui/order/OrderExpressApi.java @@ -1,8 +1,8 @@ -package com.xxpatx.os.network.api.uiui.order; +package com.vscool.os.network.api.uiui.order; -import com.xxpatx.os.bean.BaseResponse; -import com.xxpatx.os.bean.ExpressData; -import com.xxpatx.os.network.UrlAddress; +import com.vscool.os.bean.BaseResponse; +import com.vscool.os.bean.ExpressData; +import com.vscool.os.network.UrlAddress; import io.reactivex.rxjava3.core.Observable; import retrofit2.http.GET; diff --git a/app/src/main/java/com/xxpatx/os/network/api/uiui/order/OrderIndexApi.java b/app/src/main/java/com/vscool/os/network/api/uiui/order/OrderIndexApi.java similarity index 65% rename from app/src/main/java/com/xxpatx/os/network/api/uiui/order/OrderIndexApi.java rename to app/src/main/java/com/vscool/os/network/api/uiui/order/OrderIndexApi.java index 5a5d1f2..397f314 100644 --- a/app/src/main/java/com/xxpatx/os/network/api/uiui/order/OrderIndexApi.java +++ b/app/src/main/java/com/vscool/os/network/api/uiui/order/OrderIndexApi.java @@ -1,8 +1,8 @@ -package com.xxpatx.os.network.api.uiui.order; +package com.vscool.os.network.api.uiui.order; -import com.xxpatx.os.bean.BaseResponse; -import com.xxpatx.os.bean.OrderIndexData; -import com.xxpatx.os.network.UrlAddress; +import com.vscool.os.bean.BaseResponse; +import com.vscool.os.bean.OrderIndexData; +import com.vscool.os.network.UrlAddress; import io.reactivex.rxjava3.core.Observable; import retrofit2.http.GET; diff --git a/app/src/main/java/com/xxpatx/os/network/api/uiui/pay/GoodsBuyApi.java b/app/src/main/java/com/vscool/os/network/api/uiui/pay/GoodsBuyApi.java similarity index 70% rename from app/src/main/java/com/xxpatx/os/network/api/uiui/pay/GoodsBuyApi.java rename to app/src/main/java/com/vscool/os/network/api/uiui/pay/GoodsBuyApi.java index d7f557f..de24116 100644 --- a/app/src/main/java/com/xxpatx/os/network/api/uiui/pay/GoodsBuyApi.java +++ b/app/src/main/java/com/vscool/os/network/api/uiui/pay/GoodsBuyApi.java @@ -1,8 +1,8 @@ -package com.xxpatx.os.network.api.uiui.pay; +package com.vscool.os.network.api.uiui.pay; -import com.xxpatx.os.bean.BaseResponse; -import com.xxpatx.os.bean.OrderBean; -import com.xxpatx.os.network.UrlAddress; +import com.vscool.os.bean.BaseResponse; +import com.vscool.os.bean.OrderBean; +import com.vscool.os.network.UrlAddress; import java.util.Map; diff --git a/app/src/main/java/com/xxpatx/os/network/api/uiui/pay/OrderPayApi.java b/app/src/main/java/com/vscool/os/network/api/uiui/pay/OrderPayApi.java similarity index 75% rename from app/src/main/java/com/xxpatx/os/network/api/uiui/pay/OrderPayApi.java rename to app/src/main/java/com/vscool/os/network/api/uiui/pay/OrderPayApi.java index 42c0158..10c368f 100644 --- a/app/src/main/java/com/xxpatx/os/network/api/uiui/pay/OrderPayApi.java +++ b/app/src/main/java/com/vscool/os/network/api/uiui/pay/OrderPayApi.java @@ -1,8 +1,8 @@ -package com.xxpatx.os.network.api.uiui.pay; +package com.vscool.os.network.api.uiui.pay; -import com.xxpatx.os.bean.BaseResponse; -import com.xxpatx.os.bean.WxpayBean; -import com.xxpatx.os.network.UrlAddress; +import com.vscool.os.bean.BaseResponse; +import com.vscool.os.bean.WxpayBean; +import com.vscool.os.network.UrlAddress; import io.reactivex.rxjava3.core.Observable; import retrofit2.http.Field; diff --git a/app/src/main/java/com/xxpatx/os/network/api/uiui/pay/OrderPayCheckApi.java b/app/src/main/java/com/vscool/os/network/api/uiui/pay/OrderPayCheckApi.java similarity index 76% rename from app/src/main/java/com/xxpatx/os/network/api/uiui/pay/OrderPayCheckApi.java rename to app/src/main/java/com/vscool/os/network/api/uiui/pay/OrderPayCheckApi.java index 4aa5956..86c3560 100644 --- a/app/src/main/java/com/xxpatx/os/network/api/uiui/pay/OrderPayCheckApi.java +++ b/app/src/main/java/com/vscool/os/network/api/uiui/pay/OrderPayCheckApi.java @@ -1,7 +1,7 @@ -package com.xxpatx.os.network.api.uiui.pay; +package com.vscool.os.network.api.uiui.pay; -import com.xxpatx.os.bean.BaseResponse; -import com.xxpatx.os.network.UrlAddress; +import com.vscool.os.bean.BaseResponse; +import com.vscool.os.network.UrlAddress; import io.reactivex.rxjava3.core.Observable; import retrofit2.http.Field; diff --git a/app/src/main/java/com/xxpatx/os/network/api/uiui/sn/FamilyAddressApi.java b/app/src/main/java/com/vscool/os/network/api/uiui/sn/FamilyAddressApi.java similarity index 63% rename from app/src/main/java/com/xxpatx/os/network/api/uiui/sn/FamilyAddressApi.java rename to app/src/main/java/com/vscool/os/network/api/uiui/sn/FamilyAddressApi.java index 63e35cc..6a5b56f 100644 --- a/app/src/main/java/com/xxpatx/os/network/api/uiui/sn/FamilyAddressApi.java +++ b/app/src/main/java/com/vscool/os/network/api/uiui/sn/FamilyAddressApi.java @@ -1,8 +1,8 @@ -package com.xxpatx.os.network.api.uiui.sn; +package com.vscool.os.network.api.uiui.sn; -import com.xxpatx.os.bean.BaseResponse; -import com.xxpatx.os.bean.FamilyAddress; -import com.xxpatx.os.network.UrlAddress; +import com.vscool.os.bean.BaseResponse; +import com.vscool.os.bean.FamilyAddress; +import com.vscool.os.network.UrlAddress; import io.reactivex.rxjava3.core.Observable; import retrofit2.http.GET; diff --git a/app/src/main/java/com/xxpatx/os/network/api/uiui/sn/SendScreenshotApi.java b/app/src/main/java/com/vscool/os/network/api/uiui/sn/SendScreenshotApi.java similarity index 77% rename from app/src/main/java/com/xxpatx/os/network/api/uiui/sn/SendScreenshotApi.java rename to app/src/main/java/com/vscool/os/network/api/uiui/sn/SendScreenshotApi.java index 7844d91..329a53d 100644 --- a/app/src/main/java/com/xxpatx/os/network/api/uiui/sn/SendScreenshotApi.java +++ b/app/src/main/java/com/vscool/os/network/api/uiui/sn/SendScreenshotApi.java @@ -1,8 +1,8 @@ -package com.xxpatx.os.network.api.uiui.sn; +package com.vscool.os.network.api.uiui.sn; -import com.xxpatx.os.bean.BaseResponse; -import com.xxpatx.os.network.UrlAddress; +import com.vscool.os.bean.BaseResponse; +import com.vscool.os.network.UrlAddress; import io.reactivex.rxjava3.core.Observable; import okhttp3.MultipartBody; diff --git a/app/src/main/java/com/xxpatx/os/network/api/uiui/sn/SettingApi.java b/app/src/main/java/com/vscool/os/network/api/uiui/sn/SettingApi.java similarity index 61% rename from app/src/main/java/com/xxpatx/os/network/api/uiui/sn/SettingApi.java rename to app/src/main/java/com/vscool/os/network/api/uiui/sn/SettingApi.java index 47200da..37b2666 100644 --- a/app/src/main/java/com/xxpatx/os/network/api/uiui/sn/SettingApi.java +++ b/app/src/main/java/com/vscool/os/network/api/uiui/sn/SettingApi.java @@ -1,8 +1,8 @@ -package com.xxpatx.os.network.api.uiui.sn; +package com.vscool.os.network.api.uiui.sn; -import com.xxpatx.os.bean.BaseResponse; -import com.xxpatx.os.bean.SystemSettings; -import com.xxpatx.os.network.UrlAddress; +import com.vscool.os.bean.BaseResponse; +import com.vscool.os.bean.SystemSettings; +import com.vscool.os.network.UrlAddress; import io.reactivex.rxjava3.core.Observable; import retrofit2.http.GET; diff --git a/app/src/main/java/com/xxpatx/os/network/api/uiui/sn/SnInfoApi.java b/app/src/main/java/com/vscool/os/network/api/uiui/sn/SnInfoApi.java similarity index 61% rename from app/src/main/java/com/xxpatx/os/network/api/uiui/sn/SnInfoApi.java rename to app/src/main/java/com/vscool/os/network/api/uiui/sn/SnInfoApi.java index fcfadd9..7ec93c2 100644 --- a/app/src/main/java/com/xxpatx/os/network/api/uiui/sn/SnInfoApi.java +++ b/app/src/main/java/com/vscool/os/network/api/uiui/sn/SnInfoApi.java @@ -1,8 +1,8 @@ -package com.xxpatx.os.network.api.uiui.sn; +package com.vscool.os.network.api.uiui.sn; -import com.xxpatx.os.bean.BaseResponse; -import com.xxpatx.os.bean.SnInfo; -import com.xxpatx.os.network.UrlAddress; +import com.vscool.os.bean.BaseResponse; +import com.vscool.os.bean.SnInfo; +import com.vscool.os.network.UrlAddress; import io.reactivex.rxjava3.core.Observable; import retrofit2.http.GET; diff --git a/app/src/main/java/com/xxpatx/os/network/api/uiui/sn/SosRecordApi.java b/app/src/main/java/com/vscool/os/network/api/uiui/sn/SosRecordApi.java similarity index 78% rename from app/src/main/java/com/xxpatx/os/network/api/uiui/sn/SosRecordApi.java rename to app/src/main/java/com/vscool/os/network/api/uiui/sn/SosRecordApi.java index a1191d7..920bea7 100644 --- a/app/src/main/java/com/xxpatx/os/network/api/uiui/sn/SosRecordApi.java +++ b/app/src/main/java/com/vscool/os/network/api/uiui/sn/SosRecordApi.java @@ -1,7 +1,7 @@ -package com.xxpatx.os.network.api.uiui.sn; +package com.vscool.os.network.api.uiui.sn; -import com.xxpatx.os.bean.BaseResponse; -import com.xxpatx.os.network.UrlAddress; +import com.vscool.os.bean.BaseResponse; +import com.vscool.os.network.UrlAddress; import io.reactivex.rxjava3.core.Observable; import retrofit2.http.Field; diff --git a/app/src/main/java/com/xxpatx/os/network/api/uiui/sn/UpdateAddressApi.java b/app/src/main/java/com/vscool/os/network/api/uiui/sn/UpdateAddressApi.java similarity index 79% rename from app/src/main/java/com/xxpatx/os/network/api/uiui/sn/UpdateAddressApi.java rename to app/src/main/java/com/vscool/os/network/api/uiui/sn/UpdateAddressApi.java index f6915cf..3c1aa78 100644 --- a/app/src/main/java/com/xxpatx/os/network/api/uiui/sn/UpdateAddressApi.java +++ b/app/src/main/java/com/vscool/os/network/api/uiui/sn/UpdateAddressApi.java @@ -1,7 +1,7 @@ -package com.xxpatx.os.network.api.uiui.sn; +package com.vscool.os.network.api.uiui.sn; -import com.xxpatx.os.bean.BaseResponse; -import com.xxpatx.os.network.UrlAddress; +import com.vscool.os.bean.BaseResponse; +import com.vscool.os.network.UrlAddress; import io.reactivex.rxjava3.core.Observable; import retrofit2.http.Field; diff --git a/app/src/main/java/com/xxpatx/os/network/interceptor/RepeatRequestInterceptor.java b/app/src/main/java/com/vscool/os/network/interceptor/RepeatRequestInterceptor.java similarity index 97% rename from app/src/main/java/com/xxpatx/os/network/interceptor/RepeatRequestInterceptor.java rename to app/src/main/java/com/vscool/os/network/interceptor/RepeatRequestInterceptor.java index 12b8e82..75b43c6 100644 --- a/app/src/main/java/com/xxpatx/os/network/interceptor/RepeatRequestInterceptor.java +++ b/app/src/main/java/com/vscool/os/network/interceptor/RepeatRequestInterceptor.java @@ -1,9 +1,9 @@ -package com.xxpatx.os.network.interceptor; +package com.vscool.os.network.interceptor; import android.util.Log; -import com.xxpatx.os.BuildConfig; -import com.xxpatx.os.utils.MD5Util; +import com.vscool.os.BuildConfig; +import com.vscool.os.utils.MD5Util; import org.jetbrains.annotations.NotNull; diff --git a/app/src/main/java/com/xxpatx/os/push/PushManager.java b/app/src/main/java/com/vscool/os/push/PushManager.java similarity index 93% rename from app/src/main/java/com/xxpatx/os/push/PushManager.java rename to app/src/main/java/com/vscool/os/push/PushManager.java index e4db0f8..af3b126 100644 --- a/app/src/main/java/com/xxpatx/os/push/PushManager.java +++ b/app/src/main/java/com/vscool/os/push/PushManager.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.push; +package com.vscool.os.push; import android.annotation.SuppressLint; import android.content.ContentResolver; @@ -7,8 +7,8 @@ import android.content.Intent; import com.hjq.toast.Toaster; import com.tencent.mmkv.MMKV; -import com.xxpatx.os.config.CommonConfig; -import com.xxpatx.os.disklrucache.CacheHelper; +import com.vscool.os.config.CommonConfig; +import com.vscool.os.disklrucache.CacheHelper; public class PushManager { diff --git a/app/src/main/java/com/xxpatx/os/push/alipush/AliMessageIntentService.java b/app/src/main/java/com/vscool/os/push/alipush/AliMessageIntentService.java similarity index 98% rename from app/src/main/java/com/xxpatx/os/push/alipush/AliMessageIntentService.java rename to app/src/main/java/com/vscool/os/push/alipush/AliMessageIntentService.java index f12f88e..91d7824 100644 --- a/app/src/main/java/com/xxpatx/os/push/alipush/AliMessageIntentService.java +++ b/app/src/main/java/com/vscool/os/push/alipush/AliMessageIntentService.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.push.alipush; +package com.vscool.os.push.alipush; import android.content.Context; import android.util.Log; diff --git a/app/src/main/java/com/xxpatx/os/push/alipush/AliyunMessageReceiver.java b/app/src/main/java/com/vscool/os/push/alipush/AliyunMessageReceiver.java similarity index 98% rename from app/src/main/java/com/xxpatx/os/push/alipush/AliyunMessageReceiver.java rename to app/src/main/java/com/vscool/os/push/alipush/AliyunMessageReceiver.java index 1205af8..7686ab0 100644 --- a/app/src/main/java/com/xxpatx/os/push/alipush/AliyunMessageReceiver.java +++ b/app/src/main/java/com/vscool/os/push/alipush/AliyunMessageReceiver.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.push.alipush; +package com.vscool.os.push.alipush; import android.content.Context; import android.util.Log; @@ -7,7 +7,7 @@ import com.alibaba.sdk.android.push.MessageReceiver; import com.alibaba.sdk.android.push.notification.CPushMessage; import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import com.xxpatx.os.push.PushManager; +import com.vscool.os.push.PushManager; import java.util.Map; diff --git a/app/src/main/java/com/xxpatx/os/receiver/BootReceiver.java b/app/src/main/java/com/vscool/os/receiver/BootReceiver.java similarity index 98% rename from app/src/main/java/com/xxpatx/os/receiver/BootReceiver.java rename to app/src/main/java/com/vscool/os/receiver/BootReceiver.java index b8cddce..80b14a8 100644 --- a/app/src/main/java/com/xxpatx/os/receiver/BootReceiver.java +++ b/app/src/main/java/com/vscool/os/receiver/BootReceiver.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.receiver; +package com.vscool.os.receiver; import android.content.BroadcastReceiver; import android.content.Context; diff --git a/app/src/main/java/com/xxpatx/os/receiver/InstallResultReceiver.java b/app/src/main/java/com/vscool/os/receiver/InstallResultReceiver.java similarity index 98% rename from app/src/main/java/com/xxpatx/os/receiver/InstallResultReceiver.java rename to app/src/main/java/com/vscool/os/receiver/InstallResultReceiver.java index fff320c..f18ada1 100644 --- a/app/src/main/java/com/xxpatx/os/receiver/InstallResultReceiver.java +++ b/app/src/main/java/com/vscool/os/receiver/InstallResultReceiver.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.receiver; +package com.vscool.os.receiver; import android.content.BroadcastReceiver; import android.content.Context; diff --git a/app/src/main/java/com/xxpatx/os/receiver/InstallShortcutReceiver.java b/app/src/main/java/com/vscool/os/receiver/InstallShortcutReceiver.java similarity index 94% rename from app/src/main/java/com/xxpatx/os/receiver/InstallShortcutReceiver.java rename to app/src/main/java/com/vscool/os/receiver/InstallShortcutReceiver.java index 14d2a20..85162c5 100644 --- a/app/src/main/java/com/xxpatx/os/receiver/InstallShortcutReceiver.java +++ b/app/src/main/java/com/vscool/os/receiver/InstallShortcutReceiver.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.receiver; +package com.vscool.os.receiver; import android.content.BroadcastReceiver; import android.content.Context; diff --git a/app/src/main/java/com/xxpatx/os/receiver/SmsReceiver.java b/app/src/main/java/com/vscool/os/receiver/SmsReceiver.java similarity index 93% rename from app/src/main/java/com/xxpatx/os/receiver/SmsReceiver.java rename to app/src/main/java/com/vscool/os/receiver/SmsReceiver.java index 0447e5e..f7df4cd 100644 --- a/app/src/main/java/com/xxpatx/os/receiver/SmsReceiver.java +++ b/app/src/main/java/com/vscool/os/receiver/SmsReceiver.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.receiver; +package com.vscool.os.receiver; import android.content.BroadcastReceiver; import android.content.Context; @@ -8,8 +8,8 @@ import android.telephony.SmsMessage; import android.util.Log; import com.tencent.mmkv.MMKV; -import com.xxpatx.os.activity.tts.TtsActivity; -import com.xxpatx.os.config.CommonConfig; +import com.vscool.os.activity.tts.TtsActivity; +import com.vscool.os.config.CommonConfig; public class SmsReceiver extends BroadcastReceiver { private static final String TAG = "SmsReceiver"; diff --git a/app/src/main/java/com/xxpatx/os/service/NotificationService.java b/app/src/main/java/com/vscool/os/service/NotificationService.java similarity index 98% rename from app/src/main/java/com/xxpatx/os/service/NotificationService.java rename to app/src/main/java/com/vscool/os/service/NotificationService.java index f67ca7d..1e020b3 100644 --- a/app/src/main/java/com/xxpatx/os/service/NotificationService.java +++ b/app/src/main/java/com/vscool/os/service/NotificationService.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.service; +package com.vscool.os.service; import android.service.notification.NotificationListenerService; import android.service.notification.StatusBarNotification; diff --git a/app/src/main/java/com/xxpatx/os/service/WeAccessibilityService.java b/app/src/main/java/com/vscool/os/service/WeAccessibilityService.java similarity index 99% rename from app/src/main/java/com/xxpatx/os/service/WeAccessibilityService.java rename to app/src/main/java/com/vscool/os/service/WeAccessibilityService.java index 82873ec..8fe67ba 100644 --- a/app/src/main/java/com/xxpatx/os/service/WeAccessibilityService.java +++ b/app/src/main/java/com/vscool/os/service/WeAccessibilityService.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.service; +package com.vscool.os.service; import android.accessibilityservice.AccessibilityService; import android.accessibilityservice.GestureDescription; @@ -20,8 +20,8 @@ import android.view.accessibility.AccessibilityNodeInfo; import android.widget.Toast; import com.tencent.mmkv.MMKV; -import com.xxpatx.os.bean.Contact; -import com.xxpatx.os.config.CommonConfig; +import com.vscool.os.bean.Contact; +import com.vscool.os.config.CommonConfig; /** * 通过微信标签最高支持8.0.49，8.0.50 获取不到数据 diff --git a/app/src/main/java/com/xxpatx/os/service/main/MainSContact.java b/app/src/main/java/com/vscool/os/service/main/MainSContact.java similarity index 77% rename from app/src/main/java/com/xxpatx/os/service/main/MainSContact.java rename to app/src/main/java/com/vscool/os/service/main/MainSContact.java index 67f5e76..d9b00fe 100644 --- a/app/src/main/java/com/xxpatx/os/service/main/MainSContact.java +++ b/app/src/main/java/com/vscool/os/service/main/MainSContact.java @@ -1,8 +1,8 @@ -package com.xxpatx.os.service.main; +package com.vscool.os.service.main; -import com.xxpatx.os.alarm.AlarmClockData; -import com.xxpatx.os.base.mvp.BasePresenter; -import com.xxpatx.os.base.mvp.BaseView; +import com.vscool.os.alarm.AlarmClockData; +import com.vscool.os.base.mvp.BasePresenter; +import com.vscool.os.base.mvp.BaseView; import java.util.List; diff --git a/app/src/main/java/com/xxpatx/os/service/main/MainSPresenter.java b/app/src/main/java/com/vscool/os/service/main/MainSPresenter.java similarity index 97% rename from app/src/main/java/com/xxpatx/os/service/main/MainSPresenter.java rename to app/src/main/java/com/vscool/os/service/main/MainSPresenter.java index 8a00ee6..9fffc28 100644 --- a/app/src/main/java/com/xxpatx/os/service/main/MainSPresenter.java +++ b/app/src/main/java/com/vscool/os/service/main/MainSPresenter.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.service.main; +package com.vscool.os.service.main; import android.content.Context; import android.text.TextUtils; @@ -8,13 +8,13 @@ import com.hjq.toast.Toaster; import com.tencent.mmkv.MMKV; import com.trello.rxlifecycle4.RxLifecycle; import com.trello.rxlifecycle4.android.ActivityEvent; -import com.xxpatx.os.alarm.AlarmClockData; -import com.xxpatx.os.alarm.AlarmUtils; -import com.xxpatx.os.bean.AlarmClockId; -import com.xxpatx.os.bean.BaseResponse; -import com.xxpatx.os.config.CommonConfig; -import com.xxpatx.os.network.NetInterfaceManager; -import com.xxpatx.os.utils.Utils; +import com.vscool.os.alarm.AlarmClockData; +import com.vscool.os.alarm.AlarmUtils; +import com.vscool.os.bean.AlarmClockId; +import com.vscool.os.bean.BaseResponse; +import com.vscool.os.config.CommonConfig; +import com.vscool.os.network.NetInterfaceManager; +import com.vscool.os.utils.Utils; import java.io.File; import java.util.ArrayList; diff --git a/app/src/main/java/com/xxpatx/os/service/main/MainService.java b/app/src/main/java/com/vscool/os/service/main/MainService.java similarity index 97% rename from app/src/main/java/com/xxpatx/os/service/main/MainService.java rename to app/src/main/java/com/vscool/os/service/main/MainService.java index 726106b..03ee04c 100644 --- a/app/src/main/java/com/xxpatx/os/service/main/MainService.java +++ b/app/src/main/java/com/vscool/os/service/main/MainService.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.service.main; +package com.vscool.os.service.main; import android.app.ActivityManager; import android.content.BroadcastReceiver; @@ -28,23 +28,23 @@ import com.google.gson.reflect.TypeToken; import com.hjq.toast.Toaster; import com.shehuan.niv.NiceImageView; import com.tencent.mmkv.MMKV; -import com.xxpatx.os.BuildConfig; -import com.xxpatx.os.R; -import com.xxpatx.os.activity.main.MainActivity; -import com.xxpatx.os.activity.noti.NoticeActivity; -import com.xxpatx.os.alarm.AlarmClockData; -import com.xxpatx.os.alarm.AlarmUtils; -import com.xxpatx.os.base.rx.BaseRxService; -import com.xxpatx.os.bean.AppInfo; -import com.xxpatx.os.bean.BaseResponse; -import com.xxpatx.os.config.CommonConfig; -import com.xxpatx.os.network.NetInterfaceManager; -import com.xxpatx.os.receiver.SmsReceiver; -import com.xxpatx.os.utils.ApkUtils; -import com.xxpatx.os.utils.AppUsedTimeUtils; -import com.xxpatx.os.utils.CmdUtil; -import com.xxpatx.os.utils.ForegroundAppUtil; -import com.xxpatx.os.utils.Utils; +import com.vscool.os.BuildConfig; +import com.vscool.os.R; +import com.vscool.os.activity.main.MainActivity; +import com.vscool.os.activity.noti.NoticeActivity; +import com.vscool.os.alarm.AlarmClockData; +import com.vscool.os.alarm.AlarmUtils; +import com.vscool.os.base.rx.BaseRxService; +import com.vscool.os.bean.AppInfo; +import com.vscool.os.bean.BaseResponse; +import com.vscool.os.config.CommonConfig; +import com.vscool.os.network.NetInterfaceManager; +import com.vscool.os.receiver.SmsReceiver; +import com.vscool.os.utils.ApkUtils; +import com.vscool.os.utils.AppUsedTimeUtils; +import com.vscool.os.utils.CmdUtil; +import com.vscool.os.utils.ForegroundAppUtil; +import com.vscool.os.utils.Utils; import java.io.File; import java.io.FileNotFoundException; @@ -631,8 +631,8 @@ public class MainService extends BaseRxService implements MainSContact.MainSView } } - public static final String ACTION_FLOAT_WINDOW_ON = "com.xxpatx.os.float.window.on"; - public static final String ACTION_FLOAT_WINDOW_OFF = "com.xxpatx.os.float.window.off"; + public static final String ACTION_FLOAT_WINDOW_ON = "com.vscool.os.float.window.on"; + public static final String ACTION_FLOAT_WINDOW_OFF = "com.vscool.os.float.window.off"; private WindowReceiver mWindowReceiver; @@ -738,7 +738,7 @@ public class MainService extends BaseRxService implements MainSContact.MainSView private static final Set skip_kill_app = new HashSet() {{ this.add(BuildConfig.APPLICATION_ID); - this.add("com.xxpatx.sn"); + this.add("com.vscool.shbd"); this.add("com.tencent.mm"); this.add("com.google.android.inputmethod.pinyin"); this.add("com.sohu.inputmethod.sogou"); diff --git a/app/src/main/java/com/xxpatx/os/shortcut/ShortcutHelper.java b/app/src/main/java/com/vscool/os/shortcut/ShortcutHelper.java similarity index 98% rename from app/src/main/java/com/xxpatx/os/shortcut/ShortcutHelper.java rename to app/src/main/java/com/vscool/os/shortcut/ShortcutHelper.java index ce7e4a5..e6b56af 100644 --- a/app/src/main/java/com/xxpatx/os/shortcut/ShortcutHelper.java +++ b/app/src/main/java/com/vscool/os/shortcut/ShortcutHelper.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.shortcut; +package com.vscool.os.shortcut; import android.content.Context; import android.database.sqlite.SQLiteDatabase; diff --git a/app/src/main/java/com/xxpatx/os/shortcut/ShortcutPkgInfo.java b/app/src/main/java/com/vscool/os/shortcut/ShortcutPkgInfo.java similarity index 94% rename from app/src/main/java/com/xxpatx/os/shortcut/ShortcutPkgInfo.java rename to app/src/main/java/com/vscool/os/shortcut/ShortcutPkgInfo.java index c11a657..c90fcb8 100644 --- a/app/src/main/java/com/xxpatx/os/shortcut/ShortcutPkgInfo.java +++ b/app/src/main/java/com/vscool/os/shortcut/ShortcutPkgInfo.java @@ -1,8 +1,8 @@ -package com.xxpatx.os.shortcut; +package com.vscool.os.shortcut; import android.content.ComponentName; -import com.xxpatx.os.bean.DesktopIcon; +import com.vscool.os.bean.DesktopIcon; import java.io.Serializable; diff --git a/app/src/main/java/com/xxpatx/os/shortcut/ShortcutUtils.java b/app/src/main/java/com/vscool/os/shortcut/ShortcutUtils.java similarity index 99% rename from app/src/main/java/com/xxpatx/os/shortcut/ShortcutUtils.java rename to app/src/main/java/com/vscool/os/shortcut/ShortcutUtils.java index 2d25e50..ebd4886 100644 --- a/app/src/main/java/com/xxpatx/os/shortcut/ShortcutUtils.java +++ b/app/src/main/java/com/vscool/os/shortcut/ShortcutUtils.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.shortcut; +package com.vscool.os.shortcut; import android.content.ContentValues; import android.content.Context; diff --git a/app/src/main/java/com/xxpatx/os/utils/AccessibilityUtils.java b/app/src/main/java/com/vscool/os/utils/AccessibilityUtils.java similarity index 95% rename from app/src/main/java/com/xxpatx/os/utils/AccessibilityUtils.java rename to app/src/main/java/com/vscool/os/utils/AccessibilityUtils.java index f035c89..5366d19 100644 --- a/app/src/main/java/com/xxpatx/os/utils/AccessibilityUtils.java +++ b/app/src/main/java/com/vscool/os/utils/AccessibilityUtils.java @@ -1,11 +1,11 @@ -package com.xxpatx.os.utils; +package com.vscool.os.utils; import android.content.Context; import android.provider.Settings; import android.text.TextUtils; import android.util.Log; -import com.xxpatx.os.service.WeAccessibilityService; +import com.vscool.os.service.WeAccessibilityService; public class AccessibilityUtils { private static final String TAG = "AccessibilityUtils"; diff --git a/app/src/main/java/com/xxpatx/os/utils/ActivationUtil.java b/app/src/main/java/com/vscool/os/utils/ActivationUtil.java similarity index 97% rename from app/src/main/java/com/xxpatx/os/utils/ActivationUtil.java rename to app/src/main/java/com/vscool/os/utils/ActivationUtil.java index 9772e4a..ca2ba9e 100644 --- a/app/src/main/java/com/xxpatx/os/utils/ActivationUtil.java +++ b/app/src/main/java/com/vscool/os/utils/ActivationUtil.java @@ -1,9 +1,9 @@ -package com.xxpatx.os.utils; +package com.vscool.os.utils; import android.content.Context; import android.provider.Settings; -import com.xxpatx.os.config.CommonConfig; +import com.vscool.os.config.CommonConfig; public class ActivationUtil { diff --git a/app/src/main/java/com/xxpatx/os/utils/ApkUtils.java b/app/src/main/java/com/vscool/os/utils/ApkUtils.java similarity index 97% rename from app/src/main/java/com/xxpatx/os/utils/ApkUtils.java rename to app/src/main/java/com/vscool/os/utils/ApkUtils.java index 3875d2e..6bd33fd 100644 --- a/app/src/main/java/com/xxpatx/os/utils/ApkUtils.java +++ b/app/src/main/java/com/vscool/os/utils/ApkUtils.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.utils; +package com.vscool.os.utils; import android.app.ActivityManager; import android.app.PendingIntent; @@ -25,19 +25,19 @@ import androidx.annotation.RequiresApi; import com.arialyy.aria.core.Aria; import com.hjq.toast.Toaster; import com.tencent.mmkv.MMKV; -import com.xxpatx.os.BuildConfig; -import com.xxpatx.os.R; -import com.xxpatx.os.activity.quickapp.QuickAppActivity; -import com.xxpatx.os.bean.AppInfo; -import com.xxpatx.os.bean.DesktopIcon; -import com.xxpatx.os.bean.TestAppInfo; -import com.xxpatx.os.config.CommonConfig; -import com.xxpatx.os.gson.GsonUtils; -import com.xxpatx.os.manager.AppManager; -import com.xxpatx.os.manager.AppStatusManager; -import com.xxpatx.os.receiver.InstallResultReceiver; -import com.xxpatx.os.shortcut.ShortcutPkgInfo; -import com.xxpatx.os.shortcut.ShortcutUtils; +import com.vscool.os.BuildConfig; +import com.vscool.os.R; +import com.vscool.os.activity.quickapp.QuickAppActivity; +import com.vscool.os.bean.AppInfo; +import com.vscool.os.bean.DesktopIcon; +import com.vscool.os.bean.TestAppInfo; +import com.vscool.os.config.CommonConfig; +import com.vscool.os.gson.GsonUtils; +import com.vscool.os.manager.AppManager; +import com.vscool.os.manager.AppStatusManager; +import com.vscool.os.receiver.InstallResultReceiver; +import com.vscool.os.shortcut.ShortcutPkgInfo; +import com.vscool.os.shortcut.ShortcutUtils; import java.io.BufferedReader; import java.io.File; @@ -82,9 +82,9 @@ public class ApkUtils { this.add("com.uiui.videoplayer"); // this.add("com.uiui.health"); this.add("com.tencent.android.qqdownloader"); -// this.add("com.xxpatx.store"); +// this.add("com.vscool.store"); this.add("com.joytv.live"); - this.add("com.xxpatx.store"); + this.add("com.vscool.store"); this.add("com.teclast.zyos"); this.add("com.teclast.zy"); this.add("com.teclast.zyappstore"); @@ -96,9 +96,9 @@ public class ApkUtils { }}; public static HashSet showPackageName = new HashSet() {{ - this.add("com.xxpatx.sn"); + this.add("com.vscool.shbd"); this.add("com.uiuios.browser"); -// this.add("com.xxpatx.store"); +// this.add("com.vscool.store"); this.add("com.android.dialer"); this.add("com.android.gallery3d"); this.add("com.android.settings"); @@ -173,14 +173,14 @@ public class ApkUtils { this.add("com.android.gallery3d"); this.add("com.android.camera2"); this.add("com.android.settings"); - this.add("com.xxpatx.sn"); - this.add("com.xxpatx.store"); + this.add("com.vscool.shbd"); + this.add("com.vscool.store"); }}; private static List hideApp = new ArrayList() {{ - this.add("com.xxpatx.sn"); - this.add("com.xxpatx.os"); - this.add("com.xxpatx.store"); + this.add("com.vscool.shbd"); + this.add("com.vscool.os"); + this.add("com.vscool.store"); this.add("com.android.quicksearchbox"); // this.add("com.android.stk"); this.add("com.debug.loggerui"); @@ -265,7 +265,7 @@ public class ApkUtils { resolveInfos.add(resolveInfo); } } else { - if ("com.xxpatx.sn".equals(pkg)) { + if ("com.vscool.shbd".equals(pkg)) { resolveInfos.add(resolveInfo); } else { Log.e(TAG, "queryFilterAppInfo: pkgSet ! contains " + pkg); @@ -338,7 +338,7 @@ public class ApkUtils { } public static final HashSet phoneShowPackageName = new HashSet() {{ - this.add("com.xxpatx.sn"); + this.add("com.vscool.shbd"); // this.add("com.uiuios.browser"); // this.add("com.android.dialer"); // this.add("com.android.gallery3d"); diff --git a/app/src/main/java/com/xxpatx/os/utils/AppUsedTimeUtils.java b/app/src/main/java/com/vscool/os/utils/AppUsedTimeUtils.java similarity index 98% rename from app/src/main/java/com/xxpatx/os/utils/AppUsedTimeUtils.java rename to app/src/main/java/com/vscool/os/utils/AppUsedTimeUtils.java index 9a73f35..ffaebde 100644 --- a/app/src/main/java/com/xxpatx/os/utils/AppUsedTimeUtils.java +++ b/app/src/main/java/com/vscool/os/utils/AppUsedTimeUtils.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.utils; +package com.vscool.os.utils; import android.annotation.SuppressLint; import android.content.Context; @@ -11,7 +11,7 @@ import com.google.gson.Gson; import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; import com.tencent.mmkv.MMKV; -import com.xxpatx.os.config.CommonConfig; +import com.vscool.os.config.CommonConfig; import java.io.Serializable; import java.lang.reflect.Type; diff --git a/app/src/main/java/com/xxpatx/os/utils/AppUtil.java b/app/src/main/java/com/vscool/os/utils/AppUtil.java similarity index 99% rename from app/src/main/java/com/xxpatx/os/utils/AppUtil.java rename to app/src/main/java/com/vscool/os/utils/AppUtil.java index 9881b7a..03c9017 100644 --- a/app/src/main/java/com/xxpatx/os/utils/AppUtil.java +++ b/app/src/main/java/com/vscool/os/utils/AppUtil.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xxpatx.os.utils; +package com.vscool.os.utils; import android.app.ActivityManager; diff --git a/app/src/main/java/com/xxpatx/os/utils/BitmapUtils.java b/app/src/main/java/com/vscool/os/utils/BitmapUtils.java similarity index 99% rename from app/src/main/java/com/xxpatx/os/utils/BitmapUtils.java rename to app/src/main/java/com/vscool/os/utils/BitmapUtils.java index 4b6330c..f4a79e3 100644 --- a/app/src/main/java/com/xxpatx/os/utils/BitmapUtils.java +++ b/app/src/main/java/com/vscool/os/utils/BitmapUtils.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.utils; +package com.vscool.os.utils; import android.content.Context; import android.graphics.Bitmap; @@ -23,7 +23,7 @@ import com.google.zxing.WriterException; import com.google.zxing.common.BitMatrix; import com.google.zxing.qrcode.QRCodeWriter; import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel; -import com.xxpatx.os.R; +import com.vscool.os.R; import java.io.ByteArrayOutputStream; import java.util.HashMap; diff --git a/app/src/main/java/com/xxpatx/os/utils/BrightnessUtils.java b/app/src/main/java/com/vscool/os/utils/BrightnessUtils.java similarity index 99% rename from app/src/main/java/com/xxpatx/os/utils/BrightnessUtils.java rename to app/src/main/java/com/vscool/os/utils/BrightnessUtils.java index b6edb18..8ec8126 100644 --- a/app/src/main/java/com/xxpatx/os/utils/BrightnessUtils.java +++ b/app/src/main/java/com/vscool/os/utils/BrightnessUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xxpatx.os.utils; +package com.vscool.os.utils; public class BrightnessUtils { diff --git a/app/src/main/java/com/xxpatx/os/utils/CmdUtil.java b/app/src/main/java/com/vscool/os/utils/CmdUtil.java similarity index 99% rename from app/src/main/java/com/xxpatx/os/utils/CmdUtil.java rename to app/src/main/java/com/vscool/os/utils/CmdUtil.java index b991d56..6f40c1d 100644 --- a/app/src/main/java/com/xxpatx/os/utils/CmdUtil.java +++ b/app/src/main/java/com/vscool/os/utils/CmdUtil.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.utils; +package com.vscool.os.utils; import android.text.TextUtils; import android.util.Log; diff --git a/app/src/main/java/com/xxpatx/os/utils/ContactsUtils.java b/app/src/main/java/com/vscool/os/utils/ContactsUtils.java similarity index 99% rename from app/src/main/java/com/xxpatx/os/utils/ContactsUtils.java rename to app/src/main/java/com/vscool/os/utils/ContactsUtils.java index 2d56683..0e39ec4 100644 --- a/app/src/main/java/com/xxpatx/os/utils/ContactsUtils.java +++ b/app/src/main/java/com/vscool/os/utils/ContactsUtils.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.utils; +package com.vscool.os.utils; import android.content.ContentResolver; import android.content.ContentUris; @@ -17,9 +17,9 @@ import androidx.annotation.Nullable; import com.bumptech.glide.Glide; import com.bumptech.glide.request.target.SimpleTarget; import com.bumptech.glide.request.transition.Transition; -import com.xxpatx.os.R; -import com.xxpatx.os.bean.Contact; -import com.xxpatx.os.bean.ContactId; +import com.vscool.os.R; +import com.vscool.os.bean.Contact; +import com.vscool.os.bean.ContactId; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/app/src/main/java/com/xxpatx/os/utils/DataUtil.java b/app/src/main/java/com/vscool/os/utils/DataUtil.java similarity index 96% rename from app/src/main/java/com/xxpatx/os/utils/DataUtil.java rename to app/src/main/java/com/vscool/os/utils/DataUtil.java index 3fea1de..19092b0 100644 --- a/app/src/main/java/com/xxpatx/os/utils/DataUtil.java +++ b/app/src/main/java/com/vscool/os/utils/DataUtil.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.utils; +package com.vscool.os.utils; import java.text.SimpleDateFormat; import java.util.Date; diff --git a/app/src/main/java/com/xxpatx/os/utils/DayUtils.java b/app/src/main/java/com/vscool/os/utils/DayUtils.java similarity index 96% rename from app/src/main/java/com/xxpatx/os/utils/DayUtils.java rename to app/src/main/java/com/vscool/os/utils/DayUtils.java index 5c3f7d5..0fb9f4d 100644 --- a/app/src/main/java/com/xxpatx/os/utils/DayUtils.java +++ b/app/src/main/java/com/vscool/os/utils/DayUtils.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.utils; +package com.vscool.os.utils; import java.util.Calendar; import java.util.Date; diff --git a/app/src/main/java/com/xxpatx/os/utils/FFmpegUtils.java b/app/src/main/java/com/vscool/os/utils/FFmpegUtils.java similarity index 98% rename from app/src/main/java/com/xxpatx/os/utils/FFmpegUtils.java rename to app/src/main/java/com/vscool/os/utils/FFmpegUtils.java index b9267f0..70ad590 100644 --- a/app/src/main/java/com/xxpatx/os/utils/FFmpegUtils.java +++ b/app/src/main/java/com/vscool/os/utils/FFmpegUtils.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.utils; +package com.vscool.os.utils; import android.graphics.Bitmap; import android.util.Log; diff --git a/app/src/main/java/com/xxpatx/os/utils/FileUtil.java b/app/src/main/java/com/vscool/os/utils/FileUtil.java similarity index 99% rename from app/src/main/java/com/xxpatx/os/utils/FileUtil.java rename to app/src/main/java/com/vscool/os/utils/FileUtil.java index cf01b03..c0874be 100644 --- a/app/src/main/java/com/xxpatx/os/utils/FileUtil.java +++ b/app/src/main/java/com/vscool/os/utils/FileUtil.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.utils; +package com.vscool.os.utils; import android.content.ContentResolver; import android.content.Context; diff --git a/app/src/main/java/com/xxpatx/os/utils/ForegroundAppUtil.java b/app/src/main/java/com/vscool/os/utils/ForegroundAppUtil.java similarity index 99% rename from app/src/main/java/com/xxpatx/os/utils/ForegroundAppUtil.java rename to app/src/main/java/com/vscool/os/utils/ForegroundAppUtil.java index bb72824..74a82f9 100644 --- a/app/src/main/java/com/xxpatx/os/utils/ForegroundAppUtil.java +++ b/app/src/main/java/com/vscool/os/utils/ForegroundAppUtil.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.utils; +package com.vscool.os.utils; import android.app.ActivityManager; import android.app.usage.UsageStats; diff --git a/app/src/main/java/com/xxpatx/os/utils/GlideLoadUtils.java b/app/src/main/java/com/vscool/os/utils/GlideLoadUtils.java similarity index 99% rename from app/src/main/java/com/xxpatx/os/utils/GlideLoadUtils.java rename to app/src/main/java/com/vscool/os/utils/GlideLoadUtils.java index ad0ecfd..a919c2d 100644 --- a/app/src/main/java/com/xxpatx/os/utils/GlideLoadUtils.java +++ b/app/src/main/java/com/vscool/os/utils/GlideLoadUtils.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.utils; +package com.vscool.os.utils; import android.annotation.TargetApi; import android.app.Activity; diff --git a/app/src/main/java/com/xxpatx/os/utils/HomeWatcher.java b/app/src/main/java/com/vscool/os/utils/HomeWatcher.java similarity index 98% rename from app/src/main/java/com/xxpatx/os/utils/HomeWatcher.java rename to app/src/main/java/com/vscool/os/utils/HomeWatcher.java index 51d21bd..28c8b92 100644 --- a/app/src/main/java/com/xxpatx/os/utils/HomeWatcher.java +++ b/app/src/main/java/com/vscool/os/utils/HomeWatcher.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.utils; +package com.vscool.os.utils; import android.content.BroadcastReceiver; import android.content.Context; diff --git a/app/src/main/java/com/xxpatx/os/utils/IconUtils.java b/app/src/main/java/com/vscool/os/utils/IconUtils.java similarity index 97% rename from app/src/main/java/com/xxpatx/os/utils/IconUtils.java rename to app/src/main/java/com/vscool/os/utils/IconUtils.java index 9c51619..cccc1fc 100644 --- a/app/src/main/java/com/xxpatx/os/utils/IconUtils.java +++ b/app/src/main/java/com/vscool/os/utils/IconUtils.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.utils; +package com.vscool.os.utils; import android.util.Log; @@ -7,8 +7,8 @@ import java.util.List; public class IconUtils { public static List appClassNameList = new ArrayList() {{ - this.add("com.xxpatx.sn");//设备信息 - this.add("com.xxpatx.store");//应用市场 + this.add("com.vscool.shbd");//设备信息 + this.add("com.vscool.store");//应用市场 this.add("aios.appstore");//应用市场 this.add("com.uiui.weather");//天气 this.add("com.android.browser");//浏览器 diff --git a/app/src/main/java/com/xxpatx/os/utils/LocalContactUtils.java b/app/src/main/java/com/vscool/os/utils/LocalContactUtils.java similarity index 95% rename from app/src/main/java/com/xxpatx/os/utils/LocalContactUtils.java rename to app/src/main/java/com/vscool/os/utils/LocalContactUtils.java index 51bfe37..ac0935c 100644 --- a/app/src/main/java/com/xxpatx/os/utils/LocalContactUtils.java +++ b/app/src/main/java/com/vscool/os/utils/LocalContactUtils.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.utils; +package com.vscool.os.utils; import android.text.TextUtils; import android.util.Log; @@ -6,9 +6,9 @@ import android.util.Log; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.tencent.mmkv.MMKV; -import com.xxpatx.os.bean.Contact; -import com.xxpatx.os.config.CommonConfig; -import com.xxpatx.os.gson.GsonUtils; +import com.vscool.os.bean.Contact; +import com.vscool.os.config.CommonConfig; +import com.vscool.os.gson.GsonUtils; import java.lang.reflect.Type; import java.util.HashSet; diff --git a/app/src/main/java/com/xxpatx/os/utils/MD5Util.java b/app/src/main/java/com/vscool/os/utils/MD5Util.java similarity index 98% rename from app/src/main/java/com/xxpatx/os/utils/MD5Util.java rename to app/src/main/java/com/vscool/os/utils/MD5Util.java index 46d5386..fd0e046 100644 --- a/app/src/main/java/com/xxpatx/os/utils/MD5Util.java +++ b/app/src/main/java/com/vscool/os/utils/MD5Util.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.utils; +package com.vscool.os.utils; import android.annotation.SuppressLint; diff --git a/app/src/main/java/com/xxpatx/os/utils/MathUtils.java b/app/src/main/java/com/vscool/os/utils/MathUtils.java similarity index 99% rename from app/src/main/java/com/xxpatx/os/utils/MathUtils.java rename to app/src/main/java/com/vscool/os/utils/MathUtils.java index 48f0c58..a5e1c37 100644 --- a/app/src/main/java/com/xxpatx/os/utils/MathUtils.java +++ b/app/src/main/java/com/vscool/os/utils/MathUtils.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.utils; +package com.vscool.os.utils; public final class MathUtils { private static final float DEG_TO_RAD = 0.017453292F; diff --git a/app/src/main/java/com/xxpatx/os/utils/MobileNetworkUtils.java b/app/src/main/java/com/vscool/os/utils/MobileNetworkUtils.java similarity index 98% rename from app/src/main/java/com/xxpatx/os/utils/MobileNetworkUtils.java rename to app/src/main/java/com/vscool/os/utils/MobileNetworkUtils.java index 18fdeaa..b851b98 100644 --- a/app/src/main/java/com/xxpatx/os/utils/MobileNetworkUtils.java +++ b/app/src/main/java/com/vscool/os/utils/MobileNetworkUtils.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.utils; +package com.vscool.os.utils; import android.content.Context; import android.telephony.SubscriptionInfo; diff --git a/app/src/main/java/com/xxpatx/os/utils/MobileNumberUtils.java b/app/src/main/java/com/vscool/os/utils/MobileNumberUtils.java similarity index 98% rename from app/src/main/java/com/xxpatx/os/utils/MobileNumberUtils.java rename to app/src/main/java/com/vscool/os/utils/MobileNumberUtils.java index 24d52e9..f2fd79d 100644 --- a/app/src/main/java/com/xxpatx/os/utils/MobileNumberUtils.java +++ b/app/src/main/java/com/vscool/os/utils/MobileNumberUtils.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.utils; +package com.vscool.os.utils; import com.google.i18n.phonenumbers.NumberParseException; import com.google.i18n.phonenumbers.PhoneNumberToCarrierMapper; diff --git a/app/src/main/java/com/xxpatx/os/utils/NetStateUtils.java b/app/src/main/java/com/vscool/os/utils/NetStateUtils.java similarity index 98% rename from app/src/main/java/com/xxpatx/os/utils/NetStateUtils.java rename to app/src/main/java/com/vscool/os/utils/NetStateUtils.java index 2f222c5..05d5971 100644 --- a/app/src/main/java/com/xxpatx/os/utils/NetStateUtils.java +++ b/app/src/main/java/com/vscool/os/utils/NetStateUtils.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.utils; +package com.vscool.os.utils; import android.content.Context; import android.net.ConnectivityManager; diff --git a/app/src/main/java/com/xxpatx/os/utils/SchemeUtils.java b/app/src/main/java/com/vscool/os/utils/SchemeUtils.java similarity index 96% rename from app/src/main/java/com/xxpatx/os/utils/SchemeUtils.java rename to app/src/main/java/com/vscool/os/utils/SchemeUtils.java index ab8dc0b..fae05e7 100644 --- a/app/src/main/java/com/xxpatx/os/utils/SchemeUtils.java +++ b/app/src/main/java/com/vscool/os/utils/SchemeUtils.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.utils; +package com.vscool.os.utils; import android.app.Activity; import android.content.Intent; diff --git a/app/src/main/java/com/xxpatx/os/utils/ScreenUtil.java b/app/src/main/java/com/vscool/os/utils/ScreenUtil.java similarity index 95% rename from app/src/main/java/com/xxpatx/os/utils/ScreenUtil.java rename to app/src/main/java/com/vscool/os/utils/ScreenUtil.java index 6768174..1fa9dca 100644 --- a/app/src/main/java/com/xxpatx/os/utils/ScreenUtil.java +++ b/app/src/main/java/com/vscool/os/utils/ScreenUtil.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.utils; +package com.vscool.os.utils; import android.content.Context; diff --git a/app/src/main/java/com/xxpatx/os/utils/ScreenUtils.java b/app/src/main/java/com/vscool/os/utils/ScreenUtils.java similarity index 97% rename from app/src/main/java/com/xxpatx/os/utils/ScreenUtils.java rename to app/src/main/java/com/vscool/os/utils/ScreenUtils.java index 552c6d2..f1813a9 100644 --- a/app/src/main/java/com/xxpatx/os/utils/ScreenUtils.java +++ b/app/src/main/java/com/vscool/os/utils/ScreenUtils.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.utils; +package com.vscool.os.utils; import android.content.Context; import android.content.res.Resources; diff --git a/app/src/main/java/com/xxpatx/os/utils/StatusBarUtil.java b/app/src/main/java/com/vscool/os/utils/StatusBarUtil.java similarity index 99% rename from app/src/main/java/com/xxpatx/os/utils/StatusBarUtil.java rename to app/src/main/java/com/vscool/os/utils/StatusBarUtil.java index 016257f..dcfad9b 100644 --- a/app/src/main/java/com/xxpatx/os/utils/StatusBarUtil.java +++ b/app/src/main/java/com/vscool/os/utils/StatusBarUtil.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.utils; +package com.vscool.os.utils; import android.app.Activity; import android.content.Context; diff --git a/app/src/main/java/com/xxpatx/os/utils/TimeUtils.java b/app/src/main/java/com/vscool/os/utils/TimeUtils.java similarity index 98% rename from app/src/main/java/com/xxpatx/os/utils/TimeUtils.java rename to app/src/main/java/com/vscool/os/utils/TimeUtils.java index 9adf964..3cb92ad 100644 --- a/app/src/main/java/com/xxpatx/os/utils/TimeUtils.java +++ b/app/src/main/java/com/vscool/os/utils/TimeUtils.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.utils; +package com.vscool.os.utils; import android.content.Context; import android.os.Build; diff --git a/app/src/main/java/com/xxpatx/os/utils/Utils.java b/app/src/main/java/com/vscool/os/utils/Utils.java similarity index 99% rename from app/src/main/java/com/xxpatx/os/utils/Utils.java rename to app/src/main/java/com/vscool/os/utils/Utils.java index a3252f2..9e0973f 100644 --- a/app/src/main/java/com/xxpatx/os/utils/Utils.java +++ b/app/src/main/java/com/vscool/os/utils/Utils.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.utils; +package com.vscool.os.utils; import android.annotation.SuppressLint; import android.app.role.RoleManager; @@ -31,8 +31,8 @@ import android.view.WindowManager; import androidx.core.content.ContextCompat; -import com.xxpatx.os.BuildConfig; -import com.xxpatx.os.R; +import com.vscool.os.BuildConfig; +import com.vscool.os.R; import java.io.File; import java.lang.reflect.Method; diff --git a/app/src/main/java/com/xxpatx/os/utils/WakeUpUtils.java b/app/src/main/java/com/vscool/os/utils/WakeUpUtils.java similarity index 99% rename from app/src/main/java/com/xxpatx/os/utils/WakeUpUtils.java rename to app/src/main/java/com/vscool/os/utils/WakeUpUtils.java index 3e27c9b..b77917c 100644 --- a/app/src/main/java/com/xxpatx/os/utils/WakeUpUtils.java +++ b/app/src/main/java/com/vscool/os/utils/WakeUpUtils.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.utils; +package com.vscool.os.utils; import android.annotation.SuppressLint; import android.app.Activity; diff --git a/app/src/main/java/com/xxpatx/os/utils/WiFiUtils.java b/app/src/main/java/com/vscool/os/utils/WiFiUtils.java similarity index 99% rename from app/src/main/java/com/xxpatx/os/utils/WiFiUtils.java rename to app/src/main/java/com/vscool/os/utils/WiFiUtils.java index aee2118..0114e03 100644 --- a/app/src/main/java/com/xxpatx/os/utils/WiFiUtils.java +++ b/app/src/main/java/com/vscool/os/utils/WiFiUtils.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.utils; +package com.vscool.os.utils; import android.annotation.SuppressLint; import android.content.Context; diff --git a/app/src/main/java/com/xxpatx/os/view/CenterImageSpan.java b/app/src/main/java/com/vscool/os/view/CenterImageSpan.java similarity index 96% rename from app/src/main/java/com/xxpatx/os/view/CenterImageSpan.java rename to app/src/main/java/com/vscool/os/view/CenterImageSpan.java index 111a063..6669f06 100644 --- a/app/src/main/java/com/xxpatx/os/view/CenterImageSpan.java +++ b/app/src/main/java/com/vscool/os/view/CenterImageSpan.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.view; +package com.vscool.os.view; import android.graphics.Canvas; import android.graphics.Paint; diff --git a/app/src/main/java/com/xxpatx/os/view/CounterView.java b/app/src/main/java/com/vscool/os/view/CounterView.java similarity index 99% rename from app/src/main/java/com/xxpatx/os/view/CounterView.java rename to app/src/main/java/com/vscool/os/view/CounterView.java index ad36fc6..cfd5278 100644 --- a/app/src/main/java/com/xxpatx/os/view/CounterView.java +++ b/app/src/main/java/com/vscool/os/view/CounterView.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.view; +package com.vscool.os.view; import android.content.Context; import android.icu.math.BigDecimal; diff --git a/app/src/main/java/com/xxpatx/os/view/CustomPagerAdapter.java b/app/src/main/java/com/vscool/os/view/CustomPagerAdapter.java similarity index 96% rename from app/src/main/java/com/xxpatx/os/view/CustomPagerAdapter.java rename to app/src/main/java/com/vscool/os/view/CustomPagerAdapter.java index 53d1aec..d765e01 100644 --- a/app/src/main/java/com/xxpatx/os/view/CustomPagerAdapter.java +++ b/app/src/main/java/com/vscool/os/view/CustomPagerAdapter.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.view; +package com.vscool.os.view; import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; diff --git a/app/src/main/java/com/xxpatx/os/view/CustomSeekbar.java b/app/src/main/java/com/vscool/os/view/CustomSeekbar.java similarity index 99% rename from app/src/main/java/com/xxpatx/os/view/CustomSeekbar.java rename to app/src/main/java/com/vscool/os/view/CustomSeekbar.java index 0c8cc58..1807ebf 100644 --- a/app/src/main/java/com/xxpatx/os/view/CustomSeekbar.java +++ b/app/src/main/java/com/vscool/os/view/CustomSeekbar.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.view; +package com.vscool.os.view; import android.content.Context; import android.graphics.Bitmap; @@ -11,7 +11,7 @@ import android.util.TypedValue; import android.view.MotionEvent; import android.view.View; -import com.xxpatx.os.R; +import com.vscool.os.R; import java.util.ArrayList; diff --git a/app/src/main/java/com/xxpatx/os/view/EquallyDividedItemDecoration.java b/app/src/main/java/com/vscool/os/view/EquallyDividedItemDecoration.java similarity index 99% rename from app/src/main/java/com/xxpatx/os/view/EquallyDividedItemDecoration.java rename to app/src/main/java/com/vscool/os/view/EquallyDividedItemDecoration.java index c55b807..356ac02 100644 --- a/app/src/main/java/com/xxpatx/os/view/EquallyDividedItemDecoration.java +++ b/app/src/main/java/com/vscool/os/view/EquallyDividedItemDecoration.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.view; +package com.vscool.os.view; import android.graphics.Rect; import android.util.Log; diff --git a/app/src/main/java/com/xxpatx/os/view/FAB_Float_on_Scroll.java b/app/src/main/java/com/vscool/os/view/FAB_Float_on_Scroll.java similarity index 98% rename from app/src/main/java/com/xxpatx/os/view/FAB_Float_on_Scroll.java rename to app/src/main/java/com/vscool/os/view/FAB_Float_on_Scroll.java index 219f80c..080e781 100644 --- a/app/src/main/java/com/xxpatx/os/view/FAB_Float_on_Scroll.java +++ b/app/src/main/java/com/vscool/os/view/FAB_Float_on_Scroll.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.view; +package com.vscool.os.view; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/xxpatx/os/view/FadeInOutAnimator.java b/app/src/main/java/com/vscool/os/view/FadeInOutAnimator.java similarity index 99% rename from app/src/main/java/com/xxpatx/os/view/FadeInOutAnimator.java rename to app/src/main/java/com/vscool/os/view/FadeInOutAnimator.java index 81b5b6b..be9bc19 100644 --- a/app/src/main/java/com/xxpatx/os/view/FadeInOutAnimator.java +++ b/app/src/main/java/com/vscool/os/view/FadeInOutAnimator.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.view; +package com.vscool.os.view; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; diff --git a/app/src/main/java/com/xxpatx/os/view/FoldTextView.java b/app/src/main/java/com/vscool/os/view/FoldTextView.java similarity index 99% rename from app/src/main/java/com/xxpatx/os/view/FoldTextView.java rename to app/src/main/java/com/vscool/os/view/FoldTextView.java index b81dab6..0d90118 100644 --- a/app/src/main/java/com/xxpatx/os/view/FoldTextView.java +++ b/app/src/main/java/com/vscool/os/view/FoldTextView.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.view; +package com.vscool.os.view; import android.content.Context; import android.content.res.TypedArray; @@ -19,7 +19,7 @@ import android.widget.TextView; import androidx.appcompat.widget.AppCompatTextView; -import com.xxpatx.os.R; +import com.vscool.os.R; /** diff --git a/app/src/main/java/com/xxpatx/os/view/GridSpaceItemDecoration.java b/app/src/main/java/com/vscool/os/view/GridSpaceItemDecoration.java similarity index 98% rename from app/src/main/java/com/xxpatx/os/view/GridSpaceItemDecoration.java rename to app/src/main/java/com/vscool/os/view/GridSpaceItemDecoration.java index dca171f..e70ab7e 100644 --- a/app/src/main/java/com/xxpatx/os/view/GridSpaceItemDecoration.java +++ b/app/src/main/java/com/vscool/os/view/GridSpaceItemDecoration.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.view; +package com.vscool.os.view; import android.graphics.Rect; import android.util.Log; diff --git a/app/src/main/java/com/xxpatx/os/view/HorizontalItemDecoration.java b/app/src/main/java/com/vscool/os/view/HorizontalItemDecoration.java similarity index 97% rename from app/src/main/java/com/xxpatx/os/view/HorizontalItemDecoration.java rename to app/src/main/java/com/vscool/os/view/HorizontalItemDecoration.java index 556e870..165de2b 100644 --- a/app/src/main/java/com/xxpatx/os/view/HorizontalItemDecoration.java +++ b/app/src/main/java/com/vscool/os/view/HorizontalItemDecoration.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.view; +package com.vscool.os.view; import android.content.Context; import android.graphics.Rect; diff --git a/app/src/main/java/com/xxpatx/os/view/JzvdStdAssert.java b/app/src/main/java/com/vscool/os/view/JzvdStdAssert.java similarity index 98% rename from app/src/main/java/com/xxpatx/os/view/JzvdStdAssert.java rename to app/src/main/java/com/vscool/os/view/JzvdStdAssert.java index 88a700b..0a5eb9c 100644 --- a/app/src/main/java/com/xxpatx/os/view/JzvdStdAssert.java +++ b/app/src/main/java/com/vscool/os/view/JzvdStdAssert.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.view; +package com.vscool.os.view; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/xxpatx/os/view/JzvdStdRound.java b/app/src/main/java/com/vscool/os/view/JzvdStdRound.java similarity index 98% rename from app/src/main/java/com/xxpatx/os/view/JzvdStdRound.java rename to app/src/main/java/com/vscool/os/view/JzvdStdRound.java index 9c992e1..631c354 100644 --- a/app/src/main/java/com/xxpatx/os/view/JzvdStdRound.java +++ b/app/src/main/java/com/vscool/os/view/JzvdStdRound.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.view; +package com.vscool.os.view; import android.content.Context; import android.content.res.TypedArray; @@ -9,7 +9,7 @@ import android.graphics.Path; import android.graphics.RectF; import android.util.AttributeSet; -import com.xxpatx.os.R; +import com.vscool.os.R; import cn.jzvd.JzvdStd; diff --git a/app/src/main/java/com/xxpatx/os/view/MyGridLayout.java b/app/src/main/java/com/vscool/os/view/MyGridLayout.java similarity index 98% rename from app/src/main/java/com/xxpatx/os/view/MyGridLayout.java rename to app/src/main/java/com/vscool/os/view/MyGridLayout.java index 0d27805..c0fa7d5 100644 --- a/app/src/main/java/com/xxpatx/os/view/MyGridLayout.java +++ b/app/src/main/java/com/vscool/os/view/MyGridLayout.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.view; +package com.vscool.os.view; import android.annotation.SuppressLint; import android.content.Context; @@ -7,9 +7,8 @@ import android.util.AttributeSet; import android.view.View; import android.view.ViewGroup; - -import com.xxpatx.os.R; -import com.xxpatx.os.bean.DesktopIcon; +import com.vscool.os.R; +import com.vscool.os.bean.DesktopIcon; import java.util.ArrayList; diff --git a/app/src/main/java/com/xxpatx/os/view/MyJzvdStdNoTitleNoClarity.java b/app/src/main/java/com/vscool/os/view/MyJzvdStdNoTitleNoClarity.java similarity index 89% rename from app/src/main/java/com/xxpatx/os/view/MyJzvdStdNoTitleNoClarity.java rename to app/src/main/java/com/vscool/os/view/MyJzvdStdNoTitleNoClarity.java index 3e5bfb0..0e97032 100644 --- a/app/src/main/java/com/xxpatx/os/view/MyJzvdStdNoTitleNoClarity.java +++ b/app/src/main/java/com/vscool/os/view/MyJzvdStdNoTitleNoClarity.java @@ -1,9 +1,9 @@ -package com.xxpatx.os.view; +package com.vscool.os.view; import android.content.Context; import android.util.AttributeSet; -import com.xxpatx.os.R; +import com.vscool.os.R; import cn.jzvd.JzvdStd; diff --git a/app/src/main/java/com/xxpatx/os/view/RulerSeekBar.java b/app/src/main/java/com/vscool/os/view/RulerSeekBar.java similarity index 99% rename from app/src/main/java/com/xxpatx/os/view/RulerSeekBar.java rename to app/src/main/java/com/vscool/os/view/RulerSeekBar.java index bfb7a40..49bc9f8 100644 --- a/app/src/main/java/com/xxpatx/os/view/RulerSeekBar.java +++ b/app/src/main/java/com/vscool/os/view/RulerSeekBar.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.view; +package com.vscool.os.view; import android.content.Context; import android.graphics.Canvas; diff --git a/app/src/main/java/com/xxpatx/os/view/ScaleCircleNavigator.java b/app/src/main/java/com/vscool/os/view/ScaleCircleNavigator.java similarity index 99% rename from app/src/main/java/com/xxpatx/os/view/ScaleCircleNavigator.java rename to app/src/main/java/com/vscool/os/view/ScaleCircleNavigator.java index cd6db09..f500b29 100644 --- a/app/src/main/java/com/xxpatx/os/view/ScaleCircleNavigator.java +++ b/app/src/main/java/com/vscool/os/view/ScaleCircleNavigator.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.view; +package com.vscool.os.view; import android.content.Context; import android.graphics.Canvas; diff --git a/app/src/main/java/com/xxpatx/os/view/StartSnapHelper.java b/app/src/main/java/com/vscool/os/view/StartSnapHelper.java similarity index 99% rename from app/src/main/java/com/xxpatx/os/view/StartSnapHelper.java rename to app/src/main/java/com/vscool/os/view/StartSnapHelper.java index 60ca8f6..39bece2 100644 --- a/app/src/main/java/com/xxpatx/os/view/StartSnapHelper.java +++ b/app/src/main/java/com/vscool/os/view/StartSnapHelper.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.view; +package com.vscool.os.view; import android.view.View; diff --git a/app/src/main/java/com/xxpatx/os/view/TimelineLayout.java b/app/src/main/java/com/vscool/os/view/TimelineLayout.java similarity index 99% rename from app/src/main/java/com/xxpatx/os/view/TimelineLayout.java rename to app/src/main/java/com/vscool/os/view/TimelineLayout.java index 68fb2d6..2b23a43 100644 --- a/app/src/main/java/com/xxpatx/os/view/TimelineLayout.java +++ b/app/src/main/java/com/vscool/os/view/TimelineLayout.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.view; +package com.vscool.os.view; import android.content.Context; @@ -14,7 +14,7 @@ import android.widget.LinearLayout; import androidx.annotation.Nullable; -import com.xxpatx.os.R; +import com.vscool.os.R; /** * Created by Jackie on 2017/3/8. diff --git a/app/src/main/java/com/xxpatx/os/view/ToggleButton.java b/app/src/main/java/com/vscool/os/view/ToggleButton.java similarity index 99% rename from app/src/main/java/com/xxpatx/os/view/ToggleButton.java rename to app/src/main/java/com/vscool/os/view/ToggleButton.java index 80765f4..5bf6507 100644 --- a/app/src/main/java/com/xxpatx/os/view/ToggleButton.java +++ b/app/src/main/java/com/vscool/os/view/ToggleButton.java @@ -1,4 +1,4 @@ -package com.xxpatx.os.view; +package com.vscool.os.view; import android.content.Context; import android.content.res.Resources; @@ -17,7 +17,7 @@ import com.facebook.rebound.Spring; import com.facebook.rebound.SpringConfig; import com.facebook.rebound.SpringSystem; import com.facebook.rebound.SpringUtil; -import com.xxpatx.os.R; +import com.vscool.os.R; public class ToggleButton extends View { private static final String TAG = "ToggleButton"; diff --git a/app/src/main/res/drawable-hdpi/app_card_backround.png b/app/src/main/res/drawable-hdpi/app_card_backround.png new file mode 100644 index 0000000..a18ecf3 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/app_card_backround.png differ diff --git a/app/src/main/res/drawable-hdpi/bg_aero.png b/app/src/main/res/drawable-hdpi/bg_aero.png deleted file mode 100644 index ef06c02..0000000 Binary files a/app/src/main/res/drawable-hdpi/bg_aero.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/card_alarm_clock_bakground.png b/app/src/main/res/drawable-hdpi/card_alarm_clock_bakground.png index bc76782..59ad51d 100644 Binary files a/app/src/main/res/drawable-hdpi/card_alarm_clock_bakground.png and b/app/src/main/res/drawable-hdpi/card_alarm_clock_bakground.png differ diff --git a/app/src/main/res/drawable-hdpi/card_bindsn_background.png b/app/src/main/res/drawable-hdpi/card_bindsn_background.png index 9cb5d55..556d6a7 100644 Binary files a/app/src/main/res/drawable-hdpi/card_bindsn_background.png and b/app/src/main/res/drawable-hdpi/card_bindsn_background.png differ diff --git a/app/src/main/res/drawable-hdpi/card_contacts_background.png b/app/src/main/res/drawable-hdpi/card_contacts_background.png new file mode 100644 index 0000000..754d1b0 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/card_contacts_background.png differ diff --git a/app/src/main/res/drawable-hdpi/card_family_background.png b/app/src/main/res/drawable-hdpi/card_family_background.png index 1cb6ee9..e8fa547 100644 Binary files a/app/src/main/res/drawable-hdpi/card_family_background.png and b/app/src/main/res/drawable-hdpi/card_family_background.png differ diff --git a/app/src/main/res/drawable-hdpi/card_flashlight_background.png b/app/src/main/res/drawable-hdpi/card_flashlight_background.png index 3c22758..b4f903d 100644 Binary files a/app/src/main/res/drawable-hdpi/card_flashlight_background.png and b/app/src/main/res/drawable-hdpi/card_flashlight_background.png differ diff --git a/app/src/main/res/drawable-hdpi/card_more_app_background.png b/app/src/main/res/drawable-hdpi/card_more_app_background.png index 9626e4f..4e003df 100644 Binary files a/app/src/main/res/drawable-hdpi/card_more_app_background.png and b/app/src/main/res/drawable-hdpi/card_more_app_background.png differ diff --git a/app/src/main/res/drawable-hdpi/card_network_background.png b/app/src/main/res/drawable-hdpi/card_network_background.png index 1ffaa0e..6b4b512 100644 Binary files a/app/src/main/res/drawable-hdpi/card_network_background.png and b/app/src/main/res/drawable-hdpi/card_network_background.png differ diff --git a/app/src/main/res/drawable-hdpi/card_settings_background.png b/app/src/main/res/drawable-hdpi/card_settings_background.png new file mode 100644 index 0000000..ec0e567 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/card_settings_background.png differ diff --git a/app/src/main/res/drawable-hdpi/card_sms_background.png b/app/src/main/res/drawable-hdpi/card_sms_background.png new file mode 100644 index 0000000..6245bc5 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/card_sms_background.png differ diff --git a/app/src/main/res/drawable-hdpi/card_sos_background.png b/app/src/main/res/drawable-hdpi/card_sos_background.png index 5c6e2ef..43398c1 100644 Binary files a/app/src/main/res/drawable-hdpi/card_sos_background.png and b/app/src/main/res/drawable-hdpi/card_sos_background.png differ diff --git a/app/src/main/res/drawable-hdpi/card_time_background.png b/app/src/main/res/drawable-hdpi/card_time_background.png new file mode 100644 index 0000000..fbebed0 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/card_time_background.png differ diff --git a/app/src/main/res/drawable-hdpi/card_weather_background.png b/app/src/main/res/drawable-hdpi/card_weather_background.png index a7aad9d..477f3e1 100644 Binary files a/app/src/main/res/drawable-hdpi/card_weather_background.png and b/app/src/main/res/drawable-hdpi/card_weather_background.png differ diff --git a/app/src/main/res/drawable-hdpi/card_wifi_background.png b/app/src/main/res/drawable-hdpi/card_wifi_background.png index 8cb7c1e..f4ccd3b 100644 Binary files a/app/src/main/res/drawable-hdpi/card_wifi_background.png and b/app/src/main/res/drawable-hdpi/card_wifi_background.png differ diff --git a/app/src/main/res/drawable-hdpi/com_android_calculator2.png b/app/src/main/res/drawable-hdpi/com_android_calculator2.png index 4f5b3ab..b80024b 100644 Binary files a/app/src/main/res/drawable-hdpi/com_android_calculator2.png and b/app/src/main/res/drawable-hdpi/com_android_calculator2.png differ diff --git a/app/src/main/res/drawable-hdpi/com_android_calendar.png b/app/src/main/res/drawable-hdpi/com_android_calendar.png index 0e63be3..9075fb0 100644 Binary files a/app/src/main/res/drawable-hdpi/com_android_calendar.png and b/app/src/main/res/drawable-hdpi/com_android_calendar.png differ diff --git a/app/src/main/res/drawable-hdpi/com_android_camera.png b/app/src/main/res/drawable-hdpi/com_android_camera.png index 472415b..69f3947 100644 Binary files a/app/src/main/res/drawable-hdpi/com_android_camera.png and b/app/src/main/res/drawable-hdpi/com_android_camera.png differ diff --git a/app/src/main/res/drawable-hdpi/com_android_deskclock.png b/app/src/main/res/drawable-hdpi/com_android_deskclock.png index 08f8f2f..6872e13 100644 Binary files a/app/src/main/res/drawable-hdpi/com_android_deskclock.png and b/app/src/main/res/drawable-hdpi/com_android_deskclock.png differ diff --git a/app/src/main/res/drawable-hdpi/com_android_dialer.png b/app/src/main/res/drawable-hdpi/com_android_dialer.png index bb01bd0..1b87d9d 100644 Binary files a/app/src/main/res/drawable-hdpi/com_android_dialer.png and b/app/src/main/res/drawable-hdpi/com_android_dialer.png differ diff --git a/app/src/main/res/drawable-hdpi/com_android_email.png b/app/src/main/res/drawable-hdpi/com_android_email.png index 3cc1963..6d3c02a 100644 Binary files a/app/src/main/res/drawable-hdpi/com_android_email.png and b/app/src/main/res/drawable-hdpi/com_android_email.png differ diff --git a/app/src/main/res/drawable-hdpi/com_android_flashlight.png b/app/src/main/res/drawable-hdpi/com_android_flashlight.png new file mode 100644 index 0000000..0da69f6 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/com_android_flashlight.png differ diff --git a/app/src/main/res/drawable-hdpi/com_android_gallery3d_app.png b/app/src/main/res/drawable-hdpi/com_android_gallery3d_app.png index 6eb0503..dde31ba 100644 Binary files a/app/src/main/res/drawable-hdpi/com_android_gallery3d_app.png and b/app/src/main/res/drawable-hdpi/com_android_gallery3d_app.png differ diff --git a/app/src/main/res/drawable-hdpi/com_android_mms_ui.png b/app/src/main/res/drawable-hdpi/com_android_mms_ui.png index 5b3d49b..b6414b9 100644 Binary files a/app/src/main/res/drawable-hdpi/com_android_mms_ui.png and b/app/src/main/res/drawable-hdpi/com_android_mms_ui.png differ diff --git a/app/src/main/res/drawable-hdpi/com_android_music.png b/app/src/main/res/drawable-hdpi/com_android_music.png index bb1385d..ee466cc 100644 Binary files a/app/src/main/res/drawable-hdpi/com_android_music.png and b/app/src/main/res/drawable-hdpi/com_android_music.png differ diff --git a/app/src/main/res/drawable-hdpi/com_android_settings.png b/app/src/main/res/drawable-hdpi/com_android_settings.png index 864cf0e..d714bd3 100644 Binary files a/app/src/main/res/drawable-hdpi/com_android_settings.png and b/app/src/main/res/drawable-hdpi/com_android_settings.png differ diff --git a/app/src/main/res/drawable-hdpi/com_android_soundrecorder.png b/app/src/main/res/drawable-hdpi/com_android_soundrecorder.png index 8c04966..923c6d7 100644 Binary files a/app/src/main/res/drawable-hdpi/com_android_soundrecorder.png and b/app/src/main/res/drawable-hdpi/com_android_soundrecorder.png differ diff --git a/app/src/main/res/drawable-hdpi/com_android_stk_stkmain.png b/app/src/main/res/drawable-hdpi/com_android_stk_stkmain.png index 6600495..22cf693 100644 Binary files a/app/src/main/res/drawable-hdpi/com_android_stk_stkmain.png and b/app/src/main/res/drawable-hdpi/com_android_stk_stkmain.png differ diff --git a/app/src/main/res/drawable-hdpi/com_android_vdieo.png b/app/src/main/res/drawable-hdpi/com_android_vdieo.png index c3ed71b..200c1bf 100644 Binary files a/app/src/main/res/drawable-hdpi/com_android_vdieo.png and b/app/src/main/res/drawable-hdpi/com_android_vdieo.png differ diff --git a/app/src/main/res/drawable-hdpi/com_mediatek_filemanager.png b/app/src/main/res/drawable-hdpi/com_mediatek_filemanager.png index 82e89e9..27418b1 100644 Binary files a/app/src/main/res/drawable-hdpi/com_mediatek_filemanager.png and b/app/src/main/res/drawable-hdpi/com_mediatek_filemanager.png differ diff --git a/app/src/main/res/drawable-hdpi/com_mediatek_fmradio.png b/app/src/main/res/drawable-hdpi/com_mediatek_fmradio.png index af83c28..dc5f2fd 100644 Binary files a/app/src/main/res/drawable-hdpi/com_mediatek_fmradio.png and b/app/src/main/res/drawable-hdpi/com_mediatek_fmradio.png differ diff --git a/app/src/main/res/drawable-hdpi/contact_card_backround.png b/app/src/main/res/drawable-hdpi/contact_card_backround.png new file mode 100644 index 0000000..d1b1f8e Binary files /dev/null and b/app/src/main/res/drawable-hdpi/contact_card_backround.png differ diff --git a/app/src/main/res/drawable-hdpi/control_background.png b/app/src/main/res/drawable-hdpi/control_background.png deleted file mode 100644 index f9ea767..0000000 Binary files a/app/src/main/res/drawable-hdpi/control_background.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/default_avatar.png b/app/src/main/res/drawable-hdpi/default_avatar.png index 5a95227..ba6b7a9 100644 Binary files a/app/src/main/res/drawable-hdpi/default_avatar.png and b/app/src/main/res/drawable-hdpi/default_avatar.png differ diff --git a/app/src/main/res/drawable-hdpi/exit_icon.png b/app/src/main/res/drawable-hdpi/exit_icon.png index fa4f4d1..73032f1 100644 Binary files a/app/src/main/res/drawable-hdpi/exit_icon.png and b/app/src/main/res/drawable-hdpi/exit_icon.png differ diff --git a/app/src/main/res/drawable-hdpi/home_icon_camera.png b/app/src/main/res/drawable-hdpi/home_icon_camera.png new file mode 100644 index 0000000..b212208 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/home_icon_camera.png differ diff --git a/app/src/main/res/drawable-hdpi/home_icon_dialer.png b/app/src/main/res/drawable-hdpi/home_icon_dialer.png index 1feb747..908bebb 100644 Binary files a/app/src/main/res/drawable-hdpi/home_icon_dialer.png and b/app/src/main/res/drawable-hdpi/home_icon_dialer.png differ diff --git a/app/src/main/res/drawable-hdpi/home_icon_tiktok.png b/app/src/main/res/drawable-hdpi/home_icon_tiktok.png index 1633f4d..d62d1e6 100644 Binary files a/app/src/main/res/drawable-hdpi/home_icon_tiktok.png and b/app/src/main/res/drawable-hdpi/home_icon_tiktok.png differ diff --git a/app/src/main/res/drawable-hdpi/home_icon_wechat.png b/app/src/main/res/drawable-hdpi/home_icon_wechat.png index 24417ec..c15bbaa 100644 Binary files a/app/src/main/res/drawable-hdpi/home_icon_wechat.png and b/app/src/main/res/drawable-hdpi/home_icon_wechat.png differ diff --git a/app/src/main/res/drawable-hdpi/icon_check_update.png b/app/src/main/res/drawable-hdpi/icon_check_update.png new file mode 100644 index 0000000..b6b560b Binary files /dev/null and b/app/src/main/res/drawable-hdpi/icon_check_update.png differ diff --git a/app/src/main/res/drawable-hdpi/icon_user_center.png b/app/src/main/res/drawable-hdpi/icon_user_center.png new file mode 100644 index 0000000..f97699d Binary files /dev/null and b/app/src/main/res/drawable-hdpi/icon_user_center.png differ diff --git a/app/src/main/res/drawable-hdpi/icon_wechat_service.png b/app/src/main/res/drawable-hdpi/icon_wechat_service.png index 96bdfd2..fc3fd3c 100644 Binary files a/app/src/main/res/drawable-hdpi/icon_wechat_service.png and b/app/src/main/res/drawable-hdpi/icon_wechat_service.png differ diff --git a/app/src/main/res/drawable-hdpi/main_background.jpg b/app/src/main/res/drawable-hdpi/main_background.jpg deleted file mode 100644 index 9034f43..0000000 Binary files a/app/src/main/res/drawable-hdpi/main_background.jpg and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/main_background.png b/app/src/main/res/drawable-hdpi/main_background.png new file mode 100644 index 0000000..cebe3a2 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/main_background.png differ diff --git a/app/src/main/res/drawable-hdpi/mask.png b/app/src/main/res/drawable-hdpi/mask.png index e1434c1..4f19b46 100644 Binary files a/app/src/main/res/drawable-hdpi/mask.png and b/app/src/main/res/drawable-hdpi/mask.png differ diff --git a/app/src/main/res/drawable-hdpi/wallpaper.png b/app/src/main/res/drawable-hdpi/wallpaper.png deleted file mode 100644 index 6661edb..0000000 Binary files a/app/src/main/res/drawable-hdpi/wallpaper.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/wallpaper1.png b/app/src/main/res/drawable-hdpi/wallpaper1.png deleted file mode 100644 index 91f5946..0000000 Binary files a/app/src/main/res/drawable-hdpi/wallpaper1.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/wallpaper2.png b/app/src/main/res/drawable-hdpi/wallpaper2.png deleted file mode 100644 index bf0400d..0000000 Binary files a/app/src/main/res/drawable-hdpi/wallpaper2.png and /dev/null differ diff --git a/app/src/main/res/layout-sw700dp/activity_add_contact.xml b/app/src/main/res/layout-sw700dp/activity_add_contact.xml index 239913d..5e6d76f 100644 --- a/app/src/main/res/layout-sw700dp/activity_add_contact.xml +++ b/app/src/main/res/layout-sw700dp/activity_add_contact.xml @@ -8,7 +8,7 @@ + type="com.vscool.os.activity.contact.AddContactActivity.BtnClick" /> - - + type="com.vscool.os.activity.main.MainActivity.BtnClick" /> + type="com.vscool.os.activity.setting.SettingActivity.BtnClick" /> + type="com.vscool.os.activity.sim.SimCardActivity.BtnClick" /> + type="com.vscool.os.activity.setting.TouchActivity.BtnClick" /> - + type="com.vscool.os.fragment.contact.ContactFragment.BtnClick" /> + type="com.vscool.os.fragment.home.HomeFragment.BtnClick" /> + type="com.vscool.os.fragment.settings.SettingsFragment.BtnClick" /> + type="com.vscool.os.bean.SystemSettings" /> diff --git a/app/src/main/res/layout-sw700dp/item_actions.xml b/app/src/main/res/layout-sw700dp/item_actions.xml index e8aead5..eed2a7a 100644 --- a/app/src/main/res/layout-sw700dp/item_actions.xml +++ b/app/src/main/res/layout-sw700dp/item_actions.xml @@ -3,11 +3,16 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/btn_booktag" android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@drawable/actions_item_selector" - android:clickable="true" - android:gravity="center" - android:orientation="vertical"> + android:layout_height="match_parent"> + + + android:src="@drawable/contact_card_backround" /> + type="com.vscool.os.activity.activation.ActivationActivity.BtnClick" /> + type="com.vscool.os.activity.contact.AddContactActivity.BtnClick" /> - - + type="com.vscool.os.activity.alarm.add.AlarmAddActivity.Click" /> diff --git a/app/src/main/res/layout/activity_alarm_edit.xml b/app/src/main/res/layout/activity_alarm_edit.xml index 83cd1b2..051c635 100644 --- a/app/src/main/res/layout/activity_alarm_edit.xml +++ b/app/src/main/res/layout/activity_alarm_edit.xml @@ -8,12 +8,12 @@ + type="com.vscool.os.activity.alarm.edit.AlarmEditActivity.Click" /> + type="com.vscool.os.alarm.AlarmClockData" /> diff --git a/app/src/main/res/layout/activity_alarm_list.xml b/app/src/main/res/layout/activity_alarm_list.xml index 6da1a03..23b21dd 100644 --- a/app/src/main/res/layout/activity_alarm_list.xml +++ b/app/src/main/res/layout/activity_alarm_list.xml @@ -8,7 +8,7 @@ + type="com.vscool.os.activity.alarm.list.AlarmListActivity.Click" /> + app:layout_behavior="com.vscool.os.view.FAB_Float_on_Scroll" /> diff --git a/app/src/main/res/layout/activity_contact_list.xml b/app/src/main/res/layout/activity_contact_list.xml index c3581b1..49d6222 100644 --- a/app/src/main/res/layout/activity_contact_list.xml +++ b/app/src/main/res/layout/activity_contact_list.xml @@ -8,7 +8,7 @@ + type="com.vscool.os.activity.contact.ContactListActivity.BtnClick" /> + type="com.vscool.os.activity.control.ControlActivity.BtnClick" /> - + type="com.vscool.os.activity.dailyapp.DailyAppActivity.BtnClick" /> + type="com.vscool.os.activity.dock.DockActivity.BtnClick" /> + type="com.vscool.os.activity.contact.EditContactActivity.BtnClick" /> + type="com.vscool.os.bean.Contact" /> - + type="com.vscool.os.activity.emergency.EmergencyActivity.BtnClick" /> + type="com.vscool.os.activity.ImeiActivity.BtnClick" /> + type="com.vscool.os.bean.ArticleInfo" /> + type="com.vscool.os.activity.location.LocationAcivity.Click" /> + type="com.vscool.os.activity.main.MainActivity.BtnClick" /> - + type="com.vscool.os.activity.phone.PhoneActivity.BtnClick" /> diff --git a/app/src/main/res/layout/activity_select_number.xml b/app/src/main/res/layout/activity_select_number.xml index 7a1bf8b..c14be8a 100644 --- a/app/src/main/res/layout/activity_select_number.xml +++ b/app/src/main/res/layout/activity_select_number.xml @@ -8,7 +8,7 @@ + type="com.vscool.os.activity.selectnumber.SelectNumberActivity.BtnClick" /> + type="com.vscool.os.activity.service.ServiceActivity.BtnClick" /> + type="com.vscool.os.activity.setting.SettingActivity.BtnClick" /> + type="com.vscool.os.activity.sim.SimCardActivity.BtnClick" /> + type="com.vscool.os.activity.setting.TouchActivity.BtnClick" /> + type="com.vscool.os.activity.tts.TtsActivity.BtnClick" /> + type="com.vscool.os.bean.AppInfo" /> + type="com.vscool.os.activity.update.UpdateActivity.BtnClick" /> + type="com.vscool.os.activity.weather.WeatherActivity.ClickListener" /> + type="com.vscool.os.activity.callwechat.CallWechatActivity.BtnClick" /> + type="com.vscool.os.bean.Contact" /> - + type="com.vscool.os.fragment.phone.contact.ContactFragment.BtnClick" /> + type="com.vscool.os.fragment.contact.ContactFragment.BtnClick" /> + type="com.vscool.os.fragment.phone.dialer.DialerFragment.BtnClick" /> + type="com.vscool.os.fragment.home.HomeFragment.BtnClick" /> @@ -54,7 +57,7 @@ android:layout_marginStart="16dp" android:maxLines="1" android:textColor="@color/white" - android:textSize="44sp" + android:textSize="60sp" android:textStyle="bold" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" @@ -68,7 +71,7 @@ android:layout_marginTop="8dp" android:maxLines="1" android:textColor="@color/white" - android:textSize="18sp" + android:textSize="24sp" app:layout_constraintStart_toStartOf="@+id/tv_time" app:layout_constraintTop_toBottomOf="@+id/tv_time" tools:text="20230621" /> @@ -77,81 +80,17 @@ android:id="@+id/tv_week" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="8dp" + android:layout_marginStart="8dp" android:maxLines="1" android:textColor="@color/white" - android:textSize="18sp" - app:layout_constraintStart_toStartOf="@+id/tv_data" - app:layout_constraintTop_toBottomOf="@+id/tv_data" + android:textSize="24sp" + app:layout_constraintBottom_toBottomOf="@+id/tv_data" + app:layout_constraintStart_toEndOf="@+id/tv_data" + app:layout_constraintTop_toTopOf="@+id/tv_data" tools:text="20230621" /> - - - - - - - - - - - - - - @@ -165,46 +104,9 @@ android:layout_width="159dp" android:layout_height="144dp" android:layout_marginEnd="6dp" - android:background="@drawable/card_bindsn_background" - android:onClick="@{click::toSn}" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent"> - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -258,19 +269,19 @@ android:layout_height="80dp" android:adjustViewBounds="true" android:scaleType="centerCrop" - android:src="@{flashing?@drawable/home_icon_light_on:@drawable/home_icon_light_off}" + android:src="@drawable/setting_icon_bind" android:visibility="gone" - app:layout_constraintBottom_toTopOf="@+id/textView18" + app:layout_constraintBottom_toTopOf="@+id/textView19" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> + + + + + + + + + + type="com.vscool.os.fragment.settings.SettingsFragment.BtnClick" /> + type="com.vscool.os.bean.SystemSettings" /> @@ -26,185 +26,24 @@ android:layout_height="match_parent"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -237,20 +76,12 @@ - - - - @@ -261,13 +92,12 @@ android:scaleType="centerCrop" android:src="@drawable/setting_icon_bind" android:visibility="gone" - app:layout_constraintBottom_toTopOf="@+id/textView19" + app:layout_constraintBottom_toTopOf="@+id/textView21" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> + + + + + + + + + + + + + + + + + + + + @@ -343,13 +255,11 @@ android:scaleType="centerCrop" android:src="@drawable/setting_icon_wifi" android:visibility="gone" - app:layout_constraintBottom_toTopOf="@+id/textView18" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> + + + + + + @@ -407,11 +341,12 @@ + android:orientation="horizontal" + android:visibility="gone"> + android:layout_height="match_parent"> + + - - - @@ -81,7 +82,5 @@ tools:text="phone" /> - - \ No newline at end of file diff --git a/app/src/main/res/layout/phone_fragment_control.xml b/app/src/main/res/layout/phone_fragment_control.xml index d0a2776..878216c 100644 --- a/app/src/main/res/layout/phone_fragment_control.xml +++ b/app/src/main/res/layout/phone_fragment_control.xml @@ -288,7 +288,7 @@ android:layout_weight="2" android:background="@drawable/control_background_item_dis"> - - 孝心平安通讯OS + 亲情桌面 %d款应用 连接到 \"%s\" @@ -11,8 +11,8 @@ "安装快捷方式" "添加到主屏幕" - 孝心平安通讯OS快捷服务 - 孝心平安通讯OS一键拨打视频 + 亲情桌面快捷服务 + 亲情桌面一键拨打视频 Settings 已清理%d个应用 diff --git a/app/src/test/java/com/xxpatx/os/ExampleUnitTest.java b/app/src/test/java/com/vscool/os/ExampleUnitTest.java similarity index 82% rename from app/src/test/java/com/xxpatx/os/ExampleUnitTest.java rename to app/src/test/java/com/vscool/os/ExampleUnitTest.java index f1ae6d1..abb4825 100644 --- a/app/src/test/java/com/xxpatx/os/ExampleUnitTest.java +++ b/app/src/test/java/com/vscool/os/ExampleUnitTest.java @@ -1,8 +1,8 @@ -package com.xxpatx.os; +package com.vscool.os; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; /** * Example local unit test, which will execute on the development machine (host). diff --git a/niceimageview/build.gradle b/niceimageview/build.gradle index c974071..c97f41b 100644 --- a/niceimageview/build.gradle +++ b/niceimageview/build.gradle @@ -11,8 +11,6 @@ android { } buildTypes { - M50T60Debug {} - M50T60Release {} debug {} release {} } diff --git a/verification-view/build.gradle b/verification-view/build.gradle index eb63dac..6408499 100644 --- a/verification-view/build.gradle +++ b/verification-view/build.gradle @@ -4,7 +4,6 @@ android { compileSdkVersion 25 buildToolsVersion '25.0.2' - defaultConfig { minSdkVersion 15 targetSdkVersion 25 @@ -13,22 +12,16 @@ android { } buildTypes { - M50T60Debug {} - M50T60Release {} debug {} release {} } - lintOptions { abortOnError false } } - - - dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') implementation 'androidx.appcompat:appcompat:1.3.1'