tt/Xuewang365OSNeutral
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

version:1.2.3

Browse Source 
fix:
update:去掉联想csdk，去掉检查更新失败提示
This commit is contained in:
tongtongstudio
2026-01-19 18:12:35 +08:00
parent 9cfe11cea5
commit 5f91f83530
18 changed files with 18 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/build.gradle
View File

@@ -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')

BIN
app/libs/CSDK_TBY11_AiYouDu_250312.jar
View File

Binary file not shown.

2
app/src/main/java/com/xwad/os/activity/edit/EditActivity.java
View File

@@ -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;

4
app/src/main/java/com/xwad/os/activity/home/HomeViewModel.java
View File

@@ -150,8 +150,8 @@ public class HomeViewModel extends BaseViewModel<ActivityHomeBinding, ActivityEv
@Override
public void onError(@NonNull Throwable e) {
Log.e("checkUpdate", "onError: ");
Toaster.show("网络连接失败");
Log.e("checkUpdate", "onError: " + e.getMessage());
// Toaster.show("网络连接失败");
}
@Override

2
app/src/main/java/com/xwad/os/activity/main/MainActivity.java
View File

@@ -45,9 +45,7 @@ import com.xwad.os.jxw.JxwPackageConfig;
import com.xwad.os.manager.AmapManager;
import com.xwad.os.manager.DeviceSNManager;
import com.xwad.os.manager.RemoteManager;
import com.xwad.os.service.SocketService;
import com.xwad.os.utils.ApkUtils;
import com.xwad.os.utils.LenovoCsdkUtil;
import com.xwad.os.utils.OpenApkUtils;
import com.xwad.os.utils.Utils;
import com.xwad.os.view.viewpager.BaseFragmentPagerAdapter;

4
app/src/main/java/com/xwad/os/activity/main/MainViewModel.java
View File

@@ -146,8 +146,8 @@ public class MainViewModel extends BaseViewModel<ActivityMainBinding, ActivityEv
@Override
public void onError(@NonNull Throwable e) {
Log.e("checkUpdate", "onError: ");
Toaster.show("网络连接失败");
Log.e("checkUpdate", "onError: " + e.getMessage());
// Toaster.show("网络连接失败");
}
@Override

4
app/src/main/java/com/xwad/os/activity/selectegrade/SelecteGradeActivity.java
View File

@@ -7,7 +7,6 @@ import android.widget.TextView;
import androidx.lifecycle.Observer;
import com.hjq.toast.Toaster;
import com.tencent.mmkv.MMKV;
import com.xwad.os.R;
import com.xwad.os.base.mvvm.BaseMvvmActivity;
@@ -16,10 +15,7 @@ import com.xwad.os.databinding.ActivitySelecteGradeBinding;
import com.xwad.os.jxw.SPUtils;
import com.xwad.os.jxw.event.UpdateGradeEvent;
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 com.xwad.os.utils.Utils;
import org.greenrobot.eventbus.EventBus;

1
app/src/main/java/com/xwad/os/activity/user/UserActivity.java
View File

@@ -42,7 +42,6 @@ import com.xwad.os.utils.ActivationUtil;
import com.xwad.os.utils.ApkUtils;
import com.xwad.os.utils.FileUtil;
import com.xwad.os.utils.GlideLoadUtils;
import com.xwad.os.utils.LenovoCsdkUtil;
import com.xwad.os.utils.Utils;
import java.io.File;

4
app/src/main/java/com/xwad/os/activity/user/UserViewModel.java
View File

@@ -92,8 +92,8 @@ public class UserViewModel extends BaseViewModel<ActivityUserBinding, ActivityEv
@Override
public void onError(@NonNull Throwable e) {
Log.e("checkUpdate", "onError: ");
Toaster.show("网络连接失败");
Log.e("checkUpdate", "onError: " + e.getMessage());
// Toaster.show("网络连接失败");
}
@Override

2
app/src/main/java/com/xwad/os/base/BaseApplication.java
View File

@@ -30,7 +30,6 @@ import com.xwad.os.push.PushManager;
import com.xwad.os.receiver.ApkInstallReceiver;
import com.xwad.os.utils.ActivationUtil;
import com.xwad.os.utils.AppUsedTimeUtils;
import com.xwad.os.utils.LenovoCsdkUtil;
import com.xwad.os.utils.OpenApkUtils;
import com.xwad.os.utils.SystemUtils;
@@ -83,7 +82,6 @@ public class BaseApplication extends Application {
ActivationUtil.init(this);
RemoteManager.init(this);
LenovoCsdkUtil.init(this);
CrashReport.initCrashReport(getApplicationContext(), "4efcaad4c9", false);
CrashReport.setDeviceId(BaseApplication.this, DeviceSNManager.getDeviceSN());

5
app/src/main/java/com/xwad/os/fragment/user/UserViewModel.java
View File

@@ -1,7 +1,6 @@
package com.xwad.os.fragment.user;
import android.graphics.Bitmap;
import android.text.TextUtils;
import android.util.Log;
import androidx.lifecycle.MutableLiveData;
@@ -11,10 +10,8 @@ import com.google.gson.reflect.TypeToken;
import com.tencent.mmkv.MMKV;
import com.trello.rxlifecycle4.RxLifecycle;
import com.trello.rxlifecycle4.android.FragmentEvent;
import com.xwad.os.BuildConfig;
import com.xwad.os.R;
import com.xwad.os.base.mvvm.BaseViewModel;
import com.xwad.os.bean.AppUsed;
import com.xwad.os.bean.BaseResponse;
import com.xwad.os.bean.DesktopIcon;
import com.xwad.os.bean.HomeworkBean;
@@ -25,13 +22,11 @@ import com.xwad.os.config.CommonConfig;
import com.xwad.os.databinding.FragmentUserBinding;
import com.xwad.os.manager.AppManager;
import com.xwad.os.manager.DeviceSNManager;
import com.xwad.os.manager.RemoteManager;
import com.xwad.os.network.NetInterfaceManager;
import com.xwad.os.network.UrlAddress;
import com.xwad.os.utils.ActivationUtil;
import com.xwad.os.utils.ApkUtils;
import com.xwad.os.utils.CXAESUtil;
import com.xwad.os.utils.LenovoCsdkUtil;
import com.xwad.os.utils.TimeUtils;
import com.xwad.os.utils.Utils;

3
app/src/main/java/com/xwad/os/fragment/usercenter/device/DeviceFragment.java
View File

@@ -11,7 +11,6 @@ import androidx.lifecycle.Observer;
import com.hjq.toast.Toaster;
import com.xwad.os.BuildConfig;
import com.xwad.os.R;
import com.xwad.os.activity.home.HomeActivity;
import com.xwad.os.activity.permission.PermissionActivity;
import com.xwad.os.activity.service.ServiceActivity;
import com.xwad.os.activity.update.UpdateActivity;
@@ -19,9 +18,7 @@ import com.xwad.os.base.mvvm.fragment.BaseMvvmFragment;
import com.xwad.os.bean.AppUpdateInfo;
import com.xwad.os.databinding.FragmentDeviceBinding;
import com.xwad.os.manager.DeviceSNManager;
import com.xwad.os.manager.RemoteManager;
import com.xwad.os.utils.ApkUtils;
import com.xwad.os.utils.LenovoCsdkUtil;
public class DeviceFragment extends BaseMvvmFragment<DeviceViewModel, FragmentDeviceBinding> {

4
app/src/main/java/com/xwad/os/fragment/usercenter/device/DeviceViewModel.java
View File

@@ -55,8 +55,8 @@ public class DeviceViewModel extends BaseViewModel<FragmentDeviceBinding, Fragme
@Override
public void onError(@NonNull Throwable e) {
Log.e("checkUpdate", "onError: ");
Toaster.show("网络连接失败");
Log.e("checkUpdate", "onError: " + e.getMessage());
// Toaster.show("网络连接失败");
}
@Override

2
app/src/main/java/com/xwad/os/fragment/usercenter/info/InfoFragment.java
View File

@@ -19,9 +19,7 @@ import com.xwad.os.bean.SnInfo;
import com.xwad.os.config.CommonConfig;
import com.xwad.os.databinding.FragmentInfoBinding;
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;

1
app/src/main/java/com/xwad/os/network/NetInterfaceManager.java
View File

@@ -243,6 +243,7 @@ public class NetInterfaceManager {
* @param pkg
* @return
*/
@Deprecated
public Observable<BaseResponse<AppUpdateInfo>> getCheckUpdateObservable(String pkg) {
return mUiuiosRetrofit.create(CheckUpdateApi.class)
.checkUpdate(pkg)

83
app/src/main/java/com/xwad/os/utils/LenovoCsdkUtil.java
View File

@@ -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;
}
}

6
build.gradle
View File

@@ -44,6 +44,6 @@ allprojects {
}
}
task clean(type: Delete) {
delete rootProject.buildDir
}
//task clean(type: Delete) {
// delete rootProject.buildDir
//}

2
settings.gradle
View File

@@ -1,2 +1,2 @@
include ':app', ':niceimageview', ':FlycoTabLayoutZ_Lib', ':verification-view', ':PhotoPreview'
rootProject.name='九学王6_5桌面Lenovo'
rootProject.name='学王365Neutral'