diff --git a/app/build.gradle b/app/build.gradle index 8b41c97..851cbae 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.android.application' def appName() { - return "XwadOS" + return "XwadOSNeutral" } def releaseTime() { @@ -59,6 +59,10 @@ android { exclude 'META-INF/LICENSE.txt' exclude 'META-INF/NOTICE.txt' } + + manifestPlaceholders = [ + AMAP_KEY: "db082446a68db8e3ffdc8277313c2e6a" + ] } externalNativeBuild { @@ -86,9 +90,6 @@ android { //Zipalign优化 zipAlignEnabled true buildConfigField "String", "platform", '"tuixin"' - manifestPlaceholders = [ - AMAP_KEY: "9c9fabf3934df224e927b2f9fbc51064" - ] signingConfig signingConfigs.tuixin applicationVariants.all { variant -> variant.outputs.each { output -> @@ -110,9 +111,6 @@ android { //签名 signingConfig signingConfigs.tuixin buildConfigField "String", "platform", '"tuixin"' - manifestPlaceholders = [ - AMAP_KEY: "9c9fabf3934df224e927b2f9fbc51064" - ] // 将release版本的包名重命名，加上版本及日期 applicationVariants.all { variant -> variant.outputs.each { output -> @@ -131,7 +129,6 @@ android { dependencies { // implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation files('libs/CSDK_TBY11_AiYouDu_250312.jar') compileOnly files('libs/framework.jar') implementation project(path: ':niceimageview') implementation project(path: ':FlycoTabLayoutZ_Lib') diff --git a/app/libs/CSDK_TBY11_AiYouDu_250312.jar b/app/libs/CSDK_TBY11_AiYouDu_250312.jar deleted file mode 100644 index abff99a..0000000 Binary files a/app/libs/CSDK_TBY11_AiYouDu_250312.jar and /dev/null differ diff --git a/app/src/main/java/com/xwad/os/activity/edit/EditActivity.java b/app/src/main/java/com/xwad/os/activity/edit/EditActivity.java index 784d9da..df8214e 100644 --- a/app/src/main/java/com/xwad/os/activity/edit/EditActivity.java +++ b/app/src/main/java/com/xwad/os/activity/edit/EditActivity.java @@ -14,9 +14,7 @@ import com.xwad.os.base.mvvm.BaseMvvmActivity; import com.xwad.os.config.CommonConfig; import com.xwad.os.databinding.ActivityEditBinding; import com.xwad.os.manager.DeviceSNManager; -import com.xwad.os.manager.RemoteManager; import com.xwad.os.utils.ActivationUtil; -import com.xwad.os.utils.LenovoCsdkUtil; import java.util.HashMap; import java.util.Map; diff --git a/app/src/main/java/com/xwad/os/activity/home/HomeViewModel.java b/app/src/main/java/com/xwad/os/activity/home/HomeViewModel.java index 2fcbe6a..6eff509 100644 --- a/app/src/main/java/com/xwad/os/activity/home/HomeViewModel.java +++ b/app/src/main/java/com/xwad/os/activity/home/HomeViewModel.java @@ -150,8 +150,8 @@ public class HomeViewModel extends BaseViewModel { diff --git a/app/src/main/java/com/xwad/os/fragment/usercenter/device/DeviceViewModel.java b/app/src/main/java/com/xwad/os/fragment/usercenter/device/DeviceViewModel.java index 76bceee..e2fc107 100644 --- a/app/src/main/java/com/xwad/os/fragment/usercenter/device/DeviceViewModel.java +++ b/app/src/main/java/com/xwad/os/fragment/usercenter/device/DeviceViewModel.java @@ -55,8 +55,8 @@ public class DeviceViewModel extends BaseViewModel> getCheckUpdateObservable(String pkg) { return mUiuiosRetrofit.create(CheckUpdateApi.class) .checkUpdate(pkg) diff --git a/app/src/main/java/com/xwad/os/utils/LenovoCsdkUtil.java b/app/src/main/java/com/xwad/os/utils/LenovoCsdkUtil.java deleted file mode 100644 index 2b9a141..0000000 --- a/app/src/main/java/com/xwad/os/utils/LenovoCsdkUtil.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.xwad.os.utils; - -import android.annotation.SuppressLint; -import android.app.csdk.CSDKManager; -import android.content.Context; -import android.util.Log; - -import com.tencent.mmkv.MMKV; -import com.xwad.os.BuildConfig; -import com.xwad.os.config.CommonConfig; - -public class LenovoCsdkUtil { - private static final String TAG = "LenovoCsdkUtil"; - - @SuppressLint("StaticFieldLeak") - private static LenovoCsdkUtil sInstance; - private MMKV mMMKV = MMKV.mmkvWithID(CommonConfig.MMKV_ID, MMKV.MULTI_PROCESS_MODE); - private Context mContext; - private CSDKManager mCSDKManager; - - - private LenovoCsdkUtil(Context context) { - if (context == null) { - throw new RuntimeException("Context is NULL"); - } - this.mContext = context; - try { - this.mCSDKManager = new CSDKManager(context); - if (mCSDKManager.isLicenseKeyEnabled(BuildConfig.APPLICATION_ID)) { - Log.e(TAG, "LenovoCsdkUtil: devices activated"); - } else { - Log.e(TAG, "LenovoCsdkUtil: devices not activated"); - } - } catch (Exception e) { - Log.e(TAG, "LenovoCsdkUtil: " + e.getMessage()); - } - - } - - public static void init(Context context) { - if (sInstance == null) { - Log.e(TAG, "init: "); - sInstance = new LenovoCsdkUtil(context); - } - } - - public static LenovoCsdkUtil getInstance() { - if (sInstance == null) { - throw new IllegalStateException("You must be init LenovoCsdkUtil first"); - } - return sInstance; - } - - /** - * int: 1 MAC - * int： 2 SN - * int: 3 Model - * int: 4 IMEI - */ - public String getDeviceMac() { - String mac = mCSDKManager.getDeviceInfo(1); - return mac; - } - -// public String getSerial() { -// if (BuildConfig.DEBUG) { -// return "T811MN128GB23529041363"; -// } -// String sn = mCSDKManager.getDeviceInfo(2); -// return sn; -// } - - public String getDeviceModel() { - String model = mCSDKManager.getDeviceInfo(3); - return model; - } - - public String getDeviceIMEI() { - String imei = mCSDKManager.getDeviceInfo(4); - return imei; - } - -} diff --git a/build.gradle b/build.gradle index 273241b..6f98d77 100644 --- a/build.gradle +++ b/build.gradle @@ -44,6 +44,6 @@ allprojects { } } -task clean(type: Delete) { - delete rootProject.buildDir -} +//task clean(type: Delete) { +// delete rootProject.buildDir +//} diff --git a/settings.gradle b/settings.gradle index cf2eaba..0223f88 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,2 @@ include ':app', ':niceimageview', ':FlycoTabLayoutZ_Lib', ':verification-view', ':PhotoPreview' -rootProject.name='九学王6_5桌面Lenovo' \ No newline at end of file +rootProject.name='学王365Neutral' \ No newline at end of file