From 3250e9f7a0e6db03e90a8daaa1839e65656515aa Mon Sep 17 00:00:00 2001 From: tongtongstudio Date: Wed, 2 Apr 2025 17:37:50 +0800 Subject: [PATCH] =?UTF-8?q?version:1.1.9=20bugfixes:=20update:=E4=BF=AE?= =?UTF-8?q?=E6=94=B9aidl=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 4 +-- .../aidl/com/uiui/sn/IGetInfoInterface.aidl | 31 ------------------- .../aidl/com/uiui/sn/IUiUiSnInterface.aidl | 24 ++++++++++++++ .../com/uiui/sn/manager/RemoteManager.java | 27 ++++++++-------- 4 files changed, 40 insertions(+), 46 deletions(-) delete mode 100644 app/src/uiui/aidl/com/uiui/sn/IGetInfoInterface.aidl create mode 100644 app/src/uiui/aidl/com/uiui/sn/IUiUiSnInterface.aidl diff --git a/app/build.gradle b/app/build.gradle index c9cde8a..acb284b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,8 +16,8 @@ android { applicationId "com.uiui.videoplayer" minSdkVersion 24 targetSdkVersion 28 - versionCode 118 - versionName "1.1.7" + versionCode 119 + versionName "1.1.9" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/uiui/aidl/com/uiui/sn/IGetInfoInterface.aidl b/app/src/uiui/aidl/com/uiui/sn/IGetInfoInterface.aidl deleted file mode 100644 index 912a7db..0000000 --- a/app/src/uiui/aidl/com/uiui/sn/IGetInfoInterface.aidl +++ /dev/null @@ -1,31 +0,0 @@ -// IGetInfoInterface.aidl -package com.uiui.sn; - -// Declare any non-default types here with import statements - -interface IGetInfoInterface { - /** - * Demonstrates some basic types that you can use as parameters - * and return values in AIDL. - */ - void basicTypes(int anInt, long aLong, boolean aBoolean, float aFloat, - double aDouble, String aString); - - //获取sn - String getSerial(); - //获取用户信息 - String getUserInfo(); - //获取隐藏APP - List getHideAPP(); - //获取禁止打开的APP - List getForbidAPP(); - - //获取app设置 - String getAppTimeControl(); - //获取整机设置 - String getSnTimeControl(); - //获取系统设置 - String getSetting(); - //获取定位结果 - String getMapResult(); -} diff --git a/app/src/uiui/aidl/com/uiui/sn/IUiUiSnInterface.aidl b/app/src/uiui/aidl/com/uiui/sn/IUiUiSnInterface.aidl new file mode 100644 index 0000000..d171504 --- /dev/null +++ b/app/src/uiui/aidl/com/uiui/sn/IUiUiSnInterface.aidl @@ -0,0 +1,24 @@ +// IUiUiSnInterface.aidl +package com.uiui.sn; + +// Declare any non-default types here with import statements + +interface IUiUiSnInterface { + /** + * Demonstrates some basic types that you can use as parameters + * and return values in AIDL. + */ + void basicTypes(int anInt, long aLong, boolean aBoolean, float aFloat, + double aDouble, String aString); + + //获取sn + String getSerial(); + //模拟返回键 + void keyBack(); + //设置为默认桌面 + void setDefaultLauncher(String pkg, String className); + //退出桌面 + void exitDesktop(); + //获取激活码 + String getActivationCode(); +} diff --git a/app/src/uiui/java/com/uiui/sn/manager/RemoteManager.java b/app/src/uiui/java/com/uiui/sn/manager/RemoteManager.java index 642a149..1df6f7d 100644 --- a/app/src/uiui/java/com/uiui/sn/manager/RemoteManager.java +++ b/app/src/uiui/java/com/uiui/sn/manager/RemoteManager.java @@ -11,7 +11,7 @@ import android.text.TextUtils; import android.util.Log; import com.tencent.mmkv.MMKV; -import com.uiui.sn.IGetInfoInterface; +import com.uiui.sn.IUiUiSnInterface; import com.uiui.videoplayer.BuildConfig; import com.uiui.videoplayer.config.CommonConfig; @@ -31,7 +31,7 @@ public class RemoteManager { private static RemoteManager sInstance; private Context mContext; private MMKV mMMKV = MMKV.mmkvWithID(CommonConfig.MMKV_ID, MMKV.MULTI_PROCESS_MODE); - private IGetInfoInterface mIGetInfoInterface; + private IUiUiSnInterface mIUiUiSnInterface; private ServiceConnection mServiceConnection; private RemoteManager(Context context) { @@ -44,12 +44,12 @@ public class RemoteManager { public void onServiceConnected(ComponentName name, IBinder service) { Log.e(TAG, "onServiceConnected: " + name); mServiceConnected = true; - mIGetInfoInterface = IGetInfoInterface.Stub.asInterface(service); + for (ConnectedListener listener : mListeners) { + listener.onConnected(); + } + mIUiUiSnInterface = IUiUiSnInterface.Stub.asInterface(service); try { - for (ConnectedListener listener : mListeners) { - listener.onConnected(); - } - String sn = mIGetInfoInterface.getSerial(); + String sn = mIUiUiSnInterface.getSerial(); if (!TextUtils.isEmpty(sn)) { mMMKV.encode(serialKey, sn); Log.e(TAG, "onServiceConnected: sn = " + sn); @@ -63,11 +63,12 @@ public class RemoteManager { @Override public void onServiceDisconnected(ComponentName name) { Log.e(TAG, "onServiceDisconnected: " + name); - mIGetInfoInterface = null; + mServiceConnected = false; + mIUiUiSnInterface = null; bindinfoService(); } }; - if (mIGetInfoInterface == null) { + if (mIUiUiSnInterface == null) { bindinfoService(); } } @@ -89,10 +90,10 @@ public class RemoteManager { private static final String AOLEYUNINFO_PACKAGE_NAME = "com.uiui.sn"; private static final String AOLEYUNINFO_CLASS_NAME = "com.uiui.sn.service.RemoteService"; - private static final String AOLEYUNINFO_ACTION = "com.uiui.sn.IGetInfoInterface"; + private static final String AOLEYUNINFO_ACTION = "com.uiui.sn.IUiUiSnInterface"; public void checkAvailable() { - if (mIGetInfoInterface == null) { + if (mIUiUiSnInterface == null) { bindinfoService(); } } @@ -129,12 +130,12 @@ public class RemoteManager { } String sn = mMMKV.decodeString(serialKey, ""); Log.e(TAG, "sn: " + sn); - if (mIGetInfoInterface == null) { + if (mIUiUiSnInterface == null) { bindinfoService(); return sn; } try { - String serial = mIGetInfoInterface.getSerial(); + String serial = mIUiUiSnInterface.getSerial(); Log.e(TAG, "getSerial: " + serial); return serial; } catch (RemoteException e) {