zhanghaochen / ParentControl

Browse Code »

Commit 484570f5e69ace351cf39d90919abe8318f8e5ad

Authored by zhanghaochen 2024-06-14 10:34:12 +0800

1 parent 66afddedba

Exists in master

BUG修改

Showing 19 changed files with 447 additions and 69 deletions Show diff stats

app/src/main/AndroidManifest.xml

Diff comments View file @484570f

 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.hjx.parent">
     <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" /> <!-- 允许程序改变网络链接状态 -->
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> <!-- 允许程序访问访问WIFI网络状态信息 -->
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" /> <!-- 允许程序改变WIFI链接状态 -->
     <!-- 6.0系统需要添加权限才能获得wifi列表 -->
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission
         android:name="android.permission.WRITE_EXTERNAL_STORAGE"
         tools:ignore="ScopedStorage" />
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
     <uses-permission android:name="android.permission.GET_PACKAGE_SIZE" />
     <uses-permission
         android:name="android.permission.MANAGE_EXTERNAL_STORAGE"
         tools:ignore="ScopedStorage" />
     <application
         android:name=".App"
         android:allowBackup="true"
         android:icon="@mipmap/icon"
         android:label="@string/app_name"
         android:networkSecurityConfig="@xml/network_security_config"
         android:supportsRtl="true"
         android:theme="@style/Theme.Parent">
         <activity
             android:name=".LoginActivity"
             android:exported="true"
+            android:screenOrientation="portrait"
             android:theme="@style/ThemeSplash">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         <activity
             android:name=".MainActivity"
             android:launchMode="singleTask"
+            android:screenOrientation="portrait"
             android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
         <activity
             android:name=".RegisterActivity"
+            android:screenOrientation="portrait"
             android:theme="@style/ThemeSplash" />
         <activity
             android:name=".UserActivity"
+            android:screenOrientation="portrait"
             android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
         <activity
             android:name=".YinsiActivity"
+            android:screenOrientation="portrait"
             android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
         <activity
             android:name=".QRActivity"
+            android:screenOrientation="portrait"
             android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
         <activity
             android:name=".AddStudentActivity"
+            android:screenOrientation="portrait"
             android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
         <activity
             android:name=".NickActivity"
+            android:screenOrientation="portrait"
             android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
         <activity
             android:name=".SexActivity"
+            android:screenOrientation="portrait"
             android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
         <activity
             android:name=".NianActivity"
+            android:screenOrientation="portrait"
             android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
         <activity
             android:name=".ShenActivity"
+            android:screenOrientation="portrait"
             android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
         <activity
             android:name=".UserAgreementActivity"
+            android:screenOrientation="portrait"
             android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
         <activity
             android:name=".AccountActivity"
+            android:screenOrientation="portrait"
             android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
         <activity
             android:name=".ChangePwdActivity"
+            android:screenOrientation="portrait"
             android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
         <activity
             android:name=".EditStudentActivity"
+            android:screenOrientation="portrait"
             android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
         <activity
             android:name=".ChooseActivity"
+            android:screenOrientation="portrait"
             android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
         <activity
             android:name=".AddTeacherActivity"
+            android:screenOrientation="portrait"
             android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
         <activity
             android:name=".ErrorBookActivity"
+            android:screenOrientation="portrait"
             android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
         <activity
             android:name=".ImageActivity"
+            android:screenOrientation="portrait"
             android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
         <activity
             android:name=".ImageEditActivity"
+            android:screenOrientation="portrait"
             android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
         <activity
             android:name=".ImageSelectActivity"
+            android:screenOrientation="portrait"
             android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
         <activity
             android:name=".AddSuccessActivity"
+            android:screenOrientation="portrait"
             android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
         <activity
             android:name=".ErrorListActivity"
+            android:screenOrientation="portrait"
             android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
         <activity
             android:name=".ErrorDetailActivity"
+            android:screenOrientation="portrait"
             android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
         <activity
             android:name=".TeacherChooseActivity"
+            android:screenOrientation="portrait"
             android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
         <activity
             android:name=".TeacherMainActivity"
+            android:screenOrientation="portrait"
             android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="com.hjx.parent.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true"
             tools:replace="android:authorities">
             <meta-data
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/file_provider_paths"
                 tools:replace="android:resource" />
         </provider>
     </application>
 </manifest>

app/src/main/java/com/hjx/parent/AddSuccessActivity.java

Diff comments View file @484570f

1	package com.hjx.parent;	1	package com.hjx.parent;
2		2
3	import android.content.Intent;	3	import android.content.Intent;
4	import android.graphics.Bitmap;	4	import android.graphics.Bitmap;
5	import android.graphics.BitmapFactory;	5	import android.graphics.BitmapFactory;
6	import android.net.Uri;	6	import android.net.Uri;
7	import android.os.Bundle;	7	import android.os.Bundle;
8	import android.provider.MediaStore;	8	import android.provider.MediaStore;
9	import android.text.TextUtils;	9	import android.text.TextUtils;
10	import android.util.Log;	10	import android.util.Log;
11	import android.view.LayoutInflater;	11	import android.view.LayoutInflater;
12	import android.view.View;	12	import android.view.View;
13		13
14	import androidx.annotation.Nullable;	14	import androidx.annotation.Nullable;
15	import androidx.core.content.FileProvider;	15	import androidx.core.content.FileProvider;
16		16
17	import com.hjx.parent.databinding.ActivityAddSuccessBinding;	17	import com.hjx.parent.databinding.ActivityAddSuccessBinding;
18	import com.prws.common.utils.BitmapUtils;	18	import com.prws.common.utils.BitmapUtils;
19	import com.prws.common.utils.CommonUtil;	19	import com.prws.common.utils.CommonUtil;
20	import com.prws.common.utils.dialog.MyButtomDialog;	20	import com.prws.common.utils.dialog.MyButtomDialog;
21	import com.zhangteng.imagepicker.bean.ImageInfo;	21	import com.zhangteng.imagepicker.bean.ImageInfo;
22	import com.zhangteng.imagepicker.config.ImagePickerConfig;	22	import com.zhangteng.imagepicker.config.ImagePickerConfig;
23	import com.zhangteng.imagepicker.config.ImagePickerEnum;	23	import com.zhangteng.imagepicker.config.ImagePickerEnum;
24	import com.zhangteng.imagepicker.config.ImagePickerOpen;	24	import com.zhangteng.imagepicker.config.ImagePickerOpen;
25	import com.zhangteng.imagepicker.imageloader.GlideImageLoader;	25	import com.zhangteng.imagepicker.imageloader.GlideImageLoader;
26	import com.zhangteng.utils.IHandlerCallBack;	26	import com.zhangteng.utils.IHandlerCallBack;
27		27
28	import java.io.File;	28	import java.io.File;
29	import java.util.ArrayList;	29	import java.util.ArrayList;
30	import java.util.List;	30	import java.util.List;
31		31
32	public class AddSuccessActivity extends BaseActivity<ActivityAddSuccessBinding> {	32	public class AddSuccessActivity extends BaseActivity<ActivityAddSuccessBinding> {
33	private int REQUEST_CODE_IMAGE = 123;	33	private int REQUEST_CODE_IMAGE = 123;
34	private String filePath;	34	private String filePath;
35		35
36	@Override	36	@Override
37	public void initView(Bundle savedInstanceState) {	37	public void initView(Bundle savedInstanceState) {
38	binding.ivBack.setOnClickListener(new View.OnClickListener() {	38	binding.ivBack.setOnClickListener(new View.OnClickListener() {
39	@Override	39	@Override
40	public void onClick(View v) {	40	public void onClick(View v) {
41	finish();	41	finish();
42	}	42	}
43	});	43	});
44	binding.tvAdd.setOnClickListener(new View.OnClickListener() {	44	binding.tvAdd.setOnClickListener(new View.OnClickListener() {
45	@Override	45	@Override
46	public void onClick(View v) {	46	public void onClick(View v) {
47	MyButtomDialog dialog = new MyButtomDialog(context, R.style.BottomSheetDialog);	47	MyButtomDialog dialog = new MyButtomDialog(context, R.style.BottomSheetDialog);
48	View bottomView = LayoutInflater.from(context).inflate(R.layout.bottom_sheet_layout, null);	48	View bottomView = LayoutInflater.from(context).inflate(R.layout.bottom_sheet_layout, null);
49	dialog.setContentView(bottomView);	49	dialog.setContentView(bottomView);
50	bottomView.findViewById(R.id.take_photo).setOnClickListener(new View.OnClickListener() {	50	bottomView.findViewById(R.id.take_photo).setOnClickListener(new View.OnClickListener() {
51	@Override	51	@Override
52	public void onClick(View view) {	52	public void onClick(View view) {
53	dialog.dismiss();	53	dialog.dismiss();
54	Intent takePictureIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);	54	Intent takePictureIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
55	//确保有相机来处理Intent	55	//确保有相机来处理Intent
56	filePath = context.getExternalFilesDir("images").getPath() + "/" + String.valueOf(System.currentTimeMillis()) + CommonUtil.getStr() + ".jpg";	56	filePath = context.getExternalFilesDir("images").getPath() + "/" + String.valueOf(System.currentTimeMillis()) + CommonUtil.getStr() + ".jpg";
57	File photoFile = new File(filePath);	57	File photoFile = new File(filePath);
58	if (photoFile != null) {	58	if (photoFile != null) {
59	//适配Android 7.0文件权限，通过FileProvider创建一个content类型的Uri	59	//适配Android 7.0文件权限，通过FileProvider创建一个content类型的Uri
60	Uri photoUri = FileProvider.getUriForFile(activity, "com.hjx.parent.fileprovider", photoFile);	60	Uri photoUri = FileProvider.getUriForFile(activity, "com.hjx.parent.fileprovider", photoFile);
61	takePictureIntent.addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION);	61	takePictureIntent.addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
62	takePictureIntent.putExtra(MediaStore.EXTRA_OUTPUT, photoUri);	62	takePictureIntent.putExtra(MediaStore.EXTRA_OUTPUT, photoUri);
63	activity.startActivityForResult(takePictureIntent, REQUEST_CODE_IMAGE);	63	activity.startActivityForResult(takePictureIntent, REQUEST_CODE_IMAGE);
64	}	64	}
65	}	65	}
66	});	66	});
67	bottomView.findViewById(R.id.choose_photo).setOnClickListener(new View.OnClickListener() {	67	bottomView.findViewById(R.id.choose_photo).setOnClickListener(new View.OnClickListener() {
68	@Override	68	@Override
69	public void onClick(View view) {	69	public void onClick(View view) {
70	dialog.dismiss();	70	dialog.dismiss();
71	ImagePickerConfig imagePickerConfig = new ImagePickerConfig.Builder().provider(getPackageName() + ".fileprovider").imageLoader(new GlideImageLoader()) //图片加载器	71	ImagePickerConfig imagePickerConfig = new ImagePickerConfig.Builder().provider(getPackageName() + ".fileprovider").imageLoader(new GlideImageLoader()) //图片加载器
72	.iHandlerCallBack(new HandlerCallBack()) //图片选择器生命周期监听（直接打开摄像头时无效）	72	.iHandlerCallBack(new HandlerCallBack()) //图片选择器生命周期监听（直接打开摄像头时无效）
73	.multiSelect(true) //是否多选	73	.multiSelect(true) //是否多选
74	.isShowCamera(false).isVideoPicker(false) //是否选择视频默认false	74	.isShowCamera(false).isVideoPicker(false) //是否选择视频默认false
75	.isImagePicker(true).imagePickerType(ImagePickerEnum.PHOTO_PICKER) //选择器打开类型	75	.isImagePicker(true).imagePickerType(ImagePickerEnum.PHOTO_PICKER) //选择器打开类型
76	.maxImageSelectable(9) //图片可选择数	76	.maxImageSelectable(5) //图片可选择数
77	.maxHeight(1920) //图片最大高度	77	.maxHeight(1920) //图片最大高度
78	.maxWidth(1920) //图片最大宽度	78	.maxWidth(1920) //图片最大宽度
79	.maxImageSize(10) //图片最大大小Mb	79	.maxImageSize(3) //图片最大大小Mb
80	.isCrop(false).pathList(new ArrayList<>()).pickerThemeColorRes(R.color.image_picker_white).pickerTitleColorRes(R.color.image_picker_text_black).cropThemeColorRes(R.color.image_picker_white).cropTitleColorRes(R.color.image_picker_text_black).pickerBackRes(R.mipmap.image_picker_back_black).pickerFolderRes(R.mipmap.image_picker_folder_black).build();	80	.isCrop(false).pathList(new ArrayList<>()).pickerThemeColorRes(R.color.image_picker_white).pickerTitleColorRes(R.color.image_picker_text_black).cropThemeColorRes(R.color.image_picker_white).cropTitleColorRes(R.color.image_picker_text_black).pickerBackRes(R.mipmap.image_picker_back_black).pickerFolderRes(R.mipmap.image_picker_folder_black).build();
81	ImagePickerOpen.getInstance().setImagePickerConfig(imagePickerConfig).pathList(new ArrayList<>()).open(AddSuccessActivity.this);	81	ImagePickerOpen.getInstance().setImagePickerConfig(imagePickerConfig).pathList(new ArrayList<>()).open(AddSuccessActivity.this);
82		82
83	}	83	}
84	});	84	});
85	bottomView.findViewById(R.id.cancel).setOnClickListener(new View.OnClickListener() {	85	bottomView.findViewById(R.id.cancel).setOnClickListener(new View.OnClickListener() {
86	@Override	86	@Override
87	public void onClick(View view) {	87	public void onClick(View view) {
88	dialog.dismiss();	88	dialog.dismiss();
89	}	89	}
90	});	90	});
91	dialog.show();	91	dialog.show();
92	}	92	}
93	});	93	});
94	binding.tvBook.setOnClickListener(new View.OnClickListener() {	94	binding.tvBook.setOnClickListener(new View.OnClickListener() {
95	@Override	95	@Override
96	public void onClick(View v) {	96	public void onClick(View v) {
97	startActivity(new Intent(context, ErrorListActivity.class));	97	startActivity(new Intent(context, ErrorListActivity.class));
98	}	98	}
99	});	99	});
100	}	100	}
101		101
102	@Override	102	@Override
103	protected ActivityAddSuccessBinding getViewBinding() {	103	protected ActivityAddSuccessBinding getViewBinding() {
104	return ActivityAddSuccessBinding.inflate(getLayoutInflater());	104	return ActivityAddSuccessBinding.inflate(getLayoutInflater());
105	}	105	}
106		106
107	@Override	107	@Override
108	protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {	108	protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
109	super.onActivityResult(requestCode, resultCode, data);	109	super.onActivityResult(requestCode, resultCode, data);
110	if (requestCode == REQUEST_CODE_IMAGE && resultCode == RESULT_OK && !TextUtils.isEmpty(filePath)) {	110	if (requestCode == REQUEST_CODE_IMAGE && resultCode == RESULT_OK && !TextUtils.isEmpty(filePath)) {
111	Bitmap b = BitmapUtils.compress(BitmapFactory.decodeFile(filePath));	111	Bitmap b = BitmapUtils.compress(BitmapFactory.decodeFile(filePath));
112	String path = context.getExternalFilesDir("images").getPath() + "/" + String.valueOf(System.currentTimeMillis()) + CommonUtil.getStr() + ".jpg";	112	String path = context.getExternalFilesDir("images").getPath() + "/" + String.valueOf(System.currentTimeMillis()) + CommonUtil.getStr() + ".jpg";
113	CommonUtil.saveBitmapToUri(b, path);	113	CommonUtil.saveBitmapToUri(b, path);
114	List<String> strings = new ArrayList<>();	114	List<String> strings = new ArrayList<>();
115	Intent intent = new Intent(context, ImageActivity.class);	115	Intent intent = new Intent(context, ImageActivity.class);
116	strings.add(path);	116	strings.add(path);
117	intent.putStringArrayListExtra("images", (ArrayList<String>) strings);	117	intent.putStringArrayListExtra("images", (ArrayList<String>) strings);
118	startActivity(intent);	118	startActivity(intent);
119	finish();	119	finish();
120	}	120	}
121	}	121	}
122		122
123	public class HandlerCallBack implements IHandlerCallBack<ImageInfo> {	123	public class HandlerCallBack implements IHandlerCallBack<ImageInfo> {
124	private String TAG = "---ImagePicker---";	124	private String TAG = "---ImagePicker---";
125	List<ImageInfo> photoList = new ArrayList<>();	125	List<ImageInfo> photoList = new ArrayList<>();
126		126
127	@Override	127	@Override
128	public void onStart() {	128	public void onStart() {
129	Log.i(TAG, "onStart: 开启");	129	Log.i(TAG, "onStart: 开启");
130	}	130	}
131		131
132	@Override	132	@Override
133	public void onSuccess(List<ImageInfo> photoList) {	133	public void onSuccess(List<ImageInfo> photoList) {
134	this.photoList = photoList;	134	this.photoList = photoList;
135	Log.i(TAG, "onSuccess: 返回数据");	135	Log.i(TAG, "onSuccess: 返回数据");
136	}	136	}
137		137
138	@Override	138	@Override
139	public void onCancel() {	139	public void onCancel() {
140	Log.i(TAG, "onCancel: 取消");	140	Log.i(TAG, "onCancel: 取消");
141	}	141	}
142		142
143	@Override	143	@Override
144	public void onFinish(List<ImageInfo> selectImage) {	144	public void onFinish(List<ImageInfo> selectImage) {
145	if (selectImage.size() == photoList.size()) {	145	if (selectImage.size() == photoList.size()) {
146	List<String> strings = new ArrayList<>();	146	List<String> strings = new ArrayList<>();
147	Intent intent = new Intent(context, ImageActivity.class);	147	Intent intent = new Intent(context, ImageActivity.class);
148	for (ImageInfo imageInfo : selectImage) {	148	for (ImageInfo imageInfo : selectImage) {
149	strings.add(imageInfo.getPath());	149	strings.add(imageInfo.getPath());
150	}	150	}
151	intent.putStringArrayListExtra("images", (ArrayList<String>) strings);	151	intent.putStringArrayListExtra("images", (ArrayList<String>) strings);
152	startActivity(intent);	152	startActivity(intent);
153	finish();	153	finish();
154	}	154	}
155	}	155	}
156		156
157	@Override	157	@Override
158	public void onError() {	158	public void onError() {
159	Log.i(TAG, "onError: 出错");	159	Log.i(TAG, "onError: 出错");
160	}	160	}
161	}	161	}
162	}	162	}
163		163

app/src/main/java/com/hjx/parent/ErrorBookActivity.java

Diff comments View file @484570f

1	package com.hjx.parent;	1	package com.hjx.parent;
2		2
3	import android.content.Intent;	3	import android.content.Intent;
4	import android.graphics.Bitmap;	4	import android.graphics.Bitmap;
5	import android.graphics.BitmapFactory;	5	import android.graphics.BitmapFactory;
6	import android.net.Uri;	6	import android.net.Uri;
7	import android.os.Bundle;	7	import android.os.Bundle;
8	import android.provider.MediaStore;	8	import android.provider.MediaStore;
9	import android.text.TextUtils;	9	import android.text.TextUtils;
10	import android.util.Log;	10	import android.util.Log;
11	import android.view.LayoutInflater;	11	import android.view.LayoutInflater;
12	import android.view.View;	12	import android.view.View;
13	import android.view.ViewGroup;	13	import android.view.ViewGroup;
14	import android.widget.LinearLayout;	14	import android.widget.LinearLayout;
15	import android.widget.Toast;	15	import android.widget.Toast;
16		16
17	import androidx.annotation.NonNull;	17	import androidx.annotation.NonNull;
18	import androidx.annotation.Nullable;	18	import androidx.annotation.Nullable;
19	import androidx.core.content.FileProvider;	19	import androidx.core.content.FileProvider;
20	import androidx.recyclerview.widget.LinearLayoutManager;	20	import androidx.recyclerview.widget.LinearLayoutManager;
21	import androidx.recyclerview.widget.RecyclerView;	21	import androidx.recyclerview.widget.RecyclerView;
22		22
23	import com.chad.library.adapter.base.BaseQuickAdapter;	23	import com.chad.library.adapter.base.BaseQuickAdapter;
24	import com.chad.library.adapter.base.BaseViewHolder;	24	import com.chad.library.adapter.base.BaseViewHolder;
25	import com.google.gson.Gson;	25	import com.google.gson.Gson;
26	import com.hjq.permissions.OnPermissionCallback;	26	import com.hjq.permissions.OnPermissionCallback;
27	import com.hjq.permissions.Permission;	27	import com.hjq.permissions.Permission;
28	import com.hjq.permissions.XXPermissions;	28	import com.hjq.permissions.XXPermissions;
29	import com.hjx.parent.adapter.ErrorAdapter;	29	import com.hjx.parent.adapter.ErrorAdapter;
30	import com.hjx.parent.bean.StudentBean;	30	import com.hjx.parent.bean.StudentBean;
31	import com.hjx.parent.databinding.ActivityErrorBookBinding;	31	import com.hjx.parent.databinding.ActivityErrorBookBinding;
32	import com.prws.common.base.BasePresenter;	32	import com.prws.common.base.BasePresenter;
33	import com.prws.common.bean.ImageBean;	33	import com.prws.common.bean.ImageBean;
34	import com.prws.common.bean.PageInfo;	34	import com.prws.common.bean.PageInfo;
35	import com.prws.common.bean.ResponseResult;	35	import com.prws.common.bean.ResponseResult;
36	import com.prws.common.bean.TopicBean;	36	import com.prws.common.bean.TopicBean;
37	import com.prws.common.net.NetWorks;	37	import com.prws.common.net.NetWorks;
38	import com.prws.common.utils.BitmapUtils;	38	import com.prws.common.utils.BitmapUtils;
39	import com.prws.common.utils.CommonUtil;	39	import com.prws.common.utils.CommonUtil;
40	import com.prws.common.utils.SharedPreferencesUtil;	40	import com.prws.common.utils.SharedPreferencesUtil;
41	import com.prws.common.utils.dialog.MyButtomDialog;	41	import com.prws.common.utils.dialog.MyButtomDialog;
42	import com.zhangteng.imagepicker.bean.ImageInfo;	42	import com.zhangteng.imagepicker.bean.ImageInfo;
43	import com.zhangteng.imagepicker.callback.HandlerCallBack;	43	import com.zhangteng.imagepicker.callback.HandlerCallBack;
44	import com.zhangteng.imagepicker.config.ImagePickerConfig;	44	import com.zhangteng.imagepicker.config.ImagePickerConfig;
45	import com.zhangteng.imagepicker.config.ImagePickerEnum;	45	import com.zhangteng.imagepicker.config.ImagePickerEnum;
46	import com.zhangteng.imagepicker.config.ImagePickerOpen;	46	import com.zhangteng.imagepicker.config.ImagePickerOpen;
47	import com.zhangteng.imagepicker.imageloader.GlideImageLoader;	47	import com.zhangteng.imagepicker.imageloader.GlideImageLoader;
48	import com.zhangteng.utils.IHandlerCallBack;	48	import com.zhangteng.utils.IHandlerCallBack;
49		49
50	import java.io.File;	50	import java.io.File;
51	import java.util.ArrayList;	51	import java.util.ArrayList;
52	import java.util.Arrays;	52	import java.util.Arrays;
53	import java.util.HashMap;	53	import java.util.HashMap;
54	import java.util.List;	54	import java.util.List;
55	import java.util.Map;	55	import java.util.Map;
56		56
57	import io.reactivex.Observer;	57	import io.reactivex.Observer;
58	import io.reactivex.disposables.Disposable;	58	import io.reactivex.disposables.Disposable;
59		59
60	public class ErrorBookActivity extends BaseActivity<ActivityErrorBookBinding> {	60	public class ErrorBookActivity extends BaseActivity<ActivityErrorBookBinding> {
61	StudentBean studentBean;	61	StudentBean studentBean;
62	private int subject;	62	private int subject;
63	private ErrorAdapter adapter;	63	private ErrorAdapter adapter;
64	private int REQUEST_CODE_IMAGE = 123;	64	private int REQUEST_CODE_IMAGE = 123;
65	private String filePath;	65	private String filePath;
66		66
67	@Override	67	@Override
68	public void initView(Bundle savedInstanceState) {	68	public void initView(Bundle savedInstanceState) {
69	String student = (String) SharedPreferencesUtil.getData("student", "");	69	String student = (String) SharedPreferencesUtil.getData("student", "");
70	try {	70	try {
71	studentBean = new Gson().fromJson(student, StudentBean.class);	71	studentBean = new Gson().fromJson(student, StudentBean.class);
72	} catch (Exception e) {	72	} catch (Exception e) {
73		73
74	}	74	}
75	binding.ivBack.setOnClickListener(new View.OnClickListener() {	75	binding.ivBack.setOnClickListener(new View.OnClickListener() {
76	@Override	76	@Override
77	public void onClick(View v) {	77	public void onClick(View v) {
78	finish();	78	finish();
79	}	79	}
80	});	80	});
81	binding.rlTakePhoto.post(new Runnable() {	81	binding.rlTakePhoto.post(new Runnable() {
82	@Override	82	@Override
83	public void run() {	83	public void run() {
84	LinearLayout.LayoutParams layoutParams = (LinearLayout.LayoutParams) binding.rlTakePhoto.getLayoutParams();	84	LinearLayout.LayoutParams layoutParams = (LinearLayout.LayoutParams) binding.rlTakePhoto.getLayoutParams();
85	layoutParams.width = CommonUtil.getScreenWidth(context);	85	layoutParams.width = CommonUtil.getScreenWidth(context);
86	layoutParams.height = CommonUtil.getScreenWidth(context) * 20 / 37;	86	layoutParams.height = CommonUtil.getScreenWidth(context) * 20 / 37;
87	binding.rlTakePhoto.setLayoutParams(layoutParams);	87	binding.rlTakePhoto.setLayoutParams(layoutParams);
88	}	88	}
89	});	89	});
90	binding.rlTakePhoto.setOnClickListener(new View.OnClickListener() {	90	binding.rlTakePhoto.setOnClickListener(new View.OnClickListener() {
91	@Override	91	@Override
92	public void onClick(View v) {	92	public void onClick(View v) {
93	if (!XXPermissions.isGranted(context, Permission.CAMERA, Permission.WRITE_EXTERNAL_STORAGE)) {	93	if (!XXPermissions.isGranted(context, Permission.CAMERA, Permission.WRITE_EXTERNAL_STORAGE)) {
94	XXPermissions.with(context)	94	XXPermissions.with(context)
95	// 申请多个权限	95	// 申请多个权限
96	.permission(Permission.CAMERA)	96	.permission(Permission.CAMERA)
97	.request(new OnPermissionCallback() {	97	.request(new OnPermissionCallback() {
98	@Override	98	@Override
99	public void onGranted(List<String> permissions, boolean all) {	99	public void onGranted(List<String> permissions, boolean all) {
100	if (all) {	100	if (all) {
101	//开启扫码界面	101	//开启扫码界面
102	showButtonDialog();	102	showButtonDialog();
103	} else {	103	} else {
104	Toast.makeText(context, "需要权限", Toast.LENGTH_SHORT).show();	104	Toast.makeText(context, "需要权限", Toast.LENGTH_SHORT).show();
105	}	105	}
106	}	106	}
107		107
108	@Override	108	@Override
109	public void onDenied(List<String> permissions, boolean never) {	109	public void onDenied(List<String> permissions, boolean never) {
110	XXPermissions.startPermissionActivity(context, permissions);	110	XXPermissions.startPermissionActivity(context, permissions);
111	}	111	}
112	});	112	});
113	} else {	113	} else {
114	showButtonDialog();	114	showButtonDialog();
115	}	115	}
116		116
117	}	117	}
118	});	118	});
119	BaseQuickAdapter adapter = new BaseQuickAdapter(R.layout.item_subject, Arrays.asList(getResources().getStringArray(R.array.filter_subject))) {	119	BaseQuickAdapter adapter = new BaseQuickAdapter(R.layout.item_subject, Arrays.asList(getResources().getStringArray(R.array.filter_subject))) {
120	@Override	120	@Override
121	public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {	121	public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
122		122
123	}	123	}
124		124
125	@Override	125	@Override
126	protected void convert(@NonNull BaseViewHolder item, Object o) {	126	protected void convert(@NonNull BaseViewHolder item, Object o) {
127	item.setText(R.id.tv_subject, getResources().getStringArray(R.array.filter_subject)[item.getAdapterPosition()]);	127	item.setText(R.id.tv_subject, getResources().getStringArray(R.array.filter_subject)[item.getAdapterPosition()]);
128	switch (item.getAdapterPosition()) {	128	switch (item.getAdapterPosition()) {
129	case 0:	129	case 0:
130	item.setImageResource(R.id.iv_subject, R.mipmap.ic_chinese);	130	item.setImageResource(R.id.iv_subject, R.mipmap.ic_chinese);
131	break;	131	break;
132	case 1:	132	case 1:
133	item.setImageResource(R.id.iv_subject, R.mipmap.ic_math);	133	item.setImageResource(R.id.iv_subject, R.mipmap.ic_math);
134	break;	134	break;
135	case 2:	135	case 2:
136	item.setImageResource(R.id.iv_subject, R.mipmap.ic_english);	136	item.setImageResource(R.id.iv_subject, R.mipmap.ic_english);
137	break;	137	break;
138	case 3:	138	case 3:
139	item.setImageResource(R.id.iv_subject, R.mipmap.ic_physics);	139	item.setImageResource(R.id.iv_subject, R.mipmap.ic_physics);
140	break;	140	break;
141	case 4:	141	case 4:
142	item.setImageResource(R.id.iv_subject, R.mipmap.ic_chemistry);	142	item.setImageResource(R.id.iv_subject, R.mipmap.ic_chemistry);
143	break;	143	break;
144	}	144	}
145	ViewGroup.LayoutParams layoutParams = item.getView(R.id.rl_subject).getLayoutParams();	145	ViewGroup.LayoutParams layoutParams = item.getView(R.id.rl_subject).getLayoutParams();
146	layoutParams.width = (CommonUtil.getScreenWidth(context) - CommonUtil.dpToPx(context, 30)) / 4;	146	layoutParams.width = (CommonUtil.getScreenWidth(context) - CommonUtil.dpToPx(context, 30)) / 4;
147	item.getView(R.id.rl_subject).setLayoutParams(layoutParams);	147	item.getView(R.id.rl_subject).setLayoutParams(layoutParams);
148	item.getConvertView().setOnClickListener(new View.OnClickListener() {	148	item.getConvertView().setOnClickListener(new View.OnClickListener() {
149	@Override	149	@Override
150	public void onClick(View v) {	150	public void onClick(View v) {
151	if (subject != item.getAdapterPosition()) {	151	if (subject != item.getAdapterPosition()) {
152	subject = item.getAdapterPosition();	152	subject = item.getAdapterPosition();
153	getError(getResources().getStringArray(R.array.filter_subject)[subject]);	153	getError(getResources().getStringArray(R.array.filter_subject)[subject]);
154	}	154	}
155	}	155	}
156	});	156	});
157	}	157	}
158	};	158	};
159	binding.recycleSubject.setLayoutManager(new LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false));	159	binding.recycleSubject.setLayoutManager(new LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false));
160	binding.recycleSubject.setAdapter(adapter);	160	binding.recycleSubject.setAdapter(adapter);
161	subject = 0;	161	subject = 0;
162	getError(getResources().getStringArray(R.array.filter_subject)[subject]);	162	getError(getResources().getStringArray(R.array.filter_subject)[subject]);
163	binding.llAll.setOnClickListener(new View.OnClickListener() {	163	binding.llAll.setOnClickListener(new View.OnClickListener() {
164	@Override	164	@Override
165	public void onClick(View v) {	165	public void onClick(View v) {
166	Intent intent = new Intent(context, ErrorListActivity.class);	166	Intent intent = new Intent(context, ErrorListActivity.class);
167	startActivity(intent);	167	startActivity(intent);
168	}	168	}
169	});	169	});
170	}	170	}
171		171
172	@Override	172	@Override
173	protected ActivityErrorBookBinding getViewBinding() {	173	protected ActivityErrorBookBinding getViewBinding() {
174	return ActivityErrorBookBinding.inflate(getLayoutInflater());	174	return ActivityErrorBookBinding.inflate(getLayoutInflater());
175	}	175	}
176		176
177	private void showButtonDialog() {	177	private void showButtonDialog() {
178	MyButtomDialog dialog = new MyButtomDialog(context, R.style.BottomSheetDialog);	178	MyButtomDialog dialog = new MyButtomDialog(context, R.style.BottomSheetDialog);
179	View bottomView = LayoutInflater.from(context).inflate(R.layout.bottom_sheet_layout, null);	179	View bottomView = LayoutInflater.from(context).inflate(R.layout.bottom_sheet_layout, null);
180	dialog.setContentView(bottomView);	180	dialog.setContentView(bottomView);
181	bottomView.findViewById(R.id.take_photo).setOnClickListener(new View.OnClickListener() {	181	bottomView.findViewById(R.id.take_photo).setOnClickListener(new View.OnClickListener() {
182	@Override	182	@Override
183	public void onClick(View view) {	183	public void onClick(View view) {
184	dialog.dismiss();	184	dialog.dismiss();
185	Intent takePictureIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);	185	Intent takePictureIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
186	//确保有相机来处理Intent	186	//确保有相机来处理Intent
187	filePath = context.getExternalFilesDir("images").getPath() + "/" + String.valueOf(System.currentTimeMillis()) + CommonUtil.getStr() + ".jpg";	187	filePath = context.getExternalFilesDir("images").getPath() + "/" + String.valueOf(System.currentTimeMillis()) + CommonUtil.getStr() + ".jpg";
188	File photoFile = new File(filePath);	188	File photoFile = new File(filePath);
189	if (photoFile != null) {	189	if (photoFile != null) {
190	//适配Android 7.0文件权限，通过FileProvider创建一个content类型的Uri	190	//适配Android 7.0文件权限，通过FileProvider创建一个content类型的Uri
191	Uri photoUri = FileProvider.getUriForFile(activity, "com.hjx.parent.fileprovider", photoFile);	191	Uri photoUri = FileProvider.getUriForFile(activity, "com.hjx.parent.fileprovider", photoFile);
192	takePictureIntent.addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION);	192	takePictureIntent.addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
193	takePictureIntent.putExtra(MediaStore.EXTRA_OUTPUT, photoUri);	193	takePictureIntent.putExtra(MediaStore.EXTRA_OUTPUT, photoUri);
194	activity.startActivityForResult(takePictureIntent, REQUEST_CODE_IMAGE);	194	activity.startActivityForResult(takePictureIntent, REQUEST_CODE_IMAGE);
195	}	195	}
196	}	196	}
197	});	197	});
198	bottomView.findViewById(R.id.choose_photo).setOnClickListener(new View.OnClickListener() {	198	bottomView.findViewById(R.id.choose_photo).setOnClickListener(new View.OnClickListener() {
199	@Override	199	@Override
200	public void onClick(View view) {	200	public void onClick(View view) {
201	dialog.dismiss();	201	dialog.dismiss();
202	ImagePickerConfig imagePickerConfig = new ImagePickerConfig.Builder().provider(getPackageName() + ".fileprovider").imageLoader(new GlideImageLoader()) //图片加载器	202	ImagePickerConfig imagePickerConfig = new ImagePickerConfig.Builder().provider(getPackageName() + ".fileprovider").imageLoader(new GlideImageLoader()) //图片加载器
203	.iHandlerCallBack(new HandlerCallBack()) //图片选择器生命周期监听（直接打开摄像头时无效）	203	.iHandlerCallBack(new HandlerCallBack()) //图片选择器生命周期监听（直接打开摄像头时无效）
204	.multiSelect(true) //是否多选	204	.multiSelect(true) //是否多选
205	.isShowCamera(false).isVideoPicker(false) //是否选择视频默认false	205	.isShowCamera(false).isVideoPicker(false) //是否选择视频默认false
206	.isImagePicker(true).imagePickerType(ImagePickerEnum.PHOTO_PICKER) //选择器打开类型	206	.isImagePicker(true).imagePickerType(ImagePickerEnum.PHOTO_PICKER) //选择器打开类型
207	.maxImageSelectable(9) //图片可选择数	207	.maxImageSelectable(5) //图片可选择数
208	.maxHeight(1920) //图片最大高度	208	.maxHeight(1920) //图片最大高度
209	.maxWidth(1920) //图片最大宽度	209	.maxWidth(1920) //图片最大宽度
210	.maxImageSize(10) //图片最大大小Mb	210	.maxImageSize(3) //图片最大大小Mb
211	.isCrop(false).pathList(new ArrayList<>()).pickerThemeColorRes(R.color.image_picker_white).pickerTitleColorRes(R.color.image_picker_text_black).cropThemeColorRes(R.color.image_picker_white).cropTitleColorRes(R.color.image_picker_text_black).pickerBackRes(R.mipmap.image_picker_back_black).pickerFolderRes(R.mipmap.image_picker_folder_black).build();	211	.isCrop(false).pathList(new ArrayList<>()).pickerThemeColorRes(R.color.image_picker_white).pickerTitleColorRes(R.color.image_picker_text_black).cropThemeColorRes(R.color.image_picker_white).cropTitleColorRes(R.color.image_picker_text_black).pickerBackRes(R.mipmap.image_picker_back_black).pickerFolderRes(R.mipmap.image_picker_folder_black).build();
212	ImagePickerOpen.getInstance().setImagePickerConfig(imagePickerConfig).pathList(new ArrayList<>()).open(ErrorBookActivity.this);	212	ImagePickerOpen.getInstance().setImagePickerConfig(imagePickerConfig).pathList(new ArrayList<>()).open(ErrorBookActivity.this);
213		213
214	}	214	}
215	});	215	});
216	bottomView.findViewById(R.id.cancel).setOnClickListener(new View.OnClickListener() {	216	bottomView.findViewById(R.id.cancel).setOnClickListener(new View.OnClickListener() {
217	@Override	217	@Override
218	public void onClick(View view) {	218	public void onClick(View view) {
219	dialog.dismiss();	219	dialog.dismiss();
220	}	220	}
221	});	221	});
222	dialog.show();	222	dialog.show();
223	}	223	}
224		224
225	private void getError(String subject) {	225	private void getError(String subject) {
226	if (studentBean != null) {	226	if (studentBean != null) {
227	Map map = new HashMap();	227	Map map = new HashMap();
228	map.put("subject", subject);	228	map.put("subject", subject);
229	map.put("stuId", studentBean.getStuId());	229	map.put("stuId", studentBean.getStuId());
230	map.put("pageSize", 5);	230	map.put("pageSize", 5);
231	map.put("pageNum", 1);	231	map.put("pageNum", 1);
232	NetWorks.getError(map, new Observer<ResponseResult<PageInfo<TopicBean>>>() {	232	NetWorks.getError(map, new Observer<ResponseResult<PageInfo<TopicBean>>>() {
233	@Override	233	@Override
234	public void onSubscribe(Disposable d) {	234	public void onSubscribe(Disposable d) {
235		235
236	}	236	}
237		237
238	@Override	238	@Override
239	public void onNext(ResponseResult<PageInfo<TopicBean>> result) {	239	public void onNext(ResponseResult<PageInfo<TopicBean>> result) {
240	if (result.getData() != null && result.getCode() == 200) {	240	if (result.getData() != null && result.getCode() == 200) {
241	List<TopicBean> topicBeans = result.getData().getList();	241	List<TopicBean> topicBeans = result.getData().getList();
242	loadError(topicBeans);	242	loadError(topicBeans);
243	}	243	}
244	}	244	}
245		245
246	@Override	246	@Override
247	public void onError(Throwable e) {	247	public void onError(Throwable e) {
248	e.toString();	248	e.toString();
249	}	249	}
250		250
251	@Override	251	@Override
252	public void onComplete() {	252	public void onComplete() {
253		253
254	}	254	}
255	});	255	});
256	}	256	}
257	}	257	}
258		258
259	@Override	259	@Override
260	protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {	260	protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
261	super.onActivityResult(requestCode, resultCode, data);	261	super.onActivityResult(requestCode, resultCode, data);
262	if (requestCode == REQUEST_CODE_IMAGE && resultCode == RESULT_OK && !TextUtils.isEmpty(filePath)) {	262	if (requestCode == REQUEST_CODE_IMAGE && resultCode == RESULT_OK && !TextUtils.isEmpty(filePath)) {
263	Bitmap b = BitmapUtils.compress(BitmapFactory.decodeFile(filePath));	263	Bitmap b = BitmapUtils.compress(BitmapFactory.decodeFile(filePath));
264	String path = context.getExternalFilesDir("images").getPath() + "/" + String.valueOf(System.currentTimeMillis()) + CommonUtil.getStr() + ".jpg";	264	String path = context.getExternalFilesDir("images").getPath() + "/" + String.valueOf(System.currentTimeMillis()) + CommonUtil.getStr() + ".jpg";
265	CommonUtil.saveBitmapToUri(b, path);	265	CommonUtil.saveBitmapToUri(b, path);
266	List<String> strings = new ArrayList<>();	266	List<String> strings = new ArrayList<>();
267	Intent intent = new Intent(context, ImageActivity.class);	267	Intent intent = new Intent(context, ImageActivity.class);
268	strings.add(path);	268	strings.add(path);
269	intent.putStringArrayListExtra("images", (ArrayList<String>) strings);	269	intent.putStringArrayListExtra("images", (ArrayList<String>) strings);
270	startActivity(intent);	270	startActivity(intent);
271	}	271	}
272	}	272	}
273		273
274	private void loadError(List<TopicBean> list) {	274	private void loadError(List<TopicBean> list) {
275	if (list.size() > 0) {	275	if (list.size() > 0) {
276	binding.recycleError.setVisibility(View.VISIBLE);	276	binding.recycleError.setVisibility(View.VISIBLE);
277	binding.llEmpty.setVisibility(View.GONE);	277	binding.llEmpty.setVisibility(View.GONE);
278	if (adapter != null) {	278	if (adapter != null) {
279	adapter.refresh(list);	279	adapter.refresh(list);
280	} else {	280	} else {
281	adapter = new ErrorAdapter(context, list, false);	281	adapter = new ErrorAdapter(context, list, false);
282	binding.recycleError.setLayoutManager(new LinearLayoutManager(context, RecyclerView.VERTICAL, false));	282	binding.recycleError.setLayoutManager(new LinearLayoutManager(context, RecyclerView.VERTICAL, false));
283	binding.recycleError.setAdapter(adapter);	283	binding.recycleError.setAdapter(adapter);
284	}	284	}
285	} else {	285	} else {
286	binding.recycleError.setVisibility(View.GONE);	286	binding.recycleError.setVisibility(View.GONE);
287	binding.llEmpty.setVisibility(View.VISIBLE);	287	binding.llEmpty.setVisibility(View.VISIBLE);
288	}	288	}
289	}	289	}
290		290
291	@Override	291	@Override
292	protected void onResume() {	292	protected void onResume() {
293	super.onResume();	293	super.onResume();
294	getError(getResources().getStringArray(R.array.filter_subject)[subject]);	294	getError(getResources().getStringArray(R.array.filter_subject)[subject]);
295	}	295	}
296		296
297	public class HandlerCallBack implements IHandlerCallBack<ImageInfo> {	297	public class HandlerCallBack implements IHandlerCallBack<ImageInfo> {
298	private String TAG = "---ImagePicker---";	298	private String TAG = "---ImagePicker---";
299	List<ImageInfo> photoList = new ArrayList<>();	299	List<ImageInfo> photoList = new ArrayList<>();
300		300
301	@Override	301	@Override
302	public void onStart() {	302	public void onStart() {
303	Log.i(TAG, "onStart: 开启");	303	Log.i(TAG, "onStart: 开启");
304	}	304	}
305		305
306	@Override	306	@Override
307	public void onSuccess(List<ImageInfo> photoList) {	307	public void onSuccess(List<ImageInfo> photoList) {
308	this.photoList = photoList;	308	this.photoList = photoList;
309	Log.i(TAG, "onSuccess: 返回数据");	309	Log.i(TAG, "onSuccess: 返回数据");
310	}	310	}
311		311
312	@Override	312	@Override
313	public void onCancel() {	313	public void onCancel() {
314	Log.i(TAG, "onCancel: 取消");	314	Log.i(TAG, "onCancel: 取消");
315	}	315	}
316		316
317	@Override	317	@Override
318	public void onFinish(List<ImageInfo> selectImage) {	318	public void onFinish(List<ImageInfo> selectImage) {
319	if (selectImage.size() == photoList.size()) {	319	if (selectImage.size() == photoList.size()) {
320	List<String> strings = new ArrayList<>();	320	List<String> strings = new ArrayList<>();
321	Intent intent = new Intent(context, ImageActivity.class);	321	Intent intent = new Intent(context, ImageActivity.class);
322	for (ImageInfo imageInfo : selectImage) {	322	for (ImageInfo imageInfo : selectImage) {
323	strings.add(imageInfo.getPath());	323	strings.add(imageInfo.getPath());
324	}	324	}
325	intent.putStringArrayListExtra("images", (ArrayList<String>) strings);	325	intent.putStringArrayListExtra("images", (ArrayList<String>) strings);
326	startActivity(intent);	326	startActivity(intent);
327	}	327	}
328	}	328	}
329		329
330	@Override	330	@Override
331	public void onError() {	331	public void onError() {
332	Log.i(TAG, "onError: 出错");	332	Log.i(TAG, "onError: 出错");
333	}	333	}
334	}	334	}
335	}	335	}
336		336

app/src/main/java/com/hjx/parent/ErrorListActivity.java

Diff comments View file @484570f

 package com.hjx.parent;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.MediaStore;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.CompoundButton;
 import android.widget.RadioButton;
 import android.widget.RadioGroup;
 import android.widget.TextView;
 import android.widget.Toast;
 import androidx.annotation.Nullable;
 import androidx.core.content.FileProvider;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import com.google.gson.Gson;
 import com.hjq.permissions.OnPermissionCallback;
 import com.hjq.permissions.Permission;
 import com.hjq.permissions.XXPermissions;
 import com.hjx.parent.adapter.ErrorAdapter;
 import com.hjx.parent.adapter.FilterAdapter;
+import com.hjx.parent.adapter.GradeAdapter;
 import com.hjx.parent.adapter.LoadMoreOnScrollListener;
 import com.hjx.parent.bean.StudentBean;
 import com.hjx.parent.databinding.ActivityErrorListBinding;
 import com.hjx.parent.dialog.ErrorEditDialog;
 import com.hjx.parent.dialog.TipDialog;
 import com.prws.common.bean.GradeAndSubject;
 import com.prws.common.bean.PageInfo;
 import com.prws.common.bean.ResponseResult;
 import com.prws.common.bean.Subject;
 import com.prws.common.bean.TopicBean;
 import com.prws.common.net.NetWorks;
 import com.prws.common.utils.BitmapUtils;
 import com.prws.common.utils.CommonUtil;
 import com.prws.common.utils.SharedPreferencesUtil;
 import com.prws.common.utils.dialog.MyButtomDialog;
 import com.zhangteng.imagepicker.bean.ImageInfo;
 import com.zhangteng.imagepicker.config.ImagePickerConfig;
 import com.zhangteng.imagepicker.config.ImagePickerEnum;
 import com.zhangteng.imagepicker.config.ImagePickerOpen;
 import com.zhangteng.imagepicker.imageloader.GlideImageLoader;
 import com.zhangteng.utils.IHandlerCallBack;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import io.reactivex.Observer;
 import io.reactivex.disposables.Disposable;
 public class ErrorListActivity extends BaseActivity<ActivityErrorListBinding> implements View.OnClickListener {
     private TextView last;
     private String subject;
     private String grade;
+    private String grade1;
     private String manger;
     private String type = "全部";
     private String time = "全部";
     private FilterAdapter filterAdapter;
+    private GradeAdapter gradeAdapter;
     StudentBean studentBean;
     private int page = 1;
     private ErrorAdapter adapter;
     private int total;
     private int REQUEST_CODE_IMAGE = 123;
     private String filePath;
     @Override
     public void initView(Bundle savedInstanceState) {
         String student = (String) SharedPreferencesUtil.getData("student", "");
         try {
             studentBean = new Gson().fromJson(student, StudentBean.class);
         } catch (Exception e) {
         }
         binding.ivBack.setOnClickListener(this);
         binding.tvFilterGrade.setOnClickListener(this);
         binding.tvFilterSubject.setOnClickListener(this);
         binding.tvFilterMore.setOnClickListener(this);
         binding.tvFilterManage.setOnClickListener(this);
         binding.tvEdit.setOnClickListener(this);
         binding.tvAdd.setOnClickListener(this);
         binding.llDelete.setOnClickListener(this);
         binding.tvSave.setOnClickListener(this);
         binding.tvTitle.setText(studentBean.getStuName() + "的错题本");
         binding.checkbox.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                adapter.checkAll(isChecked);
+                if (binding.llEmpty.getVisibility() != View.VISIBLE) {
+                    adapter.checkAll(isChecked);
+                }
             }
         });
         RadioButton timeButton = (RadioButton) binding.groupTime.getChildAt(3);
         timeButton.setChecked(true);
         binding.groupTime.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(RadioGroup group, int checkedId) {
                 RadioButton rcheck = (RadioButton) findViewById(checkedId);
                 time = rcheck.getText().toString();
                 refreshError();
             }
         });
         RadioButton typeButton = (RadioButton) binding.groupType.getChildAt(2);
         typeButton.setChecked(true);
         binding.groupType.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(RadioGroup group, int checkedId) {
                 RadioButton rcheck = (RadioButton) findViewById(checkedId);
                 type = rcheck.getText().toString();
                 refreshError();
             }
         });
         refreshError();
         binding.ivChange.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 if (SharedPreferencesUtil.getData("role", "").equals("parent")) {
                     Intent intent = new Intent(context, ChooseActivity.class);
                     intent.putExtra("needBack", true);
                     startActivity(intent);
                 } else {
                     Intent intent = new Intent(context, TeacherChooseActivity.class);
                     intent.putExtra("needBack", true);
                     startActivity(intent);
                 }
             }
         });
+        setGradeFilter();
+    }
+    private void setGradeFilter() {
+        if (TextUtils.isEmpty(grade)) {
+            grade = "全部";
+        }
+        List<String> grades = new ArrayList<>();
+        for (GradeAndSubject gradeAndSubject : App.getInstance().getGradeAndSubjects()) {
+            grades.add(gradeAndSubject.getGrade().getGrade());
+        }
+        grades.add("全部");
+        gradeAdapter = new GradeAdapter(context, new GradeAdapter.Filter() {
+            @Override
+            public void onSelect(String select) {
+                grade = select;
+                page = 1;
+                gradeAdapter.refresh(select);
+                refreshError();
+            }
+        }, grades, grade);
+        binding.recycleGrade.setLayoutManager(new GridLayoutManager(context, 4, LinearLayoutManager.VERTICAL, false));
+        binding.recycleGrade.setAdapter(gradeAdapter);
+        binding.groupGrade.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(RadioGroup group, int checkedId) {
+                RadioButton rcheck = (RadioButton) findViewById(checkedId);
+                grade1 = rcheck.getText().toString();
+                page = 1;
+                refreshError();
+            }
+        });
     }
     @Override
     protected ActivityErrorListBinding getViewBinding() {
         return ActivityErrorListBinding.inflate(getLayoutInflater());
     }
     @Override
     public void onClick(View v) {
         switch (v.getId()) {
             case R.id.iv_back:
                 finish();
                 break;
             case R.id.tv_filter_grade:
-                List<String> grades = new ArrayList<>();
+                showFilerGrade();
-                for (GradeAndSubject gradeAndSubject : App.getInstance().getGradeAndSubjects()) {
-                    grades.add(gradeAndSubject.getGrade().getGrade());
-                }
-                grades.add("全部");
-                setFilterAdapter(grades, binding.tvFilterGrade, grade);
                 break;
             case R.id.tv_filter_subject:
                 List<String> subjects = new ArrayList<>();
                 for (GradeAndSubject gradeAndSubject : App.getInstance().getGradeAndSubjects()) {
                     for (Subject subject : gradeAndSubject.getSubjects()) {
                         if (!subjects.contains(subject.getSubject())) {
                             subjects.add(subject.getSubject());
                         }
                     }
                 }
                 subjects.add("全部");
                 setFilterAdapter(subjects, binding.tvFilterSubject, subject);
                 break;
             case R.id.tv_filter_manage:
                 List<String> manages = new ArrayList<>();
                 manages.add("已掌握");
                 manages.add("未掌握");
                 manages.add("全部");
                 setFilterAdapter(manages, binding.tvFilterManage, manger);
                 break;
             case R.id.tv_filter_more:
                 showFilterMore();
                 break;
             case R.id.tv_edit:
                 if (adapter.edit) {
                     adapter.setEdit(false);
                     binding.tvSave.setVisibility(View.GONE);
                     binding.tvAdd.setVisibility(View.VISIBLE);
                     binding.checkbox.setVisibility(View.GONE);
                     binding.llDelete.setVisibility(View.GONE);
                     binding.ivBack.setVisibility(View.VISIBLE);
                     binding.tvEdit.setText("编辑");
                 } else {
                     adapter.setEdit(true);
                     binding.tvSave.setVisibility(View.VISIBLE);
                     binding.tvAdd.setVisibility(View.GONE);
                     binding.llDelete.setVisibility(View.VISIBLE);
                     binding.checkbox.setVisibility(View.VISIBLE);
                     binding.ivBack.setVisibility(View.GONE);
                     binding.tvEdit.setText("取消");
                 }
                 adapter.notifyDataSetChanged();
                 break;
             case R.id.ll_delete:
                 showTipDialog("温馨提示", "确认删除已勾选的错题？", "取消", "确认", new TipDialog.TipDialogInterface() {
                     @Override
                     public void onConfirm(Dialog dialog) {
                         deleteError(adapter.getChecKList());
                         dialog.dismiss();
                     }
                     @Override
                     public void onCancel(Dialog dialog) {
                         dialog.dismiss();
                     }
                 });
                 break;
             case R.id.tv_add:
                 if (!XXPermissions.isGranted(context, Permission.CAMERA, Permission.MANAGE_EXTERNAL_STORAGE)) {
                     XXPermissions.with(context)
                             // 申请多个权限
                             .permission(Permission.CAMERA, Permission.MANAGE_EXTERNAL_STORAGE)
                             .request(new OnPermissionCallback() {
                                 @Override
                                 public void onGranted(List<String> permissions, boolean all) {
                                     if (all) {
                                         //开启扫码界面
                                         showButtonDialog();
                                     } else {
                                         Toast.makeText(context, "需要权限", Toast.LENGTH_SHORT).show();
                                     }
                                 }
                                 @Override
                                 public void onDenied(List<String> permissions, boolean never) {
                                     XXPermissions.startPermissionActivity(context, permissions);
                                 }
                             });
                 } else {
                     showButtonDialog();
                 }
                 break;
             case R.id.tv_save:
                 if (adapter.getChecKList().size() > 0) {
                     ErrorEditDialog errorEditDialog = new ErrorEditDialog(context, adapter.getChecKList(), new ErrorEditDialog.EditInterface() {
                         @Override
                         public void edit(String s, int i) {
                             adapter.setEdit(false);
                             binding.tvSave.setVisibility(View.GONE);
                             binding.tvAdd.setVisibility(View.VISIBLE);
                             binding.checkbox.setVisibility(View.GONE);
                             binding.llDelete.setVisibility(View.GONE);
                             binding.ivBack.setVisibility(View.VISIBLE);
                             binding.tvEdit.setText("编辑");
                             page = 1;
                             refreshError();
                         }
                     });
                     errorEditDialog.show();
                 }
                 break;
         }
     }
     private void showButtonDialog() {
         MyButtomDialog dialog = new MyButtomDialog(context, R.style.BottomSheetDialog);
         View bottomView = LayoutInflater.from(context).inflate(R.layout.bottom_sheet_layout, null);
         dialog.setContentView(bottomView);
         bottomView.findViewById(R.id.take_photo).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
                 dialog.dismiss();
                 Intent takePictureIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
                 //确保有相机来处理Intent
                 filePath = context.getExternalFilesDir("images").getPath() + "/" + String.valueOf(System.currentTimeMillis()) + CommonUtil.getStr() + ".jpg";
                 File photoFile = new File(filePath);
                 if (photoFile != null) {
                     //适配Android 7.0文件权限，通过FileProvider创建一个content类型的Uri
                     Uri photoUri = FileProvider.getUriForFile(activity, "com.hjx.parent.fileprovider", photoFile);
                     takePictureIntent.addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
                     takePictureIntent.putExtra(MediaStore.EXTRA_OUTPUT, photoUri);
                     activity.startActivityForResult(takePictureIntent, REQUEST_CODE_IMAGE);
                 }
             }
         });
         bottomView.findViewById(R.id.choose_photo).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
                 dialog.dismiss();
                 ImagePickerConfig imagePickerConfig = new ImagePickerConfig.Builder().provider(getPackageName() + ".fileprovider").imageLoader(new GlideImageLoader()) //图片加载器
                         .iHandlerCallBack(new HandlerCallBack())    //图片选择器生命周期监听（直接打开摄像头时无效）
                         .multiSelect(true)                 //是否多选
                         .isShowCamera(false).isVideoPicker(false)              //是否选择视频 默认false
                         .isImagePicker(true).imagePickerType(ImagePickerEnum.PHOTO_PICKER) //选择器打开类型
-                        .maxImageSelectable(9)                        //图片可选择数
+                        .maxImageSelectable(5)                        //图片可选择数
                         .maxHeight(1920)                              //图片最大高度
                         .maxWidth(1920)                               //图片最大宽度
-                        .maxImageSize(10)                             //图片最大大小Mb
+                        .maxImageSize(3)                             //图片最大大小Mb
                         .isCrop(false).pathList(new ArrayList<>()).pickerThemeColorRes(R.color.image_picker_white).pickerTitleColorRes(R.color.image_picker_text_black).cropThemeColorRes(R.color.image_picker_white).cropTitleColorRes(R.color.image_picker_text_black).pickerBackRes(R.mipmap.image_picker_back_black).pickerFolderRes(R.mipmap.image_picker_folder_black).build();
                 ImagePickerOpen.getInstance().setImagePickerConfig(imagePickerConfig).pathList(new ArrayList<>()).open(ErrorListActivity.this);
             }
         });
         bottomView.findViewById(R.id.cancel).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
                 dialog.dismiss();
             }
         });
         dialog.show();
     }
     private void deleteError(List<TopicBean> topicBeans) {
         List<String> list = new ArrayList<>();
         for (int i = 0; i < topicBeans.size(); i++) {
             list.add(topicBeans.get(i).getId());
         }
         NetWorks.deleteError(list, new Observer<ResponseResult>() {
             @Override
             public void onSubscribe(Disposable d) {
             }
             @Override
             public void onNext(ResponseResult responseResult) {
                 if (responseResult.getCode() == 200) {
                     adapter.setEdit(false);
                     binding.tvSave.setVisibility(View.GONE);
                     binding.tvAdd.setVisibility(View.VISIBLE);
                     binding.checkbox.setVisibility(View.GONE);
                     binding.llDelete.setVisibility(View.GONE);
                     binding.ivBack.setVisibility(View.VISIBLE);
                     binding.tvEdit.setText("编辑");
                     page = 1;
                     refreshError();
                 }
             }
             @Override
             public void onError(Throwable e) {
             }
             @Override
             public void onComplete() {
             }
         });
     }
+    private void showFilerGrade() {
+        binding.recycleFilter.setVisibility(View.GONE);
+        binding.llFilterMore.setVisibility(View.GONE);
+        if (binding.llFilterGrade.getVisibility() == View.VISIBLE) {
+            binding.llFilterGrade.setVisibility(View.GONE);
+            binding.tvFilterGrade.setTextColor(getColor(R.color.text_title));
+            Drawable drawable = getResources().getDrawable(R.drawable.ic_filter_gray);
+            // 这一步必须要做,否则不会显示.
+            drawable.setBounds(0, 0, drawable.getMinimumWidth(), drawable.getMinimumHeight());
+            binding.tvFilterGrade.setCompoundDrawables(null, null, drawable, null);
+        } else {
+            binding.llFilterGrade.setVisibility(View.VISIBLE);
+            if (last != null) {
+                last.setTextColor(getColor(R.color.text_title));
+                Drawable drawable = getResources().getDrawable(R.drawable.ic_filter_gray);
+                // 这一步必须要做,否则不会显示.
+                drawable.setBounds(0, 0, drawable.getMinimumWidth(), drawable.getMinimumHeight());
+                last.setCompoundDrawables(null, null, drawable, null);
+            }
+            binding.tvFilterGrade.setTextColor(Color.parseColor("#1C90F3"));
+            Drawable drawable1 = getResources().getDrawable(R.drawable.ic_filter_blue);
+            // 这一步必须要做,否则不会显示.
+            drawable1.setBounds(0, 0, drawable1.getMinimumWidth(), drawable1.getMinimumHeight());
+            binding.tvFilterGrade.setCompoundDrawables(null, null, drawable1, null);
+            last = binding.tvFilterGrade;
+        }
+    }
     private void showFilterMore() {
         binding.recycleFilter.setVisibility(View.GONE);
+        binding.llFilterGrade.setVisibility(View.GONE);
         if (binding.llFilterMore.getVisibility() == View.VISIBLE) {
             binding.llFilterMore.setVisibility(View.GONE);
+            binding.tvFilterMore.setTextColor(getColor(R.color.text_title));
+            Drawable drawable = getResources().getDrawable(R.drawable.ic_filter_gray);
+            // 这一步必须要做,否则不会显示.
+            drawable.setBounds(0, 0, drawable.getMinimumWidth(), drawable.getMinimumHeight());
+            binding.tvFilterMore.setCompoundDrawables(null, null, drawable, null);
         } else {
             binding.llFilterMore.setVisibility(View.VISIBLE);
             if (last != null) {
                 last.setTextColor(getColor(R.color.text_title));
                 Drawable drawable = getResources().getDrawable(R.drawable.ic_filter_gray);
                 // 这一步必须要做,否则不会显示.
                 drawable.setBounds(0, 0, drawable.getMinimumWidth(), drawable.getMinimumHeight());
                 last.setCompoundDrawables(null, null, drawable, null);
             }
             binding.tvFilterMore.setTextColor(Color.parseColor("#1C90F3"));
             Drawable drawable1 = getResources().getDrawable(R.drawable.ic_filter_blue);
             // 这一步必须要做,否则不会显示.
             drawable1.setBounds(0, 0, drawable1.getMinimumWidth(), drawable1.getMinimumHeight());
             binding.tvFilterMore.setCompoundDrawables(null, null, drawable1, null);
             last = binding.tvFilterMore;
         }
     }
     private void setFilterAdapter(List<String> list, TextView textView, String select) {
         if (TextUtils.isEmpty(select)) {
             select = "全部";
         }
+        binding.llFilterGrade.setVisibility(View.GONE);
         binding.llFilterMore.setVisibility(View.GONE);
-        if (last != null && last.getId() == R.id.tv_filter_more) {
+        if (last != null && (last.getId() == R.id.tv_filter_more || last.getId() == R.id.tv_filter_grade)) {
             last.setTextColor(getColor(R.color.text_title));
             Drawable drawable = getResources().getDrawable(R.drawable.ic_filter_gray);
             // 这一步必须要做,否则不会显示.
             drawable.setBounds(0, 0, drawable.getMinimumWidth(), drawable.getMinimumHeight());
             last.setCompoundDrawables(null, null, drawable, null);
         }
         if (binding.recycleFilter.getVisibility() == View.GONE) {
             if (filterAdapter != null) {
                 filterAdapter.refresh(list, textView, select);
             } else {
                 filterAdapter = new FilterAdapter(context, new FilterAdapter.Filter() {
                     @Override
                     public void onSelect(TextView type, String select) {
                         switch (type.getId()) {
-                            case R.id.tv_filter_grade:
-                                grade = select;
-                                break;
                             case R.id.tv_filter_subject:
                                 subject = select;
                                 break;
                             case R.id.tv_filter_manage:
                                 manger = select;
                                 break;
                         }
                         page = 1;
                         filterAdapter.refresh(select);
                         refreshError();
                     }
                 }, list, textView, select);
                 binding.recycleFilter.setLayoutManager(new GridLayoutManager(context, 4, LinearLayoutManager.VERTICAL, false));
                 binding.recycleFilter.setAdapter(filterAdapter);
             }
             binding.recycleFilter.setVisibility(View.VISIBLE);
             textView.setTextColor(Color.parseColor("#1C90F3"));
             Drawable drawable = getResources().getDrawable(R.drawable.ic_filter_blue);
             // 这一步必须要做,否则不会显示.
             drawable.setBounds(0, 0, drawable.getMinimumWidth(), drawable.getMinimumHeight());
             textView.setCompoundDrawables(null, null, drawable, null);
             last = textView;
         } else {
             if (textView.getId() == last.getId()) {
                 binding.recycleFilter.setVisibility(View.GONE);
                 textView.setTextColor(getColor(R.color.text_title));
                 Drawable drawable = getResources().getDrawable(R.drawable.ic_filter_gray);
                 // 这一步必须要做,否则不会显示.
                 drawable.setBounds(0, 0, drawable.getMinimumWidth(), drawable.getMinimumHeight());
                 textView.setCompoundDrawables(null, null, drawable, null);
             } else {
                 filterAdapter.refresh(list, textView, select);
                 last.setTextColor(getColor(R.color.text_title));
                 Drawable drawable = getResources().getDrawable(R.drawable.ic_filter_gray);
                 // 这一步必须要做,否则不会显示.
                 drawable.setBounds(0, 0, drawable.getMinimumWidth(), drawable.getMinimumHeight());
                 last.setCompoundDrawables(null, null, drawable, null);
                 textView.setTextColor(Color.parseColor("#1C90F3"));
                 Drawable drawable1 = getResources().getDrawable(R.drawable.ic_filter_blue);
                 // 这一步必须要做,否则不会显示.
                 drawable1.setBounds(0, 0, drawable.getMinimumWidth(), drawable.getMinimumHeight());
                 textView.setCompoundDrawables(null, null, drawable1, null);
                 last = textView;
             }
         }
     }
     private void refreshError() {
         Map map = new HashMap();
         if (!TextUtils.isEmpty(subject) && !"全部".equals(subject)) {
             map.put("subject", subject);
         }
         if (!TextUtils.isEmpty(grade) && !"全部".equals(grade)) {
-            map.put("grade", grade);
+            if (!TextUtils.isEmpty(grade1) && !"全部".equals(grade1)) {
+                map.put("grade", grade + grade1);
+            } else {
+                map.put("grade", grade);
+            }
+        } else {
+            if (!TextUtils.isEmpty(grade1) && !"全部".equals(grade1)) {
+                map.put("grade", grade1);
+            }
         }
         if (!TextUtils.isEmpty(time) && !"全部".equals(time)) {
             if ("一周内".equals(time)) {
                 map.put("time", 6);
             } else if ("一个月内".equals(time)) {
                 map.put("time", 30);
             } else if ("三个月内".equals(time)) {
                 map.put("time", 90);
             }
         }
         if (!TextUtils.isEmpty(type) && !"全部".equals(type)) {
             map.put("type", "课内".equals(type) ? 0 : 1);
         }
         if (!TextUtils.isEmpty(manger) && !"全部".equals(manger)) {
             map.put("controlFlag", "已掌握".equals(manger) ? 0 : 1);
         }
         map.put("stuId", studentBean.getStuId());
         map.put("pageSize", 10);
         map.put("pageNum", page);
         NetWorks.getError(map, new Observer<ResponseResult<PageInfo<TopicBean>>>() {
             @Override
             public void onSubscribe(Disposable d) {
             }
             @Override
             public void onNext(ResponseResult<PageInfo<TopicBean>> result) {
                 if (result.getData() != null && result.getCode() == 200) {
                     total = result.getData().getTotal();
                     List<TopicBean> topicBeans = result.getData().getList();
                     loadError(topicBeans);
                 }
             }
             @Override
             public void onError(Throwable e) {
                 e.toString();
             }
             @Override
             public void onComplete() {
             }
         });
     }
     private void loadError(List<TopicBean> list) {
         if (list.size() > 0) {
             binding.recycle.setVisibility(View.VISIBLE);
             binding.llEmpty.setVisibility(View.GONE);
             if (adapter != null) {
                 if (page > 1) {
                     adapter.addData(list);
                 } else {
                     adapter.refresh(list);
                 }
             } else {
                 adapter = new ErrorAdapter(context, list, false, new ErrorAdapter.CheckInterface() {
                     @Override
                     public void onErrorCheck() {
                         if (adapter.getChecKList().size() > 0) {
                             binding.tvSave.setText("批量修改标签" + "（" + adapter.getChecKList().size() + "）");
                         } else {
                             binding.tvSave.setText("批量修改标签");
                         }
                     }
                 });
                 LinearLayoutManager linearLayoutManager = new LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false);
                 binding.recycle.setLayoutManager(linearLayoutManager);
                 binding.recycle.setAdapter(adapter);
                 binding.recycle.addOnScrollListener(new LoadMoreOnScrollListener(linearLayoutManager) {
                     @Override
                     public void onLoadMore(int currentPage) {
                         if (currentPage > page) {
                             new Thread(new Runnable() {
                                 @Override
                                 public void run() {
                                     try {
                                         runOnUiThread(new Runnable() {
                                             @Override
                                             public void run() {
                                                 if (page * 10 < total) {
                                                     page++;
                                                     refreshError();
                                                 }
                                             }
                                         });
                                     } catch (Exception e) {
                                         e.printStackTrace();
                                     }
                                 }
                             }).start();
                         }
                     }
                 });
             }
         } else {
             if (page == 1) {
                 binding.recycle.setVisibility(View.GONE);
                 binding.llEmpty.setVisibility(View.VISIBLE);
             }
         }
     }
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         if (keyCode == KeyEvent.KEYCODE_BACK) {
             if (adapter != null && adapter.edit) {
                 adapter.setEdit(false);
                 binding.tvSave.setVisibility(View.GONE);
                 binding.tvAdd.setVisibility(View.VISIBLE);
                 binding.checkbox.setVisibility(View.GONE);
                 binding.llDelete.setVisibility(View.GONE);
                 binding.ivBack.setVisibility(View.VISIBLE);
                 binding.tvEdit.setText("编辑");
                 adapter.notifyDataSetChanged();
             } else {
                 finish();
             }
             return true;
         }
         return super.onKeyDown(keyCode, event);
     }
     @Override
     protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
         if (requestCode == REQUEST_CODE_IMAGE && resultCode == RESULT_OK && !TextUtils.isEmpty(filePath)) {
             Bitmap b = BitmapUtils.compress(BitmapFactory.decodeFile(filePath));
             String path = context.getExternalFilesDir("images").getPath() + "/" + String.valueOf(System.currentTimeMillis()) + CommonUtil.getStr() + ".jpg";
             CommonUtil.saveBitmapToUri(b, path);
             List<String> strings = new ArrayList<>();
             Intent intent = new Intent(context, ImageActivity.class);
             strings.add(path);
             intent.putStringArrayListExtra("images", (ArrayList<String>) strings);
             startActivity(intent);
         }
     }
     public class HandlerCallBack implements IHandlerCallBack<ImageInfo> {
         private String TAG = "---ImagePicker---";
         List<ImageInfo> photoList = new ArrayList<>();
         @Override
         public void onStart() {
             Log.i(TAG, "onStart: 开启");
         }
         @Override
         public void onSuccess(List<ImageInfo> photoList) {
             this.photoList = photoList;
             Log.i(TAG, "onSuccess: 返回数据");
         }
         @Override
         public void onCancel() {
             Log.i(TAG, "onCancel: 取消");
         }
         @Override
         public void onFinish(List<ImageInfo> selectImage) {
             if (selectImage.size() == photoList.size()) {
                 List<String> strings = new ArrayList<>();
                 Intent intent = new Intent(context, ImageActivity.class);
                 for (ImageInfo imageInfo : selectImage) {
                     strings.add(imageInfo.getPath());
                 }
                 intent.putStringArrayListExtra("images", (ArrayList<String>) strings);
                 startActivity(intent);
             }
         }
         @Override
         public void onError() {
             Log.i(TAG, "onError: 出错");
         }
     }
     @Override
     protected void onResume() {
         String student = (String) SharedPreferencesUtil.getData("student", "");
         try {
             studentBean = new Gson().fromJson(student, StudentBean.class);
         } catch (Exception e) {

app/src/main/java/com/hjx/parent/ImageActivity.java

Diff comments View file @484570f

 package com.hjx.parent;
 import android.app.Dialog;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Rect;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.provider.MediaStore;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
 import androidx.annotation.Nullable;
 import androidx.core.content.FileProvider;
 import androidx.viewpager2.widget.ViewPager2;
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
 import com.hjx.parent.adapter.ImageAdapter;
 import com.hjx.parent.databinding.ActivityImageBinding;
 import com.hjx.parent.dialog.ErrorInputDialog;
 import com.hjx.parent.dialog.TipDialog;
 import com.prws.common.bean.CutPicBean;
 import com.prws.common.bean.ImageBean;
 import com.prws.common.bean.TopicBean;
 import com.prws.common.net.NetWorks;
 import com.prws.common.utils.BitmapUtils;
 import com.prws.common.utils.CommonUtil;
 import com.xiasuhuei321.loadingdialog.view.LoadingDialog;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 import io.reactivex.Observer;
 import io.reactivex.disposables.Disposable;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
 public class ImageActivity extends BaseActivity<ActivityImageBinding> implements View.OnClickListener {
     private List<String> images = new ArrayList<>();
     private ImageAdapter imageAdapter;
     private List<ImageBean> list = new ArrayList<>();
     private String filePath;
     @Override
     public void initView(Bundle savedInstanceState) {
         images = getIntent().getStringArrayListExtra("images");
         for (String s : images) {
             String filepath = context.getExternalFilesDir("images").getPath() + "/" + String.valueOf(System.currentTimeMillis()) + CommonUtil.getStr() + ".jpg";
             ImageBean imageBean = new ImageBean();
             Bitmap bitmap = BitmapUtils.getimage(s);
             CommonUtil.saveBitmapToUri(bitmap, filepath);
             imageBean.setPath(filepath);
             list.add(imageBean);
         }
         imageAdapter = new ImageAdapter(this, list);
         binding.viewPager.setAdapter(imageAdapter);
         binding.viewPager.registerOnPageChangeCallback(new ViewPager2.OnPageChangeCallback() {
             @Override
             public void onPageSelected(int position) {
                 if (list.get(position).getCuts() == null) {
-                    binding.ivPrevious.setEnabled(false);
+//                    binding.ivPrevious.setEnabled(false);
-                    binding.ivNext.setEnabled(false);
+//                    binding.ivNext.setEnabled(false);
                     clearText();
                 }
                 binding.tvTitle.setText((binding.viewPager.getCurrentItem() + 1) + "/" + list.size());
                 if (position == 0) {
                     binding.ivPrevious.setImageResource(R.mipmap.ic_previous_gray);
+//                    binding.ivPrevious.setEnabled(true);
                 } else {
                     binding.ivPrevious.setImageResource(R.mipmap.ic_previous);
+//                    binding.ivPrevious.setEnabled(false);
                 }
                 if (position == list.size() - 1) {
                     binding.ivNext.setImageResource(R.mipmap.ic_next_gray);
+//                    binding.ivNext.setEnabled(true);
                 } else {
                     binding.ivNext.setImageResource(R.mipmap.ic_next);
+//                    binding.ivNext.setEnabled(false);
                 }
                 super.onPageSelected(position);
             }
         });
         binding.ivNext.setOnClickListener(this);
         binding.ivPrevious.setOnClickListener(this);
         binding.ivBack.setOnClickListener(this);
         binding.tvPhoto.setOnClickListener(this);
         binding.tvAdd.setOnClickListener(this);
         binding.llEdit.setOnClickListener(this);
         binding.tvSave.setOnClickListener(this);
     }
     public void clearText() {
         int index = binding.viewPager.getCurrentItem();
         showLoadingDialog(getString(R.string.loading_text), new LoadingDialog.DismissListener() {
             @Override
             public void dimiss() {
-                binding.ivPrevious.setEnabled(index != 0);
+//                binding.ivPrevious.setEnabled(index != 0);
-                binding.ivNext.setEnabled(index != list.size() - 1);
+//                binding.ivNext.setEnabled(index != list.size() - 1);
             }
         });
         Log.i("clearText", list.get(index).getPath());
         String base64 = BitmapUtils.imageToBase64(list.get(index).getPath());
         NetWorks.removeWriting(base64, new Observer<JsonObject>() {
             @Override
             public void onSubscribe(Disposable d) {
             }
             @Override
             public void onNext(JsonObject jsonObject) {
                 if (jsonObject != null && jsonObject.get("image_processed") != null) {
                     String image = jsonObject.get("image_processed").getAsString();
                     if (image != null) {
                         String filepath = context.getExternalFilesDir("images").getPath() + "/" + String.valueOf(System.currentTimeMillis()) + CommonUtil.getStr() + ".jpg";
                         CommonUtil.saveBitmapToUri(BitmapUtils.stringToBitmap(image), filepath);
                         list.get(index).setPath(filepath);
                         imageAdapter.notifyItemChanged(index);
                         cut(filepath);
                     } else {
                         loadFail("去除字迹失败");
                     }
                 } else {
                     loadFail("去除字迹失败");
                 }
             }
             @Override
             public void onError(Throwable e) {
                 loadFail("去除字迹失败");
             }
             @Override
             public void onComplete() {
             }
         });
     }
     public void cut(String path) {
         String base64 = BitmapUtils.imageToBase64(path);
         Log.i("figLoaction", path);
         NetWorks.cut(base64, new Observer<CutPicBean>() {
             @Override
             public void onSubscribe(Disposable d) {
             }
             @Override
             public void onNext(CutPicBean cutPicBean) {
                 if (cutPicBean != null) {
                     if (cutPicBean.getDirection() != 0) {
                         rotatingImage(cutPicBean);
                     } else {
                         if (cutPicBean.getQus_figure() != null && cutPicBean.getQus_figure().size() > 0) {
                             List<CutPicBean.FigLoaction> figLoactions = new ArrayList<>();
                             for (CutPicBean.CutLocation cutLocation : cutPicBean.getQus_figure()) {
                                 figLoactions.add(cutLocation.getFig_location());
                             }
                             new Handler().postDelayed(new Runnable() {
                                 @Override
                                 public void run() {
                                     getRects(figLoactions);
                                 }
                             }, 1000);
                         } else {
                             cancelLoadingDialog();
                         }
                     }
                 } else {
                     loadFail("自动切题失败");
                 }
             }
             @Override
             public void onError(Throwable e) {
                 loadFail("自动切题失败");
             }
             @Override
             public void onComplete() {
             }
         });
     }
     private void getRects(List<CutPicBean.FigLoaction> figLoactions) {
         Log.i("figLoaction", new Gson().toJson(figLoactions));
         int index = binding.viewPager.getCurrentItem();
         List<ImageBean.Cut> cuts = new ArrayList<>();
         for (CutPicBean.FigLoaction figLoaction : figLoactions) {
             ImageBean.Cut cut = new ImageBean.Cut();
             cut.setRect(figLoaction);
             cut.setSelect(false);
             cuts.add(cut);
         }
         list.get(index).setCuts(cuts);
         imageAdapter.notifyItemChanged(index);
         cancelLoadingDialog();
     }
     private void rotatingImage(CutPicBean cutPicBean) {
         int index = binding.viewPager.getCurrentItem();
         Bitmap bitmap = BitmapFactory.decodeFile(list.get(index).getPath());
         int angle = 0;
         switch (cutPicBean.getDirection()) {
             case 1:
                 angle = 90;
                 break;
             case 2:
                 angle = 180;
                 break;
             case 3:
                 angle = 270;
                 break;
         }
         if (cutPicBean.getQus_figure() != null && cutPicBean.getQus_figure().size() > 0) {
             List<CutPicBean.FigLoaction> figLoactions = new ArrayList<>();
             for (CutPicBean.CutLocation cutLocation : cutPicBean.getQus_figure()) {
                 figLoactions.add(cutLocation.getFig_location());
             }
             figLoactions = CommonUtil.rotaingLocation(angle, figLoactions, bitmap.getWidth(), bitmap.getHeight());
             bitmap = CommonUtil.rotaingImageView(angle, bitmap);
             String filepath = context.getExternalFilesDir("images").getPath() + "/" + String.valueOf(System.currentTimeMillis()) + CommonUtil.getStr() + ".jpg";
             CommonUtil.saveBitmapToUri(bitmap, filepath);
             list.get(index).setPath(filepath);
             imageAdapter.notifyItemChanged(index);
             List<CutPicBean.FigLoaction> finalFigLoactions = figLoactions;
             new Handler().postDelayed(new Runnable() {
                 @Override
                 public void run() {
                     getRects(finalFigLoactions);
                 }
             }, 500);
         } else {
             cancelLoadingDialog();
         }
     }
     @Override
     protected ActivityImageBinding getViewBinding() {
         return ActivityImageBinding.inflate(getLayoutInflater());
     }
     public void refreshNum() {
         int num = 0;
         for (ImageBean imageBean : list) {
             if (imageBean.getCuts() != null && imageBean.getCuts().size() > 0) {
                 for (ImageBean.Cut cut : imageBean.getCuts()) {
                     if (cut.isSelect()) {
                         num++;
                     }
                 }
             }
         }
         if (num > 0) {
             binding.tvSave.setEnabled(true);
             binding.tvSave.setBackgroundResource(R.drawable.bg_soild_blue_5);
             binding.tvSave.setText("保留错题(" + num + ")");
         } else {
             binding.tvSave.setEnabled(false);
             binding.tvSave.setBackgroundResource(R.drawable.bg_soild_blue_light_5);
             binding.tvSave.setText("保留错题");
         }
     }
     @Override
     public void onClick(View v) {
         switch (v.getId()) {
             case R.id.iv_back:
                 back();
                 break;
             case R.id.iv_next:
-                binding.viewPager.setCurrentItem(binding.viewPager.getCurrentItem() + 1);
+                if (binding.viewPager.getCurrentItem() + 1 < list.size()) {
+                    binding.viewPager.setCurrentItem(binding.viewPager.getCurrentItem() + 1);
+                }
                 break;
             case R.id.iv_previous:
-                binding.viewPager.setCurrentItem(binding.viewPager.getCurrentItem() - 1);
+                if (binding.viewPager.getCurrentItem() != 0) {
+                    binding.viewPager.setCurrentItem(binding.viewPager.getCurrentItem() - 1);
+                }
                 break;
             case R.id.ll_edit:
                 Intent intent = new Intent(context, ImageEditActivity.class);
                 intent.putExtra("path", list.get(binding.viewPager.getCurrentItem()).getPath());
                 startActivityForResult(intent, 1001);
                 break;
             case R.id.tv_photo:
                 Intent takePictureIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
                 //确保有相机来处理Intent
                 filePath = context.getExternalFilesDir("images").getPath() + "/" + String.valueOf(System.currentTimeMillis()) + CommonUtil.getStr() + ".jpg";
                 File photoFile = new File(filePath);
                 if (photoFile != null) {
                     //适配Android 7.0文件权限，通过FileProvider创建一个content类型的Uri
                     Uri photoUri = FileProvider.getUriForFile(activity, "com.hjx.parent.fileprovider", photoFile);
                     takePictureIntent.addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
                     takePictureIntent.putExtra(MediaStore.EXTRA_OUTPUT, photoUri);
                     activity.startActivityForResult(takePictureIntent, 1002);
                 }
                 break;
             case R.id.tv_add:
                 Intent intent1 = new Intent(context, ImageSelectActivity.class);
                 intent1.putExtra("path", list.get(binding.viewPager.getCurrentItem()).getPath());
                 startActivityForResult(intent1, 1001);
                 break;
             case R.id.tv_save:
                 List<TopicBean> topicBeans = new ArrayList<>();
                 for (ImageBean imageBean : list) {
                     if (imageBean.getCuts() != null && imageBean.getCuts().size() > 0) {
                         for (ImageBean.Cut cut : imageBean.getCuts()) {
                             if (cut.isSelect()) {
                                 TopicBean bean = new TopicBean();
                                 String path = context.getExternalFilesDir("images").getPath() + "/" + String.valueOf(System.currentTimeMillis()) + CommonUtil.getStr() + ".jpg";
                                 BitmapUtils.saveBitmap(cut.getBitmap(), path);
                                 bean.setPath(path);
                                 topicBeans.add(bean);
                             }
                         }
                     }
                 }
                 ErrorInputDialog dialog = new ErrorInputDialog(this, topicBeans);
                 dialog.show();
                 break;
         }
     }
     @Override
     protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
         if (requestCode == 1001) {
             if (resultCode == 1002) {
                 if (list.size() > 1) {
                     list.remove(binding.viewPager.getCurrentItem());
                     imageAdapter.notifyItemRemoved(binding.viewPager.getCurrentItem());
                     binding.tvTitle.setText((binding.viewPager.getCurrentItem() + 1) + "/" + list.size());
                     refreshNum();
                 } else {
                     finish();
                 }
             } else if (resultCode == 1003) {
                 int position = binding.viewPager.getCurrentItem();
                 list.remove(position);
                 String path = data.getStringExtra("path");
                 ImageBean imageBean = new ImageBean();
                 imageBean.setPath(path);
                 list.add(position, imageBean);
                 imageAdapter.notifyItemChanged(position);
                 clearText();
                 refreshNum();
             } else if (resultCode == 1004) {
                 Rect rect = data.getParcelableExtra("cut");
                 if (rect != null) {
                     int position = binding.viewPager.getCurrentItem();
                     ImageBean.Cut cut = new ImageBean.Cut();
                     cut.setRect1(rect);
                     cut.setSelect(false);
                     list.get(position).getCuts().add(cut);
                     imageAdapter.notifyItemChanged(position);
                     refreshNum();
                 }
             } else if (resultCode == 1005) {
                 int i = data.getIntExtra("position", 0);
                 int position = binding.viewPager.getCurrentItem();
                 Rect rect = data.getParcelableExtra("cut");
                 if (rect != null) {
                     ImageBean.Cut cut = new ImageBean.Cut();
                     cut.setRect1(rect);
                     cut.setSelect(false);
                     list.get(position).getCuts().remove(i);
                     list.get(position).getCuts().add(i, cut);
                     imageAdapter.notifyItemChanged(position);
                     refreshNum();
                 } else {
                     list.get(position).getCuts().remove(i);
                     imageAdapter.notifyItemChanged(position);
                     refreshNum();
                 }
             }
         } else if (requestCode == 1002 && resultCode == RESULT_OK && !TextUtils.isEmpty(filePath)) {
             Bitmap b = BitmapUtils.compress(BitmapFactory.decodeFile(filePath));
             String path = context.getExternalFilesDir("images").getPath() + "/" + String.valueOf(System.currentTimeMillis()) + CommonUtil.getStr() + ".jpg";
             CommonUtil.saveBitmapToUri(b, path);
             int position = binding.viewPager.getCurrentItem();
             list.remove(position);
             ImageBean imageBean = new ImageBean();
             imageBean.setPath(path);
             list.add(position, imageBean);
             imageAdapter.notifyItemChanged(position);
             clearText();
             refreshNum();
         }
     }
     private void back() {
         showTipDialog("温馨提示", "是否确认退出？", "取消", "确定", new TipDialog.TipDialogInterface() {
             @Override
             public void onConfirm(Dialog dialog) {
                 dialog.dismiss();
                 finish();
             }
             @Override
             public void onCancel(Dialog dialog) {
                 dialog.dismiss();
             }
         });
     }
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         if (keyCode == KeyEvent.KEYCODE_BACK) {
             back();
             return true;
         }
         return super.onKeyDown(keyCode, event);
     }
 }

app/src/main/java/com/hjx/parent/MainActivity.java

Diff comments View file @484570f

1	package com.hjx.parent;	1	package com.hjx.parent;
2		2
3	import androidx.annotation.Nullable;	3	import androidx.annotation.Nullable;
4	import androidx.appcompat.app.AppCompatActivity;	4	import androidx.appcompat.app.AppCompatActivity;
5	import androidx.constraintlayout.widget.ConstraintLayout;	5	import androidx.constraintlayout.widget.ConstraintLayout;
6	import androidx.core.content.FileProvider;	6	import androidx.core.content.FileProvider;
7		7
8	import android.app.Dialog;	8	import android.app.Dialog;
9	import android.app.ProgressDialog;	9	import android.app.ProgressDialog;
10	import android.content.Intent;	10	import android.content.Intent;
11	import android.graphics.Color;	11	import android.graphics.Color;
12	import android.net.Uri;	12	import android.net.Uri;
13	import android.os.Build;	13	import android.os.Build;
14	import android.os.Bundle;	14	import android.os.Bundle;
15	import android.os.Looper;	15	import android.os.Looper;
16	import android.widget.ImageView;	16	import android.widget.ImageView;
17	import android.widget.TextView;	17	import android.widget.TextView;
18	import android.widget.Toast;	18	import android.widget.Toast;
19		19
20	import com.google.gson.JsonObject;	20	import com.google.gson.JsonObject;
21	import com.hjq.permissions.OnPermissionCallback;	21	import com.hjq.permissions.OnPermissionCallback;
22	import com.hjq.permissions.Permission;	22	import com.hjq.permissions.Permission;
23	import com.hjq.permissions.XXPermissions;	23	import com.hjq.permissions.XXPermissions;
24	import com.hjx.parent.dialog.TipDialog;	24	import com.hjx.parent.dialog.TipDialog;
25	import com.hjx.parent.fragment.HomeFragment;	25	import com.hjx.parent.fragment.HomeFragment;
26	import com.hjx.parent.fragment.MeFragment;	26	import com.hjx.parent.fragment.MeFragment;
27	import com.prws.common.base.BaseActivity;	27	import com.prws.common.base.BaseActivity;
28	import com.prws.common.base.BasePresenter;	28	import com.prws.common.base.BasePresenter;
29	import com.prws.common.bean.GradeAndSubject;	29	import com.prws.common.bean.GradeAndSubject;
30	import com.prws.common.bean.ResponseResult;	30	import com.prws.common.bean.ResponseResult;
31	import com.prws.common.bean.UpdateBean;	31	import com.prws.common.bean.UpdateBean;
32	import com.prws.common.net.NetWorks;	32	import com.prws.common.net.NetWorks;
33	import com.prws.common.utils.DownloadUtil;	33	import com.prws.common.utils.DownloadUtil;
34	import com.prws.common.utils.SharedPreferencesUtil;	34	import com.prws.common.utils.SharedPreferencesUtil;
35		35
36	import java.io.File;	36	import java.io.File;
37	import java.util.List;	37	import java.util.List;
38		38
39	import io.reactivex.Observer;	39	import io.reactivex.Observer;
40	import io.reactivex.disposables.Disposable;	40	import io.reactivex.disposables.Disposable;
41	import retrofit2.Call;	41	import retrofit2.Call;
42	import retrofit2.Callback;	42	import retrofit2.Callback;
43	import retrofit2.Response;	43	import retrofit2.Response;
44		44
45	public class MainActivity extends BaseActivity {	45	public class MainActivity extends BaseActivity {
46		46
47	@Override	47	@Override
48	protected int layoutResId() {	48	protected int layoutResId() {
49	return R.layout.activity_main;	49	return R.layout.activity_main;
50	}	50	}
51		51
52	@Override	52	@Override
53	public Object getContract() {	53	public Object getContract() {
54	return null;	54	return null;
55	}	55	}
56		56
57	@Override	57	@Override
58	public BasePresenter getPresenter() {	58	public BasePresenter getPresenter() {
59	return null;	59	return null;
60	}	60	}
61		61
62		62
63	HomeFragment homeFragment;	63	HomeFragment homeFragment;
64	MeFragment meFragment;	64	MeFragment meFragment;
65	ConstraintLayout cl_home;	65	ConstraintLayout cl_home;
66	ConstraintLayout cl_me;	66	ConstraintLayout cl_me;
67	ImageView iv_3, iv_4;	67	ImageView iv_3, iv_4;
68	TextView tv_1, tv_4;	68	TextView tv_1, tv_4;
69		69
70		70
71	@Override	71	@Override
72	protected void onCreate(@Nullable Bundle savedInstanceState) {	72	protected void onCreate(@Nullable Bundle savedInstanceState) {
73	super.onCreate(savedInstanceState);	73	super.onCreate(savedInstanceState);
74	fullScreen();	74	fullScreen();
75	}	75	}
76		76
77	@Override	77	@Override
78	protected void initView() {	78	protected void initView() {
79	showFragment(getHomeFragment(), R.id.rl_content);	79	showFragment(getHomeFragment(), R.id.rl_content);
80	cl_home = findViewById(R.id.cl_home);	80	cl_home = findViewById(R.id.cl_home);
81	cl_me = findViewById(R.id.cl_me);	81	cl_me = findViewById(R.id.cl_me);
82	iv_3 = findViewById(R.id.iv_3);	82	iv_3 = findViewById(R.id.iv_3);
83	iv_4 = findViewById(R.id.iv_4);	83	iv_4 = findViewById(R.id.iv_4);
84	tv_1 = findViewById(R.id.tv_1);	84	tv_1 = findViewById(R.id.tv_1);
85	tv_4 = findViewById(R.id.tv_4);	85	tv_4 = findViewById(R.id.tv_4);
86	iv_3.setBackgroundResource(R.mipmap.hoss);	86	iv_3.setBackgroundResource(R.mipmap.hoss);
87	tv_1.setTextColor(Color.parseColor("#FE5E09"));	87	tv_1.setTextColor(Color.parseColor("#1C90F3"));
88	NetWorks.getBaiduToken(new Observer<JsonObject>() {	88	NetWorks.getBaiduToken(new Observer<JsonObject>() {
89	@Override	89	@Override
90	public void onSubscribe(Disposable d) {	90	public void onSubscribe(Disposable d) {
91		91
92	}	92	}
93		93
94	@Override	94	@Override
95	public void onNext(JsonObject jsonObject) {	95	public void onNext(JsonObject jsonObject) {
96	SharedPreferencesUtil.putData("baiduToken", jsonObject.get("access_token").getAsString());	96	SharedPreferencesUtil.putData("baiduToken", jsonObject.get("access_token").getAsString());
97	}	97	}
98		98
99	@Override	99	@Override
100	public void onError(Throwable e) {	100	public void onError(Throwable e) {
101		101
102	}	102	}
103		103
104	@Override	104	@Override
105	public void onComplete() {	105	public void onComplete() {
106		106
107	}	107	}
108	});	108	});
109	NetWorks.listGradeAndSubject(new Observer<ResponseResult<List<GradeAndSubject>>>() {	109	NetWorks.listGradeAndSubject(new Observer<ResponseResult<List<GradeAndSubject>>>() {
110	@Override	110	@Override
111	public void onSubscribe(Disposable d) {	111	public void onSubscribe(Disposable d) {
112		112
113	}	113	}
114		114
115	@Override	115	@Override
116	public void onNext(ResponseResult<List<GradeAndSubject>> listResponseResult) {	116	public void onNext(ResponseResult<List<GradeAndSubject>> listResponseResult) {
117	App.getInstance().setGradeAndSubjects(listResponseResult.getData());	117	App.getInstance().setGradeAndSubjects(listResponseResult.getData());
118	}	118	}
119		119
120	@Override	120	@Override
121	public void onError(Throwable e) {	121	public void onError(Throwable e) {
122	e.toString();	122	e.toString();
123	}	123	}
124		124
125	@Override	125	@Override
126	public void onComplete() {	126	public void onComplete() {
127		127
128	}	128	}
129	});	129	});
130	checkUpdate();	130	checkUpdate();
131	}	131	}
132		132
133	public HomeFragment getHomeFragment() {	133	public HomeFragment getHomeFragment() {
134	if (homeFragment == null)	134	if (homeFragment == null)
135	homeFragment = new HomeFragment();	135	homeFragment = new HomeFragment();
136	return homeFragment;	136	return homeFragment;
137	}	137	}
138		138
139	public MeFragment getMeFragment() {	139	public MeFragment getMeFragment() {
140	if (meFragment == null)	140	if (meFragment == null)
141	meFragment = new MeFragment();	141	meFragment = new MeFragment();
142	return meFragment;	142	return meFragment;
143	}	143	}
144		144
145		145
146	@Override	146	@Override
147	protected void initListener() {	147	protected void initListener() {
148	cl_home.setOnClickListener(view -> {	148	cl_home.setOnClickListener(view -> {
149	fullScreen();	149	fullScreen();
150	showFragment(getHomeFragment(), R.id.rl_content);	150	showFragment(getHomeFragment(), R.id.rl_content);
151	iv_3.setBackgroundResource(R.mipmap.hoss);	151	iv_3.setBackgroundResource(R.mipmap.hoss);
152	tv_1.setTextColor(Color.parseColor("#1C90F3"));	152	tv_1.setTextColor(Color.parseColor("#1C90F3"));
153	iv_4.setBackgroundResource(R.mipmap.wmus);	153	iv_4.setBackgroundResource(R.mipmap.wmus);
154	tv_4.setTextColor(Color.parseColor("#333333"));	154	tv_4.setTextColor(Color.parseColor("#333333"));
155	});	155	});
156		156
157	cl_me.setOnClickListener(view -> {	157	cl_me.setOnClickListener(view -> {
158	blackBar();	158	blackBar();
159	showFragment(getMeFragment(), R.id.rl_content);	159	showFragment(getMeFragment(), R.id.rl_content);
160	iv_3.setBackgroundResource(R.mipmap.hous);	160	iv_3.setBackgroundResource(R.mipmap.hous);
161	tv_1.setTextColor(Color.parseColor("#333333"));	161	tv_1.setTextColor(Color.parseColor("#333333"));
162	iv_4.setBackgroundResource(R.mipmap.wmss);	162	iv_4.setBackgroundResource(R.mipmap.wmss);
163	tv_4.setTextColor(Color.parseColor("#1C90F3"));	163	tv_4.setTextColor(Color.parseColor("#1C90F3"));
164	});	164	});
165	}	165	}
166		166
167	@Override	167	@Override
168	protected void initData() {	168	protected void initData() {
169		169
170	}	170	}
171		171
172	@Override	172	@Override
173	public void onNetChanged(int netWorkState) {	173	public void onNetChanged(int netWorkState) {
174		174
175	}	175	}
176		176
177	public void downloadApk(String url, int versionCode) {	177	public void downloadApk(String url, int versionCode) {
178	String filepath = getExternalFilesDir("apk").getPath() + "/" + versionCode + ".apk";	178	String filepath = getExternalFilesDir("apk").getPath() + "/" + versionCode + ".apk";
179	ProgressDialog dialog = new ProgressDialog(this);	179	ProgressDialog dialog = new ProgressDialog(this);
180	dialog.setTitle("版本更新");	180	dialog.setTitle("版本更新");
181	dialog.setMessage("正在下载新版本，请稍后");	181	dialog.setMessage("正在下载新版本，请稍后");
182	dialog.setMax(100);	182	dialog.setMax(100);
183	dialog.setProgress(0);	183	dialog.setProgress(0);
184	dialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);	184	dialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
185	dialog.show();	185	dialog.show();
186	DownloadUtil.download(url, filepath, new DownloadUtil.OnDownloadListener() {	186	DownloadUtil.download(url, filepath, new DownloadUtil.OnDownloadListener() {
187	@Override	187	@Override
188	public void onDownloadSuccess(String path) {	188	public void onDownloadSuccess(String path) {
189	dialog.setProgress(100);	189	dialog.setProgress(100);
190	dialog.dismiss();	190	dialog.dismiss();
191	installApk(filepath);	191	installApk(filepath);
192	}	192	}
193		193
194	@Override	194	@Override
195	public void onDownloading(int progress) {	195	public void onDownloading(int progress) {
196	dialog.setProgress(progress);	196	dialog.setProgress(progress);
197	}	197	}
198		198
199	@Override	199	@Override
200	public void onDownloadFailed(String msg) {	200	public void onDownloadFailed(String msg) {
201	dialog.dismiss();	201	dialog.dismiss();
202	Looper.prepare();	202	Looper.prepare();
203	showToast("下载失败。");	203	showToast("下载失败。");
204	Looper.loop();	204	Looper.loop();
205	}	205	}
206	});	206	});
207	}	207	}
208		208
209	public void installApk(String path) {	209	public void installApk(String path) {
210	//开启扫码界面	210	//开启扫码界面
211	Intent intentUpdate = new Intent("android.intent.action.VIEW");	211	Intent intentUpdate = new Intent("android.intent.action.VIEW");
212	intentUpdate.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);	212	intentUpdate.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
213	if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { //对Android N及以上的版本做判断	213	if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { //对Android N及以上的版本做判断
214	Uri apkUriN = FileProvider.getUriForFile(MainActivity.this,	214	Uri apkUriN = FileProvider.getUriForFile(MainActivity.this,
215	getApplicationContext().getPackageName() + ".fileprovider", new File(path));	215	getApplicationContext().getPackageName() + ".fileprovider", new File(path));
216	intentUpdate.addCategory("android.intent.category.DEFAULT");	216	intentUpdate.addCategory("android.intent.category.DEFAULT");
217	intentUpdate.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); //天假Flag 表示我们需要什么权限	217	intentUpdate.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); //天假Flag 表示我们需要什么权限
218	intentUpdate.setDataAndType(apkUriN, "application/vnd.android.package-archive");	218	intentUpdate.setDataAndType(apkUriN, "application/vnd.android.package-archive");
219	} else {	219	} else {
220	Uri apkUri = Uri.fromFile(new File(path));	220	Uri apkUri = Uri.fromFile(new File(path));
221	intentUpdate.setDataAndType(apkUri, "application/vnd.android.package-archive");	221	intentUpdate.setDataAndType(apkUri, "application/vnd.android.package-archive");
222	}	222	}
223	startActivity(intentUpdate);	223	startActivity(intentUpdate);
224	}	224	}
225		225
226	public void checkUpdate() {	226	public void checkUpdate() {
227	NetWorks.checkUpdate(BuildConfig.VERSION_CODE, BuildConfig.APPLICATION_ID, new Callback<ResponseResult<UpdateBean>>() {	227	NetWorks.checkUpdate(BuildConfig.VERSION_CODE, BuildConfig.APPLICATION_ID, new Callback<ResponseResult<UpdateBean>>() {
228	@Override	228	@Override
229	public void onResponse(Call<ResponseResult<UpdateBean>> call, Response<ResponseResult<UpdateBean>> response) {	229	public void onResponse(Call<ResponseResult<UpdateBean>> call, Response<ResponseResult<UpdateBean>> response) {
230	if (response.body() != null && response.body().getCode() == 200) {	230	if (response.body() != null && response.body().getCode() == 200) {
231	if (response.body().getData() != null) {	231	if (response.body().getData() != null) {
232	String msg = response.body().getData().getExplain();	232	String msg = response.body().getData().getExplain();
233	String url = response.body().getData().getUrl();	233	String url = response.body().getData().getUrl();
234	int versionCode = response.body().getData().getVersion();	234	int versionCode = response.body().getData().getVersion();
235	showUpdateDialog(msg, url, versionCode);	235	showUpdateDialog(msg, url, versionCode);
236	}	236	}
237	}	237	}
238	}	238	}
239		239
240	@Override	240	@Override
241	public void onFailure(Call<ResponseResult<UpdateBean>> call, Throwable t) {	241	public void onFailure(Call<ResponseResult<UpdateBean>> call, Throwable t) {
242	}	242	}
243	});	243	});
244	}	244	}
245		245
246	public void showUpdateDialog(String msg, String url, int versionCode) {	246	public void showUpdateDialog(String msg, String url, int versionCode) {
247	TipDialog tipDialog = new TipDialog(this, "检测到新版本", msg, "升级", "取消", new TipDialog.TipDialogInterface() {	247	TipDialog tipDialog = new TipDialog(this, "检测到新版本", msg, "升级", "取消", new TipDialog.TipDialogInterface() {
248	@Override	248	@Override
249	public void onConfirm(Dialog dialog) {	249	public void onConfirm(Dialog dialog) {
250	if (!XXPermissions.isGranted(MainActivity.this, Permission.MANAGE_EXTERNAL_STORAGE)) {	250	if (!XXPermissions.isGranted(MainActivity.this, Permission.MANAGE_EXTERNAL_STORAGE)) {
251	XXPermissions.with(MainActivity.this)	251	XXPermissions.with(MainActivity.this)
252	// 申请多个权限	252	// 申请多个权限
253	.permission(Permission.MANAGE_EXTERNAL_STORAGE)	253	.permission(Permission.MANAGE_EXTERNAL_STORAGE)
254	.request(new OnPermissionCallback() {	254	.request(new OnPermissionCallback() {
255	@Override	255	@Override
256	public void onGranted(List<String> permissions, boolean all) {	256	public void onGranted(List<String> permissions, boolean all) {
257	if (all) {	257	if (all) {
258	//开启扫码界面	258	//开启扫码界面
259	downloadApk(url, versionCode);	259	downloadApk(url, versionCode);
260	} else {	260	} else {
261	Toast.makeText(MainActivity.this, "需要权限", Toast.LENGTH_SHORT).show();	261	Toast.makeText(MainActivity.this, "需要权限", Toast.LENGTH_SHORT).show();
262	}	262	}
263	}	263	}
264		264
265	@Override	265	@Override
266	public void onDenied(List<String> permissions, boolean never) {	266	public void onDenied(List<String> permissions, boolean never) {
267	XXPermissions.startPermissionActivity(MainActivity.this, permissions);	267	XXPermissions.startPermissionActivity(MainActivity.this, permissions);
268	}	268	}
269	});	269	});
270	} else {	270	} else {
271	downloadApk(url, versionCode);	271	downloadApk(url, versionCode);
272	}	272	}
273		273
274	}	274	}
275		275
276	@Override	276	@Override
277	public void onCancel(Dialog dialog) {	277	public void onCancel(Dialog dialog) {
278	dialog.dismiss();	278	dialog.dismiss();
279	}	279	}
280	});	280	});
281	tipDialog.show();	281	tipDialog.show();
282	}	282	}
283	}	283	}

app/src/main/java/com/hjx/parent/TeacherMainActivity.java

Diff comments View file @484570f

 package com.hjx.parent;
 import android.app.Dialog;
 import android.app.ProgressDialog;
 import android.content.Intent;
 import android.graphics.Color;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Looper;
 import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.core.content.FileProvider;
 import com.google.gson.JsonObject;
 import com.hjq.permissions.OnPermissionCallback;
 import com.hjq.permissions.Permission;
 import com.hjq.permissions.XXPermissions;
 import com.hjx.parent.dialog.TipDialog;
 import com.hjx.parent.fragment.ErrorFragment;
 import com.hjx.parent.fragment.HomeFragment;
 import com.hjx.parent.fragment.MeFragment;
 import com.hjx.parent.fragment.TeacherFragment;
 import com.prws.common.base.BaseActivity;
 import com.prws.common.base.BasePresenter;
 import com.prws.common.bean.GradeAndSubject;
 import com.prws.common.bean.ResponseResult;
 import com.prws.common.bean.UpdateBean;
 import com.prws.common.net.NetWorks;
 import com.prws.common.utils.DownloadUtil;
 import com.prws.common.utils.SharedPreferencesUtil;
 import java.io.File;
 import java.util.List;
 import io.reactivex.Observer;
 import io.reactivex.disposables.Disposable;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
 public class TeacherMainActivity extends BaseActivity {
     @Override
     protected int layoutResId() {
         return R.layout.activity_main;
     }
     @Override
     public Object getContract() {
         return null;
     }
     @Override
     public BasePresenter getPresenter() {
         return null;
     }
     ErrorFragment errorFragment;
     TeacherFragment meFragment;
     ConstraintLayout cl_home;
     ConstraintLayout cl_me;
     ImageView iv_3, iv_4;
     TextView tv_1, tv_4;
     @Override
     protected void initView() {
         blackBar();
         showFragment(getErrorFragment(), R.id.rl_content);
         cl_home = findViewById(R.id.cl_home);
         cl_me = findViewById(R.id.cl_me);
         iv_3 = findViewById(R.id.iv_3);
         iv_4 = findViewById(R.id.iv_4);
         tv_1 = findViewById(R.id.tv_1);
         tv_4 = findViewById(R.id.tv_4);
         iv_3.setBackgroundResource(R.mipmap.hoss);
-        tv_1.setTextColor(Color.parseColor("#FE5E09"));
+        tv_1.setTextColor(Color.parseColor("#1C90F3"));
         NetWorks.getBaiduToken(new Observer<JsonObject>() {
             @Override
             public void onSubscribe(Disposable d) {
             }
             @Override
             public void onNext(JsonObject jsonObject) {
                 SharedPreferencesUtil.putData("baiduToken", jsonObject.get("access_token").getAsString());
             }
             @Override
             public void onError(Throwable e) {
             }
             @Override
             public void onComplete() {
             }
         });
         NetWorks.listGradeAndSubject(new Observer<ResponseResult<List<GradeAndSubject>>>() {
             @Override
             public void onSubscribe(Disposable d) {
             }
             @Override
             public void onNext(ResponseResult<List<GradeAndSubject>> listResponseResult) {
                 App.getInstance().setGradeAndSubjects(listResponseResult.getData());
             }
             @Override
             public void onError(Throwable e) {
                 e.toString();
             }
             @Override
             public void onComplete() {
             }
         });
         checkUpdate();
     }
     public ErrorFragment getErrorFragment() {
         if (errorFragment == null)
             errorFragment = new ErrorFragment();
         return errorFragment;
     }
     public TeacherFragment getMeFragment() {
         if (meFragment == null)
             meFragment = new TeacherFragment();
         return meFragment;
     }
     @Override
     protected void initListener() {
         cl_home.setOnClickListener(view -> {
             showFragment(getErrorFragment(), R.id.rl_content);
             iv_3.setBackgroundResource(R.mipmap.hoss);
             tv_1.setTextColor(Color.parseColor("#1C90F3"));
             iv_4.setBackgroundResource(R.mipmap.wmus);
             tv_4.setTextColor(Color.parseColor("#333333"));
         });
         cl_me.setOnClickListener(view -> {
             showFragment(getMeFragment(), R.id.rl_content);
             iv_3.setBackgroundResource(R.mipmap.hous);
             tv_1.setTextColor(Color.parseColor("#333333"));
             iv_4.setBackgroundResource(R.mipmap.wmss);
             tv_4.setTextColor(Color.parseColor("#1C90F3"));
         });
     }
     @Override
     protected void initData() {
     }
     @Override
     public void onNetChanged(int netWorkState) {
     }
     public void downloadApk(String url, int versionCode) {
         String filepath = getExternalFilesDir("apk").getPath() + "/" + versionCode + ".apk";
         ProgressDialog dialog = new ProgressDialog(this);
         dialog.setTitle("版本更新");
         dialog.setMessage("正在下载新版本，请稍后");
         dialog.setMax(100);
         dialog.setProgress(0);
         dialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
         dialog.show();
         DownloadUtil.download(url, filepath, new DownloadUtil.OnDownloadListener() {
             @Override
             public void onDownloadSuccess(String path) {
                 dialog.setProgress(100);
                 dialog.dismiss();
                 installApk(filepath);
             }
             @Override
             public void onDownloading(int progress) {
                 dialog.setProgress(progress);
             }
             @Override
             public void onDownloadFailed(String msg) {
                 dialog.dismiss();
                 Looper.prepare();
                 showToast("下载失败。");
                 Looper.loop();
             }
         });
     }
     public void installApk(String path) {
         //开启扫码界面
         Intent intentUpdate = new Intent("android.intent.action.VIEW");
         intentUpdate.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {  //对Android N及以上的版本做判断
             Uri apkUriN = FileProvider.getUriForFile(TeacherMainActivity.this,
                     getApplicationContext().getPackageName() + ".fileprovider", new File(path));
             intentUpdate.addCategory("android.intent.category.DEFAULT");
             intentUpdate.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);   //天假Flag 表示我们需要什么权限
             intentUpdate.setDataAndType(apkUriN, "application/vnd.android.package-archive");
         } else {
             Uri apkUri = Uri.fromFile(new File(path));
             intentUpdate.setDataAndType(apkUri, "application/vnd.android.package-archive");
         }
         startActivity(intentUpdate);
     }
+    @Override
+    protected void onResume() {
+        super.onResume();
+        if (errorFragment != null) {
+            errorFragment.refreshStudent();
+        }
+    }
     public void checkUpdate() {
         NetWorks.checkUpdate(BuildConfig.VERSION_CODE, BuildConfig.APPLICATION_ID, new Callback<ResponseResult<UpdateBean>>() {
             @Override
             public void onResponse(Call<ResponseResult<UpdateBean>> call, Response<ResponseResult<UpdateBean>> response) {
                 if (response.body() != null && response.body().getCode() == 200) {
                     if (response.body().getData() != null) {
                         String msg = response.body().getData().getExplain();
                         String url = response.body().getData().getUrl();
                         int versionCode = response.body().getData().getVersion();
                         showUpdateDialog(msg, url, versionCode);
                     }
                 }
             }
             @Override
             public void onFailure(Call<ResponseResult<UpdateBean>> call, Throwable t) {
             }
         });
     }
     public void showUpdateDialog(String msg, String url, int versionCode) {
         TipDialog tipDialog = new TipDialog(this, "检测到新版本", msg, "升级", "取消", new TipDialog.TipDialogInterface() {
             @Override
             public void onConfirm(Dialog dialog) {
                 if (!XXPermissions.isGranted(TeacherMainActivity.this, Permission.MANAGE_EXTERNAL_STORAGE)) {
                     XXPermissions.with(TeacherMainActivity.this)
                             // 申请多个权限
                             .permission(Permission.MANAGE_EXTERNAL_STORAGE)
                             .request(new OnPermissionCallback() {
                                 @Override
                                 public void onGranted(List<String> permissions, boolean all) {
                                     if (all) {
                                         //开启扫码界面
                                         downloadApk(url, versionCode);
                                     } else {
                                         Toast.makeText(TeacherMainActivity.this, "需要权限", Toast.LENGTH_SHORT).show();
                                     }
                                 }
                                 @Override
                                 public void onDenied(List<String> permissions, boolean never) {
                                     XXPermissions.startPermissionActivity(TeacherMainActivity.this, permissions);
                                 }
                             });
                 } else {
                     downloadApk(url, versionCode);
                 }
             }
             @Override
             public void onCancel(Dialog dialog) {
                 dialog.dismiss();
             }
         });
         tipDialog.show();
     }
 }

app/src/main/java/com/hjx/parent/adapter/GradeAdapter.java

Diff comments View file @484570f

File was created	1	package com.hjx.parent.adapter;
	2
	3	import android.content.Context;
	4	import android.graphics.Color;
	5	import android.view.LayoutInflater;
	6	import android.view.View;
	7	import android.view.ViewGroup;
	8	import android.widget.TextView;
	9
	10	import androidx.annotation.NonNull;
	11	import androidx.recyclerview.widget.RecyclerView;
	12
	13	import com.hjx.parent.R;
	14	import com.hjx.parent.databinding.ItemFilterTextBinding;
	15
	16	import java.util.List;
	17
	18	public class GradeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
	19	private List<String> list;
	20	private Filter filter;
	21	private Context context;
	22	private String key;
	23
	24	public interface Filter {
	25	void onSelect(String select);
	26	}
	27
	28	public GradeAdapter(Context context, Filter filter, List<String> list, String key) {
	29	this.context = context;
	30	this.filter = filter;
	31	this.list = list;
	32	this.key = key;
	33	}
	34
	35	public void refresh( String key) {
	36	this.key = key;
	37	notifyDataSetChanged();
	38	}
	39
	40	@NonNull
	41	@Override
	42	public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
	43	ItemFilterTextBinding itemFilterBinding = ItemFilterTextBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false);
	44	return new FilterHolder(itemFilterBinding);
	45	}
	46
	47	@Override
	48	public void onBindViewHolder(@NonNull RecyclerView.ViewHolder viewHolder, int i) {
	49	FilterHolder holder = (FilterHolder) viewHolder;
	50	String value = list.get(i);
	51	holder.binding.tvFilter.setText(value);
	52	if (key.contains(value)) {
	53	holder.binding.tvFilter.setTextColor(Color.WHITE);
	54	holder.binding.tvFilter.setBackgroundResource(R.drawable.bg_soild_blue_25);
	55	} else {
	56	holder.binding.tvFilter.setTextColor(context.getColor(R.color.text_title));
	57	holder.binding.tvFilter.setBackgroundResource(R.drawable.bg_solid_btn_grad);
	58	}
	59	holder.itemView.setOnClickListener(new View.OnClickListener() {
	60	@Override
	61	public void onClick(View view) {
	62	filter.onSelect(value);
	63	}
	64	});
	65	}
	66
	67	@Override
	68	public int getItemCount() {
	69	return list.size();
	70	}
	71
	72	static class FilterHolder extends RecyclerView.ViewHolder {
	73	ItemFilterTextBinding binding;
	74
	75	public FilterHolder(@NonNull ItemFilterTextBinding itemView) {
	76	super(itemView.getRoot());
	77	binding = itemView;
	78	}
	79	}
	80	}
	81

app/src/main/java/com/hjx/parent/adapter/ImageAdapter.java

Diff comments View file @484570f

 package com.hjx.parent.adapter;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Rect;
 import android.graphics.RectF;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import com.google.gson.Gson;
 import com.hjx.parent.ImageActivity;
 import com.hjx.parent.ImageSelectActivity;
 import com.hjx.parent.R;
 import com.hjx.parent.databinding.ItemImageBinding;
 import com.prws.common.bean.ImageBean;
 import com.prws.common.utils.CommonUtil;
 import java.util.List;
 public class ImageAdapter extends RecyclerView.Adapter<ImageAdapter.ImageHolder> {
     private List<ImageBean> list;
     private ImageActivity context;
     public ImageAdapter(ImageActivity context, List<ImageBean> list) {
         this.context = context;
         this.list = list;
     }
     @NonNull
     @Override
     public ImageHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
         ItemImageBinding itemImageBinding = ItemImageBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false);
         return new ImageHolder(itemImageBinding);
     }
     @Override
     public void onBindViewHolder(@NonNull ImageHolder holder, int position) {
         ImageBean imageBean = list.get(position);
         Bitmap bitmap = BitmapFactory.decodeFile(imageBean.getPath());
         float imageHeight = bitmap.getHeight();
         float imageWidth = bitmap.getWidth();
         float viewHeight = CommonUtil.getScreenHeight(context) - CommonUtil.dpToPx(context, 250);
         float viewWidth = CommonUtil.getScreenWidth(context) - CommonUtil.dpToPx(context, 60);
         RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(holder.binding.ivPic.getLayoutParams());
         if (imageHeight / imageWidth > viewHeight / viewWidth) {
             if (viewHeight > imageHeight) {
                 layoutParams.height = (int) imageHeight;
                 layoutParams.width = (int) imageWidth;
             } else {
                 layoutParams.height = (int) viewHeight;
                 layoutParams.width = (int) ((float) (imageWidth / imageHeight) * viewHeight);
             }
         } else {
             if (viewWidth > imageWidth) {
                 layoutParams.height = (int) imageHeight;
                 layoutParams.width = (int) imageWidth;
             } else {
                 layoutParams.height = (int) ((float) (imageHeight / imageWidth) * viewWidth);
                 layoutParams.width = (int) viewWidth;
             }
         }
         layoutParams.addRule(RelativeLayout.CENTER_IN_PARENT);
         holder.binding.ivPic.setLayoutParams(layoutParams);
         holder.binding.ivPic.setImageBitmap(bitmap);
         RelativeLayout.LayoutParams layoutParams1 = new RelativeLayout.LayoutParams(holder.binding.rlPic.getLayoutParams());
         if (imageHeight / imageWidth > viewHeight / viewWidth) {
             if (viewHeight > imageHeight) {
                 layoutParams1.height = (int) imageHeight;
                 layoutParams1.width = (int) imageWidth;
             } else {
                 layoutParams1.height = (int) viewHeight;
                 layoutParams1.width = (int) ((float) (imageWidth / imageHeight) * viewHeight);
             }
         } else {
             if (viewWidth > imageWidth) {
                 layoutParams1.height = (int) imageHeight;
                 layoutParams1.width = (int) imageWidth;
             } else {
                 layoutParams1.height = (int) ((float) (imageHeight / imageWidth) * viewWidth);
                 layoutParams1.width = (int) viewWidth;
             }
         }
         Log.i("figLoaction", "height=" + layoutParams1.height + "   width=" + layoutParams1.width);
         layoutParams1.addRule(RelativeLayout.CENTER_IN_PARENT);
         holder.binding.rlPic.setLayoutParams(layoutParams1);
         if (imageBean.getCuts() != null && imageBean.getCuts().size() > 0) {
             holder.binding.rlPic.removeAllViews();
             for (int i = 0; i < imageBean.getCuts().size(); i++) {
                 View view = LayoutInflater.from(context).inflate(R.layout.layout_select, null);
                 Rect rect;
                 if (imageBean.getCuts().get(i).getRect1() != null) {
                     rect = imageBean.getCuts().get(i).getRect1();
                 } else {
                     rect = CommonUtil.getRect(imageBean.getCuts().get(i).getRect(), bitmap, layoutParams1.height, layoutParams1.width);
                     imageBean.getCuts().get(i).setRect1(rect);
                 }
                 Log.i("figLoaction", new Gson().toJson(rect));
                 RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(rect.right - rect.left, rect.bottom - rect.top);
                 params.setMargins(rect.left, rect.top, 0, 0);
                 holder.binding.rlPic.addView(view, params);
                 RelativeLayout rl_add = view.findViewById(R.id.rl_add);
                 ImageView iv_state = view.findViewById(R.id.iv_state);
                 ImageView iv_edit = view.findViewById(R.id.iv_edit);
                 int finalI = i;
+                if (imageBean.getCuts().get(i).isSelect()) {
+                    rl_add.setBackgroundResource(R.drawable.bg_cut_select);
+                    iv_state.setImageResource(R.mipmap.ic_selected);
+                } else {
+                    rl_add.setBackgroundResource(R.drawable.bg_cut_unselect);
+                    iv_state.setImageResource(R.mipmap.ic_add);
+                }
                 rl_add.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
                         Bitmap b = Bitmap.createBitmap(bitmap, v.getLeft() * bitmap.getWidth() / holder.binding.ivPic.getWidth(), v.getTop() * bitmap.getHeight() / holder.binding.ivPic.getHeight(), (v.getRight() - v.getLeft()) * bitmap.getWidth() / holder.binding.ivPic.getWidth(), (v.getBottom() - v.getTop()) * bitmap.getHeight() / holder.binding.ivPic.getHeight());
                         if (imageBean.getCuts().get(finalI).isSelect()) {
                             imageBean.getCuts().get(finalI).setSelect(false);
                             rl_add.setBackgroundResource(R.drawable.bg_cut_unselect);
                             iv_state.setImageResource(R.mipmap.ic_add);
                         } else {
                             imageBean.getCuts().get(finalI).setSelect(true);
                             imageBean.getCuts().get(finalI).setBitmap(b);
                             rl_add.setBackgroundResource(R.drawable.bg_cut_select);
                             iv_state.setImageResource(R.mipmap.ic_selected);
                         }
                         context.refreshNum();
                     }
                 });
                 iv_edit.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
                         Intent intent = new Intent(context, ImageSelectActivity.class);
                         intent.putExtra("rect", rect);
                         intent.putExtra("path", imageBean.getPath());
                         intent.putExtra("position", finalI);
                         context.startActivityForResult(intent, 1001);
                     }
                 });
             }
         }
     }
     @Override
     public int getItemCount() {
         return list.size();
     }
     static class ImageHolder extends RecyclerView.ViewHolder {
         ItemImageBinding binding;
         public ImageHolder(@NonNull ItemImageBinding itemView) {
             super(itemView.getRoot());
             binding = itemView;
         }
     }
 }

app/src/main/java/com/hjx/parent/dialog/ErrorEditDialog.java

Diff comments View file @484570f

 package com.hjx.parent.dialog;
 import android.app.Dialog;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Color;
 import android.os.Bundle;
 import android.view.Gravity;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.CompoundButton;
 import android.widget.RadioButton;
 import android.widget.RadioGroup;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import com.bumptech.glide.Glide;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.google.gson.Gson;
 import com.hjx.parent.AddSuccessActivity;
 import com.hjx.parent.App;
 import com.hjx.parent.ImageActivity;
 import com.hjx.parent.R;
 import com.hjx.parent.bean.StudentBean;
 import com.hjx.parent.databinding.DialogAddErrorBinding;
 import com.hjx.parent.databinding.DialogEditErrorBinding;
 import com.prws.common.bean.Grade;
 import com.prws.common.bean.GradeAndSubject;
 import com.prws.common.bean.ResponseResult;
 import com.prws.common.bean.Subject;
 import com.prws.common.bean.TopicBean;
 import com.prws.common.net.NetWorks;
 import com.prws.common.utils.CommonUtil;
 import com.prws.common.utils.SharedPreferencesUtil;
 import com.prws.common.utils.StringUtils;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import io.reactivex.Observer;
 import io.reactivex.disposables.Disposable;
 public class ErrorEditDialog extends Dialog {
     private Context context;
     private DialogEditErrorBinding binding;
     private List<TopicBean> list;
     private Grade grade;
+    private String term;
     private Subject subject;
     private int reason;
     private int type = 0;
     private EditInterface editInterface;
     public interface EditInterface {
         void edit(String name, int reason);
     }
     public ErrorEditDialog(@NonNull Context context, List<TopicBean> list, EditInterface editInterface) {
         super(context, R.style.MyAlertDialog);
         this.context = context;
         this.list = list;
         this.editInterface = editInterface;
     }
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         binding = DialogEditErrorBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
         Window dialogWindow = getWindow();
         WindowManager.LayoutParams lp = dialogWindow.getAttributes();
         lp.width = CommonUtil.getScreenWidth(getContext());
         dialogWindow.setGravity(Gravity.BOTTOM);
         dialogWindow.setAttributes(lp);
         List<String> grades = new ArrayList<>();
         for (GradeAndSubject grade : App.getInstance().getGradeAndSubjects()) {
             grades.add(grade.getGrade().getGrade());
         }
         ArrayAdapter<String> gradeAdapter = new ArrayAdapter<>(context, R.layout.item_for_custom_spinner, grades);
         binding.spinnerGrade.setAdapter(gradeAdapter);
         binding.spinnerGrade.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
                 grade = App.getInstance().getGradeAndSubjects().get(position).getGrade();
                 refreshSubject(App.getInstance().getGradeAndSubjects().get(position).getSubjects());
             }
             @Override
             public void onNothingSelected(AdapterView<?> parent) {
             }
         });
+        ArrayAdapter<String> gradeAdapter1 = new ArrayAdapter<>(context, R.layout.item_for_custom_spinner, getContext().getResources().getStringArray(R.array.grade_array));
+        binding.spinnerGrade1.setAdapter(gradeAdapter1);
+        binding.spinnerGrade1.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+            @Override
+            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+                term = getContext().getResources().getStringArray(R.array.grade_array)[position];
+            }
+            @Override
+            public void onNothingSelected(AdapterView<?> parent) {
+            }
+        });
         ArrayAdapter<String> reasonAdapter = new ArrayAdapter<>(context, R.layout.item_for_custom_spinner, context.getResources().getStringArray(R.array.error_reason));
         binding.spinnerReason.setAdapter(reasonAdapter);
         binding.spinnerReason.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
                 reason = position;
             }
             @Override
             public void onNothingSelected(AdapterView<?> parent) {
             }
         });
         RadioButton typeButton = (RadioButton) binding.typeRadio.getChildAt(type);
         typeButton.setChecked(true);
         binding.typeRadio.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(RadioGroup group, int checkedId) {
                 RadioButton rcheck = (RadioButton) findViewById(checkedId);
                 type = getContext().getString(R.string.topic_type_in).equals(rcheck.getText().toString()) ? 0 : 1;
             }
         });
         binding.ivBack.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 dismiss();
             }
         });
         binding.addTopic.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 editError();
             }
         });
     }
     private void editError() {
         List<HashMap<String, Object>> hashMapArrayList = new ArrayList<>();
         for (TopicBean topicBean : list) {
             HashMap<String, Object> map = new HashMap<>();
             map.put("bookId", topicBean.getId());
-            map.put("grade", grade.getGrade());
+            map.put("grade", grade.getGrade() + term);
             map.put("subject", subject.getSubject());
             map.put("errorReason", String.valueOf(reason));
             map.put("title", grade.getGrade() + "-" + subject.getSubject() + "-" + (type == 0 ? "课内" : "课外") + "错题");
             map.put("type", type);
             hashMapArrayList.add(map);
         }
         NetWorks.editError(hashMapArrayList, new Observer<ResponseResult>() {
             @Override
             public void onSubscribe(Disposable d) {
             }
             @Override
             public void onNext(ResponseResult responseResult) {
                 if (responseResult.getCode() == 200) {
                     editInterface.edit(grade.getGrade() + "-" + subject.getSubject() + "-" + (type == 0 ? "课内" : "课外") + "错题", reason);
                     dismiss();
                 }
             }
             @Override
             public void onError(Throwable e) {
             }
             @Override
             public void onComplete() {
             }
         });
     }
     private void refreshSubject(List<Subject> subjects) {
         List<String> s = new ArrayList<>();
         for (Subject subject : subjects) {
             s.add(subject.getSubject());
         }
         ArrayAdapter<String> subjectAdapter = new ArrayAdapter<>(context, R.layout.item_for_custom_spinner, s);
         binding.spinnerSubject.setAdapter(subjectAdapter);
         binding.spinnerSubject.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
                 subject = subjects.get(position);
             }
             @Override
             public void onNothingSelected(AdapterView<?> parent) {
             }
         });
     }
 }

app/src/main/java/com/hjx/parent/dialog/ErrorInputDialog.java

Diff comments View file @484570f

 package com.hjx.parent.dialog;
 import android.app.Dialog;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.view.Gravity;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.CompoundButton;
 import android.widget.RadioButton;
 import android.widget.RadioGroup;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import com.bumptech.glide.Glide;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.google.gson.Gson;
 import com.hjx.parent.AddSuccessActivity;
 import com.hjx.parent.App;
 import com.hjx.parent.ImageActivity;
 import com.hjx.parent.R;
 import com.hjx.parent.bean.StudentBean;
 import com.hjx.parent.databinding.DialogAddErrorBinding;
 import com.prws.common.bean.Grade;
 import com.prws.common.bean.GradeAndSubject;
 import com.prws.common.bean.ResponseResult;
 import com.prws.common.bean.Subject;
 import com.prws.common.bean.TopicBean;
 import com.prws.common.net.NetWorks;
 import com.prws.common.utils.CommonUtil;
 import com.prws.common.utils.LogUtil;
 import com.prws.common.utils.SharedPreferencesUtil;
 import com.prws.common.utils.StringUtils;
 import org.json.JSONArray;
 import org.json.JSONObject;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import io.reactivex.Observer;
 import io.reactivex.disposables.Disposable;
 import okhttp3.ResponseBody;
 public class ErrorInputDialog extends Dialog {
     private ImageActivity context;
     private DialogAddErrorBinding binding;
     private List<TopicBean> list;
     private int select = 0;
     private Grade grade;
+    private String term;
     private Subject subject;
     private int reason;
     private int type = 0;
     BaseQuickAdapter adapter;
     public ErrorInputDialog(@NonNull ImageActivity context, List<TopicBean> list) {
         super(context, R.style.MyAlertDialog);
         this.context = context;
         this.list = list;
     }
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         binding = DialogAddErrorBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
         Window dialogWindow = getWindow();
         WindowManager.LayoutParams lp = dialogWindow.getAttributes();
         lp.width = CommonUtil.getScreenWidth(getContext());
         dialogWindow.setGravity(Gravity.BOTTOM);
         dialogWindow.setAttributes(lp);
         adapter = new BaseQuickAdapter(R.layout.item_topic, list) {
             @Override
             protected void convert(@NonNull BaseViewHolder item, Object o) {
                 int position = item.getAdapterPosition();
                 item.setText(R.id.tv_name, context.getString(R.string.num_topic, StringUtils.intToChinese(position + 1)));
                 if (list.get(position).isFinish()) {
                     item.setGone(R.id.iv_click, true);
                     item.setBackgroundRes(R.id.tv_name, R.drawable.topic_finish_bg);
                     item.setTextColor(R.id.tv_name, Color.parseColor("#1C90F3"));
                 } else if (select == position) {
                     item.setGone(R.id.iv_click, false);
                     item.setBackgroundRes(R.id.tv_name, R.drawable.button_select_topic_bg);
                     item.setTextColor(R.id.tv_name, Color.parseColor("#1C90F3"));
                 } else {
                     item.setGone(R.id.iv_click, false);
                     item.setBackgroundRes(R.id.tv_name, R.drawable.button_topic_bg);
                     item.setTextColor(R.id.tv_name, Color.parseColor("#999999"));
                 }
                 item.getConvertView().setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
                         select = position;
                         loadError();
                         notifyDataSetChanged();
                     }
                 });
             }
             @Override
             public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
             }
         };
         binding.listItem.setLayoutManager(new LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false));
         binding.listItem.setAdapter(adapter);
         List<String> grades = new ArrayList<>();
         for (GradeAndSubject grade : App.getInstance().getGradeAndSubjects()) {
             grades.add(grade.getGrade().getGrade());
         }
         ArrayAdapter<String> gradeAdapter = new ArrayAdapter<>(context, R.layout.item_for_custom_spinner, grades);
         binding.spinnerGrade.setAdapter(gradeAdapter);
         binding.spinnerGrade.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
                 grade = App.getInstance().getGradeAndSubjects().get(position).getGrade();
                 refreshSubject(App.getInstance().getGradeAndSubjects().get(position).getSubjects());
             }
             @Override
             public void onNothingSelected(AdapterView<?> parent) {
             }
         });
+        ArrayAdapter<String> gradeAdapter1 = new ArrayAdapter<>(context, R.layout.item_for_custom_spinner, getContext().getResources().getStringArray(R.array.grade_array));
+        binding.spinnerGrade1.setAdapter(gradeAdapter1);
+        binding.spinnerGrade1.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+            @Override
+            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+                term = getContext().getResources().getStringArray(R.array.grade_array)[position];
+            }
+            @Override
+            public void onNothingSelected(AdapterView<?> parent) {
+            }
+        });
         ArrayAdapter<String> reasonAdapter = new ArrayAdapter<>(context, R.layout.item_for_custom_spinner, context.getResources().getStringArray(R.array.error_reason));
         binding.spinnerReason.setAdapter(reasonAdapter);
         binding.spinnerReason.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
                 reason = position;
             }
             @Override
             public void onNothingSelected(AdapterView<?> parent) {
             }
         });
         RadioButton typeButton = (RadioButton) binding.typeRadio.getChildAt(type);
         typeButton.setChecked(true);
         binding.typeRadio.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(RadioGroup group, int checkedId) {
                 RadioButton rcheck = (RadioButton) findViewById(checkedId);
                 type = getContext().getString(R.string.topic_type_in).equals(rcheck.getText().toString()) ? 0 : 1;
                 list.get(select).setType(type);
             }
         });
         binding.ivBack.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 dismiss();
             }
         });
         binding.checkbox.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
                 if (isChecked) {
                     binding.addTopic.setText("全部加入错题本");
                 } else {
                     binding.addTopic.setText("第" + StringUtils.intToChinese(select + 1) + "题加入错题本");
                 }
             }
         });
         binding.addTopic.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 if (binding.checkbox.isChecked()) {
                     for (TopicBean topicBean : list) {
                         addTopic(topicBean);
                     }
                 } else {
                     addTopic(list.get(select));
                 }
             }
         });
         loadError();
     }
     private void refreshSubject(List<Subject> subjects) {
         List<String> s = new ArrayList<>();
         for (Subject subject : subjects) {
             s.add(subject.getSubject());
         }
         ArrayAdapter<String> subjectAdapter = new ArrayAdapter<>(context, R.layout.item_for_custom_spinner, s);
         binding.spinnerSubject.setAdapter(subjectAdapter);
         binding.spinnerSubject.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
                 subject = subjects.get(position);
             }
             @Override
             public void onNothingSelected(AdapterView<?> parent) {
             }
         });
     }
     private void loadError() {
         TopicBean bean = list.get(select);
         Glide.with(getContext()).load(bean.getPath()).override(CommonUtil.getScreenWidth(context) - CommonUtil.dpToPx(getContext(), 40), CommonUtil.dpToPx(getContext(), 90)).fitCenter().into(binding.ivTopic);
         if (!binding.checkbox.isChecked()) {
             binding.addTopic.setText("第" + StringUtils.intToChinese(select + 1) + "题加入错题本");
         }
     }
     private void addTopic(TopicBean bean) {
         if (!bean.isFinish()) {
             bean.setId(String.valueOf(System.currentTimeMillis()));
             bean.setDate(String.valueOf(System.currentTimeMillis()));
             bean.setGrade(grade.getGrade());
             bean.setType(type);
             bean.setSubject(subject.getSubject());
             String student = (String) SharedPreferencesUtil.getData("student", "");
             StudentBean studentBean = new Gson().fromJson(student, StudentBean.class);
             Map<String, String> param = new HashMap<>();
             param.put("bookId", bean.getId());
             param.put("stuId", studentBean.getStuId());
             param.put("errorReason", String.valueOf(reason));
             param.put("title", grade.getGrade() + "-" + subject.getSubject() + "-" + (type == 0 ? "课内" : "课外") + "错题");
             param.put("subject", bean.getSubject());
-            param.put("grade", bean.getGrade());
+            param.put("grade", bean.getGrade() + term);
             param.put("type", String.valueOf(bean.getType()));
             param.put("teacherFlag", "0");
             param.put("controlFlag", "1");
             NetWorks.addError(bean.getPath(), param, new Observer<ResponseResult>() {
                 @Override
                 public void onSubscribe(Disposable d) {
                 }
                 @Override
                 public void onNext(ResponseResult responseResult) {
                     if (responseResult.getCode() == 200) {
                         bean.setFinish(true);
                         boolean isAllAdd = true;
                         for (int i = 0; i < list.size(); i++) {
                             if (!list.get(i).isFinish()) {
                                 select = i;
                                 adapter.notifyDataSetChanged();
                                 isAllAdd = false;
                                 loadError();
                                 break;
                             }
                         }
                         if (isAllAdd) {
                             dismiss();
                             Intent intent = new Intent(context, AddSuccessActivity.class);
                             context.startActivity(intent);
                             context.finish();
                         }
                     }
                 }
                 @Override
                 public void onError(Throwable e) {
                 }
                 @Override
                 public void onComplete() {
                 }
             });
         }
     }
 }

app/src/main/java/com/hjx/parent/fragment/ErrorFragment.java

Diff comments View file @484570f

 package com.hjx.parent.fragment;
 import static android.app.Activity.RESULT_OK;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.MediaStore;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.Toast;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.content.FileProvider;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
 import com.bumptech.glide.request.RequestOptions;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.google.gson.Gson;
 import com.hjq.permissions.OnPermissionCallback;
 import com.hjq.permissions.Permission;
 import com.hjq.permissions.XXPermissions;
 import com.hjx.parent.ChooseActivity;
 import com.hjx.parent.ErrorBookActivity;
 import com.hjx.parent.ErrorListActivity;
 import com.hjx.parent.ImageActivity;
 import com.hjx.parent.R;
 import com.hjx.parent.TeacherChooseActivity;
 import com.hjx.parent.adapter.ErrorAdapter;
 import com.hjx.parent.bean.StudentBean;
 import com.hjx.parent.databinding.ActivityErrorBookBinding;
 import com.hjx.parent.databinding.FragmentErrorBookBinding;
 import com.prws.common.bean.PageInfo;
 import com.prws.common.bean.ResponseResult;
 import com.prws.common.bean.TopicBean;
 import com.prws.common.net.NetWorks;
 import com.prws.common.utils.BitmapUtils;
 import com.prws.common.utils.CommonUtil;
 import com.prws.common.utils.ScreenUtils;
 import com.prws.common.utils.SharedPreferencesUtil;
 import com.prws.common.utils.dialog.MyButtomDialog;
 import com.zhangteng.imagepicker.bean.ImageInfo;
 import com.zhangteng.imagepicker.config.ImagePickerConfig;
 import com.zhangteng.imagepicker.config.ImagePickerEnum;
 import com.zhangteng.imagepicker.config.ImagePickerOpen;
 import com.zhangteng.imagepicker.imageloader.GlideImageLoader;
 import com.zhangteng.utils.IHandlerCallBack;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import io.reactivex.Observer;
 import io.reactivex.disposables.Disposable;
 public class ErrorFragment extends BaseBindingFragment<FragmentErrorBookBinding> {
     StudentBean studentBean;
     private int subject;
     private ErrorAdapter adapter;
     private int REQUEST_CODE_IMAGE = 123;
     private String filePath;
     @Override
     protected FragmentErrorBookBinding onCreateViewBinding(@NonNull LayoutInflater inflater, @Nullable ViewGroup parent) {
         return FragmentErrorBookBinding.inflate(inflater, parent, false);
     }
-    @Override
+    public void refreshStudent() {
-    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
         String student = (String) SharedPreferencesUtil.getData("student", "");
         try {
             studentBean = new Gson().fromJson(student, StudentBean.class);
             RoundedCorners roundedCorners = new RoundedCorners(ScreenUtils.dpToPx(getContext(), 45));
             RequestOptions options = RequestOptions.bitmapTransform(roundedCorners);
             if (TextUtils.isEmpty(studentBean.getPhoto())) {
                 getBinding().ivStudent.setImageResource(studentBean.getGender() == 0 ? R.mipmap.ic_avatar_male : R.mipmap.ic_avatar_female);
             } else {
                 Glide.with(getContext()).load(studentBean.getPhoto()).apply(options).into(getBinding().ivStudent);
             }
             getBinding().tvName.setText(studentBean.getStuName());
         } catch (Exception e) {
         }
+    }
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        refreshStudent();
         getBinding().rlTakePhoto.post(new Runnable() {
             @Override
             public void run() {
                 LinearLayout.LayoutParams layoutParams = (LinearLayout.LayoutParams) getBinding().rlTakePhoto.getLayoutParams();
                 layoutParams.width = CommonUtil.getScreenWidth(getContext());
                 layoutParams.height = CommonUtil.getScreenWidth(getContext()) * 20 / 37;
                 getBinding().rlTakePhoto.setLayoutParams(layoutParams);
             }
         });
         getBinding().tvChoose.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 startActivity(new Intent(getContext(), TeacherChooseActivity.class));
-                getActivity().finish();
+//                getActivity().finish();
             }
         });
         getBinding().rlTakePhoto.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 if (!XXPermissions.isGranted(getContext(), Permission.CAMERA, Permission.WRITE_EXTERNAL_STORAGE)) {
                     XXPermissions.with(getContext())
                             // 申请多个权限
                             .permission(Permission.CAMERA).request(new OnPermissionCallback() {
                                 @Override
                                 public void onGranted(List<String> permissions, boolean all) {
                                     if (all) {
                                         //开启扫码界面
                                         showButtonDialog();
                                     } else {
                                         Toast.makeText(getContext(), "需要权限", Toast.LENGTH_SHORT).show();
                                     }
                                 }
                                 @Override
                                 public void onDenied(List<String> permissions, boolean never) {
                                     XXPermissions.startPermissionActivity(getContext(), permissions);
                                 }
                             });
                 } else {
                     showButtonDialog();
                 }
             }
         });
         BaseQuickAdapter adapter = new BaseQuickAdapter(R.layout.item_subject, Arrays.asList(getResources().getStringArray(R.array.filter_subject))) {
             @Override
             public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
             }
             @Override
             protected void convert(@NonNull BaseViewHolder item, Object o) {
                 item.setText(R.id.tv_subject, getResources().getStringArray(R.array.filter_subject)[item.getAdapterPosition()]);
                 switch (item.getAdapterPosition()) {
                     case 0:
                         item.setImageResource(R.id.iv_subject, R.mipmap.ic_chinese);
                         break;
                     case 1:
                         item.setImageResource(R.id.iv_subject, R.mipmap.ic_math);
                         break;
                     case 2:
                         item.setImageResource(R.id.iv_subject, R.mipmap.ic_english);
                         break;
                     case 3:
                         item.setImageResource(R.id.iv_subject, R.mipmap.ic_physics);
                         break;
                     case 4:
                         item.setImageResource(R.id.iv_subject, R.mipmap.ic_chemistry);
                         break;
                 }
                 ViewGroup.LayoutParams layoutParams = item.getView(R.id.rl_subject).getLayoutParams();
                 layoutParams.width = (CommonUtil.getScreenWidth(getContext()) - CommonUtil.dpToPx(getContext(), 30)) / 4;
                 item.getView(R.id.rl_subject).setLayoutParams(layoutParams);
                 item.getConvertView().setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
                         if (subject != item.getAdapterPosition()) {
                             subject = item.getAdapterPosition();
                             getError(getResources().getStringArray(R.array.filter_subject)[subject]);
                         }
                     }
                 });
             }
         };
         getBinding().recycleSubject.setLayoutManager(new LinearLayoutManager(getContext(), LinearLayoutManager.HORIZONTAL, false));
         getBinding().recycleSubject.setAdapter(adapter);
         subject = 0;
         getError(getResources().getStringArray(R.array.filter_subject)[subject]);
         getBinding().llAll.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 Intent intent = new Intent(getContext(), ErrorListActivity.class);
                 startActivity(intent);
             }
         });
     }
     private void showButtonDialog() {
         MyButtomDialog dialog = new MyButtomDialog(getActivity(), R.style.BottomSheetDialog);
         View bottomView = LayoutInflater.from(getActivity()).inflate(R.layout.bottom_sheet_layout, null);
         dialog.setContentView(bottomView);
         bottomView.findViewById(R.id.take_photo).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
                 dialog.dismiss();
                 Intent takePictureIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
                 //确保有相机来处理Intent
                 filePath = getActivity().getExternalFilesDir("images").getPath() + "/" + String.valueOf(System.currentTimeMillis()) + CommonUtil.getStr() + ".jpg";
                 File photoFile = new File(filePath);
                 if (photoFile != null) {
                     //适配Android 7.0文件权限，通过FileProvider创建一个content类型的Uri
                     Uri photoUri = FileProvider.getUriForFile(getActivity(), "com.hjx.parent.fileprovider", photoFile);
                     takePictureIntent.addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
                     takePictureIntent.putExtra(MediaStore.EXTRA_OUTPUT, photoUri);
                     startActivityForResult(takePictureIntent, REQUEST_CODE_IMAGE);
                 }
             }
         });
         bottomView.findViewById(R.id.choose_photo).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
                 dialog.dismiss();
                 ImagePickerConfig imagePickerConfig = new ImagePickerConfig.Builder().provider(getActivity().getPackageName() + ".fileprovider").imageLoader(new GlideImageLoader()) //图片加载器
                         .iHandlerCallBack(new HandlerCallBack())    //图片选择器生命周期监听（直接打开摄像头时无效）
                         .multiSelect(true)                 //是否多选
                         .isShowCamera(false).isVideoPicker(false)              //是否选择视频 默认false
                         .isImagePicker(true).imagePickerType(ImagePickerEnum.PHOTO_PICKER) //选择器打开类型
-                        .maxImageSelectable(9)                        //图片可选择数
+                        .maxImageSelectable(5)                        //图片可选择数
                         .maxHeight(1920)                              //图片最大高度
                         .maxWidth(1920)                               //图片最大宽度
-                        .maxImageSize(10)                             //图片最大大小Mb
+                        .maxImageSize(3)                             //图片最大大小Mb
                         .isCrop(false).pathList(new ArrayList<>()).pickerThemeColorRes(R.color.image_picker_white).pickerTitleColorRes(R.color.image_picker_text_black).cropThemeColorRes(R.color.image_picker_white).cropTitleColorRes(R.color.image_picker_text_black).pickerBackRes(R.mipmap.image_picker_back_black).pickerFolderRes(R.mipmap.image_picker_folder_black).build();
                 ImagePickerOpen.getInstance().setImagePickerConfig(imagePickerConfig).pathList(new ArrayList<>()).open(getActivity());
             }
         });
         bottomView.findViewById(R.id.cancel).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
                 dialog.dismiss();
             }
         });
         dialog.show();
     }
     private void getError(String subject) {
         if (studentBean != null) {
             Map map = new HashMap();
             map.put("subject", subject);
             map.put("stuId", studentBean.getStuId());
             map.put("pageSize", 5);
             map.put("pageNum", 1);
             NetWorks.getError(map, new Observer<ResponseResult<PageInfo<TopicBean>>>() {
                 @Override
                 public void onSubscribe(Disposable d) {
                 }
                 @Override
                 public void onNext(ResponseResult<PageInfo<TopicBean>> result) {
                     if (result.getData() != null && result.getCode() == 200) {
                         List<TopicBean> topicBeans = result.getData().getList();
                         loadError(topicBeans);
                     }
                 }
                 @Override
                 public void onError(Throwable e) {
                     e.toString();
                 }
                 @Override
                 public void onComplete() {
                 }
             });
         }
     }
     private void loadError(List<TopicBean> list) {
         if (list.size() > 0) {
             getBinding().recycleError.setVisibility(View.VISIBLE);
             getBinding().llEmpty.setVisibility(View.GONE);
             if (adapter != null) {
                 adapter.refresh(list);
             } else {
                 adapter = new ErrorAdapter(getActivity(), list, false);
                 getBinding().recycleError.setLayoutManager(new LinearLayoutManager(getActivity(), RecyclerView.VERTICAL, false));
                 getBinding().recycleError.setAdapter(adapter);
             }
         } else {
             getBinding().recycleError.setVisibility(View.GONE);
             getBinding().llEmpty.setVisibility(View.VISIBLE);
         }
     }
     @Override
     public void onResume() {
         super.onResume();
         getError(getResources().getStringArray(R.array.filter_subject)[subject]);
     }
     public class HandlerCallBack implements IHandlerCallBack<ImageInfo> {
         private String TAG = "---ImagePicker---";
         List<ImageInfo> photoList = new ArrayList<>();
         @Override
         public void onStart() {
             Log.i(TAG, "onStart: 开启");
         }
         @Override
         public void onSuccess(List<ImageInfo> photoList) {
             this.photoList = photoList;
             Log.i(TAG, "onSuccess: 返回数据");
         }
         @Override
         public void onCancel() {
             Log.i(TAG, "onCancel: 取消");
         }
         @Override
         public void onFinish(List<ImageInfo> selectImage) {
             if (selectImage.size() == photoList.size()) {
                 List<String> strings = new ArrayList<>();
                 Intent intent = new Intent(getActivity(), ImageActivity.class);
                 for (ImageInfo imageInfo : selectImage) {
                     strings.add(imageInfo.getPath());
                 }
                 intent.putStringArrayListExtra("images", (ArrayList<String>) strings);
                 startActivity(intent);
             }
         }
         @Override
         public void onError() {
             Log.i(TAG, "onError: 出错");
         }
     }
     @Override
     public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
         if (requestCode == REQUEST_CODE_IMAGE && resultCode == RESULT_OK && !TextUtils.isEmpty(filePath)) {
             Bitmap b = BitmapUtils.compress(BitmapFactory.decodeFile(filePath));
             String path = getContext().getExternalFilesDir("images").getPath() + "/" + String.valueOf(System.currentTimeMillis()) + CommonUtil.getStr() + ".jpg";
             CommonUtil.saveBitmapToUri(b, path);
             List<String> strings = new ArrayList<>();
             Intent intent = new Intent(getContext(), ImageActivity.class);
             strings.add(path);
             intent.putStringArrayListExtra("images", (ArrayList<String>) strings);
             startActivity(intent);
         }
     }

app/src/main/res/layout/activity_error_list.xml

Diff comments View file @484570f

 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xxx="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="#F8F8F8"
     android:orientation="vertical">
     <RelativeLayout
         android:id="@+id/rl_top"
         android:layout_width="match_parent"
         android:layout_height="40dp"
         android:background="@color/white">
         <TextView
             android:id="@+id/tv_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
             android:text="错题本"
             android:textColor="#333333"
             android:textSize="18sp" />
         <ImageView
-            android:layout_width="30dp"
             android:id="@+id/iv_change"
-            android:src="@mipmap/ic_change"
+            android:layout_width="30dp"
-            android:padding="5dp"
+            android:layout_height="30dp"
-            android:layout_toRightOf="@+id/tv_title"
             android:layout_centerVertical="true"
-            android:layout_height="30dp"/>
+            android:layout_toRightOf="@+id/tv_title"
+            android:padding="5dp"
+            android:src="@mipmap/ic_change" />
         <CheckBox
             android:id="@+id/checkbox"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:layout_marginLeft="15dp"
             android:button="@drawable/selectall_selector"
             android:checked="false"
             android:paddingLeft="8dp"
             android:text="全选"
             android:textColor="@color/text_title"
             android:visibility="gone" />
         <ImageView
             android:id="@+id/iv_back"
             android:layout_width="30dp"
             android:layout_height="36dp"
             android:layout_centerVertical="true"
             android:layout_marginLeft="5dp"
             android:padding="10dp"
             android:src="@mipmap/icon_back" />
         <TextView
             android:id="@+id/tv_edit"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
             android:layout_marginRight="15dp"
             android:text="编辑"
             android:textColor="@color/text_title"
             android:visibility="visible" />
     </RelativeLayout>
     <LinearLayout
         android:id="@+id/ll_filter"
         android:layout_width="match_parent"
         android:layout_height="40dp"
         android:layout_below="@+id/rl_top"
         android:background="@color/white">
         <RelativeLayout
             android:layout_width="0dp"
             android:layout_height="40dp"
             android:layout_weight="1">
             <TextView
                 android:id="@+id/tv_filter_subject"
                 android:layout_width="wrap_content"
                 android:layout_height="40dp"
                 android:layout_centerVertical="true"
                 android:layout_marginLeft="15dp"
                 android:drawableRight="@drawable/ic_filter_gray"
                 android:drawablePadding="5dp"
                 android:gravity="center_vertical"
                 android:text="学科"
                 android:textColor="@color/text_title"
                 android:textSize="14sp" />
         </RelativeLayout>
         <RelativeLayout
             android:layout_width="0dp"
             android:layout_height="40dp"
             android:layout_weight="1">
             <TextView
                 android:id="@+id/tv_filter_grade"
                 android:layout_width="wrap_content"
                 android:layout_height="40dp"
                 android:layout_centerVertical="true"
                 android:drawableRight="@drawable/ic_filter_gray"
                 android:drawablePadding="5dp"
                 android:gravity="center_vertical"
                 android:text="年级学期"
                 android:textColor="@color/text_title"
                 android:textSize="14sp" />
         </RelativeLayout>
         <RelativeLayout
             android:layout_width="0dp"
             android:layout_height="40dp"
             android:layout_weight="1">
             <TextView
                 android:id="@+id/tv_filter_manage"
                 android:layout_width="wrap_content"
                 android:layout_height="40dp"
                 android:layout_centerVertical="true"
                 android:layout_marginLeft="10dp"
                 android:drawableRight="@drawable/ic_filter_gray"
                 android:drawablePadding="5dp"
                 android:gravity="center_vertical"
                 android:text="掌握情况"
                 android:textColor="@color/text_title"
                 android:textSize="14sp" />
         </RelativeLayout>
         <RelativeLayout
             android:layout_width="0dp"
             android:layout_height="40dp"
             android:layout_weight="1">
             <TextView
                 android:id="@+id/tv_filter_more"
                 android:layout_width="wrap_content"
                 android:layout_height="40dp"
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:layout_marginRight="15dp"
                 android:drawableRight="@drawable/ic_filter_gray"
                 android:drawablePadding="5dp"
                 android:gravity="center_vertical"
                 android:text="更多筛选"
                 android:textColor="@color/text_title"
                 android:textSize="14sp" />
         </RelativeLayout>
     </LinearLayout>
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recycle"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_above="@+id/rl_bottom"
         android:layout_below="@+id/ll_filter"
         android:layout_marginTop="15dp" />
     <LinearLayout
         android:id="@+id/ll_filter_common"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@+id/ll_filter"
         android:background="@drawable/bg_solid_white_10_bottom"
         android:visibility="visible">
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recycle_filter"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="15dp"
             android:layout_marginTop="15dp"
             android:visibility="gone" />
     </LinearLayout>
     <LinearLayout
+        android:id="@+id/ll_empty"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_above="@+id/rl_bottom"
+        android:layout_below="@+id/ll_filter"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="150dp"
+        android:orientation="vertical"
+        android:visibility="gone">
+        <ImageView
+            android:layout_width="155dp"
+            android:layout_height="130dp"
+            android:src="@mipmap/ic_empty" />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:text="暂无错题～" />
+    </LinearLayout>
+    <LinearLayout
+        android:id="@+id/ll_filter_grade"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/ll_filter"
+        android:background="@drawable/bg_solid_white_10_bottom"
+        android:orientation="vertical"
+        android:visibility="gone">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="15dp"
+            android:layout_marginTop="15dp"
+            android:text="年级"
+            android:textColor="@color/text_title"
+            android:textSize="14sp"
+            android:textStyle="bold" />
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/recycle_grade"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="15dp"
+            android:layout_marginTop="15dp"
+            android:visibility="visible" />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="15dp"
+            android:layout_marginTop="15dp"
+            android:text="学期"
+            android:textColor="@color/text_title"
+            android:textSize="14sp"
+            android:textStyle="bold" />
+        <RadioGroup
+            android:id="@+id/group_grade"
+            android:layout_width="match_parent"
+            android:layout_height="30dp"
+            android:layout_marginLeft="15dp"
+            android:layout_marginTop="15dp"
+            android:layout_marginRight="15dp"
+            android:layout_marginBottom="15dp"
+            android:orientation="horizontal">
+            <RadioButton
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_marginRight="15dp"
+                android:layout_weight="1"
+                android:background="@drawable/filter_button_selector"
+                android:button="@null"
+                android:gravity="center"
+                android:text="全部"
+                android:textColor="@drawable/radio_text_selector"
+                android:textSize="14sp" />
+            <RadioButton
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_marginRight="15dp"
+                android:layout_weight="1"
+                android:background="@drawable/filter_button_selector"
+                android:button="@null"
+                android:gravity="center"
+                android:text="上学期"
+                android:textColor="@drawable/radio_text_selector"
+                android:textSize="14sp" />
+            <RadioButton
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_marginRight="15dp"
+                android:layout_weight="1"
+                android:background="@drawable/filter_button_selector"
+                android:button="@null"
+                android:gravity="center"
+                android:text="下学期"
+                android:textColor="@drawable/radio_text_selector"
+                android:textSize="14sp" />
+            <View
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1" />
+        </RadioGroup>
+    </LinearLayout>
+    <LinearLayout
         android:id="@+id/ll_filter_more"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@+id/ll_filter"
         android:background="@drawable/bg_solid_white_10_bottom"
         android:orientation="vertical"
         android:visibility="gone">
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="15dp"
             android:layout_marginTop="15dp"
             android:text="来源"
             android:textColor="@color/text_title"
             android:textSize="14sp"
             android:textStyle="bold" />
         <RadioGroup
             android:id="@+id/group_type"
             android:layout_width="match_parent"
             android:layout_height="30dp"
             android:layout_marginLeft="15dp"
             android:layout_marginTop="15dp"
             android:layout_marginRight="15dp"
             android:orientation="horizontal">
             <RadioButton
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_marginRight="15dp"
                 android:layout_weight="1"
                 android:background="@drawable/filter_button_selector"
                 android:button="@null"
                 android:gravity="center"
                 android:text="课内"
                 android:textColor="@drawable/radio_text_selector"
                 android:textSize="14sp" />
             <RadioButton
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_marginRight="15dp"
                 android:layout_weight="1"
                 android:background="@drawable/filter_button_selector"
                 android:button="@null"
                 android:gravity="center"
                 android:text="课外"
                 android:textColor="@drawable/radio_text_selector"
                 android:textSize="14sp" />
             <RadioButton
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_marginRight="15dp"
                 android:layout_weight="1"
                 android:background="@drawable/filter_button_selector"
                 android:button="@null"
                 android:gravity="center"
                 android:text="全部"
                 android:textColor="@drawable/radio_text_selector"
                 android:textSize="14sp" />
             <View
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1" />
         </RadioGroup>
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="15dp"
             android:layout_marginTop="15dp"
             android:text="录入时间"
             android:textColor="@color/text_title"
             android:textSize="14sp"
             android:textStyle="bold" />
         <RadioGroup
             android:id="@+id/group_time"
             android:layout_width="match_parent"
             android:layout_height="30dp"
             android:layout_marginLeft="15dp"
             android:layout_marginTop="15dp"
             android:layout_marginRight="15dp"
             android:layout_marginBottom="15dp"
             android:orientation="horizontal">
             <RadioButton
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_marginRight="15dp"
                 android:layout_weight="1"
                 android:background="@drawable/filter_button_selector"
                 android:button="@null"
                 android:gravity="center"
                 android:text="一周内"
                 android:textColor="@drawable/radio_text_selector"
                 android:textSize="14sp" />
             <RadioButton
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_marginRight="15dp"
                 android:layout_weight="1"
                 android:background="@drawable/filter_button_selector"
                 android:button="@null"
                 android:gravity="center"
                 android:text="一个月内"
                 android:textColor="@drawable/radio_text_selector"
                 android:textSize="14sp" />
             <RadioButton
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_marginRight="15dp"
                 android:layout_weight="1"
                 android:background="@drawable/filter_button_selector"
                 android:button="@null"
                 android:gravity="center"
                 android:text="三个月内"
                 android:textColor="@drawable/radio_text_selector"
                 android:textSize="14sp" />
             <RadioButton
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_marginRight="15dp"
                 android:layout_weight="1"
                 android:background="@drawable/filter_button_selector"
                 android:button="@null"
                 android:gravity="center"
                 android:text="全部"
                 android:textColor="@drawable/radio_text_selector"
                 android:textSize="14sp" />
         </RadioGroup>
     </LinearLayout>
-    <LinearLayout
-        android:id="@+id/ll_empty"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_above="@+id/rl_bottom"
-        android:layout_below="@+id/ll_filter"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="150dp"
-        android:orientation="vertical"
-        android:visibility="gone">
-        <ImageView
-            android:layout_width="155dp"
-            android:layout_height="130dp"
-            android:src="@mipmap/ic_empty" />
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:text="暂无错题～" />
-    </LinearLayout>
     <RelativeLayout
         android:id="@+id/rl_bottom"
         android:layout_width="match_parent"
         android:layout_height="70dp"
         android:layout_alignParentBottom="true"
         android:background="@color/white">
         <TextView
             android:id="@+id/tv_add"
             android:layout_width="280dp"
             android:layout_height="40dp"
             android:layout_centerInParent="true"
             android:background="@drawable/bg_soild_blue_5"
             android:gravity="center"
             android:text="录入错题"
             android:textColor="@color/white"
             android:textSize="18sp" />
         <LinearLayout
             android:id="@+id/ll_delete"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:layout_marginLeft="15dp"
             android:orientation="vertical"
             android:visibility="gone">
             <ImageView
                 android:layout_width="25dp"
                 android:layout_height="25dp"
                 android:layout_gravity="center_horizontal"
                 android:src="@mipmap/ic_delete" />

app/src/main/res/layout/activity_image.xml

Diff comments View file @484570f

1	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"	1	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
2	android:layout_width="match_parent"	2	android:layout_width="match_parent"
3	android:layout_height="match_parent"	3	android:layout_height="match_parent"
4	android:orientation="vertical">	4	android:orientation="vertical">
5		5
6	<RelativeLayout	6	<RelativeLayout
7	android:layout_width="match_parent"	7	android:layout_width="match_parent"
8	android:layout_height="40dp"	8	android:layout_height="40dp"
9	android:background="@color/white">	9	android:background="@color/white">
10		10
11	<TextView	11	<TextView
12	android:id="@+id/tv_title"	12	android:id="@+id/tv_title"
13	android:layout_width="wrap_content"	13	android:layout_width="wrap_content"
14	android:layout_height="wrap_content"	14	android:layout_height="wrap_content"
15	android:layout_centerInParent="true"	15	android:layout_centerInParent="true"
16	android:textColor="#333333"	16	android:textColor="#333333"
17	android:textSize="18sp" />	17	android:textSize="18sp" />
18		18
19	<ImageView	19	<ImageView
20	android:id="@+id/iv_back"	20	android:id="@+id/iv_back"
21	android:layout_width="30dp"	21	android:layout_width="30dp"
22	android:layout_height="36dp"	22	android:layout_height="36dp"
23	android:layout_centerVertical="true"	23	android:layout_centerVertical="true"
24	android:layout_marginLeft="5dp"	24	android:layout_marginLeft="5dp"
25	android:padding="10dp"	25	android:padding="10dp"
26	android:src="@mipmap/icon_back" />	26	android:src="@mipmap/icon_back" />
27		27
28	<TextView	28	<TextView
29	android:id="@+id/tv_photo"	29	android:id="@+id/tv_photo"
30	android:layout_width="wrap_content"	30	android:layout_width="wrap_content"
31	android:layout_height="wrap_content"	31	android:layout_height="wrap_content"
32	android:layout_centerVertical="true"	32	android:layout_centerVertical="true"
33	android:layout_toRightOf="@+id/iv_back"	33	android:layout_toRightOf="@+id/iv_back"
34	android:text="重拍"	34	android:text="重拍"
35	android:textColor="#333333"	35	android:textColor="#333333"
36	android:textSize="14sp" />	36	android:textSize="14sp" />
37		37
38	<TextView	38	<TextView
39	android:layout_width="wrap_content"	39	android:layout_width="wrap_content"
40	android:layout_height="wrap_content"	40	android:layout_height="wrap_content"
41	android:layout_alignParentRight="true"	41	android:layout_alignParentRight="true"
42	android:layout_centerVertical="true"	42	android:layout_centerVertical="true"
43	android:layout_marginRight="15dp"	43	android:layout_marginRight="15dp"
44	android:text="查看原图"	44	android:text="查看原图"
45	android:textColor="#333333"	45	android:textColor="#333333"
46	android:textSize="14sp"	46	android:textSize="14sp"
47	android:visibility="gone" />	47	android:visibility="gone" />
48	</RelativeLayout>	48	</RelativeLayout>
49		49
50	<TextView	50	<TextView
51	android:layout_width="match_parent"	51	android:layout_width="match_parent"
52	android:layout_height="35dp"	52	android:layout_height="35dp"
53	android:background="#C7DFF5"	53	android:background="#C7DFF5"
54	android:gravity="center"	54	android:gravity="center"
55	android:text="已为您自动框选题目，点击“+”添加题目"	55	android:text="已为您自动框选题目，点击“+”添加题目"
56	android:textColor="#1C90F3"	56	android:textColor="#1C90F3"
57	android:textSize="13sp" />	57	android:textSize="13sp" />
58		58
59	<RelativeLayout	59	<RelativeLayout
60	android:layout_width="match_parent"	60	android:layout_width="match_parent"
61	android:layout_height="match_parent"	61	android:layout_height="match_parent"
62	android:background="#F8F8F8">	62	android:background="#F8F8F8">
63		63
64	<androidx.viewpager2.widget.ViewPager2	64	<androidx.viewpager2.widget.ViewPager2
65	android:id="@+id/viewPager"	65	android:id="@+id/viewPager"
66	android:layout_width="match_parent"	66	android:layout_width="match_parent"
67	android:layout_height="match_parent"	67	android:layout_height="match_parent"
68	android:layout_above="@+id/rl_previous" />	68	android:layout_above="@+id/rl_previous" />
69		69
70	<RelativeLayout	70	<RelativeLayout
71	android:id="@+id/rl_previous"	71	android:id="@+id/rl_previous"
72	android:layout_width="30dp"	72	android:layout_width="30dp"
73	android:layout_height="30dp"	73	android:layout_height="30dp"
74	android:layout_above="@+id/rl_bottom"	74	android:layout_above="@+id/rl_bottom"
75	android:layout_marginLeft="15dp"	75	android:layout_marginLeft="15dp"
76	android:layout_marginBottom="15dp"	76	android:layout_marginBottom="15dp"
77	android:background="@drawable/bg_solid_white">	77	android:background="@drawable/bg_solid_white">
78		78
79	<ImageView	79	<ImageView
80	android:id="@+id/iv_previous"	80	android:id="@+id/iv_previous"
81	android:layout_width="10dp"	81	android:layout_width="10dp"
82	android:layout_height="18dp"	82	android:layout_height="18dp"
83	android:layout_centerInParent="true"	83	android:layout_centerInParent="true"
84	android:src="@mipmap/ic_previous_gray" />	84	android:src="@mipmap/ic_previous_gray" />
85	</RelativeLayout>	85	</RelativeLayout>
86		86
87	<RelativeLayout	87	<RelativeLayout
88	android:id="@+id/rl_next"	88	android:id="@+id/rl_next"
89	android:layout_width="30dp"	89	android:layout_width="30dp"
90	android:layout_height="30dp"	90	android:layout_height="30dp"
91	android:layout_above="@+id/rl_bottom"	91	android:layout_above="@+id/rl_bottom"
92	android:layout_alignParentRight="true"	92	android:layout_alignParentRight="true"
93	android:layout_marginRight="15dp"	93	android:layout_marginRight="15dp"
94	android:layout_marginBottom="15dp"	94	android:layout_marginBottom="15dp"
95	android:background="@drawable/bg_solid_white">	95	android:background="@drawable/bg_solid_white">
96		96
97	<ImageView	97	<ImageView
98	android:id="@+id/iv_next"	98	android:id="@+id/iv_next"
99	android:layout_width="10dp"	99	android:layout_width="10dp"
100	android:layout_height="18dp"	100	android:layout_height="18dp"
101	android:layout_centerInParent="true"	101	android:layout_centerInParent="true"
102	android:src="@mipmap/ic_next_gray" />	102	android:src="@mipmap/ic_next_gray" />
103	</RelativeLayout>	103	</RelativeLayout>
104		104
105	<RelativeLayout	105	<RelativeLayout
106	android:id="@+id/rl_bottom"	106	android:id="@+id/rl_bottom"
107	android:layout_width="match_parent"	107	android:layout_width="match_parent"
108	android:layout_height="70dp"	108	android:layout_height="70dp"
109	android:layout_alignParentBottom="true"	109	android:layout_alignParentBottom="true"
110	android:background="@color/white">	110	android:background="@color/white">
111		111
112	<LinearLayout	112	<LinearLayout
113	android:id="@+id/ll_edit"	113	android:id="@+id/ll_edit"
114	android:layout_width="wrap_content"	114	android:layout_width="wrap_content"
115	android:layout_height="wrap_content"	115	android:layout_height="wrap_content"
116	android:layout_centerVertical="true"	116	android:layout_centerVertical="true"
117	android:layout_marginLeft="15dp"	117	android:layout_marginLeft="15dp"
118	android:orientation="vertical">	118	android:orientation="vertical">
119		119
120	<ImageView	120	<ImageView
121	android:layout_width="25dp"	121	android:layout_width="25dp"
122	android:layout_height="25dp"	122	android:layout_height="25dp"
123	android:layout_gravity="center_horizontal"	123	android:layout_gravity="center_horizontal"
124	android:src="@mipmap/ic_pic_edit" />	124	android:src="@mipmap/ic_pic_edit" />
125		125
126	<TextView	126	<TextView
127	android:layout_width="wrap_content"	127	android:layout_width="wrap_content"
128	android:layout_height="wrap_content"	128	android:layout_height="wrap_content"
129	android:layout_marginTop="5dp"	129	android:layout_marginTop="5dp"
130	android:text="图片编辑"	130	android:text="图片编辑"
131	android:textSize="11sp" />	131	android:textSize="11sp" />
132	</LinearLayout>	132	</LinearLayout>
133		133
134	<TextView	134	<TextView
135	android:id="@+id/tv_add"	135	android:id="@+id/tv_add"
136	android:layout_width="140dp"	136	android:layout_width="140dp"
137	android:layout_height="40dp"	137	android:layout_height="40dp"
138	android:layout_centerVertical="true"	138	android:layout_centerVertical="true"
139	android:layout_marginRight="15dp"	139	android:layout_marginRight="15dp"
140	android:layout_toLeftOf="@+id/tv_save"	140	android:layout_toLeftOf="@+id/tv_save"
141	android:background="@drawable/bg_soild_orange_5"	141	android:background="@drawable/bg_soild_orange_5"
142	android:gravity="center"	142	android:gravity="center"
143	android:text="手动框选"	143	android:text="手动框选"
144	android:textColor="@color/white"	144	android:textColor="@color/white"
145	android:textSize="18sp" />	145	android:textSize="18sp" />
146		146
147	<TextView	147	<TextView
148	android:id="@+id/tv_save"	148	android:id="@+id/tv_save"
149	android:layout_width="140dp"	149	android:layout_width="140dp"
150	android:layout_height="40dp"	150	android:layout_height="40dp"
151	android:layout_alignParentRight="true"	151	android:layout_alignParentRight="true"
152	android:layout_centerVertical="true"	152	android:layout_centerVertical="true"
153	android:layout_marginRight="15dp"	153	android:layout_marginRight="15dp"
154	android:background="@drawable/bg_soild_blue_light_5"	154	android:background="@drawable/bg_soild_blue_light_5"
155	android:enabled="false"	155	android:enabled="false"
156	android:gravity="center"	156	android:gravity="center"
157	android:text="保留错题"	157	android:text="保存错题"
158	android:textColor="@color/white"	158	android:textColor="@color/white"
159	android:textSize="18sp" />	159	android:textSize="18sp" />
160	</RelativeLayout>	160	</RelativeLayout>
161	</RelativeLayout>	161	</RelativeLayout>
162	</LinearLayout>	162	</LinearLayout>

app/src/main/res/layout/activity_main.xml

Diff comments View file @484570f

app/src/main/res/layout/dialog_add_error.xml

Diff comments View file @484570f

 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@drawable/bg_solid_white_10_top"
     android:orientation="vertical">
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="50dp">
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
             android:text="加入错题本"
             android:textColor="@color/text_title"
             android:textSize="17sp"
             android:textStyle="bold" />
         <ImageView
             android:id="@+id/iv_back"
             android:layout_width="35dp"
             android:layout_height="35dp"
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
             android:layout_marginRight="10dp"
             android:padding="10dp"
             android:src="@mipmap/ic_close" />
     </RelativeLayout>
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/list_item"
         android:layout_width="match_parent"
         android:layout_height="30dp"
         android:layout_marginLeft="20dp"
         android:layout_marginTop="10dp"
         android:layout_marginRight="20dp" />
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="90dp"
         android:layout_marginLeft="20dp"
         android:layout_marginTop="20dp"
         android:layout_marginRight="20dp">
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="#F5F5F5">
             <ImageView
                 android:id="@+id/iv_topic"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true" />
         </RelativeLayout>
     </RelativeLayout>
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
         android:layout_marginLeft="20dp"
         android:layout_marginTop="20dp"
-        android:text="年级学期"
+        android:text="年级"
         android:textColor="@color/text_title"
         android:textSize="15sp"
         android:textStyle="bold" />
     <androidx.appcompat.widget.AppCompatSpinner
         android:id="@+id/spinner_grade"
         style="@style/customSpinnerStyle"
         android:layout_width="match_parent"
         android:layout_height="40dp"
         android:layout_centerHorizontal="true"
         android:layout_marginLeft="20dp"
         android:layout_marginTop="10dp"
         android:layout_marginRight="20dp"
         android:background="@drawable/selector_for_custom_spinner"
-        android:entries="@array/filter_subject"
+        android:popupBackground="@drawable/shape_for_custom_spinner"
+        android:scrollbars="none" />
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_marginLeft="20dp"
+        android:layout_marginTop="20dp"
+        android:text="学期"
+        android:textColor="@color/text_title"
+        android:textSize="15sp"
+        android:textStyle="bold" />
+    <androidx.appcompat.widget.AppCompatSpinner
+        android:id="@+id/spinner_grade1"
+        style="@style/customSpinnerStyle"
+        android:layout_width="match_parent"
+        android:layout_height="40dp"
+        android:layout_centerHorizontal="true"
+        android:layout_marginLeft="20dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginRight="20dp"
+        android:background="@drawable/selector_for_custom_spinner"
+        android:entries="@array/grade_array"
         android:popupBackground="@drawable/shape_for_custom_spinner"
         android:scrollbars="none" />
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
         android:layout_marginLeft="20dp"
         android:layout_marginTop="20dp"
         android:text="科目"
         android:textColor="@color/text_title"
         android:textSize="15sp"
         android:textStyle="bold" />
     <androidx.appcompat.widget.AppCompatSpinner
         android:id="@+id/spinner_subject"
         style="@style/customSpinnerStyle"
         android:layout_width="match_parent"
         android:layout_height="40dp"
         android:layout_centerHorizontal="true"
         android:layout_marginLeft="20dp"
         android:layout_marginTop="10dp"
         android:layout_marginRight="20dp"
         android:background="@drawable/selector_for_custom_spinner"
         android:entries="@array/filter_subject"
         android:popupBackground="@drawable/shape_for_custom_spinner"
         android:scrollbars="none" />
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
         android:layout_marginLeft="20dp"
         android:layout_marginTop="20dp"
         android:text="错误原因"
         android:textColor="@color/text_title"
         android:textSize="15sp"
         android:textStyle="bold" />
     <androidx.appcompat.widget.AppCompatSpinner
         android:id="@+id/spinner_reason"
         style="@style/customSpinnerStyle"
         android:layout_width="match_parent"
         android:layout_height="40dp"
         android:layout_centerHorizontal="true"
         android:layout_marginLeft="20dp"
         android:layout_marginTop="10dp"
         android:layout_marginRight="20dp"
         android:background="@drawable/selector_for_custom_spinner"
         android:entries="@array/filter_subject"
         android:popupBackground="@drawable/shape_for_custom_spinner"
         android:scrollbars="none" />
     <TextView
         android:id="@+id/tv_student"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
         android:layout_marginLeft="20dp"
         android:layout_marginTop="20dp"
         android:text="学生"
         android:textColor="@color/text_title"
         android:visibility="gone"
         android:textSize="15sp"
         android:textStyle="bold" />
     <androidx.appcompat.widget.AppCompatSpinner
         android:id="@+id/spinner_student"
         style="@style/customSpinnerStyle"
         android:layout_width="match_parent"
         android:layout_height="40dp"
         android:layout_centerHorizontal="true"
         android:layout_marginLeft="20dp"
         android:layout_marginTop="10dp"
         android:layout_marginRight="20dp"
         android:visibility="gone"
         android:background="@drawable/selector_for_custom_spinner"
         android:entries="@array/filter_subject"
         android:popupBackground="@drawable/shape_for_custom_spinner"
         android:scrollbars="none" />
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
         android:layout_marginLeft="20dp"
         android:layout_marginTop="20dp"
         android:text="来源"
         android:textColor="@color/text_title"
         android:textSize="15sp"
         android:textStyle="bold" />
     <RadioGroup
         android:id="@+id/type_radio"
         android:layout_width="match_parent"
         android:layout_height="40dp"
         android:layout_marginLeft="20dp"
         android:layout_marginTop="10dp"
         android:orientation="horizontal">
         <RadioButton
             android:layout_width="65dp"
             android:layout_height="match_parent"
             android:layout_marginRight="20dp"
             android:background="@drawable/radio_button_selector"
             android:button="@null"
             android:gravity="center"
             android:text="课内"
             android:textColor="@drawable/radio_text_selector"
             android:textSize="14sp" />
         <RadioButton
             android:layout_width="65dp"
             android:layout_height="match_parent"
             android:layout_marginRight="20dp"
             android:background="@drawable/radio_button_selector"
             android:button="@null"
             android:gravity="center"
             android:text="课外"
             android:textColor="@drawable/radio_text_selector"
             android:textSize="14sp" />
     </RadioGroup>
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="40dp"
         android:layout_marginLeft="20dp"
         android:layout_marginTop="20dp"
         android:layout_marginRight="20dp"
         android:layout_marginBottom="15dp">
         <TextView
             android:id="@+id/add_topic"
             android:layout_width="250dp"
             android:layout_height="match_parent"
             android:layout_alignParentRight="true"
             android:background="@drawable/bg_soild_blue_5"
             android:gravity="center"
             android:textColor="@color/white"
             android:textSize="17sp" />
         <CheckBox
             android:id="@+id/checkbox"
             android:layout_width="wrap_content"
             android:layout_height="30dp"
             android:layout_centerVertical="true"
             android:button="@drawable/checkbox_selector"
             android:text="批量设置"
             android:paddingLeft="8dp"
             android:textColor="@color/text_title"
             android:textSize="14sp" />
     </RelativeLayout>
 </LinearLayout>

app/src/main/res/layout/dialog_edit_error.xml

Diff comments View file @484570f

 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@drawable/bg_solid_white_10_top"
     android:orientation="vertical">
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="50dp">
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
             android:text="错题标签"
             android:textColor="@color/text_title"
             android:textSize="17sp"
             android:textStyle="bold" />
         <ImageView
             android:id="@+id/iv_back"
             android:layout_width="35dp"
             android:layout_height="35dp"
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
             android:layout_marginRight="10dp"
             android:padding="10dp"
             android:src="@mipmap/ic_close" />
     </RelativeLayout>
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
         android:layout_marginLeft="20dp"
         android:layout_marginTop="20dp"
-        android:text="年级学期"
+        android:text="年级"
         android:textColor="@color/text_title"
         android:textSize="15sp"
         android:textStyle="bold" />
     <androidx.appcompat.widget.AppCompatSpinner
         android:id="@+id/spinner_grade"
         style="@style/customSpinnerStyle"
         android:layout_width="match_parent"
         android:layout_height="40dp"
         android:layout_centerHorizontal="true"
         android:layout_marginLeft="20dp"
         android:layout_marginTop="10dp"
         android:layout_marginRight="20dp"
         android:background="@drawable/selector_for_custom_spinner"
         android:entries="@array/filter_subject"
         android:popupBackground="@drawable/shape_for_custom_spinner"
         android:scrollbars="none" />
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
         android:layout_marginLeft="20dp"
         android:layout_marginTop="20dp"
+        android:text="学期"
+        android:textColor="@color/text_title"
+        android:textSize="15sp"
+        android:textStyle="bold" />
+    <androidx.appcompat.widget.AppCompatSpinner
+        android:id="@+id/spinner_grade1"
+        style="@style/customSpinnerStyle"
+        android:layout_width="match_parent"
+        android:layout_height="40dp"
+        android:layout_centerHorizontal="true"
+        android:layout_marginLeft="20dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginRight="20dp"
+        android:background="@drawable/selector_for_custom_spinner"
+        android:entries="@array/grade_array"
+        android:popupBackground="@drawable/shape_for_custom_spinner"
+        android:scrollbars="none" />
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_marginLeft="20dp"
+        android:layout_marginTop="20dp"
         android:text="科目"
         android:textColor="@color/text_title"
         android:textSize="15sp"
         android:textStyle="bold" />
     <androidx.appcompat.widget.AppCompatSpinner
         android:id="@+id/spinner_subject"
         style="@style/customSpinnerStyle"
         android:layout_width="match_parent"
         android:layout_height="40dp"
         android:layout_centerHorizontal="true"
         android:layout_marginLeft="20dp"
         android:layout_marginTop="10dp"
         android:layout_marginRight="20dp"
         android:background="@drawable/selector_for_custom_spinner"
         android:entries="@array/filter_subject"
         android:popupBackground="@drawable/shape_for_custom_spinner"
         android:scrollbars="none" />
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
         android:layout_marginLeft="20dp"
         android:layout_marginTop="20dp"
         android:text="错误原因"
         android:textColor="@color/text_title"
         android:textSize="15sp"
         android:textStyle="bold" />
     <androidx.appcompat.widget.AppCompatSpinner
         android:id="@+id/spinner_reason"
         style="@style/customSpinnerStyle"
         android:layout_width="match_parent"
         android:layout_height="40dp"
         android:layout_centerHorizontal="true"
         android:layout_marginLeft="20dp"
         android:layout_marginTop="10dp"
         android:layout_marginRight="20dp"
         android:background="@drawable/selector_for_custom_spinner"
         android:entries="@array/filter_subject"
         android:popupBackground="@drawable/shape_for_custom_spinner"
         android:scrollbars="none" />
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
         android:layout_marginLeft="20dp"
         android:layout_marginTop="20dp"
         android:text="来源"
         android:textColor="@color/text_title"
         android:textSize="15sp"
         android:textStyle="bold" />
     <RadioGroup
         android:id="@+id/type_radio"
         android:layout_width="match_parent"
         android:layout_height="40dp"
         android:layout_marginLeft="20dp"
         android:layout_marginTop="10dp"
         android:orientation="horizontal">
         <RadioButton
             android:layout_width="65dp"
             android:layout_height="match_parent"
             android:layout_marginRight="20dp"
             android:background="@drawable/radio_button_selector"
             android:button="@null"
             android:gravity="center"
             android:text="课内"
             android:textColor="@drawable/radio_text_selector"
             android:textSize="14sp" />
         <RadioButton
             android:layout_width="65dp"
             android:layout_height="match_parent"
             android:layout_marginRight="20dp"
             android:background="@drawable/radio_button_selector"
             android:button="@null"
             android:gravity="center"
             android:text="课外"
             android:textColor="@drawable/radio_text_selector"
             android:textSize="14sp" />
     </RadioGroup>
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="40dp"
         android:layout_marginLeft="20dp"
         android:layout_marginTop="20dp"
         android:layout_marginRight="20dp"
         android:layout_marginBottom="15dp">
         <TextView
             android:id="@+id/add_topic"
             android:layout_width="250dp"
             android:layout_height="match_parent"
             android:layout_centerInParent="true"
             android:background="@drawable/bg_soild_blue_5"
             android:gravity="center"
             android:text="确认修改"
             android:textColor="@color/white"
             android:textSize="17sp" />
     </RelativeLayout>
 </LinearLayout>

app/src/main/res/mipmap-xxxhdpi/ic_chinese.png

Diff comments View file @484570f

app/src/main/res/values/strings.xml

Diff comments View file @484570f

 <resources>
     <string name="app_name">家长管控</string>
     <string name="chinese">语文</string>
     <string name="math">数学</string>
     <string name="english">英语</string>
     <string name="physics">物理</string>
     <string name="chemistry">化学</string>
     <string name="text_done">已掌握</string>
     <string name="text_undo">未掌握</string>
     <string name="topic_start">知识点</string>
     <string name="loading_text">图片处理中，请稍后。。。</string>
     <string name="num_topic">第%1$s题</string>
     <string name="topic_type_in">课内</string>
     <string name="topic_type_out">课外</string>
     <string-array name="filter_subject">
         <item>@string/chinese</item>
         <item>@string/math</item>
         <item>@string/english</item>
         <item>@string/physics</item>
         <item>@string/chemistry</item>
     </string-array>
     <string-array name="error_reason">
         <item>审题错误</item>
         <item>思路错误</item>
         <item>运算错误</item>
         <item>概念模糊</item>
         <item>粗心大意</item>
         <item>其他错误</item>
     </string-array>
+    <string-array name="grade_array">
+        <item>上学期</item>
+        <item>下学期</item>
+    </string-array>
 </resources>

1	<?xml version="1.0" encoding="utf-8"?>	1	<?xml version="1.0" encoding="utf-8"?>
2	<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"	2	<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
3	xmlns:app="http://schemas.android.com/apk/res-auto"	3	xmlns:app="http://schemas.android.com/apk/res-auto"
4	xmlns:tools="http://schemas.android.com/tools"	4	xmlns:tools="http://schemas.android.com/tools"
5	android:layout_width="match_parent"	5	android:layout_width="match_parent"
6	android:layout_height="match_parent"	6	android:layout_height="match_parent"
7	android:background="#F4F6F8"	7	android:background="#F4F6F8"
8	tools:context=".MainActivity">	8	tools:context=".MainActivity">
9		9
10	<FrameLayout	10	<FrameLayout
11	android:id="@+id/rl_content"	11	android:id="@+id/rl_content"
12	android:layout_width="match_parent"	12	android:layout_width="match_parent"
13	android:layout_height="0dp"	13	android:layout_height="0dp"
14	app:layout_constraintBottom_toTopOf="@id/cl_1"	14	app:layout_constraintBottom_toTopOf="@id/cl_1"
15	app:layout_constraintLeft_toLeftOf="parent"	15	app:layout_constraintLeft_toLeftOf="parent"
16	app:layout_constraintTop_toTopOf="parent" />	16	app:layout_constraintTop_toTopOf="parent" />
17		17
18		18
19	<androidx.constraintlayout.widget.ConstraintLayout	19	<androidx.constraintlayout.widget.ConstraintLayout
20	android:id="@+id/cl_1"	20	android:id="@+id/cl_1"
21	android:layout_width="match_parent"	21	android:layout_width="match_parent"
22	android:layout_height="50dp"	22	android:layout_height="50dp"
23	android:background="@drawable/bg_solid_white_20"	23	android:background="@drawable/bg_solid_white_20"
24	app:layout_constraintBottom_toBottomOf="parent">	24	app:layout_constraintBottom_toBottomOf="parent">
25		25
26	<View	26	<View
27	android:id="@+id/view_5"	27	android:id="@+id/view_5"
28	android:layout_width="1dp"	28	android:layout_width="1dp"
29	android:layout_height="1dp"	29	android:layout_height="1dp"
30	app:layout_constraintBottom_toBottomOf="parent"	30	app:layout_constraintBottom_toBottomOf="parent"
31	app:layout_constraintLeft_toLeftOf="parent"	31	app:layout_constraintLeft_toLeftOf="parent"
32	app:layout_constraintRight_toRightOf="parent" />	32	app:layout_constraintRight_toRightOf="parent" />
33		33
34	<androidx.constraintlayout.widget.ConstraintLayout	34	<androidx.constraintlayout.widget.ConstraintLayout
35	android:id="@+id/cl_home"	35	android:id="@+id/cl_home"
36	android:layout_width="0dp"	36	android:layout_width="0dp"
37	android:layout_height="0dp"	37	android:layout_height="0dp"
38	app:layout_constraintBottom_toBottomOf="parent"	38	app:layout_constraintBottom_toBottomOf="parent"
39	app:layout_constraintLeft_toLeftOf="parent"	39	app:layout_constraintLeft_toLeftOf="parent"
40	app:layout_constraintRight_toRightOf="@id/view_5"	40	app:layout_constraintRight_toRightOf="@id/view_5"
41	app:layout_constraintTop_toTopOf="@id/cl_1">	41	app:layout_constraintTop_toTopOf="@id/cl_1">
42		42
43	<ImageView	43	<ImageView
44	android:id="@+id/iv_3"	44	android:id="@+id/iv_3"
45	android:layout_width="27dp"	45	android:layout_width="27dp"
46	android:layout_height="24dp"	46	android:layout_height="24dp"
47	android:layout_marginTop="5dp"	47	android:layout_marginTop="5dp"
48	android:background="@mipmap/hous"	48	android:background="@mipmap/hous"
49	app:layout_constraintLeft_toLeftOf="parent"	49	app:layout_constraintLeft_toLeftOf="parent"
50	app:layout_constraintRight_toRightOf="parent"	50	app:layout_constraintRight_toRightOf="parent"
51	app:layout_constraintTop_toTopOf="parent" />	51	app:layout_constraintTop_toTopOf="parent" />
52		52
53	<TextView	53	<TextView
54	android:id="@+id/tv_1"	54	android:id="@+id/tv_1"
55	android:layout_width="wrap_content"	55	android:layout_width="wrap_content"
56	android:layout_height="wrap_content"	56	android:layout_height="wrap_content"
57	android:layout_marginTop="5dp"	57	android:layout_marginTop="5dp"
58	android:text="首页"	58	android:text="首页"
59	android:textColor="@drawable/select_t_1"	59	android:textColor="#333333"
60	android:textSize="11dp"	60	android:textSize="11dp"
61	app:layout_constraintLeft_toLeftOf="parent"	61	app:layout_constraintLeft_toLeftOf="parent"
62	app:layout_constraintRight_toRightOf="parent"	62	app:layout_constraintRight_toRightOf="parent"
63	app:layout_constraintTop_toBottomOf="@id/iv_3" />	63	app:layout_constraintTop_toBottomOf="@id/iv_3" />
64		64
65		65
66	</androidx.constraintlayout.widget.ConstraintLayout>	66	</androidx.constraintlayout.widget.ConstraintLayout>
67		67
68	<androidx.constraintlayout.widget.ConstraintLayout	68	<androidx.constraintlayout.widget.ConstraintLayout
69	android:id="@+id/cl_me"	69	android:id="@+id/cl_me"
70	android:layout_width="0dp"	70	android:layout_width="0dp"
71	android:layout_height="0dp"	71	android:layout_height="0dp"
72	app:layout_constraintBottom_toBottomOf="parent"	72	app:layout_constraintBottom_toBottomOf="parent"
73	app:layout_constraintLeft_toLeftOf="@id/view_5"	73	app:layout_constraintLeft_toLeftOf="@id/view_5"
74	app:layout_constraintRight_toRightOf="parent"	74	app:layout_constraintRight_toRightOf="parent"
75	app:layout_constraintTop_toTopOf="@id/cl_1">	75	app:layout_constraintTop_toTopOf="@id/cl_1">
76		76
77	<ImageView	77	<ImageView
78	android:id="@+id/iv_4"	78	android:id="@+id/iv_4"
79	android:layout_width="22dp"	79	android:layout_width="22dp"
80	android:layout_height="25dp"	80	android:layout_height="25dp"
81	android:layout_marginTop="5dp"	81	android:layout_marginTop="5dp"
82	android:background="@mipmap/wmus"	82	android:background="@mipmap/wmus"
83	app:layout_constraintLeft_toLeftOf="parent"	83	app:layout_constraintLeft_toLeftOf="parent"
84	app:layout_constraintRight_toRightOf="parent"	84	app:layout_constraintRight_toRightOf="parent"
85	app:layout_constraintTop_toTopOf="parent" />	85	app:layout_constraintTop_toTopOf="parent" />
86		86
87	<TextView	87	<TextView
88	android:id="@+id/tv_4"	88	android:id="@+id/tv_4"
89	android:layout_width="wrap_content"	89	android:layout_width="wrap_content"
90	android:layout_height="wrap_content"	90	android:layout_height="wrap_content"
91	android:layout_marginTop="5dp"	91	android:layout_marginTop="5dp"
92	android:text="我的"	92	android:text="我的"
93	android:textColor="@drawable/select_t_1"	93	android:textColor="#333333"
94	android:textSize="11dp"	94	android:textSize="11dp"
95	app:layout_constraintLeft_toLeftOf="parent"	95	app:layout_constraintLeft_toLeftOf="parent"
96	app:layout_constraintRight_toRightOf="parent"	96	app:layout_constraintRight_toRightOf="parent"
97	app:layout_constraintTop_toBottomOf="@id/iv_4" />	97	app:layout_constraintTop_toBottomOf="@id/iv_4" />
98		98
99	</androidx.constraintlayout.widget.ConstraintLayout>	99	</androidx.constraintlayout.widget.ConstraintLayout>
100		100
101		101
102	</androidx.constraintlayout.widget.ConstraintLayout>	102	</androidx.constraintlayout.widget.ConstraintLayout>
103		103
104	</androidx.constraintlayout.widget.ConstraintLayout>	104	</androidx.constraintlayout.widget.ConstraintLayout>