diff --git a/app/build.gradle b/app/build.gradle index 6cd03c1..dc56c6e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,4 +1,5 @@ apply plugin: 'com.android.application' +apply plugin: "com.tencent.android.tpns" def appName() { return "桌面" @@ -12,13 +13,24 @@ android { compileSdkVersion 29 defaultConfig { - applicationId "com.uiui.os" + applicationId "com.uiui.aios" minSdkVersion 24 targetSdkVersion 29 - versionCode 10 - versionName "1.9" + versionCode 11 + versionName "2.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + + ndk { + //根据需要 自行选择添加的对应cpu类型的.so库。 + abiFilters 'armeabi', 'armeabi-v7a', 'arm64-v8a' + // 还可以添加 'x86', 'x86_64', 'mips', 'mips64' + } + + manifestPlaceholders = [ + XG_ACCESS_ID : "1500030457", + XG_ACCESS_KEY : "AZZXANJF4HBD", + ] } lintOptions { @@ -178,6 +190,7 @@ dependencies { implementation 'com.amap.api:location:5.1.0' //MMKV implementation 'com.tencent:mmkv-static:1.2.12' + implementation 'com.tencent.tpns:tpns:1.3.3.3-release' //状态栏透明 implementation 'com.gitee.zackratos:UltimateBarX:0.8.0' //指示器 diff --git a/app/src/androidTest/java/com/uiui/aios/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/uiui/aios/ExampleInstrumentedTest.java new file mode 100644 index 0000000..93cbad8 --- /dev/null +++ b/app/src/androidTest/java/com/uiui/aios/ExampleInstrumentedTest.java @@ -0,0 +1,27 @@ +package com.uiui.aios; + +import android.content.Context; + +import androidx.test.platform.app.InstrumentationRegistry; +import androidx.test.ext.junit.runners.AndroidJUnit4; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import static org.junit.Assert.*; + +/** + * Instrumented test, which will execute on an Android device. + * + * @see Testing documentation + */ +@RunWith(AndroidJUnit4.class) +public class ExampleInstrumentedTest { + @Test + public void useAppContext() { + // Context of the app under test. + Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); + + assertEquals("com.uiui.aios", appContext.getPackageName()); + } +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 9629519..308c8f7 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,7 @@ @@ -8,24 +9,54 @@ - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + @@ -121,9 +124,163 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/uiui/os/AppInfo.java b/app/src/main/java/com/uiui/aios/AppInfo.java similarity index 87% rename from app/src/main/java/com/uiui/os/AppInfo.java rename to app/src/main/java/com/uiui/aios/AppInfo.java index ecfedeb..0081c0a 100644 --- a/app/src/main/java/com/uiui/os/AppInfo.java +++ b/app/src/main/java/com/uiui/aios/AppInfo.java @@ -1,4 +1,4 @@ -package com.uiui.os; +package com.uiui.aios; import java.io.Serializable; diff --git a/app/src/main/java/com/uiui/os/activity/APPListActivity.java b/app/src/main/java/com/uiui/aios/activity/APPListActivity.java similarity index 92% rename from app/src/main/java/com/uiui/os/activity/APPListActivity.java rename to app/src/main/java/com/uiui/aios/activity/APPListActivity.java index 436eecb..fe3e21d 100644 --- a/app/src/main/java/com/uiui/os/activity/APPListActivity.java +++ b/app/src/main/java/com/uiui/aios/activity/APPListActivity.java @@ -1,4 +1,4 @@ -package com.uiui.os.activity; +package com.uiui.aios.activity; import android.content.Context; import android.content.pm.ApplicationInfo; @@ -13,13 +13,13 @@ import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.uiui.os.R; -import com.uiui.os.adapter.APPListAdapter; -import com.uiui.os.base.BaseActivity; -import com.uiui.os.bean.AppListInfo; -import com.uiui.os.utils.ApkUtils; -import com.uiui.os.utils.BitmapUtils; -import com.uiui.os.view.RecyclerViewSpacesItemDecoration; +import com.uiui.aios.R; +import com.uiui.aios.adapter.APPListAdapter; +import com.uiui.aios.base.BaseActivity; +import com.uiui.aios.bean.AppListInfo; +import com.uiui.aios.utils.ApkUtils; +import com.uiui.aios.utils.BitmapUtils; +import com.uiui.aios.view.RecyclerViewSpacesItemDecoration; import java.util.ArrayList; import java.util.HashMap; diff --git a/app/src/main/java/com/uiui/os/activity/CodeActivity.java b/app/src/main/java/com/uiui/aios/activity/CodeActivity.java similarity index 91% rename from app/src/main/java/com/uiui/os/activity/CodeActivity.java rename to app/src/main/java/com/uiui/aios/activity/CodeActivity.java index 8427a08..fef7939 100644 --- a/app/src/main/java/com/uiui/os/activity/CodeActivity.java +++ b/app/src/main/java/com/uiui/aios/activity/CodeActivity.java @@ -1,4 +1,4 @@ -package com.uiui.os.activity; +package com.uiui.aios.activity; import android.graphics.Color; import android.util.Log; @@ -9,14 +9,14 @@ import androidx.viewpager.widget.ViewPager; import com.bumptech.glide.Glide; import com.trello.rxlifecycle4.RxLifecycle; import com.trello.rxlifecycle4.android.ActivityEvent; -import com.uiui.os.R; -import com.uiui.os.adapter.HealthCodeAdapter; -import com.uiui.os.base.BaseActivity; -import com.uiui.os.bean.BaseResponse; -import com.uiui.os.bean.HealthCode; -import com.uiui.os.network.NetInterfaceManager; -import com.uiui.os.utils.Utils; -import com.uiui.os.view.ScaleCircleNavigator; +import com.uiui.aios.R; +import com.uiui.aios.adapter.HealthCodeAdapter; +import com.uiui.aios.base.BaseActivity; +import com.uiui.aios.bean.BaseResponse; +import com.uiui.aios.bean.HealthCode; +import com.uiui.aios.network.NetInterfaceManager; +import com.uiui.aios.utils.Utils; +import com.uiui.aios.view.ScaleCircleNavigator; import net.lucode.hackware.magicindicator.MagicIndicator; import net.lucode.hackware.magicindicator.ViewPagerHelper; diff --git a/app/src/main/java/com/uiui/os/activity/EmergencyActivity.java b/app/src/main/java/com/uiui/aios/activity/EmergencyActivity.java similarity index 94% rename from app/src/main/java/com/uiui/os/activity/EmergencyActivity.java rename to app/src/main/java/com/uiui/aios/activity/EmergencyActivity.java index 3a88629..b5f9dd3 100644 --- a/app/src/main/java/com/uiui/os/activity/EmergencyActivity.java +++ b/app/src/main/java/com/uiui/aios/activity/EmergencyActivity.java @@ -1,34 +1,27 @@ -package com.uiui.os.activity; +package com.uiui.aios.activity; import androidx.appcompat.app.AppCompatActivity; -import android.app.StatusBarManager; -import android.content.BroadcastReceiver; import android.content.ComponentName; -import android.content.Context; import android.content.Intent; import android.net.Uri; import android.os.Bundle; import android.os.Handler; -import android.os.Parcelable; import android.provider.Settings; -import android.telephony.PhoneStateListener; -import android.telephony.TelephonyManager; import android.text.TextUtils; import android.util.Log; import android.view.View; import android.widget.ImageView; import android.widget.TextView; -import com.uiui.os.R; -import com.uiui.os.bean.BaseResponse; -import com.uiui.os.network.NetInterfaceManager; -import com.uiui.os.receiver.BootReceiver; -import com.uiui.os.utils.ToastUtil; +import com.uiui.aios.R; +import com.uiui.aios.bean.BaseResponse; +import com.uiui.aios.network.NetInterfaceManager; +import com.uiui.aios.receiver.BootReceiver; +import com.uiui.aios.utils.ToastUtil; import java.util.ArrayList; import java.util.Arrays; -import java.util.HashSet; import java.util.List; import java.util.concurrent.TimeUnit; @@ -39,7 +32,6 @@ import io.reactivex.rxjava3.annotations.NonNull; import io.reactivex.rxjava3.core.Observable; import io.reactivex.rxjava3.core.Observer; import io.reactivex.rxjava3.disposables.Disposable; -import io.reactivex.rxjava3.functions.Consumer; import io.reactivex.rxjava3.schedulers.Schedulers; public class EmergencyActivity extends AppCompatActivity { diff --git a/app/src/main/java/com/uiui/os/activity/NoticeActivity.java b/app/src/main/java/com/uiui/aios/activity/NoticeActivity.java similarity index 95% rename from app/src/main/java/com/uiui/os/activity/NoticeActivity.java rename to app/src/main/java/com/uiui/aios/activity/NoticeActivity.java index 5c68b26..eb2d24f 100644 --- a/app/src/main/java/com/uiui/os/activity/NoticeActivity.java +++ b/app/src/main/java/com/uiui/aios/activity/NoticeActivity.java @@ -1,4 +1,4 @@ -package com.uiui.os.activity; +package com.uiui.aios.activity; import androidx.appcompat.app.AppCompatActivity; import androidx.constraintlayout.widget.ConstraintLayout; @@ -15,14 +15,14 @@ import android.widget.TextView; import com.blankj.utilcode.util.FileUtils; import com.bumptech.glide.Glide; -import com.uiui.os.R; -import com.uiui.os.bean.AlarmClockData; -import com.uiui.os.bean.BaseResponse; -import com.uiui.os.network.NetInterfaceManager; -import com.uiui.os.utils.AlarmUtils; -import com.uiui.os.utils.FileUtil; -import com.uiui.os.utils.Utils; -import com.uiui.os.view.JzvdStdAssert; +import com.uiui.aios.R; +import com.uiui.aios.bean.AlarmClockData; +import com.uiui.aios.bean.BaseResponse; +import com.uiui.aios.network.NetInterfaceManager; +import com.uiui.aios.utils.AlarmUtils; +import com.uiui.aios.utils.FileUtil; +import com.uiui.aios.utils.Utils; +import com.uiui.aios.view.JzvdStdAssert; import java.io.File; import java.io.FileInputStream; @@ -34,7 +34,6 @@ import java.util.List; import butterknife.BindView; import butterknife.ButterKnife; import cn.jzvd.Jzvd; -import cn.jzvd.JzvdStd; import io.reactivex.rxjava3.annotations.NonNull; import io.reactivex.rxjava3.core.Observer; import io.reactivex.rxjava3.disposables.Disposable; diff --git a/app/src/main/java/com/uiui/os/activity/main/MainActivity.java b/app/src/main/java/com/uiui/aios/activity/main/MainActivity.java similarity index 95% rename from app/src/main/java/com/uiui/os/activity/main/MainActivity.java rename to app/src/main/java/com/uiui/aios/activity/main/MainActivity.java index 392e737..10ca452 100644 --- a/app/src/main/java/com/uiui/os/activity/main/MainActivity.java +++ b/app/src/main/java/com/uiui/aios/activity/main/MainActivity.java @@ -1,4 +1,4 @@ -package com.uiui.os.activity.main; +package com.uiui.aios.activity.main; import android.content.BroadcastReceiver; import android.content.ComponentName; @@ -23,18 +23,18 @@ import androidx.viewpager.widget.ViewPager; import com.alarmclock.uiui.IAlarmAidlInterface; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import com.uiui.os.BuildConfig; -import com.uiui.os.R; -import com.uiui.os.base.BaseActivity; -import com.uiui.os.bean.AlarmItem; -import com.uiui.os.bean.DesktopIcon; -import com.uiui.os.fragment.AppListFragment; -import com.uiui.os.fragment.BaseFragmentPagerAdapter; -import com.uiui.os.fragment.CustomFragment; -import com.uiui.os.fragment.SecondFragment; -import com.uiui.os.utils.ApkUtils; -import com.uiui.os.utils.AppUsedTimeUtils; -import com.uiui.os.view.ScaleCircleNavigator; +import com.uiui.aios.BuildConfig; +import com.uiui.aios.R; +import com.uiui.aios.base.BaseActivity; +import com.uiui.aios.bean.AlarmItem; +import com.uiui.aios.bean.DesktopIcon; +import com.uiui.aios.fragment.AppListFragment; +import com.uiui.aios.fragment.BaseFragmentPagerAdapter; +import com.uiui.aios.fragment.CustomFragment; +import com.uiui.aios.fragment.SecondFragment; +import com.uiui.aios.utils.ApkUtils; +import com.uiui.aios.utils.AppUsedTimeUtils; +import com.uiui.aios.view.ScaleCircleNavigator; import net.lucode.hackware.magicindicator.MagicIndicator; import net.lucode.hackware.magicindicator.ViewPagerHelper; diff --git a/app/src/main/java/com/uiui/os/activity/main/MainContact.java b/app/src/main/java/com/uiui/aios/activity/main/MainContact.java similarity index 83% rename from app/src/main/java/com/uiui/os/activity/main/MainContact.java rename to app/src/main/java/com/uiui/aios/activity/main/MainContact.java index 80ceb75..9248745 100644 --- a/app/src/main/java/com/uiui/os/activity/main/MainContact.java +++ b/app/src/main/java/com/uiui/aios/activity/main/MainContact.java @@ -1,7 +1,7 @@ -package com.uiui.os.activity.main; +package com.uiui.aios.activity.main; -import com.uiui.os.base.BasePresenter; -import com.uiui.os.base.BaseView; +import com.uiui.aios.base.BasePresenter; +import com.uiui.aios.base.BaseView; public class MainContact { public interface Presenter extends BasePresenter { diff --git a/app/src/main/java/com/uiui/os/activity/main/MainPresenter.java b/app/src/main/java/com/uiui/aios/activity/main/MainPresenter.java similarity index 95% rename from app/src/main/java/com/uiui/os/activity/main/MainPresenter.java rename to app/src/main/java/com/uiui/aios/activity/main/MainPresenter.java index ab83717..42e1be6 100644 --- a/app/src/main/java/com/uiui/os/activity/main/MainPresenter.java +++ b/app/src/main/java/com/uiui/aios/activity/main/MainPresenter.java @@ -1,4 +1,4 @@ -package com.uiui.os.activity.main; +package com.uiui.aios.activity.main; import android.content.Context; import android.text.TextUtils; @@ -7,13 +7,13 @@ import android.util.Log; import com.google.gson.JsonObject; import com.trello.rxlifecycle4.RxLifecycle; import com.trello.rxlifecycle4.android.ActivityEvent; -import com.uiui.os.BuildConfig; -import com.uiui.os.bean.BaseResponse; -import com.uiui.os.bean.NetDesktopIcon; -import com.uiui.os.network.NetInterfaceManager; -import com.uiui.os.utils.ApkUtils; -import com.uiui.os.utils.AppUsedTimeUtils; -import com.uiui.os.utils.Utils; +import com.uiui.aios.BuildConfig; +import com.uiui.aios.bean.BaseResponse; +import com.uiui.aios.bean.NetDesktopIcon; +import com.uiui.aios.network.NetInterfaceManager; +import com.uiui.aios.utils.ApkUtils; +import com.uiui.aios.utils.AppUsedTimeUtils; +import com.uiui.aios.utils.Utils; import java.util.List; diff --git a/app/src/main/java/com/uiui/os/activity/weather/WeatherActivity.java b/app/src/main/java/com/uiui/aios/activity/weather/WeatherActivity.java similarity index 87% rename from app/src/main/java/com/uiui/os/activity/weather/WeatherActivity.java rename to app/src/main/java/com/uiui/aios/activity/weather/WeatherActivity.java index 0e4e73a..54868ad 100644 --- a/app/src/main/java/com/uiui/os/activity/weather/WeatherActivity.java +++ b/app/src/main/java/com/uiui/aios/activity/weather/WeatherActivity.java @@ -1,23 +1,18 @@ -package com.uiui.os.activity.weather; +package com.uiui.aios.activity.weather; import android.content.res.Resources; -import android.media.Image; import android.view.View; import android.widget.ImageView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import com.qweather.sdk.bean.weather.WeatherDailyBean; -import com.uiui.os.R; -import com.uiui.os.adapter.WeatherDayApdapter; -import com.uiui.os.base.BaseActivity; -import com.uiui.os.bean.WeatherDailyJson; -import com.uiui.os.utils.ScreenUtils; -import com.uiui.os.view.HorizontalItemDecoration; -import com.uiui.os.view.RecyclerItemDecoration; +import com.uiui.aios.R; +import com.uiui.aios.adapter.WeatherDayApdapter; +import com.uiui.aios.base.BaseActivity; +import com.uiui.aios.view.HorizontalItemDecoration; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/main/java/com/uiui/os/activity/weather/WeatherContact.java b/app/src/main/java/com/uiui/aios/activity/weather/WeatherContact.java similarity index 74% rename from app/src/main/java/com/uiui/os/activity/weather/WeatherContact.java rename to app/src/main/java/com/uiui/aios/activity/weather/WeatherContact.java index 4331c33..0e0950f 100644 --- a/app/src/main/java/com/uiui/os/activity/weather/WeatherContact.java +++ b/app/src/main/java/com/uiui/aios/activity/weather/WeatherContact.java @@ -1,12 +1,8 @@ -package com.uiui.os.activity.weather; +package com.uiui.aios.activity.weather; import com.qweather.sdk.bean.weather.WeatherDailyBean; -import com.uiui.os.base.BasePresenter; -import com.uiui.os.base.BaseView; -import com.uiui.os.bean.AlarmClockData; -import com.uiui.os.bean.WeatherDailyJson; - -import java.util.List; +import com.uiui.aios.base.BasePresenter; +import com.uiui.aios.base.BaseView; public class WeatherContact { public interface Presenter extends BasePresenter { diff --git a/app/src/main/java/com/uiui/os/activity/weather/WeatherPresenter.java b/app/src/main/java/com/uiui/aios/activity/weather/WeatherPresenter.java similarity index 88% rename from app/src/main/java/com/uiui/os/activity/weather/WeatherPresenter.java rename to app/src/main/java/com/uiui/aios/activity/weather/WeatherPresenter.java index 6965a89..743b865 100644 --- a/app/src/main/java/com/uiui/os/activity/weather/WeatherPresenter.java +++ b/app/src/main/java/com/uiui/aios/activity/weather/WeatherPresenter.java @@ -1,4 +1,4 @@ -package com.uiui.os.activity.weather; +package com.uiui.aios.activity.weather; import android.content.Context; import android.util.Log; @@ -12,18 +12,10 @@ import com.qweather.sdk.bean.weather.WeatherDailyBean; import com.qweather.sdk.view.QWeather; import com.tencent.mmkv.MMKV; import com.trello.rxlifecycle4.android.ActivityEvent; -import com.uiui.os.bean.AlarmClockData; -import com.uiui.os.bean.BaseResponse; -import com.uiui.os.bean.WeatherDailyJson; -import com.uiui.os.network.NetInterfaceManager; -import com.uiui.os.utils.AlarmUtils; -import com.uiui.os.utils.AmapManager; +import com.uiui.aios.utils.AmapManager; import java.lang.reflect.Type; -import java.util.List; -import io.reactivex.rxjava3.core.Observer; -import io.reactivex.rxjava3.disposables.Disposable; import io.reactivex.rxjava3.subjects.BehaviorSubject; /** diff --git a/app/src/main/java/com/uiui/os/adapter/APPListAdapter.java b/app/src/main/java/com/uiui/aios/adapter/APPListAdapter.java similarity index 94% rename from app/src/main/java/com/uiui/os/adapter/APPListAdapter.java rename to app/src/main/java/com/uiui/aios/adapter/APPListAdapter.java index ac59df4..2a99d81 100644 --- a/app/src/main/java/com/uiui/os/adapter/APPListAdapter.java +++ b/app/src/main/java/com/uiui/aios/adapter/APPListAdapter.java @@ -1,4 +1,4 @@ -package com.uiui.os.adapter; +package com.uiui.aios.adapter; import android.content.Context; import android.view.LayoutInflater; @@ -12,9 +12,9 @@ import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; -import com.uiui.os.R; -import com.uiui.os.bean.AppListInfo; -import com.uiui.os.utils.ApkUtils; +import com.uiui.aios.R; +import com.uiui.aios.bean.AppListInfo; +import com.uiui.aios.utils.ApkUtils; import java.util.List; diff --git a/app/src/main/java/com/uiui/os/adapter/AlarmClockAdapter.java b/app/src/main/java/com/uiui/aios/adapter/AlarmClockAdapter.java similarity index 94% rename from app/src/main/java/com/uiui/os/adapter/AlarmClockAdapter.java rename to app/src/main/java/com/uiui/aios/adapter/AlarmClockAdapter.java index 4c1c3d0..97dcd3e 100644 --- a/app/src/main/java/com/uiui/os/adapter/AlarmClockAdapter.java +++ b/app/src/main/java/com/uiui/aios/adapter/AlarmClockAdapter.java @@ -1,4 +1,4 @@ -package com.uiui.os.adapter; +package com.uiui.aios.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.uiui.os.R; -import com.uiui.os.bean.AlarmItem; +import com.uiui.aios.R; +import com.uiui.aios.bean.AlarmItem; import java.util.List; diff --git a/app/src/main/java/com/uiui/os/adapter/HealthCodeAdapter.java b/app/src/main/java/com/uiui/aios/adapter/HealthCodeAdapter.java similarity index 97% rename from app/src/main/java/com/uiui/os/adapter/HealthCodeAdapter.java rename to app/src/main/java/com/uiui/aios/adapter/HealthCodeAdapter.java index 8cf2d8e..d50c7e5 100644 --- a/app/src/main/java/com/uiui/os/adapter/HealthCodeAdapter.java +++ b/app/src/main/java/com/uiui/aios/adapter/HealthCodeAdapter.java @@ -1,4 +1,4 @@ -package com.uiui.os.adapter; +package com.uiui.aios.adapter; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/uiui/os/adapter/NotificationAdapter.java b/app/src/main/java/com/uiui/aios/adapter/NotificationAdapter.java similarity index 93% rename from app/src/main/java/com/uiui/os/adapter/NotificationAdapter.java rename to app/src/main/java/com/uiui/aios/adapter/NotificationAdapter.java index 0667223..6c8b630 100644 --- a/app/src/main/java/com/uiui/os/adapter/NotificationAdapter.java +++ b/app/src/main/java/com/uiui/aios/adapter/NotificationAdapter.java @@ -1,4 +1,4 @@ -package com.uiui.os.adapter; +package com.uiui.aios.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.uiui.os.R; -import com.uiui.os.bean.AlarmClockData; +import com.uiui.aios.R; +import com.uiui.aios.bean.AlarmClockData; import java.util.List; diff --git a/app/src/main/java/com/uiui/os/adapter/SOSNnmberAdapter.java b/app/src/main/java/com/uiui/aios/adapter/SOSNnmberAdapter.java similarity index 93% rename from app/src/main/java/com/uiui/os/adapter/SOSNnmberAdapter.java rename to app/src/main/java/com/uiui/aios/adapter/SOSNnmberAdapter.java index fe23b1d..8cb8f54 100644 --- a/app/src/main/java/com/uiui/os/adapter/SOSNnmberAdapter.java +++ b/app/src/main/java/com/uiui/aios/adapter/SOSNnmberAdapter.java @@ -1,4 +1,4 @@ -package com.uiui.os.adapter; +package com.uiui.aios.adapter; import android.content.Context; import android.content.Intent; @@ -11,9 +11,8 @@ import androidx.annotation.NonNull; import androidx.constraintlayout.widget.ConstraintLayout; import androidx.recyclerview.widget.RecyclerView; -import com.uiui.os.R; -import com.uiui.os.activity.EmergencyActivity; -import com.uiui.os.bean.AlarmItem; +import com.uiui.aios.R; +import com.uiui.aios.activity.EmergencyActivity; import java.util.List; diff --git a/app/src/main/java/com/uiui/os/adapter/WeatherDayApdapter.java b/app/src/main/java/com/uiui/aios/adapter/WeatherDayApdapter.java similarity index 96% rename from app/src/main/java/com/uiui/os/adapter/WeatherDayApdapter.java rename to app/src/main/java/com/uiui/aios/adapter/WeatherDayApdapter.java index 8037c3e..e8b65f0 100644 --- a/app/src/main/java/com/uiui/os/adapter/WeatherDayApdapter.java +++ b/app/src/main/java/com/uiui/aios/adapter/WeatherDayApdapter.java @@ -1,8 +1,7 @@ -package com.uiui.os.adapter; +package com.uiui.aios.adapter; import android.content.Context; import android.graphics.drawable.Drawable; -import android.media.Image; import android.util.Log; import android.view.LayoutInflater; import android.view.View; @@ -15,7 +14,7 @@ import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.RecyclerView; import com.qweather.sdk.bean.weather.WeatherDailyBean; -import com.uiui.os.R; +import com.uiui.aios.R; import java.util.List; @@ -73,7 +72,7 @@ public class WeatherDayApdapter extends RecyclerView.Adapter accountInfoList = new ArrayList<>(); + accountInfoList.add(new XGPushManager.AccountInfo(XGPushManager.AccountType.CUSTOM.getValue(), Utils.getSerial())); + XGPushManager.upsertAccounts(getApplicationContext(), accountInfoList, new XGIOperateCallback() { + @Override + public void onSuccess(Object data, int flag) { + Log.e("TPush", "onSuccess, data:" + data + ", flag:" + flag); + } + + @Override + public void onFail(Object data, int errCode, String msg) { + Log.e("TPush", "onFail, data:" + data + ", code:" + errCode + ", msg:" + msg); + } + }); + } + + @Override + public void onFail(Object data, int errCode, String msg) { + Log.e("TPush", "注册失败，错误码：" + errCode + ",错误信息：" + msg); + } + }); + } + private void catchException() { Thread.setDefaultUncaughtExceptionHandler( diff --git a/app/src/main/java/com/uiui/os/base/BaseFragment.java b/app/src/main/java/com/uiui/aios/base/BaseFragment.java similarity index 94% rename from app/src/main/java/com/uiui/os/base/BaseFragment.java rename to app/src/main/java/com/uiui/aios/base/BaseFragment.java index 95a9a75..61c14b6 100644 --- a/app/src/main/java/com/uiui/os/base/BaseFragment.java +++ b/app/src/main/java/com/uiui/aios/base/BaseFragment.java @@ -1,12 +1,10 @@ -package com.uiui.os.base; +package com.uiui.aios.base; import android.os.Bundle; import android.view.View; import androidx.annotation.CallSuper; import androidx.annotation.CheckResult; -import androidx.annotation.ContentView; -import androidx.annotation.LayoutRes; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; @@ -16,7 +14,6 @@ import com.trello.rxlifecycle4.LifecycleTransformer; import com.trello.rxlifecycle4.RxLifecycle; import com.trello.rxlifecycle4.android.FragmentEvent; import com.trello.rxlifecycle4.android.RxLifecycleAndroid; -import com.trello.rxlifecycle4.components.RxFragment; import io.reactivex.rxjava3.core.Observable; import io.reactivex.rxjava3.subjects.BehaviorSubject; diff --git a/app/src/main/java/com/uiui/os/base/BasePresenter.java b/app/src/main/java/com/uiui/aios/base/BasePresenter.java similarity index 84% rename from app/src/main/java/com/uiui/os/base/BasePresenter.java rename to app/src/main/java/com/uiui/aios/base/BasePresenter.java index 3abc217..c2e48aa 100644 --- a/app/src/main/java/com/uiui/os/base/BasePresenter.java +++ b/app/src/main/java/com/uiui/aios/base/BasePresenter.java @@ -1,4 +1,4 @@ -package com.uiui.os.base; +package com.uiui.aios.base; import androidx.annotation.NonNull; diff --git a/app/src/main/java/com/uiui/os/base/BaseService.java b/app/src/main/java/com/uiui/aios/base/BaseService.java similarity index 98% rename from app/src/main/java/com/uiui/os/base/BaseService.java rename to app/src/main/java/com/uiui/aios/base/BaseService.java index 3b4b424..4d323ab 100644 --- a/app/src/main/java/com/uiui/os/base/BaseService.java +++ b/app/src/main/java/com/uiui/aios/base/BaseService.java @@ -1,4 +1,4 @@ -package com.uiui.os.base; +package com.uiui.aios.base; import android.app.Service; import android.content.Intent; diff --git a/app/src/main/java/com/uiui/os/base/BaseView.java b/app/src/main/java/com/uiui/aios/base/BaseView.java similarity index 52% rename from app/src/main/java/com/uiui/os/base/BaseView.java rename to app/src/main/java/com/uiui/aios/base/BaseView.java index f11b175..b97fe9a 100644 --- a/app/src/main/java/com/uiui/os/base/BaseView.java +++ b/app/src/main/java/com/uiui/aios/base/BaseView.java @@ -1,4 +1,4 @@ -package com.uiui.os.base; +package com.uiui.aios.base; public interface BaseView { } diff --git a/app/src/main/java/com/uiui/os/bean/ActivityBean.java b/app/src/main/java/com/uiui/aios/bean/ActivityBean.java similarity index 98% rename from app/src/main/java/com/uiui/os/bean/ActivityBean.java rename to app/src/main/java/com/uiui/aios/bean/ActivityBean.java index 72372c1..f9717d6 100644 --- a/app/src/main/java/com/uiui/os/bean/ActivityBean.java +++ b/app/src/main/java/com/uiui/aios/bean/ActivityBean.java @@ -1,4 +1,4 @@ -package com.uiui.os.bean; +package com.uiui.aios.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/uiui/os/bean/AlarmClockData.java b/app/src/main/java/com/uiui/aios/bean/AlarmClockData.java similarity index 98% rename from app/src/main/java/com/uiui/os/bean/AlarmClockData.java rename to app/src/main/java/com/uiui/aios/bean/AlarmClockData.java index 1b56d61..b146dbe 100644 --- a/app/src/main/java/com/uiui/os/bean/AlarmClockData.java +++ b/app/src/main/java/com/uiui/aios/bean/AlarmClockData.java @@ -1,4 +1,4 @@ -package com.uiui.os.bean; +package com.uiui.aios.bean; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/app/src/main/java/com/uiui/os/bean/AlarmItem.java b/app/src/main/java/com/uiui/aios/bean/AlarmItem.java similarity index 95% rename from app/src/main/java/com/uiui/os/bean/AlarmItem.java rename to app/src/main/java/com/uiui/aios/bean/AlarmItem.java index 1f6393b..4b3a886 100644 --- a/app/src/main/java/com/uiui/os/bean/AlarmItem.java +++ b/app/src/main/java/com/uiui/aios/bean/AlarmItem.java @@ -1,4 +1,4 @@ -package com.uiui.os.bean; +package com.uiui.aios.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/uiui/os/bean/AppListInfo.java b/app/src/main/java/com/uiui/aios/bean/AppListInfo.java similarity index 96% rename from app/src/main/java/com/uiui/os/bean/AppListInfo.java rename to app/src/main/java/com/uiui/aios/bean/AppListInfo.java index c7278a8..e557432 100644 --- a/app/src/main/java/com/uiui/os/bean/AppListInfo.java +++ b/app/src/main/java/com/uiui/aios/bean/AppListInfo.java @@ -1,4 +1,4 @@ -package com.uiui.os.bean; +package com.uiui.aios.bean; import android.graphics.Bitmap; diff --git a/app/src/main/java/com/uiui/os/bean/ArticleDetails.java b/app/src/main/java/com/uiui/aios/bean/ArticleDetails.java similarity index 96% rename from app/src/main/java/com/uiui/os/bean/ArticleDetails.java rename to app/src/main/java/com/uiui/aios/bean/ArticleDetails.java index 4cc7d45..a12813e 100644 --- a/app/src/main/java/com/uiui/os/bean/ArticleDetails.java +++ b/app/src/main/java/com/uiui/aios/bean/ArticleDetails.java @@ -1,4 +1,4 @@ -package com.uiui.os.bean; +package com.uiui.aios.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/uiui/os/bean/ArticleInfo.java b/app/src/main/java/com/uiui/aios/bean/ArticleInfo.java similarity index 97% rename from app/src/main/java/com/uiui/os/bean/ArticleInfo.java rename to app/src/main/java/com/uiui/aios/bean/ArticleInfo.java index 007239d..9005b48 100644 --- a/app/src/main/java/com/uiui/os/bean/ArticleInfo.java +++ b/app/src/main/java/com/uiui/aios/bean/ArticleInfo.java @@ -1,4 +1,4 @@ -package com.uiui.os.bean; +package com.uiui.aios.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/uiui/os/bean/BaseResponse.java b/app/src/main/java/com/uiui/aios/bean/BaseResponse.java similarity index 94% rename from app/src/main/java/com/uiui/os/bean/BaseResponse.java rename to app/src/main/java/com/uiui/aios/bean/BaseResponse.java index b86ee59..8a3a171 100644 --- a/app/src/main/java/com/uiui/os/bean/BaseResponse.java +++ b/app/src/main/java/com/uiui/aios/bean/BaseResponse.java @@ -1,4 +1,4 @@ -package com.uiui.os.bean; +package com.uiui.aios.bean; import androidx.annotation.NonNull; diff --git a/app/src/main/java/com/uiui/os/bean/DemandBean.java b/app/src/main/java/com/uiui/aios/bean/DemandBean.java similarity index 98% rename from app/src/main/java/com/uiui/os/bean/DemandBean.java rename to app/src/main/java/com/uiui/aios/bean/DemandBean.java index 00d7582..027b339 100644 --- a/app/src/main/java/com/uiui/os/bean/DemandBean.java +++ b/app/src/main/java/com/uiui/aios/bean/DemandBean.java @@ -1,4 +1,4 @@ -package com.uiui.os.bean; +package com.uiui.aios.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/uiui/os/bean/DesktopIcon.java b/app/src/main/java/com/uiui/aios/bean/DesktopIcon.java similarity index 97% rename from app/src/main/java/com/uiui/os/bean/DesktopIcon.java rename to app/src/main/java/com/uiui/aios/bean/DesktopIcon.java index c494944..6262eee 100644 --- a/app/src/main/java/com/uiui/os/bean/DesktopIcon.java +++ b/app/src/main/java/com/uiui/aios/bean/DesktopIcon.java @@ -1,9 +1,8 @@ -package com.uiui.os.bean; +package com.uiui.aios.bean; import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; -import android.graphics.Bitmap; import android.graphics.drawable.Drawable; import android.os.Parcel; import android.os.Parcelable; diff --git a/app/src/main/java/com/uiui/os/bean/GoodsDetails.java b/app/src/main/java/com/uiui/aios/bean/GoodsDetails.java similarity index 98% rename from app/src/main/java/com/uiui/os/bean/GoodsDetails.java rename to app/src/main/java/com/uiui/aios/bean/GoodsDetails.java index 54efe1f..bcafe80 100644 --- a/app/src/main/java/com/uiui/os/bean/GoodsDetails.java +++ b/app/src/main/java/com/uiui/aios/bean/GoodsDetails.java @@ -1,4 +1,4 @@ -package com.uiui.os.bean; +package com.uiui.aios.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/uiui/os/bean/GoodsInfo.java b/app/src/main/java/com/uiui/aios/bean/GoodsInfo.java similarity index 98% rename from app/src/main/java/com/uiui/os/bean/GoodsInfo.java rename to app/src/main/java/com/uiui/aios/bean/GoodsInfo.java index 303898d..b3f6af7 100644 --- a/app/src/main/java/com/uiui/os/bean/GoodsInfo.java +++ b/app/src/main/java/com/uiui/aios/bean/GoodsInfo.java @@ -1,4 +1,4 @@ -package com.uiui.os.bean; +package com.uiui.aios.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/uiui/os/bean/HealthCode.java b/app/src/main/java/com/uiui/aios/bean/HealthCode.java similarity index 93% rename from app/src/main/java/com/uiui/os/bean/HealthCode.java rename to app/src/main/java/com/uiui/aios/bean/HealthCode.java index d9bf59a..133c2e3 100644 --- a/app/src/main/java/com/uiui/os/bean/HealthCode.java +++ b/app/src/main/java/com/uiui/aios/bean/HealthCode.java @@ -1,4 +1,4 @@ -package com.uiui.os.bean; +package com.uiui.aios.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/uiui/os/bean/NetDesktopIcon.java b/app/src/main/java/com/uiui/aios/bean/NetDesktopIcon.java similarity index 97% rename from app/src/main/java/com/uiui/os/bean/NetDesktopIcon.java rename to app/src/main/java/com/uiui/aios/bean/NetDesktopIcon.java index d932cc2..f941f55 100644 --- a/app/src/main/java/com/uiui/os/bean/NetDesktopIcon.java +++ b/app/src/main/java/com/uiui/aios/bean/NetDesktopIcon.java @@ -1,4 +1,4 @@ -package com.uiui.os.bean; +package com.uiui.aios.bean; import android.graphics.Bitmap; diff --git a/app/src/main/java/com/uiui/os/bean/WeatherDailyJson.java b/app/src/main/java/com/uiui/aios/bean/WeatherDailyJson.java similarity index 99% rename from app/src/main/java/com/uiui/os/bean/WeatherDailyJson.java rename to app/src/main/java/com/uiui/aios/bean/WeatherDailyJson.java index f085925..82dbfd8 100644 --- a/app/src/main/java/com/uiui/os/bean/WeatherDailyJson.java +++ b/app/src/main/java/com/uiui/aios/bean/WeatherDailyJson.java @@ -1,4 +1,4 @@ -package com.uiui.os.bean; +package com.uiui.aios.bean; import com.qweather.sdk.bean.Basic; import com.qweather.sdk.bean.Refer; diff --git a/app/src/main/java/com/uiui/os/fragment/AppListFragment.java b/app/src/main/java/com/uiui/aios/fragment/AppListFragment.java similarity index 94% rename from app/src/main/java/com/uiui/os/fragment/AppListFragment.java rename to app/src/main/java/com/uiui/aios/fragment/AppListFragment.java index 11a4acb..fce5c3f 100644 --- a/app/src/main/java/com/uiui/os/fragment/AppListFragment.java +++ b/app/src/main/java/com/uiui/aios/fragment/AppListFragment.java @@ -1,4 +1,4 @@ -package com.uiui.os.fragment; +package com.uiui.aios.fragment; import android.content.Context; import android.content.pm.PackageManager; @@ -17,15 +17,15 @@ import android.widget.LinearLayout; import android.widget.TextView; import com.google.gson.JsonObject; -import com.uiui.os.R; -import com.uiui.os.bean.BaseResponse; -import com.uiui.os.bean.DesktopIcon; -import com.uiui.os.network.NetInterfaceManager; -import com.uiui.os.utils.ApkUtils; -import com.uiui.os.utils.BitmapUtils; -import com.uiui.os.utils.IconUtils; -import com.uiui.os.utils.AppUsedTimeUtils; -import com.uiui.os.view.MyGridLayout; +import com.uiui.aios.R; +import com.uiui.aios.bean.BaseResponse; +import com.uiui.aios.bean.DesktopIcon; +import com.uiui.aios.network.NetInterfaceManager; +import com.uiui.aios.utils.ApkUtils; +import com.uiui.aios.utils.BitmapUtils; +import com.uiui.aios.utils.IconUtils; +import com.uiui.aios.utils.AppUsedTimeUtils; +import com.uiui.aios.view.MyGridLayout; import java.util.ArrayList; import java.util.Arrays; @@ -123,7 +123,7 @@ public class AppListFragment extends Fragment { int i = IconUtils.appClassNameList.indexOf(desktopIcon.getPackageName()); if (i != -1) { String val = IconUtils.appIconList.get(i); - int resID = getActivity().getResources().getIdentifier(val, "drawable", "com.uiui.os"); + int resID = getActivity().getResources().getIdentifier(val, "drawable", "com.uiui.aios"); if (resID == 0) { Log.e(TAG, "getView: not found src : " + desktopIcon.getPackageName()); iv.setImageDrawable(desktopIcon.getIcon()); diff --git a/app/src/main/java/com/uiui/os/fragment/BaseFragmentPagerAdapter.java b/app/src/main/java/com/uiui/aios/fragment/BaseFragmentPagerAdapter.java similarity index 99% rename from app/src/main/java/com/uiui/os/fragment/BaseFragmentPagerAdapter.java rename to app/src/main/java/com/uiui/aios/fragment/BaseFragmentPagerAdapter.java index 56b04bc..eb3c982 100644 --- a/app/src/main/java/com/uiui/os/fragment/BaseFragmentPagerAdapter.java +++ b/app/src/main/java/com/uiui/aios/fragment/BaseFragmentPagerAdapter.java @@ -1,4 +1,4 @@ -package com.uiui.os.fragment; +package com.uiui.aios.fragment; import android.util.SparseArray; diff --git a/app/src/main/java/com/uiui/os/fragment/CustomFragment.java b/app/src/main/java/com/uiui/aios/fragment/CustomFragment.java similarity index 97% rename from app/src/main/java/com/uiui/os/fragment/CustomFragment.java rename to app/src/main/java/com/uiui/aios/fragment/CustomFragment.java index 0bc4b5b..1efe154 100644 --- a/app/src/main/java/com/uiui/os/fragment/CustomFragment.java +++ b/app/src/main/java/com/uiui/aios/fragment/CustomFragment.java @@ -1,4 +1,4 @@ -package com.uiui.os.fragment; +package com.uiui.aios.fragment; import android.app.ActivityManager; import android.content.BroadcastReceiver; @@ -41,20 +41,20 @@ import com.qweather.sdk.bean.weather.WeatherHourlyBean; import com.qweather.sdk.bean.weather.WeatherNowBean; import com.qweather.sdk.view.QWeather; import com.tencent.mmkv.MMKV; -import com.uiui.os.BuildConfig; -import com.uiui.os.R; -import com.uiui.os.activity.APPListActivity; -import com.uiui.os.activity.CodeActivity; -import com.uiui.os.activity.EmergencyActivity; -import com.uiui.os.activity.weather.WeatherActivity; -import com.uiui.os.adapter.NotificationAdapter; -import com.uiui.os.adapter.SOSNnmberAdapter; -import com.uiui.os.bean.AlarmClockData; -import com.uiui.os.bean.AlarmItem; -import com.uiui.os.utils.AmapManager; -import com.uiui.os.utils.ApkUtils; -import com.uiui.os.utils.AppUtil; -import com.uiui.os.utils.Utils; +import com.uiui.aios.BuildConfig; +import com.uiui.aios.R; +import com.uiui.aios.activity.APPListActivity; +import com.uiui.aios.activity.CodeActivity; +import com.uiui.aios.activity.EmergencyActivity; +import com.uiui.aios.activity.weather.WeatherActivity; +import com.uiui.aios.adapter.NotificationAdapter; +import com.uiui.aios.adapter.SOSNnmberAdapter; +import com.uiui.aios.bean.AlarmClockData; +import com.uiui.aios.bean.AlarmItem; +import com.uiui.aios.utils.AmapManager; +import com.uiui.aios.utils.ApkUtils; +import com.uiui.aios.utils.AppUtil; +import com.uiui.aios.utils.Utils; import java.lang.reflect.Method; import java.lang.reflect.Type; diff --git a/app/src/main/java/com/uiui/os/fragment/SecondFragment.java b/app/src/main/java/com/uiui/aios/fragment/SecondFragment.java similarity index 96% rename from app/src/main/java/com/uiui/os/fragment/SecondFragment.java rename to app/src/main/java/com/uiui/aios/fragment/SecondFragment.java index c71840d..f782d27 100644 --- a/app/src/main/java/com/uiui/os/fragment/SecondFragment.java +++ b/app/src/main/java/com/uiui/aios/fragment/SecondFragment.java @@ -1,4 +1,4 @@ -package com.uiui.os.fragment; +package com.uiui.aios.fragment; import android.content.ComponentName; import android.content.ContentResolver; @@ -19,22 +19,20 @@ import android.widget.TextView; import com.bumptech.glide.Glide; import com.trello.rxlifecycle4.RxLifecycle; -import com.trello.rxlifecycle4.android.ActivityEvent; import com.trello.rxlifecycle4.android.FragmentEvent; -import com.uiui.os.R; -import com.uiui.os.base.BaseFragment; -import com.uiui.os.bean.ActivityBean; -import com.uiui.os.bean.ArticleInfo; -import com.uiui.os.bean.BaseResponse; -import com.uiui.os.bean.DemandBean; -import com.uiui.os.bean.GoodsInfo; -import com.uiui.os.network.NetInterfaceManager; +import com.uiui.aios.R; +import com.uiui.aios.base.BaseFragment; +import com.uiui.aios.bean.ActivityBean; +import com.uiui.aios.bean.ArticleInfo; +import com.uiui.aios.bean.BaseResponse; +import com.uiui.aios.bean.DemandBean; +import com.uiui.aios.bean.GoodsInfo; +import com.uiui.aios.network.NetInterfaceManager; import java.util.List; import butterknife.BindView; import butterknife.ButterKnife; -import butterknife.OnClick; import io.reactivex.rxjava3.annotations.NonNull; import io.reactivex.rxjava3.core.Observer; import io.reactivex.rxjava3.disposables.Disposable; diff --git a/app/src/main/java/com/uiui/os/iconpostition/IconPositionDBHelper.java b/app/src/main/java/com/uiui/aios/iconpostition/IconPositionDBHelper.java similarity index 96% rename from app/src/main/java/com/uiui/os/iconpostition/IconPositionDBHelper.java rename to app/src/main/java/com/uiui/aios/iconpostition/IconPositionDBHelper.java index 4ed650a..261a73e 100644 --- a/app/src/main/java/com/uiui/os/iconpostition/IconPositionDBHelper.java +++ b/app/src/main/java/com/uiui/aios/iconpostition/IconPositionDBHelper.java @@ -1,4 +1,4 @@ -package com.uiui.os.iconpostition; +package com.uiui.aios.iconpostition; import android.content.Context; import android.database.sqlite.SQLiteDatabase; diff --git a/app/src/main/java/com/uiui/os/iconpostition/IconPositionManager.java b/app/src/main/java/com/uiui/aios/iconpostition/IconPositionManager.java similarity index 96% rename from app/src/main/java/com/uiui/os/iconpostition/IconPositionManager.java rename to app/src/main/java/com/uiui/aios/iconpostition/IconPositionManager.java index dfa4db3..402e968 100644 --- a/app/src/main/java/com/uiui/os/iconpostition/IconPositionManager.java +++ b/app/src/main/java/com/uiui/aios/iconpostition/IconPositionManager.java @@ -1,4 +1,4 @@ -package com.uiui.os.iconpostition; +package com.uiui.aios.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.uiui.os.bean.NetDesktopIcon; -import com.uiui.os.utils.ApkUtils; +import com.uiui.aios.bean.NetDesktopIcon; +import com.uiui.aios.utils.ApkUtils; import java.util.ArrayList; import java.util.HashMap; diff --git a/app/src/main/java/com/uiui/os/iconpostition/IconUtils.java b/app/src/main/java/com/uiui/aios/iconpostition/IconUtils.java similarity index 97% rename from app/src/main/java/com/uiui/os/iconpostition/IconUtils.java rename to app/src/main/java/com/uiui/aios/iconpostition/IconUtils.java index 981cde2..7c0d06c 100644 --- a/app/src/main/java/com/uiui/os/iconpostition/IconUtils.java +++ b/app/src/main/java/com/uiui/aios/iconpostition/IconUtils.java @@ -1,4 +1,4 @@ -package com.uiui.os.iconpostition; +package com.uiui.aios.iconpostition; import android.content.Context; import android.content.pm.ApplicationInfo; diff --git a/app/src/main/java/com/uiui/os/network/NetInterfaceManager.java b/app/src/main/java/com/uiui/aios/network/NetInterfaceManager.java similarity index 90% rename from app/src/main/java/com/uiui/os/network/NetInterfaceManager.java rename to app/src/main/java/com/uiui/aios/network/NetInterfaceManager.java index b8bd5b8..4da8f12 100644 --- a/app/src/main/java/com/uiui/os/network/NetInterfaceManager.java +++ b/app/src/main/java/com/uiui/aios/network/NetInterfaceManager.java @@ -1,31 +1,31 @@ -package com.uiui.os.network; +package com.uiui.aios.network; import android.annotation.SuppressLint; import android.content.Context; import android.util.Log; -import com.uiui.os.bean.ActivityBean; -import com.uiui.os.bean.AlarmClockData; -import com.uiui.os.bean.ArticleInfo; -import com.uiui.os.bean.BaseResponse; -import com.uiui.os.bean.DemandBean; -import com.uiui.os.bean.GoodsInfo; -import com.uiui.os.bean.NetDesktopIcon; -import com.uiui.os.network.api.ActivityListApi; -import com.uiui.os.network.api.AlarmClockApi; -import com.uiui.os.network.api.AppUsageRecordApi; -import com.uiui.os.network.api.ArticleListApi; -import com.uiui.os.network.api.DemandListApi; -import com.uiui.os.network.api.GetDesktopApi; -import com.uiui.os.network.api.GoodsListApi; -import com.uiui.os.network.api.HealthCodeApi; -import com.uiui.os.network.api.RunNewApp; -import com.uiui.os.network.api.SOSRecordApi; -import com.uiui.os.network.api.SendScreenshotApi; -import com.uiui.os.network.api.UpdateAlarmClockApi; -import com.uiui.os.network.api.UpdateDesktopApi; -import com.uiui.os.utils.MD5Util; -import com.uiui.os.utils.Utils; +import com.uiui.aios.bean.ActivityBean; +import com.uiui.aios.bean.AlarmClockData; +import com.uiui.aios.bean.ArticleInfo; +import com.uiui.aios.bean.BaseResponse; +import com.uiui.aios.bean.DemandBean; +import com.uiui.aios.bean.GoodsInfo; +import com.uiui.aios.bean.NetDesktopIcon; +import com.uiui.aios.network.api.ActivityListApi; +import com.uiui.aios.network.api.AlarmClockApi; +import com.uiui.aios.network.api.AppUsageRecordApi; +import com.uiui.aios.network.api.ArticleListApi; +import com.uiui.aios.network.api.DemandListApi; +import com.uiui.aios.network.api.GetDesktopApi; +import com.uiui.aios.network.api.GoodsListApi; +import com.uiui.aios.network.api.HealthCodeApi; +import com.uiui.aios.network.api.RunNewApp; +import com.uiui.aios.network.api.SOSRecordApi; +import com.uiui.aios.network.api.SendScreenshotApi; +import com.uiui.aios.network.api.UpdateAlarmClockApi; +import com.uiui.aios.network.api.UpdateDesktopApi; +import com.uiui.aios.utils.MD5Util; +import com.uiui.aios.utils.Utils; import org.jetbrains.annotations.NotNull; diff --git a/app/src/main/java/com/uiui/os/network/URLAddress.java b/app/src/main/java/com/uiui/aios/network/URLAddress.java similarity index 97% rename from app/src/main/java/com/uiui/os/network/URLAddress.java rename to app/src/main/java/com/uiui/aios/network/URLAddress.java index d47b79b..ee26e0a 100644 --- a/app/src/main/java/com/uiui/os/network/URLAddress.java +++ b/app/src/main/java/com/uiui/aios/network/URLAddress.java @@ -1,4 +1,4 @@ -package com.uiui.os.network; +package com.uiui.aios.network; public class URLAddress { public static final String ROOT_URL = "https://led.aolelearn.cn/android/"; diff --git a/app/src/main/java/com/uiui/os/network/api/ActivityListApi.java b/app/src/main/java/com/uiui/aios/network/api/ActivityListApi.java similarity index 72% rename from app/src/main/java/com/uiui/os/network/api/ActivityListApi.java rename to app/src/main/java/com/uiui/aios/network/api/ActivityListApi.java index 6c4aa0d..099d26d 100644 --- a/app/src/main/java/com/uiui/os/network/api/ActivityListApi.java +++ b/app/src/main/java/com/uiui/aios/network/api/ActivityListApi.java @@ -1,8 +1,8 @@ -package com.uiui.os.network.api; +package com.uiui.aios.network.api; -import com.uiui.os.bean.ActivityBean; -import com.uiui.os.bean.BaseResponse; -import com.uiui.os.network.URLAddress; +import com.uiui.aios.bean.ActivityBean; +import com.uiui.aios.bean.BaseResponse; +import com.uiui.aios.network.URLAddress; import java.util.List; diff --git a/app/src/main/java/com/uiui/os/network/api/AlarmClockApi.java b/app/src/main/java/com/uiui/aios/network/api/AlarmClockApi.java similarity index 66% rename from app/src/main/java/com/uiui/os/network/api/AlarmClockApi.java rename to app/src/main/java/com/uiui/aios/network/api/AlarmClockApi.java index 75bc53f..ad5e53d 100644 --- a/app/src/main/java/com/uiui/os/network/api/AlarmClockApi.java +++ b/app/src/main/java/com/uiui/aios/network/api/AlarmClockApi.java @@ -1,8 +1,8 @@ -package com.uiui.os.network.api; +package com.uiui.aios.network.api; -import com.uiui.os.bean.AlarmClockData; -import com.uiui.os.bean.BaseResponse; -import com.uiui.os.network.URLAddress; +import com.uiui.aios.bean.AlarmClockData; +import com.uiui.aios.bean.BaseResponse; +import com.uiui.aios.network.URLAddress; import java.util.List; diff --git a/app/src/main/java/com/uiui/os/network/api/AppUsageRecordApi.java b/app/src/main/java/com/uiui/aios/network/api/AppUsageRecordApi.java similarity index 82% rename from app/src/main/java/com/uiui/os/network/api/AppUsageRecordApi.java rename to app/src/main/java/com/uiui/aios/network/api/AppUsageRecordApi.java index d159756..ed1e2a3 100644 --- a/app/src/main/java/com/uiui/os/network/api/AppUsageRecordApi.java +++ b/app/src/main/java/com/uiui/aios/network/api/AppUsageRecordApi.java @@ -1,7 +1,7 @@ -package com.uiui.os.network.api; +package com.uiui.aios.network.api; -import com.uiui.os.bean.BaseResponse; -import com.uiui.os.network.URLAddress; +import com.uiui.aios.bean.BaseResponse; +import com.uiui.aios.network.URLAddress; import io.reactivex.rxjava3.core.Observable; import retrofit2.http.Field; diff --git a/app/src/main/java/com/uiui/os/network/api/ArticleDetailsApi.java b/app/src/main/java/com/uiui/aios/network/api/ArticleDetailsApi.java similarity index 64% rename from app/src/main/java/com/uiui/os/network/api/ArticleDetailsApi.java rename to app/src/main/java/com/uiui/aios/network/api/ArticleDetailsApi.java index 57e2402..71b2145 100644 --- a/app/src/main/java/com/uiui/os/network/api/ArticleDetailsApi.java +++ b/app/src/main/java/com/uiui/aios/network/api/ArticleDetailsApi.java @@ -1,8 +1,8 @@ -package com.uiui.os.network.api; +package com.uiui.aios.network.api; -import com.uiui.os.bean.ArticleDetails; -import com.uiui.os.bean.BaseResponse; -import com.uiui.os.network.URLAddress; +import com.uiui.aios.bean.ArticleDetails; +import com.uiui.aios.bean.BaseResponse; +import com.uiui.aios.network.URLAddress; import io.reactivex.rxjava3.core.Observable; import retrofit2.http.GET; diff --git a/app/src/main/java/com/uiui/os/network/api/ArticleListApi.java b/app/src/main/java/com/uiui/aios/network/api/ArticleListApi.java similarity index 66% rename from app/src/main/java/com/uiui/os/network/api/ArticleListApi.java rename to app/src/main/java/com/uiui/aios/network/api/ArticleListApi.java index b4cdc6d..532e68b 100644 --- a/app/src/main/java/com/uiui/os/network/api/ArticleListApi.java +++ b/app/src/main/java/com/uiui/aios/network/api/ArticleListApi.java @@ -1,8 +1,8 @@ -package com.uiui.os.network.api; +package com.uiui.aios.network.api; -import com.uiui.os.bean.ArticleInfo; -import com.uiui.os.bean.BaseResponse; -import com.uiui.os.network.URLAddress; +import com.uiui.aios.bean.ArticleInfo; +import com.uiui.aios.bean.BaseResponse; +import com.uiui.aios.network.URLAddress; import java.util.List; diff --git a/app/src/main/java/com/uiui/os/network/api/DemandListApi.java b/app/src/main/java/com/uiui/aios/network/api/DemandListApi.java similarity index 72% rename from app/src/main/java/com/uiui/os/network/api/DemandListApi.java rename to app/src/main/java/com/uiui/aios/network/api/DemandListApi.java index aa7665d..2e2b156 100644 --- a/app/src/main/java/com/uiui/os/network/api/DemandListApi.java +++ b/app/src/main/java/com/uiui/aios/network/api/DemandListApi.java @@ -1,8 +1,8 @@ -package com.uiui.os.network.api; +package com.uiui.aios.network.api; -import com.uiui.os.bean.BaseResponse; -import com.uiui.os.bean.DemandBean; -import com.uiui.os.network.URLAddress; +import com.uiui.aios.bean.BaseResponse; +import com.uiui.aios.bean.DemandBean; +import com.uiui.aios.network.URLAddress; import java.util.List; diff --git a/app/src/main/java/com/uiui/os/network/api/GetDesktopApi.java b/app/src/main/java/com/uiui/aios/network/api/GetDesktopApi.java similarity index 56% rename from app/src/main/java/com/uiui/os/network/api/GetDesktopApi.java rename to app/src/main/java/com/uiui/aios/network/api/GetDesktopApi.java index 8bb4a21..0b4b6b6 100644 --- a/app/src/main/java/com/uiui/os/network/api/GetDesktopApi.java +++ b/app/src/main/java/com/uiui/aios/network/api/GetDesktopApi.java @@ -1,16 +1,13 @@ -package com.uiui.os.network.api; +package com.uiui.aios.network.api; -import com.uiui.os.bean.BaseResponse; -import com.uiui.os.bean.NetDesktopIcon; -import com.uiui.os.network.URLAddress; +import com.uiui.aios.bean.BaseResponse; +import com.uiui.aios.bean.NetDesktopIcon; +import com.uiui.aios.network.URLAddress; import java.util.List; import io.reactivex.rxjava3.core.Observable; -import retrofit2.http.Field; -import retrofit2.http.FormUrlEncoded; import retrofit2.http.GET; -import retrofit2.http.POST; import retrofit2.http.Query; public interface GetDesktopApi { diff --git a/app/src/main/java/com/uiui/os/network/api/GoodsDetailsApi.java b/app/src/main/java/com/uiui/aios/network/api/GoodsDetailsApi.java similarity index 57% rename from app/src/main/java/com/uiui/os/network/api/GoodsDetailsApi.java rename to app/src/main/java/com/uiui/aios/network/api/GoodsDetailsApi.java index 909c45c..3a0db76 100644 --- a/app/src/main/java/com/uiui/os/network/api/GoodsDetailsApi.java +++ b/app/src/main/java/com/uiui/aios/network/api/GoodsDetailsApi.java @@ -1,11 +1,8 @@ -package com.uiui.os.network.api; +package com.uiui.aios.network.api; -import com.uiui.os.bean.BaseResponse; -import com.uiui.os.bean.GoodsDetails; -import com.uiui.os.bean.GoodsInfo; -import com.uiui.os.network.URLAddress; - -import java.util.List; +import com.uiui.aios.bean.BaseResponse; +import com.uiui.aios.bean.GoodsDetails; +import com.uiui.aios.network.URLAddress; import io.reactivex.rxjava3.core.Observable; import retrofit2.http.GET; diff --git a/app/src/main/java/com/uiui/os/network/api/GoodsListApi.java b/app/src/main/java/com/uiui/aios/network/api/GoodsListApi.java similarity index 66% rename from app/src/main/java/com/uiui/os/network/api/GoodsListApi.java rename to app/src/main/java/com/uiui/aios/network/api/GoodsListApi.java index 266635d..fe7a5d7 100644 --- a/app/src/main/java/com/uiui/os/network/api/GoodsListApi.java +++ b/app/src/main/java/com/uiui/aios/network/api/GoodsListApi.java @@ -1,8 +1,8 @@ -package com.uiui.os.network.api; +package com.uiui.aios.network.api; -import com.uiui.os.bean.BaseResponse; -import com.uiui.os.bean.GoodsInfo; -import com.uiui.os.network.URLAddress; +import com.uiui.aios.bean.BaseResponse; +import com.uiui.aios.bean.GoodsInfo; +import com.uiui.aios.network.URLAddress; import java.util.List; diff --git a/app/src/main/java/com/uiui/os/network/api/HealthCodeApi.java b/app/src/main/java/com/uiui/aios/network/api/HealthCodeApi.java similarity index 66% rename from app/src/main/java/com/uiui/os/network/api/HealthCodeApi.java rename to app/src/main/java/com/uiui/aios/network/api/HealthCodeApi.java index 1c07478..db5b1e3 100644 --- a/app/src/main/java/com/uiui/os/network/api/HealthCodeApi.java +++ b/app/src/main/java/com/uiui/aios/network/api/HealthCodeApi.java @@ -1,8 +1,8 @@ -package com.uiui.os.network.api; +package com.uiui.aios.network.api; -import com.uiui.os.bean.BaseResponse; -import com.uiui.os.bean.HealthCode; -import com.uiui.os.network.URLAddress; +import com.uiui.aios.bean.BaseResponse; +import com.uiui.aios.bean.HealthCode; +import com.uiui.aios.network.URLAddress; import java.util.List; diff --git a/app/src/main/java/com/uiui/os/network/api/RunNewApp.java b/app/src/main/java/com/uiui/aios/network/api/RunNewApp.java similarity index 75% rename from app/src/main/java/com/uiui/os/network/api/RunNewApp.java rename to app/src/main/java/com/uiui/aios/network/api/RunNewApp.java index 9b2a14c..1bd4534 100644 --- a/app/src/main/java/com/uiui/os/network/api/RunNewApp.java +++ b/app/src/main/java/com/uiui/aios/network/api/RunNewApp.java @@ -1,7 +1,7 @@ -package com.uiui.os.network.api; +package com.uiui.aios.network.api; -import com.uiui.os.bean.BaseResponse; -import com.uiui.os.network.URLAddress; +import com.uiui.aios.bean.BaseResponse; +import com.uiui.aios.network.URLAddress; import io.reactivex.rxjava3.core.Observable; import retrofit2.http.Field; diff --git a/app/src/main/java/com/uiui/os/network/api/SOSRecordApi.java b/app/src/main/java/com/uiui/aios/network/api/SOSRecordApi.java similarity index 73% rename from app/src/main/java/com/uiui/os/network/api/SOSRecordApi.java rename to app/src/main/java/com/uiui/aios/network/api/SOSRecordApi.java index d5a83f9..64d9604 100644 --- a/app/src/main/java/com/uiui/os/network/api/SOSRecordApi.java +++ b/app/src/main/java/com/uiui/aios/network/api/SOSRecordApi.java @@ -1,7 +1,7 @@ -package com.uiui.os.network.api; +package com.uiui.aios.network.api; -import com.uiui.os.bean.BaseResponse; -import com.uiui.os.network.URLAddress; +import com.uiui.aios.bean.BaseResponse; +import com.uiui.aios.network.URLAddress; import io.reactivex.rxjava3.core.Observable; import retrofit2.http.Field; diff --git a/app/src/main/java/com/uiui/os/network/api/SendScreenshotApi.java b/app/src/main/java/com/uiui/aios/network/api/SendScreenshotApi.java similarity index 75% rename from app/src/main/java/com/uiui/os/network/api/SendScreenshotApi.java rename to app/src/main/java/com/uiui/aios/network/api/SendScreenshotApi.java index 7a93163..774d008 100644 --- a/app/src/main/java/com/uiui/os/network/api/SendScreenshotApi.java +++ b/app/src/main/java/com/uiui/aios/network/api/SendScreenshotApi.java @@ -1,10 +1,8 @@ -package com.uiui.os.network.api; +package com.uiui.aios.network.api; -import com.uiui.os.bean.BaseResponse; -import com.uiui.os.network.URLAddress; - -import java.util.Map; +import com.uiui.aios.bean.BaseResponse; +import com.uiui.aios.network.URLAddress; import io.reactivex.rxjava3.core.Observable; import okhttp3.MultipartBody; diff --git a/app/src/main/java/com/uiui/os/network/api/UpdateAlarmClockApi.java b/app/src/main/java/com/uiui/aios/network/api/UpdateAlarmClockApi.java similarity index 75% rename from app/src/main/java/com/uiui/os/network/api/UpdateAlarmClockApi.java rename to app/src/main/java/com/uiui/aios/network/api/UpdateAlarmClockApi.java index 49ba76b..3ffe26c 100644 --- a/app/src/main/java/com/uiui/os/network/api/UpdateAlarmClockApi.java +++ b/app/src/main/java/com/uiui/aios/network/api/UpdateAlarmClockApi.java @@ -1,7 +1,7 @@ -package com.uiui.os.network.api; +package com.uiui.aios.network.api; -import com.uiui.os.bean.BaseResponse; -import com.uiui.os.network.URLAddress; +import com.uiui.aios.bean.BaseResponse; +import com.uiui.aios.network.URLAddress; import io.reactivex.rxjava3.core.Observable; import retrofit2.http.Field; diff --git a/app/src/main/java/com/uiui/os/network/api/UpdateDesktopApi.java b/app/src/main/java/com/uiui/aios/network/api/UpdateDesktopApi.java similarity index 76% rename from app/src/main/java/com/uiui/os/network/api/UpdateDesktopApi.java rename to app/src/main/java/com/uiui/aios/network/api/UpdateDesktopApi.java index 4cd0b8c..034e387 100644 --- a/app/src/main/java/com/uiui/os/network/api/UpdateDesktopApi.java +++ b/app/src/main/java/com/uiui/aios/network/api/UpdateDesktopApi.java @@ -1,7 +1,7 @@ -package com.uiui.os.network.api; +package com.uiui.aios.network.api; -import com.uiui.os.bean.BaseResponse; -import com.uiui.os.network.URLAddress; +import com.uiui.aios.bean.BaseResponse; +import com.uiui.aios.network.URLAddress; import io.reactivex.rxjava3.core.Observable; import retrofit2.http.Field; diff --git a/app/src/main/java/com/uiui/os/receiver/BootReceiver.java b/app/src/main/java/com/uiui/aios/receiver/BootReceiver.java similarity index 97% rename from app/src/main/java/com/uiui/os/receiver/BootReceiver.java rename to app/src/main/java/com/uiui/aios/receiver/BootReceiver.java index 517f160..892a0e0 100644 --- a/app/src/main/java/com/uiui/os/receiver/BootReceiver.java +++ b/app/src/main/java/com/uiui/aios/receiver/BootReceiver.java @@ -1,4 +1,4 @@ -package com.uiui.os.receiver; +package com.uiui.aios.receiver; import android.content.BroadcastReceiver; import android.content.Context; @@ -6,7 +6,7 @@ import android.content.Intent; import android.text.TextUtils; import android.util.Log; -import com.uiui.os.service.main.MainService; +import com.uiui.aios.service.main.MainService; import java.util.concurrent.TimeUnit; diff --git a/app/src/main/java/com/uiui/os/receiver/InstallResultReceiver.java b/app/src/main/java/com/uiui/aios/receiver/InstallResultReceiver.java similarity index 98% rename from app/src/main/java/com/uiui/os/receiver/InstallResultReceiver.java rename to app/src/main/java/com/uiui/aios/receiver/InstallResultReceiver.java index 7f0cd06..94d2ed3 100644 --- a/app/src/main/java/com/uiui/os/receiver/InstallResultReceiver.java +++ b/app/src/main/java/com/uiui/aios/receiver/InstallResultReceiver.java @@ -1,4 +1,4 @@ -package com.uiui.os.receiver; +package com.uiui.aios.receiver; import android.content.BroadcastReceiver; import android.content.Context; diff --git a/app/src/main/java/com/uiui/os/service/AlarmService.java b/app/src/main/java/com/uiui/aios/service/AlarmService.java similarity index 89% rename from app/src/main/java/com/uiui/os/service/AlarmService.java rename to app/src/main/java/com/uiui/aios/service/AlarmService.java index 7128b79..9b4a0e1 100644 --- a/app/src/main/java/com/uiui/os/service/AlarmService.java +++ b/app/src/main/java/com/uiui/aios/service/AlarmService.java @@ -1,4 +1,4 @@ -package com.uiui.os.service; +package com.uiui.aios.service; import android.app.Service; import android.content.Intent; diff --git a/app/src/main/java/com/uiui/os/service/main/MainSContact.java b/app/src/main/java/com/uiui/aios/service/main/MainSContact.java similarity index 68% rename from app/src/main/java/com/uiui/os/service/main/MainSContact.java rename to app/src/main/java/com/uiui/aios/service/main/MainSContact.java index eb6af0c..9632b5a 100644 --- a/app/src/main/java/com/uiui/os/service/main/MainSContact.java +++ b/app/src/main/java/com/uiui/aios/service/main/MainSContact.java @@ -1,8 +1,8 @@ -package com.uiui.os.service.main; +package com.uiui.aios.service.main; -import com.uiui.os.base.BasePresenter; -import com.uiui.os.base.BaseView; -import com.uiui.os.bean.AlarmClockData; +import com.uiui.aios.base.BasePresenter; +import com.uiui.aios.base.BaseView; +import com.uiui.aios.bean.AlarmClockData; import java.util.List; diff --git a/app/src/main/java/com/uiui/os/service/main/MainSPresenter.java b/app/src/main/java/com/uiui/aios/service/main/MainSPresenter.java similarity index 92% rename from app/src/main/java/com/uiui/os/service/main/MainSPresenter.java rename to app/src/main/java/com/uiui/aios/service/main/MainSPresenter.java index 9c0eab8..1609b0c 100644 --- a/app/src/main/java/com/uiui/os/service/main/MainSPresenter.java +++ b/app/src/main/java/com/uiui/aios/service/main/MainSPresenter.java @@ -1,14 +1,14 @@ -package com.uiui.os.service.main; +package com.uiui.aios.service.main; import android.content.Context; import android.util.Log; import com.tencent.mmkv.MMKV; import com.trello.rxlifecycle4.android.ActivityEvent; -import com.uiui.os.bean.AlarmClockData; -import com.uiui.os.bean.BaseResponse; -import com.uiui.os.network.NetInterfaceManager; -import com.uiui.os.utils.AlarmUtils; +import com.uiui.aios.bean.AlarmClockData; +import com.uiui.aios.bean.BaseResponse; +import com.uiui.aios.network.NetInterfaceManager; +import com.uiui.aios.utils.AlarmUtils; import java.util.List; diff --git a/app/src/main/java/com/uiui/os/service/main/MainService.java b/app/src/main/java/com/uiui/aios/service/main/MainService.java similarity index 96% rename from app/src/main/java/com/uiui/os/service/main/MainService.java rename to app/src/main/java/com/uiui/aios/service/main/MainService.java index d54f5dc..91755ad 100644 --- a/app/src/main/java/com/uiui/os/service/main/MainService.java +++ b/app/src/main/java/com/uiui/aios/service/main/MainService.java @@ -1,4 +1,4 @@ -package com.uiui.os.service.main; +package com.uiui.aios.service.main; import android.annotation.SuppressLint; import android.content.BroadcastReceiver; @@ -15,18 +15,18 @@ import com.arialyy.annotations.Download; import com.arialyy.aria.core.Aria; import com.arialyy.aria.core.task.DownloadTask; import com.blankj.utilcode.util.NetworkUtils; -import com.uiui.os.BuildConfig; -import com.uiui.os.activity.NoticeActivity; -import com.uiui.os.base.BaseService; -import com.uiui.os.bean.AlarmClockData; -import com.uiui.os.bean.BaseResponse; -import com.uiui.os.network.NetInterfaceManager; -import com.uiui.os.utils.ApkUtils; -import com.uiui.os.utils.CmdUtil; -import com.uiui.os.utils.ForegroundAppUtil; -import com.uiui.os.utils.AppUsedTimeUtils; -import com.uiui.os.utils.ToastUtil; -import com.uiui.os.utils.Utils; +import com.uiui.aios.BuildConfig; +import com.uiui.aios.activity.NoticeActivity; +import com.uiui.aios.base.BaseService; +import com.uiui.aios.bean.AlarmClockData; +import com.uiui.aios.bean.BaseResponse; +import com.uiui.aios.network.NetInterfaceManager; +import com.uiui.aios.utils.ApkUtils; +import com.uiui.aios.utils.CmdUtil; +import com.uiui.aios.utils.ForegroundAppUtil; +import com.uiui.aios.utils.AppUsedTimeUtils; +import com.uiui.aios.utils.ToastUtil; +import com.uiui.aios.utils.Utils; import java.io.File; import java.io.FileNotFoundException; diff --git a/app/src/main/java/com/uiui/aios/tpush/Constants.java b/app/src/main/java/com/uiui/aios/tpush/Constants.java new file mode 100644 index 0000000..b838f48 --- /dev/null +++ b/app/src/main/java/com/uiui/aios/tpush/Constants.java @@ -0,0 +1,17 @@ +package com.uiui.aios.tpush; + +/** + * Created by chacewang on 2019/7/5. + */ + +public class Constants { + public static final int TEST_LOCAL_NOTIFICATION = 1; + public static final int TEST_NOTIFICATION = 2; + public static final int TEST_SET_TAG = 3; + public static final int TEST_DEL_TAG = 4; + public static final int TEST_SET_ACCOUNT = 5; + public static final int TEST_DEL_ACCOUNT = 6; + + public static final String LOCAL_NOTIFICATION_TITLE = "localtest"; + public static final String TEST_TAG_NAME = "DiagnosisTag"; +} diff --git a/app/src/main/java/com/uiui/aios/tpush/MessageReceiver.java b/app/src/main/java/com/uiui/aios/tpush/MessageReceiver.java new file mode 100644 index 0000000..ff447b9 --- /dev/null +++ b/app/src/main/java/com/uiui/aios/tpush/MessageReceiver.java @@ -0,0 +1,313 @@ +package com.uiui.aios.tpush; + +import android.content.ContentResolver; +import android.content.Context; +import android.content.Intent; +import android.content.pm.PackageManager; +import android.text.TextUtils; +import android.util.Log; +import android.widget.Toast; + +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; +import com.tencent.android.tpush.NotificationAction; +import com.tencent.android.tpush.XGPushBaseReceiver; +import com.tencent.android.tpush.XGPushClickedResult; +import com.tencent.android.tpush.XGPushRegisterResult; +import com.tencent.android.tpush.XGPushShowedResult; +import com.tencent.android.tpush.XGPushTextMessage; +import com.uiui.aios.tpush.common.NotificationService; +import com.uiui.aios.tpush.po.XGNotification; + +import java.text.SimpleDateFormat; +import java.util.Calendar; + +public class MessageReceiver extends XGPushBaseReceiver { + private static final String TAG = MessageReceiver.class.getSimpleName(); + + public static final String UPDATE_LISTVIEW_ACTION = "com.qq.xgdemo.activity.UPDATE_LISTVIEW"; + public static final String TEST_ACTION = "com.qq.xgdemo.activity.TEST_ACTION"; + public static final String LogTag = "xg.test"; + + + private Context mContext; + private ContentResolver mResolver; + private PackageManager mPackageManager; + + /** + * 消息透传处理 + * + * @param context + * @param message 解析自定义的 JSON + */ + @Override + public void onTextMessage(Context context, XGPushTextMessage message) { + this.mContext = context; + this.mResolver = context.getContentResolver(); + this.mPackageManager = context.getPackageManager(); + String text = "收到消息:" + message.toString(); + // 获取自定义key-value + String customContent = message.getCustomContent(); + if (customContent != null && customContent.length() != 0) { + JsonObject obj = JsonParser.parseString(customContent).getAsJsonObject(); + // key1为前台配置的key + if (!TextUtils.isEmpty(obj.get("key").getAsString())) { + String value = obj.get("key").getAsString(); + Log.d(LogTag, "get custom value:" + value); + } + // ... + } + // APP自主处理消息的过程... + Log.e(LogTag, text); + show(context, text); + processCustomMessage(context, message); + } + + /** + * 通知展示 + * + * @param context + * @param notifiShowedRlt 包含通知的内容 + */ + @Override + public void onNotificationShowedResult(Context context, XGPushShowedResult notifiShowedRlt) { + if (context == null || notifiShowedRlt == null) { + return; + } + XGNotification notific = new XGNotification(); + notific.setMsg_id(notifiShowedRlt.getMsgId()); + notific.setTitle(notifiShowedRlt.getTitle()); + notific.setContent(notifiShowedRlt.getContent()); + // notificationActionType==1为Activity，2为url，3为intent + notific.setNotificationActionType(notifiShowedRlt + .getNotificationActionType()); + // Activity,url,intent都可以通过getActivity()获得 + notific.setActivity(notifiShowedRlt.getActivity()); + notific.setUpdate_time(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss") + .format(Calendar.getInstance().getTime())); + NotificationService.getInstance(context).save(notific); + + Intent testIntent = new Intent(TEST_ACTION); + if (notifiShowedRlt.getTitle().equals(Constants.LOCAL_NOTIFICATION_TITLE)) { + testIntent.putExtra("step", Constants.TEST_LOCAL_NOTIFICATION); + } else { + testIntent.putExtra("step", Constants.TEST_NOTIFICATION); + } + context.sendBroadcast(testIntent); + + Intent viewIntent = new Intent(UPDATE_LISTVIEW_ACTION); + context.sendBroadcast(viewIntent); + show(context, "您有1条新消息, " + "通知被展示 ， " + notifiShowedRlt.toString()); + Log.d(LogTag, "您有1条新消息, " + "通知被展示 ， " + notifiShowedRlt.toString() + ", PushChannel:" + notifiShowedRlt.getPushChannel()); + } + + /** + * 注册回调 + * + * @param context + * @param errorCode 0 为成功，其它为错误码 + */ + @Override + public void onRegisterResult(Context context, int errorCode, XGPushRegisterResult message) { + if (context == null || message == null) { + return; + } + String text = ""; + if (errorCode == XGPushBaseReceiver.SUCCESS) { + // 在这里拿token + String token = message.getToken(); + text = "注册成功1. token：" + token; + } else { + text = message + "注册失败，错误码：" + errorCode; + } + Log.d(LogTag, text); + show(context, text); + } + + /** + * 反注册回调 + * + * @param context + * @param errorCode 0 为成功，其它为错误码 + */ + @Override + public void onUnregisterResult(Context context, int errorCode) { + if (context == null) { + return; + } + String text = ""; + if (errorCode == XGPushBaseReceiver.SUCCESS) { + text = "反注册成功"; + } else { + text = "反注册失败" + errorCode; + } + Log.d(LogTag, text); + show(context, text); + + } + + /** + * 设置标签回调 + * + * @param context + * @param errorCode 0 为成功，其它为错误码 + * @param tagName 设置的 TAG + */ + @Override + public void onSetTagResult(Context context, int errorCode, String tagName) { + if (context == null) { + return; + } + String text = ""; + if (errorCode == XGPushBaseReceiver.SUCCESS) { + text = "\"" + tagName + "\"设置成功"; + } else { + text = "\"" + tagName + "\"设置失败,错误码：" + errorCode; + } + Log.d(LogTag, text); + show(context, text); + + Intent testIntent = new Intent(TEST_ACTION); + testIntent.putExtra("step", Constants.TEST_SET_TAG); + context.sendBroadcast(testIntent); + } + + /** + * 删除标签的回调 + * + * @param context + * @param errorCode 0 为成功，其它为错误码 + * @param tagName 设置的 TAG + */ + @Override + public void onDeleteTagResult(Context context, int errorCode, String tagName) { + if (context == null) { + return; + } + String text = ""; + if (errorCode == XGPushBaseReceiver.SUCCESS) { + text = "\"" + tagName + "\"删除成功"; + } else { + text = "\"" + tagName + "\"删除失败,错误码：" + errorCode; + } + Log.d(LogTag, text); + show(context, text); + + Intent testIntent = new Intent(TEST_ACTION); + testIntent.putExtra("step", Constants.TEST_DEL_TAG); + context.sendBroadcast(testIntent); + } + + /** + * 设置账号回调 + * + * @param context + * @param errorCode 0 为成功，其它为错误码 + * @param account 设置的账号 + */ + @Override + public void onSetAccountResult(Context context, int errorCode, String account) { + Intent testIntent = new Intent(TEST_ACTION); + testIntent.putExtra("step", Constants.TEST_SET_ACCOUNT); + context.sendBroadcast(testIntent); + } + + + /** + * 删除账号回调 + * + * @param context + * @param errorCode 0 为成功，其它为错误码 + * @param account 设置的账号 + */ + @Override + public void onDeleteAccountResult(Context context, int errorCode, String account) { + Intent testIntent = new Intent(TEST_ACTION); + testIntent.putExtra("step", Constants.TEST_DEL_ACCOUNT); + context.sendBroadcast(testIntent); + } + + @Override + public void onSetAttributeResult(Context context, int i, String s) { + + } + + @Override + public void onDeleteAttributeResult(Context context, int i, String s) { + + } + + @Override + public void onQueryTagsResult(Context context, int errorCode, String data, String operateName) { + Log.i(LogTag, "action - onQueryTagsResult, errorCode:" + errorCode + ", operateName:" + operateName + ", data: " + data); + } + + /** + * 通知点击回调 actionType=1为该消息被清除，actionType=0为该消息被点击 + * + * @param context + * @param message 包含被点击通知的内容 + */ + @Override + public void onNotificationClickedResult(Context context, XGPushClickedResult message) { + if (context == null || message == null) { + return; + } + String text = ""; + if (message.getActionType() == NotificationAction.clicked.getType()) { + // 通知在通知栏被点击啦。。。。。 + // APP自己处理点击的相关动作 + // 这个动作可以在activity的onResume也能监听，请看第3点相关内容 + text = "通知被打开 :" + message; + } else if (message.getActionType() == NotificationAction.delete.getType()) { + // 通知被清除啦。。。。 + // APP自己处理通知被清除后的相关动作 + text = "通知被清除 :" + message; + } + Toast.makeText(context, "广播接收到通知被点击:" + message.toString(), + Toast.LENGTH_SHORT).show(); + // 获取自定义key-value + String customContent = message.getCustomContent(); + if (customContent != null && customContent.length() != 0) { + JsonObject obj = JsonParser.parseString(customContent).getAsJsonObject(); + // key1为前台配置的key + if (!TextUtils.isEmpty(obj.get("key").getAsString())) { + String value = obj.get("key").getAsString(); + Log.d(LogTag, "get custom value:" + value); + } + // ... + } + // APP自主处理的过程。。。 + Log.d(LogTag, text); + show(context, text); + } + + private void show(Context context, String text) { +// Toast.makeText(context, text, Toast.LENGTH_SHORT).show(); + } + + private int changeNum(int paramInt) { + return paramInt == 0 ? 1 : 0; + } + + private void processCustomMessage(Context context, XGPushTextMessage message) { + if (context == null || message == null) { + return; + } + + String title = message.getTitle(); + String content = message.getContent(); + JsonObject extrasJson = JsonParser.parseString(content).getAsJsonObject(); + + String extras = ""; + if (extrasJson.get("extras") != null) { + extras = extrasJson.get("extras").toString(); + } + + switch (title) { + default: + } + } + + +} diff --git a/app/src/main/java/com/uiui/aios/tpush/common/DBOpenHelper.java b/app/src/main/java/com/uiui/aios/tpush/common/DBOpenHelper.java new file mode 100644 index 0000000..fa225b4 --- /dev/null +++ b/app/src/main/java/com/uiui/aios/tpush/common/DBOpenHelper.java @@ -0,0 +1,23 @@ +package com.uiui.aios.tpush.common; + +import android.content.Context; +import android.database.sqlite.SQLiteDatabase; +import android.database.sqlite.SQLiteOpenHelper; + +public class DBOpenHelper extends SQLiteOpenHelper { + + public DBOpenHelper(Context context) { + super(context, "XGExample.db", null, 1); + } + + @Override + public void onCreate(SQLiteDatabase db) { + db.execSQL("CREATE TABLE notification (id integer primary key autoincrement,msg_id varchar(64),title varchar(128),activity varchar(256),notificationActionType varchar(512),content text,update_time varchar(16))"); + } + + @Override + public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { + + } + +} diff --git a/app/src/main/java/com/uiui/aios/tpush/common/NotificationService.java b/app/src/main/java/com/uiui/aios/tpush/common/NotificationService.java new file mode 100644 index 0000000..10344d1 --- /dev/null +++ b/app/src/main/java/com/uiui/aios/tpush/common/NotificationService.java @@ -0,0 +1,135 @@ +package com.uiui.aios.tpush.common; + +import android.content.ContentValues; +import android.content.Context; +import android.database.Cursor; +import android.database.sqlite.SQLiteDatabase; + + +import com.uiui.aios.tpush.po.XGNotification; + +import java.util.ArrayList; +import java.util.List; + +public class NotificationService { + private DBOpenHelper dbOpenHelper; + private static NotificationService instance = null; + + public NotificationService(Context context) { + this.dbOpenHelper = new DBOpenHelper(context); + } + + public synchronized static NotificationService getInstance(Context ctx) { + if (null == instance) { + instance = new NotificationService(ctx); + } + return instance; + } + + public void save(XGNotification notification) { + SQLiteDatabase db = dbOpenHelper.getWritableDatabase(); + ContentValues values = new ContentValues(); + values.put("msg_id", notification.getMsg_id()); + values.put("title", notification.getTitle()); + values.put("content", notification.getContent()); + values.put("activity", notification.getActivity()); + values.put("notificationActionType", notification.getNotificationActionType()); + values.put("update_time", notification.getUpdate_time()); + db.insert("notification", null, values); + } + + public void delete(Integer id) { + SQLiteDatabase db = dbOpenHelper.getWritableDatabase(); + db.delete("notification", "id=?", new String[] { id.toString() }); + } + + public void deleteAll() { + SQLiteDatabase db = dbOpenHelper.getWritableDatabase(); + db.delete("notification", "", null); + } + + public void update(XGNotification notification) { + SQLiteDatabase db = dbOpenHelper.getWritableDatabase(); + ContentValues values = new ContentValues(); + values.put("msg_id", notification.getMsg_id()); + values.put("title", notification.getTitle()); + values.put("content", notification.getContent()); + values.put("activity", notification.getActivity()); + values.put("notificationActionType", notification.getNotificationActionType()); + values.put("update_time", notification.getUpdate_time()); + db.update("notification", values, "id=?", new String[] { notification + .getId().toString() }); + } + + public XGNotification find(Integer id) { + SQLiteDatabase db = dbOpenHelper.getReadableDatabase(); + Cursor cursor = db + .query("notification", + new String[] { "id,msg_id,title,content,activity,notificationActionType,update_time" }, + "id=?", new String[] { id.toString() }, null, null, + null, "1"); + try { + if (cursor.moveToFirst()) { + return new XGNotification(cursor.getInt(cursor + .getColumnIndex("id")), cursor.getLong(cursor + .getColumnIndex("msg_id")), cursor.getString(cursor + .getColumnIndex("title")), cursor.getString(cursor + .getColumnIndex("content")), cursor.getString(cursor + .getColumnIndex("activity")), cursor.getInt(cursor + .getColumnIndex("notificationActionType")), cursor.getString(cursor + .getColumnIndex("update_time"))); + } + return null; + } finally { + cursor.close(); + } + } + + public List getScrollData(int currentPage, int lineSize, + String msg_id) { + String firstResult = String.valueOf((currentPage - 1) * lineSize); + SQLiteDatabase db = dbOpenHelper.getReadableDatabase(); + Cursor cursor = null; + try { + if (msg_id == null || "".equals(msg_id)) { + cursor = db + .query("notification", + new String[] { "id,msg_id,title,content,activity,notificationActionType,update_time" }, + null, null, null, null, "update_time DESC", + firstResult + "," + lineSize); + } else { + cursor = db + .query("notification", + new String[] { "id,msg_id,title,content,activity,notificationActionType,update_time" }, + "msg_id like ?", new String[] { msg_id + "%" }, + null, null, "update_time DESC", firstResult + + "," + lineSize); + } + List notifications = new ArrayList(); + while (cursor.moveToNext()) { + notifications.add(new XGNotification(cursor.getInt(cursor + .getColumnIndex("id")), cursor.getLong(cursor + .getColumnIndex("msg_id")), cursor.getString(cursor + .getColumnIndex("title")), cursor.getString(cursor + .getColumnIndex("content")), cursor.getString(cursor + .getColumnIndex("activity")), cursor.getInt(cursor + .getColumnIndex("notificationActionType")), cursor.getString(cursor + .getColumnIndex("update_time")))); + } + return notifications; + } finally { + cursor.close(); + } + } + + public int getCount() { + SQLiteDatabase db = dbOpenHelper.getReadableDatabase(); + Cursor cursor = db.rawQuery("select count(*) from notification", null); + try { + cursor.moveToFirst(); + return cursor.getInt(0); + } finally { + cursor.close(); + } + } +} diff --git a/app/src/main/java/com/uiui/aios/tpush/po/XGNotification.java b/app/src/main/java/com/uiui/aios/tpush/po/XGNotification.java new file mode 100644 index 0000000..c13e3d9 --- /dev/null +++ b/app/src/main/java/com/uiui/aios/tpush/po/XGNotification.java @@ -0,0 +1,83 @@ +package com.uiui.aios.tpush.po; + +public class XGNotification { + private Integer id; + private Long msg_id; + private String title; + private String content; + private String activity; + private int notificationActionType; + private String update_time; + + public XGNotification() { + + } + + public XGNotification(Integer id, Long msg_id, String title, + String content, String activity, int notificationActionType, String update_time) { + super(); + this.id = id; + this.msg_id = msg_id; + this.title = title; + this.content = content; + this.activity = activity; + this.notificationActionType = notificationActionType; + this.update_time = update_time; + } + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public Long getMsg_id() { + return msg_id; + } + + public void setMsg_id(Long msg_id) { + this.msg_id = msg_id; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getContent() { + return content; + } + + public void setContent(String content) { + this.content = content; + } + + public String getUpdate_time() { + return update_time; + } + + public void setUpdate_time(String update_time) { + this.update_time = update_time; + } + + public String getActivity() { + return activity; + } + + public void setActivity(String activity) { + this.activity = activity; + } + + public int getNotificationActionType() { + return notificationActionType; + } + + public void setNotificationActionType(int notificationActionType) { + this.notificationActionType = notificationActionType; + } +} diff --git a/app/src/main/java/com/uiui/os/utils/AlarmUtils.java b/app/src/main/java/com/uiui/aios/utils/AlarmUtils.java similarity index 98% rename from app/src/main/java/com/uiui/os/utils/AlarmUtils.java rename to app/src/main/java/com/uiui/aios/utils/AlarmUtils.java index 6f59cf9..0511a30 100644 --- a/app/src/main/java/com/uiui/os/utils/AlarmUtils.java +++ b/app/src/main/java/com/uiui/aios/utils/AlarmUtils.java @@ -1,4 +1,4 @@ -package com.uiui.os.utils; +package com.uiui.aios.utils; import android.annotation.SuppressLint; import android.app.AlarmManager; @@ -13,8 +13,8 @@ import com.blankj.utilcode.util.FileUtils; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.tencent.mmkv.MMKV; -import com.uiui.os.bean.AlarmClockData; -import com.uiui.os.service.main.MainService; +import com.uiui.aios.bean.AlarmClockData; +import com.uiui.aios.service.main.MainService; import java.io.File; import java.lang.reflect.Type; diff --git a/app/src/main/java/com/uiui/os/utils/AmapManager.java b/app/src/main/java/com/uiui/aios/utils/AmapManager.java similarity index 99% rename from app/src/main/java/com/uiui/os/utils/AmapManager.java rename to app/src/main/java/com/uiui/aios/utils/AmapManager.java index 5d25550..19d76b0 100644 --- a/app/src/main/java/com/uiui/os/utils/AmapManager.java +++ b/app/src/main/java/com/uiui/aios/utils/AmapManager.java @@ -1,4 +1,4 @@ -package com.uiui.os.utils; +package com.uiui.aios.utils; import android.annotation.SuppressLint; import android.content.Context; diff --git a/app/src/main/java/com/uiui/os/utils/ApkUtils.java b/app/src/main/java/com/uiui/aios/utils/ApkUtils.java similarity index 99% rename from app/src/main/java/com/uiui/os/utils/ApkUtils.java rename to app/src/main/java/com/uiui/aios/utils/ApkUtils.java index 1f1ed71..52cca54 100644 --- a/app/src/main/java/com/uiui/os/utils/ApkUtils.java +++ b/app/src/main/java/com/uiui/aios/utils/ApkUtils.java @@ -1,4 +1,4 @@ -package com.uiui.os.utils; +package com.uiui.aios.utils; import android.app.PendingIntent; import android.content.ComponentName; @@ -16,9 +16,9 @@ import android.util.Log; import androidx.annotation.RequiresApi; -import com.uiui.os.BuildConfig; -import com.uiui.os.bean.DesktopIcon; -import com.uiui.os.receiver.InstallResultReceiver; +import com.uiui.aios.BuildConfig; +import com.uiui.aios.bean.DesktopIcon; +import com.uiui.aios.receiver.InstallResultReceiver; import java.io.File; import java.lang.reflect.InvocationTargetException; diff --git a/app/src/main/java/com/uiui/os/utils/AppUsedTimeUtils.java b/app/src/main/java/com/uiui/aios/utils/AppUsedTimeUtils.java similarity index 99% rename from app/src/main/java/com/uiui/os/utils/AppUsedTimeUtils.java rename to app/src/main/java/com/uiui/aios/utils/AppUsedTimeUtils.java index f71755c..a632406 100644 --- a/app/src/main/java/com/uiui/os/utils/AppUsedTimeUtils.java +++ b/app/src/main/java/com/uiui/aios/utils/AppUsedTimeUtils.java @@ -1,4 +1,4 @@ -package com.uiui.os.utils; +package com.uiui.aios.utils; import android.annotation.SuppressLint; import android.content.Context; @@ -17,7 +17,6 @@ import java.lang.reflect.Type; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; -import java.util.List; public class AppUsedTimeUtils { private static final String TAG = AppUsedTimeUtils.class.getSimpleName(); diff --git a/app/src/main/java/com/uiui/os/utils/AppUtil.java b/app/src/main/java/com/uiui/aios/utils/AppUtil.java similarity index 99% rename from app/src/main/java/com/uiui/os/utils/AppUtil.java rename to app/src/main/java/com/uiui/aios/utils/AppUtil.java index 37bf8f0..b7ad46b 100644 --- a/app/src/main/java/com/uiui/os/utils/AppUtil.java +++ b/app/src/main/java/com/uiui/aios/utils/AppUtil.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.uiui.os.utils; +package com.uiui.aios.utils; import android.app.ActivityManager; diff --git a/app/src/main/java/com/uiui/os/utils/BitmapUtils.java b/app/src/main/java/com/uiui/aios/utils/BitmapUtils.java similarity index 98% rename from app/src/main/java/com/uiui/os/utils/BitmapUtils.java rename to app/src/main/java/com/uiui/aios/utils/BitmapUtils.java index 8c81422..b804413 100644 --- a/app/src/main/java/com/uiui/os/utils/BitmapUtils.java +++ b/app/src/main/java/com/uiui/aios/utils/BitmapUtils.java @@ -1,4 +1,4 @@ -package com.uiui.os.utils; +package com.uiui.aios.utils; import android.content.Context; import android.graphics.Bitmap; diff --git a/app/src/main/java/com/uiui/os/utils/CmdUtil.java b/app/src/main/java/com/uiui/aios/utils/CmdUtil.java similarity index 99% rename from app/src/main/java/com/uiui/os/utils/CmdUtil.java rename to app/src/main/java/com/uiui/aios/utils/CmdUtil.java index f717fb6..3dd5591 100644 --- a/app/src/main/java/com/uiui/os/utils/CmdUtil.java +++ b/app/src/main/java/com/uiui/aios/utils/CmdUtil.java @@ -1,4 +1,4 @@ -package com.uiui.os.utils; +package com.uiui.aios.utils; import android.text.TextUtils; import android.util.Log; diff --git a/app/src/main/java/com/uiui/os/utils/FileUtil.java b/app/src/main/java/com/uiui/aios/utils/FileUtil.java similarity index 98% rename from app/src/main/java/com/uiui/os/utils/FileUtil.java rename to app/src/main/java/com/uiui/aios/utils/FileUtil.java index f2f1306..b381e39 100644 --- a/app/src/main/java/com/uiui/os/utils/FileUtil.java +++ b/app/src/main/java/com/uiui/aios/utils/FileUtil.java @@ -1,4 +1,4 @@ -package com.uiui.os.utils; +package com.uiui.aios.utils; import android.text.TextUtils; diff --git a/app/src/main/java/com/uiui/os/utils/ForegroundAppUtil.java b/app/src/main/java/com/uiui/aios/utils/ForegroundAppUtil.java similarity index 99% rename from app/src/main/java/com/uiui/os/utils/ForegroundAppUtil.java rename to app/src/main/java/com/uiui/aios/utils/ForegroundAppUtil.java index 9b28c8e..fbcd566 100644 --- a/app/src/main/java/com/uiui/os/utils/ForegroundAppUtil.java +++ b/app/src/main/java/com/uiui/aios/utils/ForegroundAppUtil.java @@ -1,4 +1,4 @@ -package com.uiui.os.utils; +package com.uiui.aios.utils; import android.app.ActivityManager; import android.app.usage.UsageStats; diff --git a/app/src/main/java/com/uiui/os/utils/IconUtils.java b/app/src/main/java/com/uiui/aios/utils/IconUtils.java similarity index 99% rename from app/src/main/java/com/uiui/os/utils/IconUtils.java rename to app/src/main/java/com/uiui/aios/utils/IconUtils.java index e071a2e..22a1e6d 100644 --- a/app/src/main/java/com/uiui/os/utils/IconUtils.java +++ b/app/src/main/java/com/uiui/aios/utils/IconUtils.java @@ -1,4 +1,4 @@ -package com.uiui.os.utils; +package com.uiui.aios.utils; import android.util.Log; diff --git a/app/src/main/java/com/uiui/os/utils/MD5Util.java b/app/src/main/java/com/uiui/aios/utils/MD5Util.java similarity index 98% rename from app/src/main/java/com/uiui/os/utils/MD5Util.java rename to app/src/main/java/com/uiui/aios/utils/MD5Util.java index 371ed8b..ad473f5 100644 --- a/app/src/main/java/com/uiui/os/utils/MD5Util.java +++ b/app/src/main/java/com/uiui/aios/utils/MD5Util.java @@ -1,4 +1,4 @@ -package com.uiui.os.utils; +package com.uiui.aios.utils; import android.annotation.SuppressLint; diff --git a/app/src/main/java/com/uiui/os/utils/ScreenUtils.java b/app/src/main/java/com/uiui/aios/utils/ScreenUtils.java similarity index 97% rename from app/src/main/java/com/uiui/os/utils/ScreenUtils.java rename to app/src/main/java/com/uiui/aios/utils/ScreenUtils.java index 439c41e..06a8e7c 100644 --- a/app/src/main/java/com/uiui/os/utils/ScreenUtils.java +++ b/app/src/main/java/com/uiui/aios/utils/ScreenUtils.java @@ -1,4 +1,4 @@ -package com.uiui.os.utils; +package com.uiui.aios.utils; import android.content.Context; import android.content.res.Resources; diff --git a/app/src/main/java/com/uiui/os/utils/ToastUtil.java b/app/src/main/java/com/uiui/aios/utils/ToastUtil.java similarity index 97% rename from app/src/main/java/com/uiui/os/utils/ToastUtil.java rename to app/src/main/java/com/uiui/aios/utils/ToastUtil.java index 6aa0849..87fb3da 100644 --- a/app/src/main/java/com/uiui/os/utils/ToastUtil.java +++ b/app/src/main/java/com/uiui/aios/utils/ToastUtil.java @@ -1,4 +1,4 @@ -package com.uiui.os.utils; +package com.uiui.aios.utils; import android.annotation.SuppressLint; import android.content.Context; @@ -10,7 +10,7 @@ import android.util.Log; import android.widget.Toast; import com.blankj.utilcode.util.ToastUtils; -import com.uiui.os.BuildConfig; +import com.uiui.aios.BuildConfig; /** diff --git a/app/src/main/java/com/uiui/os/utils/Utils.java b/app/src/main/java/com/uiui/aios/utils/Utils.java similarity index 94% rename from app/src/main/java/com/uiui/os/utils/Utils.java rename to app/src/main/java/com/uiui/aios/utils/Utils.java index e9556fa..a846748 100644 --- a/app/src/main/java/com/uiui/os/utils/Utils.java +++ b/app/src/main/java/com/uiui/aios/utils/Utils.java @@ -1,4 +1,4 @@ -package com.uiui.os.utils; +package com.uiui.aios.utils; import android.annotation.SuppressLint; import android.content.Context; @@ -12,13 +12,10 @@ import android.util.Log; import androidx.core.content.ContextCompat; -import com.uiui.os.BuildConfig; +import com.uiui.aios.BuildConfig; import java.io.File; -import java.io.FileInputStream; import java.lang.reflect.Method; -import java.math.BigInteger; -import java.security.MessageDigest; public class Utils { /** diff --git a/app/src/main/java/com/uiui/os/view/CustomContent.java b/app/src/main/java/com/uiui/aios/view/CustomContent.java similarity index 98% rename from app/src/main/java/com/uiui/os/view/CustomContent.java rename to app/src/main/java/com/uiui/aios/view/CustomContent.java index 00eec53..4737752 100644 --- a/app/src/main/java/com/uiui/os/view/CustomContent.java +++ b/app/src/main/java/com/uiui/aios/view/CustomContent.java @@ -1,4 +1,4 @@ -package com.uiui.os.view; +package com.uiui.aios.view; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/uiui/os/view/CustomContentCallbacks.java b/app/src/main/java/com/uiui/aios/view/CustomContentCallbacks.java similarity index 95% rename from app/src/main/java/com/uiui/os/view/CustomContentCallbacks.java rename to app/src/main/java/com/uiui/aios/view/CustomContentCallbacks.java index 86778d5..dafaef8 100644 --- a/app/src/main/java/com/uiui/os/view/CustomContentCallbacks.java +++ b/app/src/main/java/com/uiui/aios/view/CustomContentCallbacks.java @@ -1,4 +1,4 @@ -package com.uiui.os.view; +package com.uiui.aios.view; // add by codemx.cn ---- 20190712 ---plus- start diff --git a/app/src/main/java/com/uiui/os/view/HorizontalItemDecoration.java b/app/src/main/java/com/uiui/aios/view/HorizontalItemDecoration.java similarity index 97% rename from app/src/main/java/com/uiui/os/view/HorizontalItemDecoration.java rename to app/src/main/java/com/uiui/aios/view/HorizontalItemDecoration.java index 831fca0..afd8b97 100644 --- a/app/src/main/java/com/uiui/os/view/HorizontalItemDecoration.java +++ b/app/src/main/java/com/uiui/aios/view/HorizontalItemDecoration.java @@ -1,4 +1,4 @@ -package com.uiui.os.view; +package com.uiui.aios.view; import android.content.Context; import android.graphics.Rect; diff --git a/app/src/main/java/com/uiui/os/view/JzvdStdAssert.java b/app/src/main/java/com/uiui/aios/view/JzvdStdAssert.java similarity index 98% rename from app/src/main/java/com/uiui/os/view/JzvdStdAssert.java rename to app/src/main/java/com/uiui/aios/view/JzvdStdAssert.java index a82e14e..ecc960d 100644 --- a/app/src/main/java/com/uiui/os/view/JzvdStdAssert.java +++ b/app/src/main/java/com/uiui/aios/view/JzvdStdAssert.java @@ -1,4 +1,4 @@ -package com.uiui.os.view; +package com.uiui.aios.view; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/uiui/os/view/MyGridLayout.java b/app/src/main/java/com/uiui/aios/view/MyGridLayout.java similarity index 97% rename from app/src/main/java/com/uiui/os/view/MyGridLayout.java rename to app/src/main/java/com/uiui/aios/view/MyGridLayout.java index 65379c7..bff1a0d 100644 --- a/app/src/main/java/com/uiui/os/view/MyGridLayout.java +++ b/app/src/main/java/com/uiui/aios/view/MyGridLayout.java @@ -1,17 +1,15 @@ -package com.uiui.os.view; +package com.uiui.aios.view; import android.annotation.SuppressLint; import android.content.Context; -import android.content.pm.ApplicationInfo; import android.content.res.TypedArray; import android.util.AttributeSet; -import android.util.Log; import android.view.View; import android.view.ViewGroup; -import com.uiui.os.R; -import com.uiui.os.bean.DesktopIcon; +import com.uiui.aios.R; +import com.uiui.aios.bean.DesktopIcon; import java.util.ArrayList; diff --git a/app/src/main/java/com/uiui/os/view/RecyclerItemDecoration.java b/app/src/main/java/com/uiui/aios/view/RecyclerItemDecoration.java similarity index 97% rename from app/src/main/java/com/uiui/os/view/RecyclerItemDecoration.java rename to app/src/main/java/com/uiui/aios/view/RecyclerItemDecoration.java index e9aa81c..4efb0c2 100644 --- a/app/src/main/java/com/uiui/os/view/RecyclerItemDecoration.java +++ b/app/src/main/java/com/uiui/aios/view/RecyclerItemDecoration.java @@ -1,4 +1,4 @@ -package com.uiui.os.view; +package com.uiui.aios.view; import android.graphics.Rect; import android.view.View; diff --git a/app/src/main/java/com/uiui/os/view/RecyclerViewSpacesItemDecoration.java b/app/src/main/java/com/uiui/aios/view/RecyclerViewSpacesItemDecoration.java similarity index 98% rename from app/src/main/java/com/uiui/os/view/RecyclerViewSpacesItemDecoration.java rename to app/src/main/java/com/uiui/aios/view/RecyclerViewSpacesItemDecoration.java index 7983415..ed8f17d 100644 --- a/app/src/main/java/com/uiui/os/view/RecyclerViewSpacesItemDecoration.java +++ b/app/src/main/java/com/uiui/aios/view/RecyclerViewSpacesItemDecoration.java @@ -1,4 +1,4 @@ -package com.uiui.os.view; +package com.uiui.aios.view; import android.graphics.Rect; import android.view.View; diff --git a/app/src/main/java/com/uiui/os/view/ScaleCircleNavigator.java b/app/src/main/java/com/uiui/aios/view/ScaleCircleNavigator.java similarity index 99% rename from app/src/main/java/com/uiui/os/view/ScaleCircleNavigator.java rename to app/src/main/java/com/uiui/aios/view/ScaleCircleNavigator.java index f810d5d..0eb58d5 100644 --- a/app/src/main/java/com/uiui/os/view/ScaleCircleNavigator.java +++ b/app/src/main/java/com/uiui/aios/view/ScaleCircleNavigator.java @@ -1,4 +1,4 @@ -package com.uiui.os.view; +package com.uiui.aios.view; import android.content.Context; import android.graphics.Canvas; diff --git a/app/src/main/res/layout-land/fragment_custom.xml b/app/src/main/res/layout-land/fragment_custom.xml index 997d023..2c94caa 100644 --- a/app/src/main/res/layout-land/fragment_custom.xml +++ b/app/src/main/res/layout-land/fragment_custom.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout-port/fragment_custom.xml b/app/src/main/res/layout-port/fragment_custom.xml index 10b4fa8..c319341 100644 --- a/app/src/main/res/layout-port/fragment_custom.xml +++ b/app/src/main/res/layout-port/fragment_custom.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_notice.xml b/app/src/main/res/layout/activity_notice.xml index e6f89ac..5ef94e6 100644 --- a/app/src/main/res/layout/activity_notice.xml +++ b/app/src/main/res/layout/activity_notice.xml @@ -58,7 +58,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/cl_voice"> - diff --git a/app/src/main/res/layout/fragment_applist.xml b/app/src/main/res/layout/fragment_applist.xml index 2b8c644..cbb612c 100644 --- a/app/src/main/res/layout/fragment_applist.xml +++ b/app/src/main/res/layout/fragment_applist.xml @@ -6,7 +6,7 @@ android:layout_height="match_parent" tools:context=".fragment.AppListFragment"> - Testing documentation + */ +public class ExampleUnitTest { + @Test + public void addition_isCorrect() { + assertEquals(4, 2 + 2); + } +} \ No newline at end of file diff --git a/app/tpns-configs.json b/app/tpns-configs.json new file mode 100644 index 0000000..b27cd81 --- /dev/null +++ b/app/tpns-configs.json @@ -0,0 +1,14 @@ +{ + "tpns": { + "access_id": "1500030457", + "access_key": "AZZXANJF4HBD" + }, + "com.uiui.aios": { + "channel": { + "enable": true + } + }, + "debug": false, + "version": "1.3.3.3-release", + "upgrade": true +} \ No newline at end of file diff --git a/build.gradle b/build.gradle index ea6dd8d..8d26a1d 100644 --- a/build.gradle +++ b/build.gradle @@ -1,15 +1,17 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - + repositories { google() jcenter() maven { url "https://jitpack.io" } + mavenCentral() + maven { url 'http://developer.huawei.com/repo/' } } dependencies { classpath 'com.android.tools.build:gradle:3.6.4' - + classpath "com.tencent.android.tpns:tpnsplugin:1.8.0" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -21,6 +23,8 @@ allprojects { google() jcenter() maven { url "https://jitpack.io" } + mavenCentral() + maven { url 'http://developer.huawei.com/repo/' } } gradle.projectsEvaluated { tasks.withType(JavaCompile) {