version:1.0.5

fix:
update:资源替换,跳转优化
This commit is contained in:
2025-12-16 09:15:30 +08:00
parent 3f83d1b136
commit 8a6bd705dc
58 changed files with 226 additions and 31 deletions

View File

@@ -16,8 +16,8 @@ android {
minSdkVersion 24 minSdkVersion 24
targetSdkVersion 29 targetSdkVersion 29
versionCode 5 versionCode 6
versionName "1.0.4" versionName "1.0.5"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

View File

@@ -17,6 +17,7 @@ import android.view.KeyEvent;
import android.view.View; import android.view.View;
import android.view.animation.Animation; import android.view.animation.Animation;
import android.view.animation.TranslateAnimation; import android.view.animation.TranslateAnimation;
import android.widget.RelativeLayout;
import android.widget.Toast; import android.widget.Toast;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
@@ -52,6 +53,7 @@ import com.xwad.os.jxw.JxwPackageConfig;
import com.xwad.os.jxw.SPUtils; import com.xwad.os.jxw.SPUtils;
import com.xwad.os.jxw.StudyRecordAPKInfo; import com.xwad.os.jxw.StudyRecordAPKInfo;
import com.xwad.os.jxw.TabAdapter; import com.xwad.os.jxw.TabAdapter;
import com.xwad.os.jxw.event.UpdateColorEvent;
import com.xwad.os.jxw.util.Util; import com.xwad.os.jxw.util.Util;
import com.xwad.os.jxw.event.UpdateGradeEvent; import com.xwad.os.jxw.event.UpdateGradeEvent;
import com.xwad.os.jxw.fragment.SztzFragment; import com.xwad.os.jxw.fragment.SztzFragment;
@@ -109,6 +111,8 @@ public class HomeActivity extends BaseMvvmActivity<HomeViewModel, ActivityHomeBi
EventBus.getDefault().register(this); EventBus.getDefault().register(this);
} }
setWallpaper();
startActivity(new Intent(HomeActivity.this, LoginActivity.class)); startActivity(new Intent(HomeActivity.this, LoginActivity.class));
RemoteManager.setListener(this); RemoteManager.setListener(this);
Utils.getAndroiodScreenProperty(this); Utils.getAndroiodScreenProperty(this);
@@ -182,6 +186,27 @@ public class HomeActivity extends BaseMvvmActivity<HomeViewModel, ActivityHomeBi
initDatas(); initDatas();
} }
@Subscribe(threadMode = ThreadMode.MAIN)
public void onGkNoticeEvent(UpdateColorEvent updateColorEvent) {
mViewDataBinding.llMain.setBackgroundResource(getResources().getIdentifier("img_home_bg_" + SPUtils.getInt(this, "themenBg", 0), "drawable", getPackageName()));
}
private void setWallpaper() {
// List<Integer> arrayList = new ArrayList<Integer>() {{
// this.add(R.drawable.icon_bz_0);
// this.add(R.drawable.icon_bz_1);
// this.add(R.drawable.icon_bz_2);
// this.add(R.drawable.icon_bz_3);
// this.add(R.drawable.icon_bz_4);
// this.add(R.drawable.icon_bz_5);
// this.add(R.drawable.icon_bz_6);
// this.add(R.drawable.icon_bz_7);
// this.add(R.drawable.icon_bz_8);
// }};
mViewDataBinding.llMain.setBackgroundResource(getResources().getIdentifier("img_home_bg_" + SPUtils.getInt(this, "themenBg", 0), "drawable", getPackageName()));
}
private void initDatas() { private void initDatas() {
Log.e(TAG, "initDatas: "); Log.e(TAG, "initDatas: ");
mViewDataBinding.tvTime.setText(DataUtil.formatDateHour()); mViewDataBinding.tvTime.setText(DataUtil.formatDateHour());
@@ -210,7 +235,7 @@ public class HomeActivity extends BaseMvvmActivity<HomeViewModel, ActivityHomeBi
// if ("小学".equals(Util.checkGrade(SPUtils.getGrade()))) { // if ("小学".equals(Util.checkGrade(SPUtils.getGrade()))) {
tabBeanLists.add(new TabBean("素养课", R.drawable.icon_tab_syk, R.drawable.icon_tab_syk_pre)); tabBeanLists.add(new TabBean("素养课", R.drawable.icon_tab_syk, R.drawable.icon_tab_syk_pre));
// } // }
tabBeanLists.add(new TabBean("绿色安全", R.drawable.icon_tab_lsaq, R.drawable.icon_tab_lsaq_pre)); tabBeanLists.add(new TabBean("应用", R.drawable.icon_tab_app, R.drawable.icon_tab_app));
tabAdapter.setData(tabBeanLists); tabAdapter.setData(tabBeanLists);
tabAdapter.setChoosePosition(defaultCurrent); tabAdapter.setChoosePosition(defaultCurrent);

View File

@@ -75,7 +75,7 @@ public class SelecteGradeActivity extends BaseMvvmActivity<SelecteGradeViewModel
public void initView() { public void initView() {
grade = mMMKV.decodeString(CommonConfig.UIUI_USER_GRADE_KEY, "七年级"); grade = mMMKV.decodeString(CommonConfig.UIUI_USER_GRADE_KEY, "七年级");
for (int i = 1; i < 13; i++) { for (int i = 1; i <= 13; i++) {
int viewId = getResources().getIdentifier("radioButton" + i, "id", getPackageName()); int viewId = getResources().getIdentifier("radioButton" + i, "id", getPackageName());
RadioButton radioButton = findViewById(viewId); RadioButton radioButton = findViewById(viewId);
if (grade.equals(radioButton.getText().toString())) { if (grade.equals(radioButton.getText().toString())) {
@@ -101,6 +101,10 @@ public class SelecteGradeActivity extends BaseMvvmActivity<SelecteGradeViewModel
if (b) setPrimary2(compoundButton); if (b) setPrimary2(compoundButton);
}); });
mViewDataBinding.radioButton13.setOnCheckedChangeListener((compoundButton, b) -> {
if (b) setJuniorHighSchool(compoundButton);
});
mViewDataBinding.radioButton7.setOnCheckedChangeListener((compoundButton, b) -> { mViewDataBinding.radioButton7.setOnCheckedChangeListener((compoundButton, b) -> {
if (b) setJuniorHighSchool(compoundButton); if (b) setJuniorHighSchool(compoundButton);
}); });

View File

@@ -1,12 +1,16 @@
package com.xwad.os.fragment.mine; package com.xwad.os.fragment.mine;
import android.app.Activity; import android.app.Activity;
import android.content.ComponentName;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.pm.ApplicationInfo; import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.provider.Settings;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import android.view.View; import android.view.View;
@@ -15,6 +19,7 @@ import androidx.fragment.app.Fragment;
import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.GridLayoutManager;
import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseQuickAdapter;
import com.xwad.os.BuildConfig;
import com.xwad.os.R; import com.xwad.os.R;
import com.xwad.os.activity.activation.ActivationActivity; import com.xwad.os.activity.activation.ActivationActivity;
import com.xwad.os.activity.home.HomeActivity; import com.xwad.os.activity.home.HomeActivity;
@@ -44,6 +49,9 @@ import java.io.FileReader;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.function.Function;
import java.util.function.Predicate;
import java.util.stream.Collectors;
/** /**
* A simple {@link Fragment} subclass. * A simple {@link Fragment} subclass.
@@ -326,6 +334,30 @@ public class MineFragment extends BaseMvvmFragment<MineViewModel, FragmentMineBi
} }
} }
private List<ComponentName> getAllLauncherApps(Context context) {
PackageManager packageManager = context.getPackageManager();
// 构建用于查询桌面应用的Intent
Intent intent = new Intent(Intent.ACTION_MAIN);
intent.addCategory(Intent.CATEGORY_HOME);
// 查询所有可以处理该Intent的Activity
List<ResolveInfo> resolveInfoList = packageManager.queryIntentActivities(intent, PackageManager.MATCH_ALL);
List<ComponentName> launcherPackageList = resolveInfoList.stream().filter(new Predicate<ResolveInfo>() {
@Override
public boolean test(ResolveInfo resolveInfo) {
return !BuildConfig.APPLICATION_ID.equals(resolveInfo.activityInfo.packageName);
}
}).map(new Function<ResolveInfo, ComponentName>() {
@Override
public ComponentName apply(ResolveInfo resolveInfo) {
return resolveInfo.getComponentInfo().getComponentName();
}
}).collect(Collectors.toList());
return launcherPackageList;
}
public class BtnClick { public class BtnClick {
public void toLigin(View view) { public void toLigin(View view) {
@@ -342,5 +374,24 @@ public class MineFragment extends BaseMvvmFragment<MineViewModel, FragmentMineBi
} }
}); });
} }
public void exit(View view) {
Log.e(TAG, "exit: " + getAllLauncherApps(mContext));
ComponentName componentName = new ComponentName("com.hihonor.android.launcher", "com.hihonor.android.launcher.unihome.UniHomeLauncher");
Intent intent = new Intent();
intent.setComponent(componentName);
mContext.startActivity(intent);
startActivity(new Intent(Settings.ACTION_HOME_SETTINGS));
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
mContext.finishAndRemoveTask();
} else {
mContext.finishAffinity();
}
android.os.Process.killProcess(android.os.Process.myPid());
System.exit(0);
// OpenApkUtils.getInstance().openJxwApp(mContext, "com.hihonor.android.launcher,com.hihonor.android.launcher.unihome.UniHomeLauncher,,,退出桌面");
}
} }
} }

View File

@@ -108,7 +108,7 @@ public class ReadFragment extends BaseMvvmFragment<ReadViewModel, FragmentReadBi
@Override @Override
public void onPageSelected(int i) { public void onPageSelected(int i) {
if (i == 0) { if (i == 0) {
mViewDataBinding.tvTitle.setText("最近阅读"); mViewDataBinding.tvTitle.setText("阅读报告");
} else { } else {
mViewDataBinding.tvTitle.setText("我的书架"); mViewDataBinding.tvTitle.setText("我的书架");
} }

View File

@@ -278,24 +278,24 @@ public class SafeFragment extends BaseMvvmFragment<SafeViewModel, FragmentSafeBi
} }
public void initAppData() { public void initAppData() {
AppInfo build = new AppInfo.Builder().appLabel("课程表").appStargs(getResources().getString(R.string.tag_args_new_kcb)).appIcon(mContext.getResources().getDrawable(R.drawable.icon_bbx_kcb)).build(); // AppInfo build = new AppInfo.Builder().appLabel("课程表").appStargs(getResources().getString(R.string.tag_args_new_kcb)).appIcon(mContext.getResources().getDrawable(R.drawable.icon_bbx_kcb)).build();
AppInfo build2 = new AppInfo.Builder().appLabel("语音翻译").appStargs(getResources().getString(R.string.tag_args_new_zyhy)).appIcon(mContext.getResources().getDrawable(R.drawable.icon_bbx_yyfy)).build(); // AppInfo build2 = new AppInfo.Builder().appLabel("语音翻译").appStargs(getResources().getString(R.string.tag_args_new_zyhy)).appIcon(mContext.getResources().getDrawable(R.drawable.icon_bbx_yyfy)).build();
AppInfo build3 = new AppInfo.Builder().appLabel("使用助手").appStargs(getResources().getString(R.string.tag_args_new_sysmx)).appIcon(mContext.getResources().getDrawable(R.drawable.icon_bbx_syzs)).build(); AppInfo build3 = new AppInfo.Builder().appLabel("使用助手").appStargs(getResources().getString(R.string.tag_args_new_sysmx)).appIcon(mContext.getResources().getDrawable(R.drawable.icon_bbx_syzs)).build();
AppInfo build4 = new AppInfo.Builder().appLabel("应用更新").appStargs(getResources().getString(R.string.tag_args_updae)).appIcon(mContext.getResources().getDrawable(R.drawable.icon_bbx_yygx)).build(); // AppInfo build4 = new AppInfo.Builder().appLabel("应用更新").appStargs(getResources().getString(R.string.tag_args_updae)).appIcon(mContext.getResources().getDrawable(R.drawable.icon_bbx_yygx)).build();
AppInfo build5 = new AppInfo.Builder().appLabel("一键加速").appStargs(getResources().getString(R.string.tag_args_new_yjjs)).appIcon(mContext.getResources().getDrawable(R.drawable.icon_bbx_yjjs)).build(); // AppInfo build5 = new AppInfo.Builder().appLabel("一键加速").appStargs(getResources().getString(R.string.tag_args_new_yjjs)).appIcon(mContext.getResources().getDrawable(R.drawable.icon_bbx_yjjs)).build();
AppInfo build6 = new AppInfo.Builder().appLabel("下载中心").appStargs(getResources().getString(R.string.tag_args_new_download)).appIcon(mContext.getResources().getDrawable(R.drawable.icon_bbx_xzzx)).build(); // AppInfo build6 = new AppInfo.Builder().appLabel("下载中心").appStargs(getResources().getString(R.string.tag_args_new_download)).appIcon(mContext.getResources().getDrawable(R.drawable.icon_bbx_xzzx)).build();
AppInfo build7 = new AppInfo.Builder().appLabel("切换壁纸").appStargs(getResources().getString(R.string.tag_args_launcher)).appIcon(mContext.getResources().getDrawable(R.drawable.icon_bbx_qhbz)).build(); // AppInfo build7 = new AppInfo.Builder().appLabel("切换壁纸").appStargs(getResources().getString(R.string.tag_args_launcher)).appIcon(mContext.getResources().getDrawable(R.drawable.icon_bbx_qhbz)).build();
AppInfo build8 = new AppInfo.Builder().appLabel("安卓平台").appStargs(getResources().getString(R.string.tag_args_launcher)).appIcon(mContext.getResources().getDrawable(R.drawable.icon_bbx_azpt)).build(); // AppInfo build8 = new AppInfo.Builder().appLabel("安卓平台").appStargs(getResources().getString(R.string.tag_args_launcher)).appIcon(mContext.getResources().getDrawable(R.drawable.icon_bbx_azpt)).build();
AppInfo build9 = new AppInfo.Builder().appLabel("设置").appStargs(getResources().getString(R.string.tag_args_new_jxwSettings)).appIcon(mContext.getResources().getDrawable(R.drawable.icon_bbx_sz)).build(); // AppInfo build9 = new AppInfo.Builder().appLabel("设置").appStargs(getResources().getString(R.string.tag_args_new_jxwSettings)).appIcon(mContext.getResources().getDrawable(R.drawable.icon_bbx_sz)).build();
mlistAppInfo.add(build); // mlistAppInfo.add(build);
mlistAppInfo.add(build2); // mlistAppInfo.add(build2);
mlistAppInfo.add(build3); mlistAppInfo.add(build3);
mlistAppInfo.add(build4); // mlistAppInfo.add(build4);
mlistAppInfo.add(build5); // mlistAppInfo.add(build5);
mlistAppInfo.add(build6); // mlistAppInfo.add(build6);
mlistAppInfo.add(build7); // mlistAppInfo.add(build7);
mlistAppInfo.add(build8); // mlistAppInfo.add(build8);
mlistAppInfo.add(build9); // mlistAppInfo.add(build9);
getAppData(); getAppData();
mHandler.post(new Runnable() { mHandler.post(new Runnable() {
@Override @Override

View File

@@ -72,7 +72,7 @@ public class WlFragment extends BaseNewFragment {
}); });
} }
}; };
List<ItemsBean> appList = new ArrayList(); List<ItemsBean> appList = new ArrayList<>();
@Override @Override
public void initListener() { public void initListener() {

View File

@@ -653,7 +653,7 @@ public class OpenApkUtils {
* *
* @param paramStr 参数字符串(格式:包名,类名,extra参数,第四项,第五项) * @param paramStr 参数字符串(格式:包名,类名,extra参数,第四项,第五项)
*/ */
public void openJxwApp(Activity context, String paramStr) { public void openJxwApp(Activity activity, String paramStr) {
if (TextUtils.isEmpty(paramStr)) { if (TextUtils.isEmpty(paramStr)) {
Log.e(TAG, "context为空或参数字符串为空"); Log.e(TAG, "context为空或参数字符串为空");
return; return;
@@ -677,7 +677,7 @@ public class OpenApkUtils {
+ "\n第四项" + fourthParam + "\n应用名" + appName); + "\n第四项" + fourthParam + "\n应用名" + appName);
if (!ApkUtils.isAvailable(mContext, packageName)) { if (!ApkUtils.isAvailable(mContext, packageName)) {
showDownloadDialog(context, packageName, appName); showDownloadDialog(activity, packageName, appName);
return; return;
} }
@@ -711,10 +711,11 @@ public class OpenApkUtils {
// 4. 启动Activity处理异常 // 4. 启动Activity处理异常
try { try {
context.startActivity(intent); activity.startActivity(intent);
} catch (Exception e) { } catch (Exception e) {
if (e instanceof android.content.ActivityNotFoundException) { if (e instanceof android.content.ActivityNotFoundException) {
Log.e(TAG, "未找到目标Activity" + packageName + "/" + className); Log.e(TAG, "未找到目标Activity" + packageName + "/" + className);
Toaster.show("打开失败,请升级应用到最新版本");
} else if (e instanceof SecurityException) { } else if (e instanceof SecurityException) {
Log.e(TAG, "启动Activity权限不足"); Log.e(TAG, "启动Activity权限不足");
} else { } else {
@@ -773,7 +774,7 @@ public class OpenApkUtils {
public void showDownloadDialog(Activity context, String pkg, String appName) { public void showDownloadDialog(Activity context, String pkg, String appName) {
Dialog dialog = new Dialog(context, R.style.ActionSheet); Dialog dialog = new Dialog(context, R.style.ActionSheet);
Window window = dialog.getWindow(); Window window = dialog.getWindow();
View inflate = ((LayoutInflater) context.getSystemService("layout_inflater")).inflate(R.layout.download_dialog, (ViewGroup) null); View inflate = ((LayoutInflater) context.getSystemService("layout_inflater")).inflate(R.layout.download_dialog, null);
TextView textView = inflate.findViewById(R.id.download_cancel); TextView textView = inflate.findViewById(R.id.download_cancel);
TextView textView2 = inflate.findViewById(R.id.tag_title); TextView textView2 = inflate.findViewById(R.id.tag_title);
if (!TextUtils.isEmpty(appName)) { if (!TextUtils.isEmpty(appName)) {

Binary file not shown.

Before

Width:  |  Height:  |  Size: 41 KiB

After

Width:  |  Height:  |  Size: 65 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 114 KiB

After

Width:  |  Height:  |  Size: 68 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 161 KiB

After

Width:  |  Height:  |  Size: 418 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 118 KiB

After

Width:  |  Height:  |  Size: 171 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 134 KiB

After

Width:  |  Height:  |  Size: 201 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 78 KiB

After

Width:  |  Height:  |  Size: 116 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 67 KiB

After

Width:  |  Height:  |  Size: 96 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 139 KiB

After

Width:  |  Height:  |  Size: 198 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 139 KiB

After

Width:  |  Height:  |  Size: 198 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 788 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 82 KiB

After

Width:  |  Height:  |  Size: 125 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 79 KiB

After

Width:  |  Height:  |  Size: 115 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 111 KiB

After

Width:  |  Height:  |  Size: 301 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 342 KiB

After

Width:  |  Height:  |  Size: 489 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 91 KiB

After

Width:  |  Height:  |  Size: 245 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 215 KiB

After

Width:  |  Height:  |  Size: 312 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 224 KiB

After

Width:  |  Height:  |  Size: 334 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 73 KiB

After

Width:  |  Height:  |  Size: 137 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 204 KiB

After

Width:  |  Height:  |  Size: 295 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 73 KiB

After

Width:  |  Height:  |  Size: 145 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 133 KiB

After

Width:  |  Height:  |  Size: 200 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 64 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 92 KiB

After

Width:  |  Height:  |  Size: 298 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 68 KiB

After

Width:  |  Height:  |  Size: 142 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 79 KiB

After

Width:  |  Height:  |  Size: 141 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 641 KiB

After

Width:  |  Height:  |  Size: 1.5 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 74 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 52 KiB

After

Width:  |  Height:  |  Size: 105 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 243 KiB

After

Width:  |  Height:  |  Size: 521 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 763 KiB

After

Width:  |  Height:  |  Size: 1.7 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 35 KiB

After

Width:  |  Height:  |  Size: 71 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 63 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 244 KiB

After

Width:  |  Height:  |  Size: 535 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 51 KiB

After

Width:  |  Height:  |  Size: 102 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 247 KiB

After

Width:  |  Height:  |  Size: 529 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 185 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 973 KiB

After

Width:  |  Height:  |  Size: 748 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 241 KiB

After

Width:  |  Height:  |  Size: 489 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 235 KiB

After

Width:  |  Height:  |  Size: 540 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 110 KiB

After

Width:  |  Height:  |  Size: 276 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 147 KiB

After

Width:  |  Height:  |  Size: 344 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 110 KiB

After

Width:  |  Height:  |  Size: 298 KiB

View File

@@ -185,11 +185,24 @@
app:layout_constraintStart_toEndOf="@+id/tv_city" app:layout_constraintStart_toEndOf="@+id/tv_city"
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">
<RadioButton
android:id="@+id/radioButton13"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/radio"
android:button="@null"
android:gravity="center"
android:minEms="4"
android:text="初中六年级"
android:textColor="@drawable/radio_textcolor"
android:textSize="9sp" />
<RadioButton <RadioButton
android:id="@+id/radioButton7" android:id="@+id/radioButton7"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/radio" android:background="@drawable/radio"
android:layout_marginStart="16dp"
android:button="@null" android:button="@null"
android:gravity="center" android:gravity="center"
android:minEms="4" android:minEms="4"

View File

@@ -163,7 +163,7 @@
android:id="@+id/iv_djjp" android:id="@+id/iv_djjp"
android:layout_width="32dp" android:layout_width="32dp"
android:layout_height="34dp" android:layout_height="34dp"
android:background="@drawable/icon_wd_zs" /> android:background="@drawable/icon_wd_cr" />
<LinearLayout <LinearLayout
android:id="@+id/ll_wjx" android:id="@+id/ll_wjx"
@@ -341,6 +341,48 @@
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="@dimen/mine_icon_width"
android:layout_height="match_parent"
android:onClick="onClick"
android:tag="@string/tag_args_new_arzd">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<ImageView
android:id="@+id/app_icon9"
android:layout_width="@dimen/mine_icon_height"
android:layout_height="@dimen/mine_icon_height"
android:layout_gravity="center_horizontal"
android:src="@drawable/icon_bbx_arzd"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/app_name9"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="2dp"
android:singleLine="true"
android:text="AR指读"
android:textColor="@color/white"
android:textSize="@dimen/mine_app_name_size"
app:layout_constraintEnd_toEndOf="@+id/app_icon9"
app:layout_constraintStart_toStartOf="@+id/app_icon9"
app:layout_constraintTop_toBottomOf="@+id/app_icon9" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="@dimen/mine_icon_width" android:layout_width="@dimen/mine_icon_width"
android:layout_height="match_parent" android:layout_height="match_parent"
@@ -389,6 +431,49 @@
android:onClick="onClick" android:onClick="onClick"
android:tag="@string/tag_args_new_yjjs"> android:tag="@string/tag_args_new_yjjs">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<ImageView
android:id="@+id/app_icon10"
android:layout_width="@dimen/mine_icon_height"
android:layout_height="@dimen/mine_icon_height"
android:layout_gravity="center_horizontal"
android:src="@drawable/icon_bbx_jzgk_home"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/app_name10"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="2dp"
android:singleLine="true"
android:text="家长管控"
android:textColor="@color/white"
android:textSize="@dimen/mine_app_name_size"
app:layout_constraintEnd_toEndOf="@+id/app_icon10"
app:layout_constraintStart_toStartOf="@+id/app_icon10"
app:layout_constraintTop_toBottomOf="@+id/app_icon10" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="@dimen/mine_icon_width"
android:layout_height="match_parent"
android:onClick="onClick"
android:visibility="gone"
android:tag="@string/tag_args_new_yjjs">
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -512,7 +597,7 @@
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="@dimen/mine_icon_width" android:layout_width="@dimen/mine_icon_width"
android:layout_height="match_parent" android:layout_height="match_parent"
android:onClick="onClick" android:onClick="@{click::exit}"
android:tag="@string/tag_args_launcher"> android:tag="@string/tag_args_launcher">
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout

View File

@@ -162,7 +162,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="12dp" android:layout_marginStart="12dp"
android:layout_marginTop="12dp" android:layout_marginTop="12dp"
android:text="最近阅读" android:text="阅读报告"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="12sp" /> android:textSize="12sp" />
@@ -180,13 +180,25 @@
android:layout_marginTop="5dp" /> android:layout_marginTop="5dp" />
</LinearLayout> </LinearLayout>
<ImageView
android:layout_width="238dp"
android:layout_height="138dp"
android:layout_marginStart="12dp"
android:layout_marginEnd="12dp"
android:adjustViewBounds="true"
android:onClick="onClick"
android:scaleType="centerCrop"
android:src="@drawable/icon_read_suhb"
android:tag="@string/tag_args_new_zhtsg_syhb" />
<RelativeLayout <RelativeLayout
android:layout_width="238dp" android:layout_width="238dp"
android:layout_height="138dp" android:layout_height="138dp"
android:layout_marginStart="12dp" android:layout_marginStart="12dp"
android:layout_marginEnd="12dp" android:layout_marginEnd="12dp"
android:background="@drawable/bg_shape_zjxx" android:background="@drawable/bg_shape_zjxx"
android:orientation="vertical"> android:orientation="vertical"
android:visibility="gone">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -227,6 +239,7 @@
android:textColor="#ffffff" android:textColor="#ffffff"
android:textSize="9sp" /> android:textSize="9sp" />
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>
<ImageView <ImageView

View File

@@ -31,6 +31,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/bg_shape_212562_40" android:background="@drawable/bg_shape_212562_40"
android:orientation="vertical" android:orientation="vertical"
android:visibility="gone"
android:padding="12dp"> android:padding="12dp">
<LinearLayout <LinearLayout
@@ -93,7 +94,7 @@
<RelativeLayout <RelativeLayout
android:id="@+id/rela_root" android:id="@+id/rela_root"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="162dp" android:layout_height="282dp"
android:layout_marginStart="25dp" android:layout_marginStart="25dp"
android:layout_marginTop="6dp" android:layout_marginTop="6dp"
android:layout_marginEnd="25dp"> android:layout_marginEnd="25dp">

View File

@@ -586,6 +586,7 @@
<string name="tag_args_new_zhtsg_jrgwstgm">com.jxwgb.zhtsg,com.jxw.home.ui.activitys.BookDetailActivity,int:jump_type:1#int:book_id:1402,,智慧图书馆</string> <string name="tag_args_new_zhtsg_jrgwstgm">com.jxwgb.zhtsg,com.jxw.home.ui.activitys.BookDetailActivity,int:jump_type:1#int:book_id:1402,,智慧图书馆</string>
<string name="tag_args_new_zhtsg_lryh">com.jxwgb.zhtsg,com.jxw.home.ui.activitys.BookDetailActivity,int:jump_type:1#int:book_id:1416,,智慧图书馆</string> <string name="tag_args_new_zhtsg_lryh">com.jxwgb.zhtsg,com.jxw.home.ui.activitys.BookDetailActivity,int:jump_type:1#int:book_id:1416,,智慧图书馆</string>
<string name="tag_args_new_zhtsg_tjkd">com.jxwgb.zhtsg,com.jxw.home.ui.activitys.BookDetailActivity,int:jump_type:1#int:book_id:810,,智慧图书馆</string> <string name="tag_args_new_zhtsg_tjkd">com.jxwgb.zhtsg,com.jxw.home.ui.activitys.BookDetailActivity,int:jump_type:1#int:book_id:810,,智慧图书馆</string>
<string name="tag_args_new_zhtsg_syhb">com.jxw.yyhb,com.jxw.yyhb.ui.activity.MainActivity,,,双语绘本</string>
<string name="tag_args_new_zhtsg_tmssdxw">com.jxwgb.zhtsg,com.jxw.home.ui.activitys.BookDetailActivity,int:jump_type:1#int:book_id:1410,,智慧图书馆</string> <string name="tag_args_new_zhtsg_tmssdxw">com.jxwgb.zhtsg,com.jxw.home.ui.activitys.BookDetailActivity,int:jump_type:1#int:book_id:1410,,智慧图书馆</string>
<string name="tag_args_new_zhtsg_tsg">com.jxwgb.zhtsg,com.jxw.home.ui.MainActivity,int:home_tab:0#int:jump_type:1,,智慧图书馆</string> <string name="tag_args_new_zhtsg_tsg">com.jxwgb.zhtsg,com.jxw.home.ui.MainActivity,int:home_tab:0#int:jump_type:1,,智慧图书馆</string>
<string name="tag_args_new_zhtsg_xlbb">com.jxwgb.zhtsg,com.jxw.home.ui.activitys.BookDetailActivity,int:jump_type:1#int:book_id:936,,智慧图书馆</string> <string name="tag_args_new_zhtsg_xlbb">com.jxwgb.zhtsg,com.jxw.home.ui.activitys.BookDetailActivity,int:jump_type:1#int:book_id:936,,智慧图书馆</string>
@@ -651,6 +652,7 @@
<string name="tag_args_new_zxxzhjypt">com.eduyun.app.factory.ykt,com.nd.smartcan.appfactory.demo.SplashActivity,,,国家中小学智慧教育平台</string> <string name="tag_args_new_zxxzhjypt">com.eduyun.app.factory.ykt,com.nd.smartcan.appfactory.demo.SplashActivity,,,国家中小学智慧教育平台</string>
<string name="tag_args_new_zyb">com.baidu.homework,com.baidu.homework.activity.init.InitActivity,,,作业帮</string> <string name="tag_args_new_zyb">com.baidu.homework,com.baidu.homework.activity.init.InitActivity,,,作业帮</string>
<string name="tag_args_new_zyhy">com.tech.translate,com.tech.translate.MainActivity,,,中英互译</string> <string name="tag_args_new_zyhy">com.tech.translate,com.tech.translate.MainActivity,,,中英互译</string>
<string name="tag_args_new_arzd">com.jxw.huiben,com.jxw.huiben.activity.SplashActivity,keben,,AR指读</string>
<string name="tag_args_new_zypg">com.jxw.souti,com.jxw.souti.ui.activity.LoadingActivity,int:searchType:2,,作业批改</string> <string name="tag_args_new_zypg">com.jxw.souti,com.jxw.souti.ui.activity.LoadingActivity,int:searchType:2,,作业批改</string>
<string name="tag_args_new_zypg_yy">com.jxw.souti,com.jxw.souti.ui.activity.LoadingActivity,int:searchType:2,,作业批改</string> <string name="tag_args_new_zypg_yy">com.jxw.souti,com.jxw.souti.ui.activity.LoadingActivity,int:searchType:2,,作业批改</string>
<string name="tag_args_qjt">uni.UNIEEABC32,io.dcloud.PandoraEntry,,,巧解题</string> <string name="tag_args_qjt">uni.UNIEEABC32,io.dcloud.PandoraEntry,,,巧解题</string>