Skip to content

Commit 6718272

Browse files
committed
Fixed weekday bugs
1 parent 8ed0be9 commit 6718272

5 files changed

Lines changed: 16 additions & 4 deletions

File tree

.idea/gradle.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import com.alibaba.fastjson2.JSON;
2323
import com.alibaba.fastjson2.JSONArray;
2424
import org.shirakawatyu.swust.utils.CourseUtils;
25+
import org.shirakawatyu.swust.utils.DateUtils;
2526
import org.shirakawatyu.swust.widget.CourseWidget;
2627

2728
public class MainActivity extends AppCompatActivity implements View.OnClickListener {
@@ -134,7 +135,7 @@ public void onPageStarted(WebView view, String url, Bitmap favicon) {
134135
@Override
135136
public void onPageFinished(WebView view, String url) {
136137
super.onPageFinished(view, url);
137-
// Toast.makeText(mContext, "111111", Toast.LENGTH_SHORT).show();
138+
// Toast.makeText(mContext, DateUtils.getWeekDay(), Toast.LENGTH_SHORT).show();
138139
// 网页加载完毕,隐藏进度条
139140
progressBar.setVisibility(View.INVISIBLE);
140141
setData();

app/src/main/java/org/shirakawatyu/swust/utils/CourseUtils.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
public class CourseUtils {
1414
public static JSONArray getTodayCourse(JSONArray array) {
1515
JSONArray jsonArray = new JSONArray();
16+
String weekDay = DateUtils.getWeekDay();
1617
if(array != null) {
1718
for (int i = 0; i < array.size(); i++) {
1819
if(array.getJSONObject(i).get("week_day").equals(DateUtils.getWeekDay())) {

app/src/main/java/org/shirakawatyu/swust/utils/DateUtils.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import java.text.SimpleDateFormat;
55
import java.util.Calendar;
66
import java.util.Date;
7+
import java.util.TimeZone;
78

89
public class DateUtils {
910
public static long START_DATE = DateUtils.getDate("2022-8-29");
@@ -22,6 +23,13 @@ public static long getDate(String source) {
2223
}
2324

2425
public static String getWeekDay() {
25-
return Integer.toString(Calendar.DAY_OF_WEEK);
26+
TimeZone.setDefault(TimeZone.getTimeZone("GMT+8"));
27+
Calendar c = Calendar.getInstance(TimeZone.getTimeZone("GMT+8"));
28+
int i = c.get(Calendar.DAY_OF_WEEK);
29+
int week = i - 1;
30+
if(week == 0) {
31+
week = 7;
32+
}
33+
return Integer.toString(week);
2634
}
2735
}

app/src/test/java/org/shirakawatyu/swust/ExampleUnitTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.shirakawatyu.swust;
22

33
import org.junit.Test;
4+
import org.shirakawatyu.swust.utils.DateUtils;
45

56
import static org.junit.Assert.*;
67

@@ -12,6 +13,7 @@
1213
public class ExampleUnitTest {
1314
@Test
1415
public void addition_isCorrect() {
15-
assertEquals(4, 2 + 2);
16+
String weekDay = DateUtils.getWeekDay();
17+
System.out.println(weekDay);
1618
}
1719
}

0 commit comments

Comments
 (0)