From 98f0b15d24da4eff6df1e53f13ff13e293447954 Mon Sep 17 00:00:00 2001 From: "Rookie, LIN" <1049825685@qq.com> Date: Fri, 2 Aug 2024 08:49:25 +0800 Subject: [PATCH 01/13] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=BE=A9=E9=81=B8?= =?UTF-8?q?=E8=AA=B2=E9=A0=81=20-=20FAH=20DJP=E4=B8=8D=E9=A1=AF=E7=A4=BA?= =?UTF-8?q?=E7=9A=84=E5=95=8F=E9=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/TabbarPages/what2Reg/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/TabbarPages/what2Reg/index.js b/src/pages/TabbarPages/what2Reg/index.js index 5611426f..0eaf67bd 100644 --- a/src/pages/TabbarPages/what2Reg/index.js +++ b/src/pages/TabbarPages/what2Reg/index.js @@ -71,6 +71,7 @@ const depaMap = { 'DHIST': '歷史系', 'DPHIL': '哲學及宗教學系', 'DPT': '葡文系', + 'DJP': '日文系', 'ELC': '英語中心', // FBA From fa74cd49c9b38262e8ec2945b511baf6da506e46 Mon Sep 17 00:00:00 2001 From: "Rookie, LIN" <1049825685@qq.com> Date: Mon, 5 Aug 2024 14:25:01 +0800 Subject: [PATCH 02/13] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=BE=A9=E9=81=B8?= =?UTF-8?q?=E8=AA=B2=E9=A0=81=20-=20FAH=20DAD=E4=B8=8D=E9=A1=AF=E7=A4=BA?= =?UTF-8?q?=E7=9A=84=E5=95=8F=E9=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/TabbarPages/what2Reg/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/TabbarPages/what2Reg/index.js b/src/pages/TabbarPages/what2Reg/index.js index 0eaf67bd..185bf77d 100644 --- a/src/pages/TabbarPages/what2Reg/index.js +++ b/src/pages/TabbarPages/what2Reg/index.js @@ -72,6 +72,7 @@ const depaMap = { 'DPHIL': '哲學及宗教學系', 'DPT': '葡文系', 'DJP': '日文系', + 'DAD': '藝術設計系', 'ELC': '英語中心', // FBA From c3a875e4306e3dcfafea2a7382553c9ef58e210f Mon Sep 17 00:00:00 2001 From: "Rookie, LIN" <1049825685@qq.com> Date: Fri, 9 Aug 2024 01:13:00 +0800 Subject: [PATCH 03/13] =?UTF-8?q?:sparkles:=20=E6=9B=B4=E6=96=B008-07?= =?UTF-8?q?=E8=AA=B2=E8=A1=A8=E6=95=B8=E6=93=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/static/UMCourses/coursePlan.json | 12 ++-- src/static/UMCourses/coursePlanTime.json | 85 +++++++++++++++++++++--- 2 files changed, 81 insertions(+), 16 deletions(-) diff --git a/src/static/UMCourses/coursePlan.json b/src/static/UMCourses/coursePlan.json index 2de847ef..0e8e3bfa 100644 --- a/src/static/UMCourses/coursePlan.json +++ b/src/static/UMCourses/coursePlan.json @@ -2884,7 +2884,7 @@ "Time From": "10:00", "Time To": "12:45", "Classroom": "E22-2018", - "Course Title Chi": "以學科為基礎的教學方法（中學數學）II" + "Course Title Chi": "基於學科的教學方法（中學數學）II" }, { "Offering Unit": "FED", @@ -4991,7 +4991,7 @@ "Course Title": "Advanced History Writing I", "Section": "001", "Medium of Instruction": "English", - "Teacher Information": "WANG DI", + "Teacher Information": "KWAN CHING-YIN NATHAN", "Lecture / Lab": "Lecture", "Course Title Chi": "高級歷史寫作Ⅰ" }, @@ -5533,7 +5533,7 @@ "Time To": "11:15", "Classroom": "E22-G004", "\"Class For / Class Not For\" Information": "Class for :\n - FBA - IIR17-GMM17-FOURTH YEAR / IIR20-GMM20-THIRD YEAR / IIR20-GMM20-FOURTH YEAR\n", - "Course Title Chi": "遊戲管理實習" + "Course Title Chi": "博彩管理實習" }, { "Offering Unit": "FBA", @@ -7493,7 +7493,7 @@ "Day": "MON", "Time From": "14:30", "Time To": "15:45", - "Classroom": "E21-1031", + "Classroom": "E22-3015", "Course Title Chi": "佛教哲學" }, { @@ -8129,7 +8129,7 @@ "Time From": "11:30", "Time To": "12:45", "Classroom": "E22-4015", - "Course Title Chi": "遊戲社會學" + "Course Title Chi": "博彩社會學" }, { "Offering Unit": "FSS", @@ -8327,7 +8327,7 @@ "Course Title Chi": "大學英文II（教程）" } ], - "updateTime": "2024-08-05", + "updateTime": "2024-08-07", "academicYear": "24/25", "sem": "1", "remark": "用於Add Drop期間的數據，帶課表時間" diff --git a/src/static/UMCourses/coursePlanTime.json b/src/static/UMCourses/coursePlanTime.json index 0c3a17b1..ce417be2 100644 --- a/src/static/UMCourses/coursePlanTime.json +++ b/src/static/UMCourses/coursePlanTime.json @@ -8245,7 +8245,7 @@ "Notes for Course Enrolment": "Course for students admitted in AY2021/2022 and onwards; Class for (RC=MLC)", "Teacher Information": "VÉNUS TERESA VIANA", "Lecture / Lab": "Lecture", - "Course Title Chi": "住宿學院社區團隊計畫" + "Course Title Chi": "住宿學院社區團隊專案" }, { "Offering Unit": "FST", @@ -10580,7 +10580,7 @@ "Time From": "10:00", "Time To": "12:45", "Classroom": "E22-2018", - "Course Title Chi": "以學科為基礎的教學方法（中學數學）II" + "Course Title Chi": "基於學科的教學方法（中學數學）II" }, { "Offering Unit": "FED", @@ -25138,7 +25138,7 @@ "Course Title": "Advanced History Writing I", "Section": "001", "Medium of Instruction": "English", - "Teacher Information": "WANG DI", + "Teacher Information": "KWAN CHING-YIN NATHAN", "Lecture / Lab": "Lecture", "Course Title Chi": "高級歷史寫作Ⅰ" }, @@ -25204,7 +25204,7 @@ "Course Title": "Advanced History Writing I", "Section": "007", "Medium of Instruction": "English", - "Teacher Information": "WU DONGMING", + "Teacher Information": "GUILLERMO FRANCISCO RICHARD RUIZ STOVEL", "Lecture / Lab": "Lecture", "Course Title Chi": "高級歷史寫作Ⅰ" }, @@ -25241,6 +25241,39 @@ "Lecture / Lab": "Lecture", "Course Title Chi": "研究計畫" }, + { + "Offering Unit": "FAH", + "Offering Department": "DHIST", + "Course Code": "HIST4003", + "Course Title": "Research Project", + "Section": "004", + "Medium of Instruction": "English", + "Teacher Information": "KWAN CHING-YIN NATHAN", + "Lecture / Lab": "Lecture", + "Course Title Chi": "研究計畫" + }, + { + "Offering Unit": "FAH", + "Offering Department": "DHIST", + "Course Code": "HIST4003", + "Course Title": "Research Project", + "Section": "005", + "Medium of Instruction": "English", + "Teacher Information": "WU DONGMING", + "Lecture / Lab": "Lecture", + "Course Title Chi": "研究計畫" + }, + { + "Offering Unit": "FAH", + "Offering Department": "DHIST", + "Course Code": "HIST4003", + "Course Title": "Research Project", + "Section": "006", + "Medium of Instruction": "English", + "Teacher Information": "JOSHUA PARR EHRLICH", + "Lecture / Lab": "Lecture", + "Course Title Chi": "研究計畫" + }, { "Offering Unit": "HC", "Course Code": "HONR2003", @@ -26359,7 +26392,7 @@ "Time To": "11:15", "Classroom": "E22-G004", "\"Class For / Class Not For\" Information": "Class for :\n - FBA - IIR17-GMM17-FOURTH YEAR / IIR20-GMM20-THIRD YEAR / IIR20-GMM20-FOURTH YEAR\n", - "Course Title Chi": "遊戲管理實習" + "Course Title Chi": "博彩管理實習" }, { "Offering Unit": "FBA", @@ -26375,7 +26408,7 @@ "Time To": "11:15", "Classroom": "E22-G004", "\"Class For / Class Not For\" Information": "Class for :\n - FBA - IIR17-GMM17-FOURTH YEAR / IIR20-GMM20-THIRD YEAR / IIR20-GMM20-FOURTH YEAR\n", - "Course Title Chi": "遊戲管理實習" + "Course Title Chi": "博彩管理實習" }, { "Offering Unit": "FBA", @@ -32423,7 +32456,7 @@ "Day": "MON", "Time From": "14:30", "Time To": "15:45", - "Classroom": "E21-1031", + "Classroom": "E22-3015", "Course Title Chi": "佛教哲學" }, { @@ -32438,7 +32471,7 @@ "Day": "THU", "Time From": "14:30", "Time To": "15:45", - "Classroom": "E21-1031", + "Classroom": "E22-3015", "Course Title Chi": "佛教哲學" }, { @@ -35223,6 +35256,38 @@ "\"Class For / Class Not For\" Information": "Class for :\n - FAH - PTS19\n", "Course Title Chi": "專業實用寫作 I" }, + { + "Offering Unit": "FAH", + "Offering Department": "DPT", + "Course Code": "PORT3002", + "Course Title": "Practical Writing for Professional Purposes I", + "Section": "002", + "Medium of Instruction": "Portuguese", + "Teacher Information": "JÚLIO REIS JATOBÁ", + "Lecture / Lab": "Lecture", + "Day": "TUE", + "Time From": "16:00", + "Time To": "17:15", + "Classroom": "E21-1045", + "\"Class For / Class Not For\" Information": "Class for :\n - FAH - PTS19\n", + "Course Title Chi": "專業實用寫作 I" + }, + { + "Offering Unit": "FAH", + "Offering Department": "DPT", + "Course Code": "PORT3002", + "Course Title": "Practical Writing for Professional Purposes I", + "Section": "002", + "Medium of Instruction": "Portuguese", + "Teacher Information": "JÚLIO REIS JATOBÁ", + "Lecture / Lab": "Lecture", + "Day": "FRI", + "Time From": "16:00", + "Time To": "17:15", + "Classroom": "E21-1045", + "\"Class For / Class Not For\" Information": "Class for :\n - FAH - PTS19\n", + "Course Title Chi": "專業實用寫作 I" + }, { "Offering Unit": "FAH", "Offering Department": "DPT", @@ -36556,7 +36621,7 @@ "Time From": "11:30", "Time To": "12:45", "Classroom": "E22-4015", - "Course Title Chi": "遊戲社會學" + "Course Title Chi": "博彩社會學" }, { "Offering Unit": "FSS", @@ -36571,7 +36636,7 @@ "Time From": "11:30", "Time To": "12:45", "Classroom": "E22-4015", - "Course Title Chi": "遊戲社會學" + "Course Title Chi": "博彩社會學" }, { "Offering Unit": "FSS", From 7b672d5690db42bda72cedf5dff9a6fbfa43e1f0 Mon Sep 17 00:00:00 2001 From: "Rookie, LIN" <1049825685@qq.com> Date: Fri, 9 Aug 2024 01:25:20 +0800 Subject: [PATCH 04/13] =?UTF-8?q?:sparkles:=20=E6=96=B0=E5=A2=9E=E9=81=B8?= =?UTF-8?q?=E8=AA=B2=E9=A0=81=E7=9B=B4=E6=8E=A5=E6=90=9C=E7=B4=A2=E9=81=B8?= =?UTF-8?q?=E5=92=A9=E8=AA=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/TabbarPages/what2Reg/index.js | 13 ++++++++++++- src/utils/pathMap.js | 1 + 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/pages/TabbarPages/what2Reg/index.js b/src/pages/TabbarPages/what2Reg/index.js index 185bf77d..f7fe4fe8 100644 --- a/src/pages/TabbarPages/what2Reg/index.js +++ b/src/pages/TabbarPages/what2Reg/index.js @@ -13,7 +13,7 @@ import { Alert, } from "react-native"; -import { UMEH_URI, UMEH_API, WHAT_2_REG, USER_AGREE, ARK_WIKI_SEARCH, OFFICIAL_COURSE_SEARCH, } from "../../../utils/pathMap"; +import { UMEH_URI, UMEH_API, WHAT_2_REG, USER_AGREE, ARK_WIKI_SEARCH, OFFICIAL_COURSE_SEARCH, WHAT_2_REG_SEARCH, } from "../../../utils/pathMap"; import { COLOR_DIY, uiStyle, } from '../../../utils/uiMap'; import { trigger } from '../../../utils/trigger'; import { logToFirebase } from '../../../utils/firebaseAnalytics'; @@ -817,6 +817,12 @@ export default class index extends Component { this.props.navigation.navigate('Wiki', { url: URL }); break; + case 'what2reg': + trigger(); + // 進入選咩課搜索模式 + openLink(`${WHAT_2_REG_SEARCH}${encodeURIComponent(inputText)}`); + break; + case 'official': trigger(); let courseCode = encodeURIComponent(inputText); @@ -838,6 +844,11 @@ export default class index extends Component { title: '查 ARK Wiki !!! ε٩(๑> ₃ <)۶з', titleColor: themeColor, }, + { + id: 'what2reg', + title: '查 選咩課', + titleColor: black.third, + }, { id: 'official', title: '查 官方', diff --git a/src/utils/pathMap.js b/src/utils/pathMap.js index 49d80147..7792bac7 100644 --- a/src/utils/pathMap.js +++ b/src/utils/pathMap.js @@ -112,6 +112,7 @@ export const USUAL_Q = 'https://umall.one/qa.html'; // Webview 服務 // 選咩課 export const WHAT_2_REG = 'https://www.umeh.top'; +export const WHAT_2_REG_SEARCH = 'https://www.umeh.top/search/course/'; // 澳大討論區 export const UM_WHOLE = 'https://umbbs.xyz'; From 4a4d38b02d014d49bfbb2c9f25026ff2d8ad9473 Mon Sep 17 00:00:00 2001 From: "Rookie, LIN" <1049825685@qq.com> Date: Fri, 9 Aug 2024 01:34:09 +0800 Subject: [PATCH 05/13] =?UTF-8?q?:sparkles:=20Tabbar=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E5=90=8C=E6=99=82=E5=B1=95=E7=A4=BA=E6=96=87=E5=AD=97=E5=92=8C?= =?UTF-8?q?=E5=9C=96=E6=A8=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Tabbar.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Tabbar.js b/src/Tabbar.js index da6d91c3..6bcd9fd2 100644 --- a/src/Tabbar.js +++ b/src/Tabbar.js @@ -52,6 +52,8 @@ class Tabbar extends Component { activeTabBackgrounds: COLOR_DIY.themeColor, activeColors: COLOR_DIY.white, tabBarBackground: COLOR_DIY.bg_color, + whenInactiveShow: 'both', + tabButtonLayout: 'vertical', }} initialRouteName={isClub ? 'MeTabbar' : 'NewsTabbar'}> From 51b631357d0b2eb450bfd4aaa35ef2b42574b362 Mon Sep 17 00:00:00 2001 From: "Rookie, LIN" <1049825685@qq.com> Date: Fri, 9 Aug 2024 01:34:29 +0800 Subject: [PATCH 06/13] =?UTF-8?q?:art:=20=E4=BF=AE=E6=94=B9Tabbar=E7=9A=84?= =?UTF-8?q?Wiki=E7=82=BA=E4=B8=AD=E6=96=87=E7=99=BE=E7=A7=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Tabbar.js | 2 +- src/i18n/en-us.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Tabbar.js b/src/Tabbar.js index 6bcd9fd2..c2402cd2 100644 --- a/src/Tabbar.js +++ b/src/Tabbar.js @@ -97,7 +97,7 @@ class Tabbar extends Component { focused={focused} /> ), - title: t('Wiki'), + title: t('百科'), }} listeners={() => ({ tabPress: () => trigger() diff --git a/src/i18n/en-us.js b/src/i18n/en-us.js index 3f2d5f76..6bf708a0 100644 --- a/src/i18n/en-us.js +++ b/src/i18n/en-us.js @@ -8,6 +8,7 @@ export default { "資訊": "Info", "搵課": "Courses", + "百科": "Wiki", "課表": "Timetable", "服務": "Services", "組織": "Club", From bb7c18b246b907ae9ccaea939273b08fe9f83632 Mon Sep 17 00:00:00 2001 From: "Rookie, LIN" <1049825685@qq.com> Date: Fri, 9 Aug 2024 01:47:23 +0800 Subject: [PATCH 07/13] =?UTF-8?q?:art:=20=E9=87=8D=E6=96=B0=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E9=A6=96=E9=A0=81=E7=9A=84=E5=BF=AB=E6=8D=B7=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit :art: 主頁Moodle功能加入firebase --- src/pages/TabbarPages/info/home/index.js | 110 ++++++++++++----------- 1 file changed, 57 insertions(+), 53 deletions(-) diff --git a/src/pages/TabbarPages/info/home/index.js b/src/pages/TabbarPages/info/home/index.js index 383c0e9d..67ce68dc 100644 --- a/src/pages/TabbarPages/info/home/index.js +++ b/src/pages/TabbarPages/info/home/index.js @@ -23,6 +23,7 @@ import { MAIL, ARK_WIKI, ARK_WIKI_RANDOM_TITLE, + UM_Moodle, } from '../../../../utils/pathMap.js'; import EventPage from './EventPage.js'; import ModalBottom from '../../../../components/ModalBottom.js'; @@ -33,6 +34,7 @@ import { UMCalendar } from '../../../../static/UMCalendar/UMCalendar.js'; import HomeCard from './components/HomeCard.js'; import { screenWidth } from '../../../../utils/stylesKits.js'; import { trigger } from '../../../../utils/trigger.js'; +import { logToFirebase } from '../../../../utils/firebaseAnalytics.js'; import Ionicons from 'react-native-vector-icons/Ionicons'; import MaterialCommunityIcons from 'react-native-vector-icons/MaterialCommunityIcons'; @@ -47,6 +49,7 @@ import FastImage from 'react-native-fast-image'; import moment from 'moment'; import TouchableScale from "react-native-touchable-scale"; import { t } from "i18next"; +import { openLink } from '../../../../utils/browser.js'; const { white, bg_color, black, themeColor, themeColorLight, themeColorUltraLight, viewShadow } = COLOR_DIY; const iconSize = verticalScale(25); @@ -164,19 +167,13 @@ class HomeScreen extends Component { }, }, { - icon_name: 'coffee', + icon_name: 'alpha-m-circle-outline', icon_type: iconTypes.materialCommunityIcons, - function_name: t('支持我們', { ns: 'home' }), + function_name: t('Moodle', { ns: 'home' }), func: () => { trigger(); - let webview_param = { - url: GITHUB_DONATE, - title: '支持我們', - text_color: white, - bg_color_diy: themeColor, - isBarStyleBlack: false, - }; - this.props.navigation.navigate('Webviewer', webview_param); + logToFirebase('openPage', { page: 'moodle' }); + openLink(UM_Moodle); }, }, { @@ -193,12 +190,19 @@ class HomeScreen extends Component { }, }, { - icon_name: 'file-document-edit', + icon_name: 'coffee', icon_type: iconTypes.materialCommunityIcons, - function_name: t('方舟百科', { ns: 'home' }), + function_name: t('支持我們', { ns: 'home' }), func: () => { trigger(); - this.props.navigation.navigate('Wiki'); + let webview_param = { + url: GITHUB_DONATE, + title: '支持我們', + text_color: white, + bg_color_diy: themeColor, + isBarStyleBlack: false, + }; + this.props.navigation.navigate('Webviewer', webview_param); }, }, { @@ -675,27 +679,29 @@ class HomeScreen extends Component { onScroll={this.handleScroll} scrollEventThrottle={400} > - - {/* ARK Logo */} - - ARK ALL 澳大方舟 - + {false && ( + + {/* ARK Logo */} + + ARK ALL 澳大方舟 + + )} {/* 校曆列表 */} {cal && cal.length > 0 ? ( @@ -796,22 +802,20 @@ class HomeScreen extends Component { } {/* 快捷功能圖標 */} - {false && - this.GetFunctionIcon(item)} - showsVerticalScrollIndicator={false} - scrollEnabled={false} - /> - } + this.GetFunctionIcon(item)} + showsVerticalScrollIndicator={false} + scrollEnabled={false} + /> {/* 更新提示 */} { @@ -903,9 +907,9 @@ class HomeScreen extends Component { {this.state.networkError ? ( 網絡錯誤，請手動刷新！ ) : null - // (<> - // 各組織可自行操作發佈活動! 立即進駐ARK! - // ) + // (<> + // 各組織可自行操作發佈活動! 立即進駐ARK! + // ) } From 10e11777d94561f08b590fc11e4fa0dcc6fdf241 Mon Sep 17 00:00:00 2001 From: "Rookie, LIN" <1049825685@qq.com> Date: Fri, 9 Aug 2024 01:54:44 +0800 Subject: [PATCH 08/13] =?UTF-8?q?:art:=20=E6=81=A2=E5=BE=A9=E6=AF=8F?= =?UTF-8?q?=E5=80=8B=E9=A0=81=E9=9D=A2=E7=9A=84=E5=81=B4=E9=82=8A=E6=BB=BE?= =?UTF-8?q?=E5=8B=95=E6=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/TabbarPages/courseSim/index.js | 2 +- src/pages/TabbarPages/features/index.js | 2 +- src/pages/TabbarPages/info/AboutPage.js | 2 +- src/pages/TabbarPages/info/ClubPage.js | 2 +- src/pages/TabbarPages/what2Reg/index.js | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/pages/TabbarPages/courseSim/index.js b/src/pages/TabbarPages/courseSim/index.js index 6002dbad..dd8a9e82 100644 --- a/src/pages/TabbarPages/courseSim/index.js +++ b/src/pages/TabbarPages/courseSim/index.js @@ -1041,7 +1041,7 @@ E11-0000 {/* 課表 / 首次使用提示 */} diff --git a/src/pages/TabbarPages/features/index.js b/src/pages/TabbarPages/features/index.js index 3e1152a7..380811a5 100644 --- a/src/pages/TabbarPages/features/index.js +++ b/src/pages/TabbarPages/features/index.js @@ -800,7 +800,7 @@ class Index extends Component { }} /> - + {/* ARK Logo */} - + {/* 頁面標題欄 */} From fa773cd58c58195f5c882b8d0398efd964492a8e Mon Sep 17 00:00:00 2001 From: "Rookie, LIN" <1049825685@qq.com> Date: Fri, 9 Aug 2024 01:58:10 +0800 Subject: [PATCH 09/13] =?UTF-8?q?:lipstick:=20=E6=B7=BB=E5=8A=A0=E8=AA=B2?= =?UTF-8?q?=E8=A1=A8=E6=A8=A1=E6=93=AC=E9=A0=81=E7=9A=84=E8=BC=B8=E5=85=A5?= =?UTF-8?q?=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/TabbarPages/courseSim/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/TabbarPages/courseSim/index.js b/src/pages/TabbarPages/courseSim/index.js index dd8a9e82..2cb1156e 100644 --- a/src/pages/TabbarPages/courseSim/index.js +++ b/src/pages/TabbarPages/courseSim/index.js @@ -634,7 +634,7 @@ export default class courseSim extends Component { onChangeText={text => { this.setState({ importTimeTableText: text }); }} - placeholder={`Example： + placeholder={`Click here and enter your timetable:\nExample： TimeDay Mon Tue Wed Thur Fri Sat Sun 9:00 09:00-10:45 ECEN0000(001) E11-0000 From 9949b502857ba333f32a0825536ce7a39fb2ec92 Mon Sep 17 00:00:00 2001 From: "Rookie, LIN" <1049825685@qq.com> Date: Fri, 9 Aug 2024 02:11:53 +0800 Subject: [PATCH 10/13] =?UTF-8?q?:zap:=20=E9=81=B8=E8=AA=B2=E6=A8=A1?= =?UTF-8?q?=E6=93=AC=E9=A0=81=E5=A2=9E=E5=8A=A0=E9=97=9C=E9=96=89=E5=81=B4?= =?UTF-8?q?=E9=82=8A=E5=80=99=E9=81=B8=E6=8F=90=E7=A4=BA=EF=BC=8C=E9=BB=9E?= =?UTF-8?q?=E6=93=8A=E8=AA=B2=E7=A8=8B=E9=97=9C=E9=96=89=E5=81=B4=E9=82=8A?= =?UTF-8?q?=E5=80=99=E9=81=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 適應用戶操作習慣 --- src/pages/TabbarPages/courseSim/index.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/pages/TabbarPages/courseSim/index.js b/src/pages/TabbarPages/courseSim/index.js index 2cb1156e..8a80c9c5 100644 --- a/src/pages/TabbarPages/courseSim/index.js +++ b/src/pages/TabbarPages/courseSim/index.js @@ -33,7 +33,7 @@ import { UM_ISW, ARK_WIKI_SEARCH, WHAT_2_REG, OFFICIAL_COURSE_SEARCH, } from ".. import { logToFirebase } from "../../../utils/firebaseAnalytics"; import { trigger } from "../../../utils/trigger"; -const { themeColor, themeColorUltraLight, black, white, bg_color, unread, } = COLOR_DIY; +const { themeColor, themeColorUltraLight, secondThemeColor, black, white, bg_color, unread, } = COLOR_DIY; const iconSize = scale(25); const dayList = ['MON', 'TUE', 'WED', 'THU', 'FRI', 'SAT', 'SUN']; @@ -464,6 +464,7 @@ export default class courseSim extends Component { // }} onPress={() => { trigger('rigid'); + this.setState({ addMode: false }); }} delayLongPress={300} > @@ -1019,7 +1020,7 @@ E11-0000 {this.state.addMode ? t('關閉', { ns: 'timetable' }) : t('搵課/加課', { ns: 'timetable' })} @@ -1041,7 +1042,7 @@ E11-0000 {/* 課表 / 首次使用提示 */} From 84422374d22d65aafab38ff3a26f531556f3b875 Mon Sep 17 00:00:00 2001 From: "Rookie, LIN" <1049825685@qq.com> Date: Fri, 9 Aug 2024 02:31:36 +0800 Subject: [PATCH 11/13] =?UTF-8?q?:sparkles:=20=E6=AA=A2=E6=9F=A5APP?= =?UTF-8?q?=E9=9D=9C=E6=85=8B=E6=96=87=E4=BB=B6=E7=9A=84=E8=AA=B2=E7=A8=8B?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=99=82=E9=96=93=E5=92=8C=E7=B7=A9=E5=AD=98?= =?UTF-8?q?=E6=95=B8=E6=93=9A=E6=96=B0=E8=88=8A=EF=BC=8C=E5=8F=96=E6=9C=80?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.js | 4 ++++ src/utils/checkCoursesKits.js | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 src/utils/checkCoursesKits.js diff --git a/App.js b/App.js index 7ad7d574..d3592c00 100644 --- a/App.js +++ b/App.js @@ -7,6 +7,8 @@ import RootStore from './src/mobx'; import { COLOR_DIY, isLight, uiStyle, } from './src/utils/uiMap'; import { BASE_HOST } from './src/utils/pathMap'; import { setLanguage, setLocalStorage } from './src/i18n/i18n'; +import { checkLocalCourseVersion, } from './src/utils/checkCoursesKits'; + import { Provider } from 'mobx-react'; import AnimatedSplash from 'react-native-animated-splash-screen'; @@ -121,6 +123,8 @@ class App extends Component { this.setState({ isLogin: false }); } this.checkLanguage(); + // 檢查APP靜態文件的課程更新時間和緩存數據新舊，取最新 + checkLocalCourseVersion(); } catch (e) { console.error('App error', e); } diff --git a/src/utils/checkCoursesKits.js b/src/utils/checkCoursesKits.js new file mode 100644 index 00000000..f727f8be --- /dev/null +++ b/src/utils/checkCoursesKits.js @@ -0,0 +1,35 @@ +import moment from 'moment'; +import { getLocalStorage, setLocalStorage, logAllStorage } from './storageKits'; +import offerCourses from '../static/UMCourses/offerCourses'; +import coursePlan from '../static/UMCourses/coursePlan'; +import coursePlanTime from '../static/UMCourses/coursePlanTime'; + + +export async function checkLocalCourseVersion() { + const storageOfferCourses = await getLocalStorage('offer_courses'); + if (storageOfferCourses) { + if (moment(storageOfferCourses.updateTime).isBefore(moment(offerCourses.updateTime))) { + // 新APP需覆蓋舊版APP的本地緩存 + const saveResult = await setLocalStorage('offer_courses', offerCourses); + if (saveResult != 'ok') { Alert.alert('Error', JSON.stringify(saveResult)); } + } + } else { + const saveResult = await setLocalStorage('offer_courses', offerCourses); + if (saveResult != 'ok') { Alert.alert('Error', JSON.stringify(saveResult)); } + } + + const storageCoursePlan = await getLocalStorage('course_plan'); + if (storageCoursePlan) { + if (moment(storageCoursePlan.updateTime).isBefore(moment(coursePlan.updateTime))) { + // 新APP需覆蓋舊版APP的本地緩存 + // console.log('修改本地緩存日期為', coursePlan.updateTime); + let saveResult = await setLocalStorage('course_plan', coursePlan); + if (saveResult != 'ok') { Alert.alert('Error', JSON.stringify(saveResult)); } + saveResult = await setLocalStorage('course_plan_time', coursePlanTime); + if (saveResult != 'ok') { Alert.alert('Error', JSON.stringify(saveResult)); } + } + } else { + const saveResult = await setLocalStorage('course_plan', coursePlan); + if (saveResult != 'ok') { Alert.alert('Error', JSON.stringify(saveResult)); } + } +} \ No newline at end of file From b7e9e3c6990347673fdc78ba92b41c90daf3a2ce Mon Sep 17 00:00:00 2001 From: "Rookie, LIN" <1049825685@qq.com> Date: Fri, 9 Aug 2024 02:47:37 +0800 Subject: [PATCH 12/13] =?UTF-8?q?:rocket:=20=E6=9B=B4=E6=96=B0package?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E8=99=9F=E5=92=8CiOS=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E8=99=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/UMALL.xcodeproj/project.pbxproj | 12 ++++++------ package.json | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ios/UMALL.xcodeproj/project.pbxproj b/ios/UMALL.xcodeproj/project.pbxproj index 26b7309f..22a7fa86 100644 --- a/ios/UMALL.xcodeproj/project.pbxproj +++ b/ios/UMALL.xcodeproj/project.pbxproj @@ -623,18 +623,18 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = UMALL/UMALL.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; - CURRENT_PROJECT_VERSION = 3.0.0; + CURRENT_PROJECT_VERSION = 3.1.0; DEVELOPMENT_TEAM = UVSHNJYJWU; ENABLE_BITCODE = NO; INFOPLIST_FILE = UMALL/Info.plist; - INFOPLIST_KEY_CFBundleDisplayName = 3.0.0; + INFOPLIST_KEY_CFBundleDisplayName = 3.1.0; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities"; IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 3.0.0; + MARKETING_VERSION = 3.1.0; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -661,17 +661,17 @@ CODE_SIGN_ENTITLEMENTS = UMALL/UMALL.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development"; - CURRENT_PROJECT_VERSION = 3.0.0; + CURRENT_PROJECT_VERSION = 3.1.0; DEVELOPMENT_TEAM = UVSHNJYJWU; INFOPLIST_FILE = UMALL/Info.plist; - INFOPLIST_KEY_CFBundleDisplayName = 3.0.0; + INFOPLIST_KEY_CFBundleDisplayName = 3.1.0; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities"; IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 3.0.0; + MARKETING_VERSION = 3.1.0; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", diff --git a/package.json b/package.json index 9e3adb2f..540fe1c6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "umall", - "version": "3.0.0", + "version": "3.1.0", "private": true, "scripts": { "android": "react-native run-android", From 9ccb4caf908bbe1196fbaa5651d151d7690c3be2 Mon Sep 17 00:00:00 2001 From: "Rookie, LIN" <1049825685@qq.com> Date: Fri, 9 Aug 2024 02:59:12 +0800 Subject: [PATCH 13/13] =?UTF-8?q?:rocket:=20=E6=9B=B4=E6=96=B0Android?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E8=99=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 95dd23fc..c7b839c3 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -139,8 +139,8 @@ android { applicationId "one.umall" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 58 - versionName "3.0.0" + versionCode 59 + versionName "3.1.0" buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString() if (isNewArchitectureEnabled()) {