diff --git a/FlycoTabLayoutZ_Lib/build.gradle b/FlycoTabLayoutZ_Lib/build.gradle index e21b40c..bc84351 100644 --- a/FlycoTabLayoutZ_Lib/build.gradle +++ b/FlycoTabLayoutZ_Lib/build.gradle @@ -13,6 +13,8 @@ android { versionName version } buildTypes { + MTKT1102Debug {} + MTKT1102Release {} U807Debug {} U807Release {} iPlay50SEDebug {} diff --git a/PhotoPreview/build.gradle b/PhotoPreview/build.gradle index c513c91..dc83108 100644 --- a/PhotoPreview/build.gradle +++ b/PhotoPreview/build.gradle @@ -10,10 +10,14 @@ android { } buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } + MTKT1102Debug {} + MTKT1102Release {} + U807Debug {} + U807Release {} + iPlay50SEDebug {} + iPlay50SERelease {} + debug {} + release {} } // 设置JDK1.8 diff --git a/app/build.gradle b/app/build.gradle index 9f94168..42474b1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,8 +16,8 @@ android { minSdkVersion 24 targetSdkVersion 29 - versionCode 90 - versionName "1.9.9" + versionCode 91 + versionName "2.0.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true @@ -75,9 +75,38 @@ android { keyPassword "123456" v2SigningEnabled false } + + T1102 { + storeFile file("keystore/T1102.jks") + storePassword "123456" + keyAlias "t1102" + keyPassword "123456" + v1SigningEnabled true + v2SigningEnabled true + } } buildTypes { + MTKT1102Debug.initWith(debug) + MTKT1102Debug { + buildConfigField "String", "platform", '"MTKT1102"' + versionNameSuffix "-debug" + debuggable true + signingConfig signingConfigs.T1102 + manifestPlaceholders = [ + AMAP_KEY: "aed54e2ec50c45151d17b512c9e4f34c" + ] + } + + MTKT1102Release.initWith(release) + MTKT1102Release { + buildConfigField "String", "platform", '"MTKT1102"' + signingConfig signingConfigs.T1102 + manifestPlaceholders = [ + AMAP_KEY: "aed54e2ec50c45151d17b512c9e4f34c" + ] + } + U807Debug.initWith(debug) U807Debug { versionNameSuffix "-debug" diff --git a/app/keystore/T1102.jks b/app/keystore/T1102.jks new file mode 100644 index 0000000..3a3ee1d Binary files /dev/null and b/app/keystore/T1102.jks differ diff --git a/app/src/main/java/com/uiui/zyos/activity/edit/EditActivity.java b/app/src/main/java/com/uiui/zyos/activity/edit/EditActivity.java index df0ea16..9c1cda6 100644 --- a/app/src/main/java/com/uiui/zyos/activity/edit/EditActivity.java +++ b/app/src/main/java/com/uiui/zyos/activity/edit/EditActivity.java @@ -24,6 +24,7 @@ public class EditActivity extends BaseMvvmActivity() { +// mViewModel.mAppUpdateInfoData.observe(this, new Observer() { // @Override // public void onChanged(AppUpdateInfo appUpdateInfo) { // mAppUpdateInfo = appUpdateInfo; @@ -250,6 +248,7 @@ public class MainActivity extends BaseMvvmActivity { - private static final String TAG = "MainViewModel"; + private MMKV mMMKV = MMKV.mmkvWithID(CommonConfig.MMKV_ID, MMKV.MULTI_PROCESS_MODE); + + @Override public ActivityMainBinding getVDBinding() { return binding; @@ -40,12 +47,50 @@ public class MainViewModel extends BaseViewModel mAppUpdateInfoData = new MutableLiveData<>(); + public MutableLiveData mGradleData = new MutableLiveData<>(); + + public void getSnInfo() { + NetInterfaceManager.getInstance().getsnInfoControl() + .compose(RxLifecycle.bindUntilEvent(getLifecycle(), ActivityEvent.DESTROY)) + .subscribe(new Observer>() { + @Override + public void onSubscribe(@NonNull Disposable d) { + Log.e("getSnInfo", "onSubscribe: "); + } + + @Override + public void onNext(@NonNull BaseResponse snInfoBaseResponse) { + Log.e("getSnInfo", "onNext: "); + if (snInfoBaseResponse.code == 200) { + SnInfo snInfo = snInfoBaseResponse.data; + String old = mMMKV.decodeString(CommonConfig.UIUI_USER_GRADE_KEY, getCtx().getString(R.string.default_grade)); + if (!old.equals(snInfo.getGrade())) { + mMMKV.encode(CommonConfig.UIUI_USER_GRADE_KEY, snInfo.getGrade()); + Toaster.showLong("桌面调整,正在重启"); + Utils.triggerRebirth(getCtx()); + } else { + Log.e("getSnInfo", "onNext: not changed"); + } + mGradleData.setValue(snInfo.getGrade()); + } + } + + @Override + public void onError(@NonNull Throwable e) { + Log.e("getSnInfo", "onError: " + e.getMessage()); + } + + @Override + public void onComplete() { + Log.e("getSnInfo", "onComplete: "); + } + }); + - public MutableLiveData getAppUpdateInfoData() { - return mAppUpdateInfoData; } + public MutableLiveData mAppUpdateInfoData = new MutableLiveData<>(); + public void checkUpdate() { NetInterfaceManager.getInstance().getCheckUpdateObservable(BuildConfig.APPLICATION_ID) .compose(RxLifecycle.bindUntilEvent(getLifecycle(), ActivityEvent.DESTROY)) @@ -150,7 +195,7 @@ public class MainViewModel extends BaseViewModel { if (b) setPrimary(compoundButton); }); @@ -111,6 +123,8 @@ public class SelecteGradeActivity extends BaseMvvmActivity params = new HashMap<>(); params.put("sn", RemoteManager.getInstance().getSerial()); params.put("sn_grade", grade); mViewModel.updateInfo(params); - } else { - mMMKV.encode("local_" + "sn_grade", grade); } - finish(); } } diff --git a/app/src/main/java/com/uiui/zyos/activity/user/UserActivity.java b/app/src/main/java/com/uiui/zyos/activity/user/UserActivity.java index 94aa3c4..d91050a 100644 --- a/app/src/main/java/com/uiui/zyos/activity/user/UserActivity.java +++ b/app/src/main/java/com/uiui/zyos/activity/user/UserActivity.java @@ -156,9 +156,9 @@ public class UserActivity extends BaseMvvmActivity { private static final String TAG = "SubjectFragment"; - private String[] title = new String[]{ + private MMKV mMMKV = MMKV.mmkvWithID(CommonConfig.MMKV_ID, MMKV.MULTI_PROCESS_MODE); + + private String[] mAllTitle = new String[]{ // "AR自主学", "精准学", "语文", "数学", "英语", "物理", "化学", "生物", "综合", "应用"}; + private String[] mTitleWithoutScience = new String[]{"精准学", "语文", "数学", "英语", "应用"}; + private FragmentActivity mContext; // private ARStudyFragment mARStudyFragment; @@ -44,10 +50,12 @@ public class SubjectFragment extends BaseDataBindingFragment mFragments; @@ -104,20 +112,25 @@ public class SubjectFragment extends BaseDataBindingFragment lifecycle, ObserverCallback callback) { + public void getSnInfo(BehaviorSubject lifecycle, ObserverCallback callback) { + getsnInfoControl() + .compose(RxLifecycle.bindUntilEvent(lifecycle, ActivityEvent.DESTROY)) + .subscribe(getSnInfoObserver(callback)); + } + + public void getSnInfoFragment(BehaviorSubject lifecycle, ObserverCallback callback) { getsnInfoControl() .compose(RxLifecycle.bindUntilEvent(lifecycle, FragmentEvent.DESTROY)) .subscribe(getSnInfoObserver(callback)); @@ -445,18 +450,14 @@ public class NetInterfaceManager { if (userInfoBaseResponse.code == 200) { mMMKV.encode(CommonConfig.isLogined, 1); SnInfo snInfo = userInfoBaseResponse.data; - if (!TextUtils.isEmpty(snInfo.getSn_name())) { - mMMKV.encode("USERINFO_NAME", snInfo.getSn_name()); - } - if (!TextUtils.isEmpty(snInfo.getSchool())) { - mMMKV.encode("USERINFO_SCHOOL", snInfo.getSchool()); - } - if (!TextUtils.isEmpty(snInfo.getGrade())) { - mMMKV.encode("USERINFO_GRADE", snInfo.getGrade()); - } - if (!TextUtils.isEmpty(snInfo.getAvatar())) { - mMMKV.encode("USERINFO_AVATAR", snInfo.getGrade()); - } + mMMKV.encode(CommonConfig.UIUI_USER_GENDER_KEY, snInfo.getSex()); + mMMKV.encode(CommonConfig.UIUI_USER_NAME_KEY, snInfo.getSn_name()); + mMMKV.encode(CommonConfig.UIUI_USER_SCHOOL_KEY, snInfo.getSchool()); + mMMKV.encode(CommonConfig.UIUI_USER_GRADE_KEY, snInfo.getGrade()); + mMMKV.encode(CommonConfig.UIUI_USER_CLASS_KEY, snInfo.getClass_name()); + mMMKV.encode(CommonConfig.UIUI_USER_AVATAR_KEY, snInfo.getGrade()); + mMMKV.encode(CommonConfig.UIUI_USER_MOBILE_KEY, snInfo.getMobile()); + } else if (code == 300) { mMMKV.encode(UrlAddress.SNINFO, ""); mMMKV.encode(CommonConfig.isLogined, 0); diff --git a/app/src/main/java/com/uiui/zyos/utils/Utils.java b/app/src/main/java/com/uiui/zyos/utils/Utils.java index 95f583e..a43cc2a 100644 --- a/app/src/main/java/com/uiui/zyos/utils/Utils.java +++ b/app/src/main/java/com/uiui/zyos/utils/Utils.java @@ -1,10 +1,12 @@ package com.uiui.zyos.utils; import android.app.Activity; +import android.content.ComponentName; import android.content.Context; import android.content.ContextWrapper; import android.content.Intent; import android.content.IntentFilter; +import android.content.pm.PackageManager; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.graphics.Canvas; @@ -271,6 +273,15 @@ public class Utils { System.exit(0); } + public static void triggerRebirth(Context context) { + PackageManager packageManager = context.getPackageManager(); + Intent intent = packageManager.getLaunchIntentForPackage(context.getPackageName()); // + ComponentName componentName = intent.getComponent(); + Intent mainIntent = Intent.makeRestartActivityTask(componentName); // + context.startActivity(mainIntent); + Runtime.getRuntime().exit(0); // + } + /** * 获取系统配置信息 * diff --git a/app/src/main/res/drawable-hdpi/wechat_service.png b/app/src/main/res/drawable-hdpi/wechat_service.png index 7100731..9fbf951 100644 Binary files a/app/src/main/res/drawable-hdpi/wechat_service.png and b/app/src/main/res/drawable-hdpi/wechat_service.png differ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3704bde..46ac1da 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -8,7 +8,7 @@ 未设置 设备未经授权 小酷 - 一年级 + 七年级 Hello blank fragment diff --git a/niceimageview/build.gradle b/niceimageview/build.gradle index 618fefe..fc984b6 100644 --- a/niceimageview/build.gradle +++ b/niceimageview/build.gradle @@ -11,6 +11,8 @@ android { } buildTypes { + MTKT1102Debug {} + MTKT1102Release {} U807Debug {} U807Release {} iPlay50SEDebug {} diff --git a/verification-view/build.gradle b/verification-view/build.gradle index 97b61c6..29231e7 100644 --- a/verification-view/build.gradle +++ b/verification-view/build.gradle @@ -13,25 +13,12 @@ android { } buildTypes { + MTKT1102Debug {} + MTKT1102Release {} U807Debug {} U807Release {} - iPlay50Debug {} - iPlay50Release {} - zhanRuiUserdebug {} iPlay50SEDebug {} iPlay50SERelease {} - iPlay50ProDebug {} - iPlay50ProRelease {} - iPlay50miniDebug {} - iPlay50miniRelease {} - iPlay5013Debug {} - iPlay5013Release {} - MTKAndroid12Debug {} - MTKAndroid12Release {} - teclast8183Debug {} - teclast8183Release {} - XPadDebug {} - XPadRelease {} debug {} release {} }