diff --git a/build.gradle b/build.gradle index 38e0046..59e6171 100644 --- a/build.gradle +++ b/build.gradle @@ -57,8 +57,8 @@ android { defaultConfig { minSdkVersion 26 targetSdkVersion 28 - versionCode 9 - versionName "1.8" + versionCode 10 + versionName "1.9" ndk { //选择要添加的对应 cpu 类型的 .so 库。 abiFilters 'armeabi', 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64' diff --git a/res/drawable-hdpi/com_android_appstore.png b/res/drawable-hdpi/com_android_appstore.png index 3e9a2a2..cfc37e9 100644 Binary files a/res/drawable-hdpi/com_android_appstore.png and b/res/drawable-hdpi/com_android_appstore.png differ diff --git a/res/drawable-hdpi/com_android_browser.png b/res/drawable-hdpi/com_android_browser.png index 4de3d1c..28d243b 100644 Binary files a/res/drawable-hdpi/com_android_browser.png and b/res/drawable-hdpi/com_android_browser.png differ diff --git a/res/drawable-hdpi/com_android_calculator2.png b/res/drawable-hdpi/com_android_calculator2.png index 0b4844d..1de3635 100644 Binary files a/res/drawable-hdpi/com_android_calculator2.png and b/res/drawable-hdpi/com_android_calculator2.png differ diff --git a/res/drawable-hdpi/com_android_calendar.png b/res/drawable-hdpi/com_android_calendar.png index 1781527..1119ba1 100644 Binary files a/res/drawable-hdpi/com_android_calendar.png and b/res/drawable-hdpi/com_android_calendar.png differ diff --git a/res/drawable-hdpi/com_android_camera.png b/res/drawable-hdpi/com_android_camera.png index ceecdde..a6397d1 100644 Binary files a/res/drawable-hdpi/com_android_camera.png and b/res/drawable-hdpi/com_android_camera.png differ diff --git a/res/drawable-hdpi/com_android_clean.png b/res/drawable-hdpi/com_android_clean.png index a76249d..194da2c 100644 Binary files a/res/drawable-hdpi/com_android_clean.png and b/res/drawable-hdpi/com_android_clean.png differ diff --git a/res/drawable-hdpi/com_android_contacts.png b/res/drawable-hdpi/com_android_contacts.png index db1d2f4..35970d2 100644 Binary files a/res/drawable-hdpi/com_android_contacts.png and b/res/drawable-hdpi/com_android_contacts.png differ diff --git a/res/drawable-hdpi/com_android_deskclock.png b/res/drawable-hdpi/com_android_deskclock.png index dc21551..9fbacbb 100644 Binary files a/res/drawable-hdpi/com_android_deskclock.png and b/res/drawable-hdpi/com_android_deskclock.png differ diff --git a/res/drawable-hdpi/com_android_dialer.png b/res/drawable-hdpi/com_android_dialer.png index 6e36b4b..335090a 100644 Binary files a/res/drawable-hdpi/com_android_dialer.png and b/res/drawable-hdpi/com_android_dialer.png differ diff --git a/res/drawable-hdpi/com_android_email.png b/res/drawable-hdpi/com_android_email.png index e40e0b2..2eb7a70 100644 Binary files a/res/drawable-hdpi/com_android_email.png and b/res/drawable-hdpi/com_android_email.png differ diff --git a/res/drawable-hdpi/com_android_gallery3d_app.png b/res/drawable-hdpi/com_android_gallery3d_app.png index 56a935b..98e484f 100644 Binary files a/res/drawable-hdpi/com_android_gallery3d_app.png and b/res/drawable-hdpi/com_android_gallery3d_app.png differ diff --git a/res/drawable-hdpi/com_android_mms_ui.png b/res/drawable-hdpi/com_android_mms_ui.png index 085a66a..9f62b91 100644 Binary files a/res/drawable-hdpi/com_android_mms_ui.png and b/res/drawable-hdpi/com_android_mms_ui.png differ diff --git a/res/drawable-hdpi/com_android_music.png b/res/drawable-hdpi/com_android_music.png index b65405f..8beb546 100644 Binary files a/res/drawable-hdpi/com_android_music.png and b/res/drawable-hdpi/com_android_music.png differ diff --git a/res/drawable-hdpi/com_android_providers_downloads_ui.png b/res/drawable-hdpi/com_android_providers_downloads_ui.png index 3673546..55cd1e9 100644 Binary files a/res/drawable-hdpi/com_android_providers_downloads_ui.png and b/res/drawable-hdpi/com_android_providers_downloads_ui.png differ diff --git a/res/drawable-hdpi/com_android_quicksearchbox.png b/res/drawable-hdpi/com_android_quicksearchbox.png index 0312c4c..fd8b051 100644 Binary files a/res/drawable-hdpi/com_android_quicksearchbox.png and b/res/drawable-hdpi/com_android_quicksearchbox.png differ diff --git a/res/drawable-hdpi/com_android_settings.png b/res/drawable-hdpi/com_android_settings.png index bce6eb3..e3ef259 100644 Binary files a/res/drawable-hdpi/com_android_settings.png and b/res/drawable-hdpi/com_android_settings.png differ diff --git a/res/drawable-hdpi/com_android_soundrecorder.png b/res/drawable-hdpi/com_android_soundrecorder.png index 99a8438..34a2ddd 100644 Binary files a/res/drawable-hdpi/com_android_soundrecorder.png and b/res/drawable-hdpi/com_android_soundrecorder.png differ diff --git a/res/drawable-hdpi/com_android_stk_stkmain.png b/res/drawable-hdpi/com_android_stk_stkmain.png index 9812360..0c460cc 100644 Binary files a/res/drawable-hdpi/com_android_stk_stkmain.png and b/res/drawable-hdpi/com_android_stk_stkmain.png differ diff --git a/res/drawable-hdpi/com_android_vdieo.png b/res/drawable-hdpi/com_android_vdieo.png index 92eaf78..d292dfd 100644 Binary files a/res/drawable-hdpi/com_android_vdieo.png and b/res/drawable-hdpi/com_android_vdieo.png differ diff --git a/res/drawable-hdpi/com_mediatek_filemanager.png b/res/drawable-hdpi/com_mediatek_filemanager.png index b020449..02a37cd 100644 Binary files a/res/drawable-hdpi/com_mediatek_filemanager.png and b/res/drawable-hdpi/com_mediatek_filemanager.png differ diff --git a/res/drawable-hdpi/com_mediatek_fmradio.png b/res/drawable-hdpi/com_mediatek_fmradio.png index c47e2ed..6eaf599 100644 Binary files a/res/drawable-hdpi/com_mediatek_fmradio.png and b/res/drawable-hdpi/com_mediatek_fmradio.png differ diff --git a/src/com/aoleyun/os/TTUtils/APKUtils.java b/src/com/aoleyun/os/TTUtils/APKUtils.java index a2e2bd0..b12756a 100644 --- a/src/com/aoleyun/os/TTUtils/APKUtils.java +++ b/src/com/aoleyun/os/TTUtils/APKUtils.java @@ -118,6 +118,18 @@ public class APKUtils { return versionName; } + public static String getAppNameByPackage(Context context, String pkg) { + PackageManager packageManager = context.getPackageManager(); + try { + ApplicationInfo applicationInfo = packageManager.getApplicationInfo(pkg, PackageManager.GET_META_DATA); + String packageName = packageManager.getApplicationLabel(applicationInfo).toString(); + return packageName; + } catch (PackageManager.NameNotFoundException e) { + e.printStackTrace(); + } + return ""; + } + public static void installApp(Context context, String filePath) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) { installAppatPie(context, filePath); diff --git a/src/com/aoleyun/os/network/HTTPInterface.java b/src/com/aoleyun/os/network/HTTPInterface.java index 17d162f..395f354 100644 --- a/src/com/aoleyun/os/network/HTTPInterface.java +++ b/src/com/aoleyun/os/network/HTTPInterface.java @@ -124,6 +124,8 @@ public class HTTPInterface { jsonObject.addProperty("app_package", packageName); jsonObject.addProperty("version_name", APKUtils.getAPPVersionName(context, packageName)); jsonObject.addProperty("run_time", time / 1000); + jsonObject.addProperty("app_name", APKUtils.getAppNameByPackage(context, packageName)); + jsonObject.addProperty("status", 1); String jsonString = jsonObject.toString(); NetworkManager.getInstance().getRunningAppObservable(jsonString) .subscribe(new Observer() { diff --git a/src/com/aoleyun/os/network/URLPath.java b/src/com/aoleyun/os/network/URLPath.java index 62c71da..08e13c6 100644 --- a/src/com/aoleyun/os/network/URLPath.java +++ b/src/com/aoleyun/os/network/URLPath.java @@ -3,6 +3,7 @@ package com.aoleyun.os.network; public class URLPath { public static final String ROOT_URL = "https://led.aoleyun.cn/api/"; public static final String APP_LOG = "app/addAppLog"; + //获取正在运行的app public static final String RUN_NEW_APP = "And/runNewApp"; //更新 public final static String GET_NEWESTAPPUPDATE = "Silent/silent";