version:1.0.9
fix: update:更新资源,增加登录,增加检测更新
This commit is contained in:
@@ -45,6 +45,7 @@ import com.xwad.os.bean.StudyStatBean;
|
||||
import com.xwad.os.config.CommonConfig;
|
||||
import com.xwad.os.databinding.FragmentUserBinding;
|
||||
import com.xwad.os.jxw.JxwPackageConfig;
|
||||
import com.xwad.os.jxw.SPUtils;
|
||||
import com.xwad.os.manager.RemoteManager;
|
||||
import com.xwad.os.utils.OpenApkUtils;
|
||||
import com.xwad.os.utils.TimeUtils;
|
||||
@@ -207,6 +208,7 @@ public class UserFragment extends BaseMvvmFragment<UserViewModel, FragmentUserBi
|
||||
Glide.with(mViewDataBinding.ivAvatar).load(snInfo.getAvatar()).error(R.drawable.default_avatar).into(mViewDataBinding.ivAvatar);
|
||||
String name = snInfo.getSn_name();
|
||||
String grade = snInfo.getGrade();
|
||||
SPUtils.setGrade(grade);
|
||||
if (TextUtils.isEmpty(name)) {
|
||||
mViewDataBinding.tvName.setText(getString(R.string.default_nickname));
|
||||
} else {
|
||||
|
||||
@@ -24,6 +24,7 @@ import com.xwad.os.bean.StudyStatBean;
|
||||
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;
|
||||
@@ -62,7 +63,7 @@ public class UserViewModel extends BaseViewModel<FragmentUserBinding, FragmentEv
|
||||
public MutableLiveData<BaseResponse<SnInfo>> mSnInfoData = new MutableLiveData<>();
|
||||
|
||||
public void getSnInfo() {
|
||||
boolean activation = ActivationUtil.getInstance().isActivation();
|
||||
boolean activation = ActivationUtil.getInstance().isLogin();
|
||||
if (!activation) {
|
||||
return;
|
||||
}
|
||||
@@ -99,7 +100,7 @@ public class UserViewModel extends BaseViewModel<FragmentUserBinding, FragmentEv
|
||||
public MutableLiveData<StudyStatBean> mStudyStatBeanData = new MutableLiveData<>();
|
||||
|
||||
public void getStudyStat() {
|
||||
boolean activation = ActivationUtil.getInstance().isActivation();
|
||||
boolean activation = ActivationUtil.getInstance().isLogin();
|
||||
if (!activation) {
|
||||
return;
|
||||
}
|
||||
@@ -138,7 +139,7 @@ public class UserViewModel extends BaseViewModel<FragmentUserBinding, FragmentEv
|
||||
public MutableLiveData<Bitmap> mQrCodeData = new MutableLiveData<>();
|
||||
|
||||
public void getQrCode() {
|
||||
String encryptString = CXAESUtil.encrypt(CommonConfig.AES_KEY, RemoteManager.getInstance().getSerial());
|
||||
String encryptString = CXAESUtil.encrypt(CommonConfig.AES_KEY, DeviceSNManager.getDeviceSN());
|
||||
Log.e("getQRCode", "setImageAndText: " + encryptString);
|
||||
Bitmap bitmap = Utils.createQRImage(encryptString, 400, 400);
|
||||
mQrCodeData.setValue(bitmap);
|
||||
@@ -174,36 +175,13 @@ public class UserViewModel extends BaseViewModel<FragmentUserBinding, FragmentEv
|
||||
public MutableLiveData<Long> mAppUsedData = new MutableLiveData<>();
|
||||
|
||||
public void getAppUsedStatistics() {
|
||||
String jsonString = RemoteManager.getInstance().getAppUsedStatistics();
|
||||
if (TextUtils.isEmpty(jsonString)) {
|
||||
mAppUsedData.setValue((long) 0);
|
||||
} else {
|
||||
Gson gson = new Gson();
|
||||
Type listType = new TypeToken<List<AppUsed>>() {
|
||||
}.getType();
|
||||
try {
|
||||
List<AppUsed> appUseds = gson.fromJson(jsonString, listType);
|
||||
Log.e(TAG, "getAppUsedStatistics: " + appUseds);
|
||||
List<AppUsed> appUseTime = appUseds.stream().filter(new Predicate<AppUsed>() {
|
||||
@Override
|
||||
public boolean test(AppUsed appUsed) {
|
||||
return !BuildConfig.APPLICATION_ID.equals(appUsed.getPackages())
|
||||
&& !"com.safe.uiui".equals(appUsed.getPackages());
|
||||
}
|
||||
}).collect(Collectors.toList());
|
||||
long time = appUseTime.stream().mapToLong(AppUsed::getUseTime).sum();
|
||||
mAppUsedData.setValue(time);
|
||||
} catch (Exception e) {
|
||||
Log.e(TAG, "getAppUsedStatistics: " + e.getMessage());
|
||||
mAppUsedData.setValue((long) 0);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public MutableLiveData<List<HomeworkBean>> mHomeworkBeanListData = new MutableLiveData<>();
|
||||
|
||||
public void getHomework() {
|
||||
boolean activation = ActivationUtil.getInstance().isActivation();
|
||||
boolean activation = ActivationUtil.getInstance().isLogin();
|
||||
if (!activation) {
|
||||
return;
|
||||
}
|
||||
@@ -247,7 +225,7 @@ public class UserViewModel extends BaseViewModel<FragmentUserBinding, FragmentEv
|
||||
public MutableLiveData<PhraseContent> mPhraseData = new MutableLiveData<>();
|
||||
|
||||
public void getPhrase() {
|
||||
boolean activation = ActivationUtil.getInstance().isActivation();
|
||||
boolean activation = ActivationUtil.getInstance().isLogin();
|
||||
if (!activation) {
|
||||
return;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user