Skip to content

Commit ac6daab

Browse files
committed
修改了课程加载逻辑
1 parent 17967c1 commit ac6daab

2 files changed

Lines changed: 17 additions & 13 deletions

File tree

app/src/main/java/org/shirakawatyu/swust/MainActivity.java

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,7 @@ protected void onCreate(Bundle savedInstanceState) {
3939
SplashScreen.installSplashScreen(this);
4040

4141
// 状态栏文字暗色
42-
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
43-
getWindow().getInsetsController().setSystemBarsAppearance(WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS, WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS);
44-
}else {
45-
getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
46-
}
42+
getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
4743

4844
// 防止底部按钮上移
4945
getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN);
@@ -90,9 +86,9 @@ private void initWeb() {
9086
settings.setLoadWithOverviewMode(true);
9187

9288
// 支持缩放,默认为true。是下面那个的前提。
93-
settings.setSupportZoom(true);
89+
settings.setSupportZoom(false);
9490
// 设置内置的缩放控件。若为false,则该 WebView 不可缩放
95-
settings.setBuiltInZoomControls(true);
91+
settings.setBuiltInZoomControls(false);
9692
// 隐藏原生的缩放控件
9793
settings.setDisplayZoomControls(false);
9894

@@ -143,7 +139,7 @@ public void onPageFinished(WebView view, String url) {
143139

144140
public void setData() {
145141
// 设置版本号
146-
webView.evaluateJavascript("window.localStorage.setItem('version', '0.3')", value -> {});
142+
webView.evaluateJavascript("window.localStorage.setItem('version', '0.32')", value -> {});
147143
// 从本地缓存读取课程表
148144
webView.evaluateJavascript("window.localStorage.getItem('lessons')", value -> {
149145
// Toast.makeText(mContext, value, Toast.LENGTH_SHORT).show();
@@ -152,12 +148,9 @@ public void setData() {
152148
if("null".equals(value)) {
153149
value = "[]";
154150
}
155-
JSONArray objects = JSON.parseArray(value);
156-
JSONArray todayCourse = CourseUtils.getTodayCourse(objects);
157151
SharedPreferences courses = getSharedPreferences("courses", MODE_PRIVATE);
158152
SharedPreferences.Editor edit = courses.edit();
159-
String s = JSON.toJSONString(todayCourse);
160-
edit.putString("today_courses", s);
153+
edit.putString("week_courses", value);
161154
edit.apply();
162155
}
163156
});

app/src/main/java/org/shirakawatyu/swust/widget/CourseWidget.java

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,12 @@
1212
import android.widget.RemoteViews;
1313
import android.widget.Toast;
1414

15+
import com.alibaba.fastjson2.JSON;
16+
import com.alibaba.fastjson2.JSONArray;
17+
1518
import org.shirakawatyu.swust.MainActivity;
1619
import org.shirakawatyu.swust.R;
20+
import org.shirakawatyu.swust.utils.CourseUtils;
1721
import org.shirakawatyu.swust.utils.DateUtils;
1822

1923
/**
@@ -34,8 +38,15 @@ static void updateAppWidget(Context context, AppWidgetManager appWidgetManager,
3438
// 设置Adapter
3539
views.setRemoteAdapter(R.id.course_list, adapter);
3640
views.setEmptyView(R.id.course_list, android.R.id.empty);
37-
// 判断数据是否过期
41+
// 设置课表数据
3842
SharedPreferences courses = context.getSharedPreferences("courses", Context.MODE_PRIVATE);
43+
String weekCourses = courses.getString("week_courses", "[]");
44+
JSONArray objects = JSON.parseArray(weekCourses);
45+
JSONArray todayCourse = CourseUtils.getTodayCourse(objects);
46+
SharedPreferences.Editor edit = courses.edit();
47+
edit.putString("today_courses", JSON.toJSONString(todayCourse));
48+
edit.apply();
49+
// 判断数据是否过期
3950
String cur = courses.getString("cur", "0").replace("\"", "");
4051
String s = DateUtils.curWeek();
4152
Log.d("broadcast => cur ", s);

0 commit comments

Comments
 (0)