From 411928de8ea47432d907758b1883cee1d9acb7f7 Mon Sep 17 00:00:00 2001 From: m6z1 Date: Sat, 15 Feb 2025 19:53:10 +0900 Subject: [PATCH 1/5] =?UTF-8?q?feat:=20=EB=B3=80=EA=B2=BD=EB=90=9C=20?= =?UTF-8?q?=ED=95=99=EA=B3=BC=20=EC=83=81=EC=88=98=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../youdongknowme/standard/util/Constants.kt | 3 +- .../youdongknowme/standard/util/Department.kt | 43 +++---------------- 2 files changed, 9 insertions(+), 37 deletions(-) diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/standard/util/Constants.kt b/app/src/main/java/com/dongyang/android/youdongknowme/standard/util/Constants.kt index b3b3fe12..386387e3 100644 --- a/app/src/main/java/com/dongyang/android/youdongknowme/standard/util/Constants.kt +++ b/app/src/main/java/com/dongyang/android/youdongknowme/standard/util/Constants.kt @@ -1,4 +1,3 @@ - object CODE { const val SCHOOL_CODE = 1 @@ -31,4 +30,6 @@ object CODE { const val HOTEL_TOURISM_CODE = 604 const val MANAGEMENT_INFORMATION_CODE = 605 const val BIG_DATA_MANAGEMENT_CODE = 606 + + const val UNDECLARED_MAJOR_CODE = 701 } \ No newline at end of file diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/standard/util/Department.kt b/app/src/main/java/com/dongyang/android/youdongknowme/standard/util/Department.kt index ca72e99e..617591c1 100644 --- a/app/src/main/java/com/dongyang/android/youdongknowme/standard/util/Department.kt +++ b/app/src/main/java/com/dongyang/android/youdongknowme/standard/util/Department.kt @@ -1,19 +1,18 @@ package com.dongyang.android.youdongknowme.standard.util sealed class Department( - var name: String, - var code: Int + var name: String, var code: Int ) { object Mechanical : Department("기계공학과", CODE.MECHANICAL_ENGINE_CODE) object MechanicalDesign : Department("기계설계공학과", CODE.MECHANICAL_DESIGN_CODE) object Automation : Department("자동화공학과", CODE.AUTOMATION_ENGINE_CODE) - object Robot : Department("로봇공학과", CODE.ROBOT_ENGINE_CODE) + object Robot : Department("로봇소프트웨어과", CODE.ROBOT_ENGINE_CODE) object Electrical : Department("전기공학과", CODE.ELECTRICAL_ENGINE_CODE) object InfoElectrical : Department("정보전자공학과", CODE.INFO_ELECTRONIC_ENGINE_CODE) object Semiconductor : Department("반도체전자공학과", CODE.SEMICONDUCTOR_ENGINE_CODE) object InfoCommunication : Department("정보통신공학과", CODE.INFO_COMMUNICATION_ENGINE_CODE) object FireManagement : Department("소방안전관리과", CODE.FIRE_MANAGEMENT_CODE) - object ComputerInfo : Department("컴퓨터정보공학과", CODE.COMPUTER_INFO_ENGINE_CODE) + object ComputerInfo : Department("웹응용소프트웨어공학과", CODE.COMPUTER_INFO_ENGINE_CODE) object ComputerSoftware : Department("컴퓨터소프트웨어공학과", CODE.COMPUTER_SOFTWARE_ENGINE_CODE) object Artificial : Department("인공지능소프트웨어학과", CODE.ARTIFICIAL_ENGINE_CODE) object Biochemical : Department("생명화학공학과", CODE.BIOCHEMICAL_ENGINE_CODE) @@ -28,20 +27,21 @@ sealed class Department( object HotelTourism : Department("호텔관광학과", CODE.HOTEL_TOURISM_CODE) object BusinessInfo : Department("경영정보학과", CODE.MANAGEMENT_INFORMATION_CODE) object BigDataManagement : Department("빅데이터경영과", CODE.BIG_DATA_MANAGEMENT_CODE) + object UndeclaredMajor : Department("자유전공학과", CODE.UNDECLARED_MAJOR_CODE) companion object { fun getDepartment(department: String): Department { return when (department) { "기계공학과" -> Mechanical "기계설계공학과" -> MechanicalDesign - "로봇공학과" -> Robot + "로봇소프트웨어과" -> Robot "자동화공학과" -> Automation "전기공학과" -> Electrical "정보전자공학과" -> InfoElectrical "반도체전자공학과" -> Semiconductor "정보통신공학과" -> InfoCommunication "소방안전관리과" -> FireManagement - "컴퓨터정보공학과" -> ComputerInfo + "웹응용소프트웨어공학과" -> ComputerInfo "컴퓨터소프트웨어공학과" -> ComputerSoftware "인공지능소프트웨어학과" -> Artificial "생명화학공학과" -> Biochemical @@ -56,38 +56,9 @@ sealed class Department( "호텔관광학과" -> HotelTourism "경영정보학과" -> BusinessInfo "빅데이터경영과" -> BigDataManagement + "자유전공학과" -> UndeclaredMajor else -> throw IllegalArgumentException("올바른 타입이 아닙니다.") } } - - fun getDepartmentList(): ArrayList { - return arrayListOf( - Mechanical, - MechanicalDesign, - Automation, - Robot, - Electrical, - InfoElectrical, - Semiconductor, - InfoCommunication, - FireManagement, - ComputerInfo, - ComputerSoftware, - Artificial, - Biochemical, - BioConvergence, - Architecture, - InteriorDesign, - VisualDesign, - ArVrContents, - Business, - TaxAccounting, - DistributionMarketing, - HotelTourism, - BusinessInfo, - BigDataManagement - ) - } } - } \ No newline at end of file From 123d2e3798883ad55bd30d980bfea97c0636c092 Mon Sep 17 00:00:00 2001 From: m6z1 Date: Sat, 15 Feb 2025 19:53:18 +0900 Subject: [PATCH 2/5] =?UTF-8?q?feat:=20=EB=B3=80=EA=B2=BD=EB=90=9C=20?= =?UTF-8?q?=ED=95=99=EA=B3=BC=20=EB=A6=AC=EC=8A=A4=ED=8A=B8=EC=97=90=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/values/arrays.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index 738d9bb1..6106e268 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -3,7 +3,7 @@ 기계공학과 기계설계공학과 - 로봇공학과 + 로봇소프트웨어과 자동화공학과 전기공학과 정보전자공학과 @@ -11,7 +11,7 @@ 정보통신공학과 소방안전관리과 컴퓨터소프트웨어공학과 - 컴퓨터정보공학과 + 웹응용소프트웨어공학과 인공지능소프트웨어학과 생명화학공학과 바이오융합공학과 @@ -25,5 +25,6 @@ 호텔관광학과 경영정보학과 빅데이터경영과 + 자유전공학과 \ No newline at end of file From f88e308d84809649ae15ce059d2e087ef9bd0d2d Mon Sep 17 00:00:00 2001 From: m6z1 Date: Sat, 15 Feb 2025 19:54:39 +0900 Subject: [PATCH 3/5] =?UTF-8?q?feat:=20=ED=95=99=EA=B3=BC=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=ED=95=99=EA=B3=BC=20?= =?UTF-8?q?=EC=98=A4=EB=A6=84=EC=B0=A8=EC=88=9C=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../android/youdongknowme/ui/view/depart/DepartActivity.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/depart/DepartActivity.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/depart/DepartActivity.kt index b3568866..e8d331be 100644 --- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/depart/DepartActivity.kt +++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/depart/DepartActivity.kt @@ -17,8 +17,7 @@ class DepartActivity : BaseActivity(), D override fun initStartView() { // 학과 리스트 items = - resources.getStringArray(R.array.dmu_department_list).toCollection(ArrayList()) - items.sort() + resources.getStringArray(R.array.dmu_department_list).toCollection(ArrayList()) adapter = DepartAdapter().apply { submitList(items) From b1176a992a49c55744840ba11aaeb2813038f9fd Mon Sep 17 00:00:00 2001 From: m6z1 Date: Mon, 17 Feb 2025 17:22:33 +0900 Subject: [PATCH 4/5] =?UTF-8?q?refactor:=20=EC=83=81=EC=88=98=20=EB=84=A4?= =?UTF-8?q?=EC=9D=B4=EB=B0=8D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 변경된 학과명에 맞춰 상수 네이밍을 수정합니다. --- .../android/youdongknowme/standard/util/Constants.kt | 6 +++--- .../android/youdongknowme/standard/util/Department.kt | 8 ++++---- .../android/youdongknowme/standard/util/Mapping.kt | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/standard/util/Constants.kt b/app/src/main/java/com/dongyang/android/youdongknowme/standard/util/Constants.kt index 386387e3..e5b0900e 100644 --- a/app/src/main/java/com/dongyang/android/youdongknowme/standard/util/Constants.kt +++ b/app/src/main/java/com/dongyang/android/youdongknowme/standard/util/Constants.kt @@ -5,10 +5,10 @@ object CODE { const val MECHANICAL_DESIGN_CODE = 102 const val AUTOMATION_ENGINE_CODE = 201 - const val ROBOT_ENGINE_CODE = 202 + const val ROBOT_SOFTWARE_CODE = 202 const val COMPUTER_SOFTWARE_ENGINE_CODE = 301 - const val COMPUTER_INFO_ENGINE_CODE = 302 + const val WEB_APP_SOFTWARE_ENGINE_CODE = 302 const val ARTIFICIAL_ENGINE_CODE = 303 const val ELECTRICAL_ENGINE_CODE = 401 @@ -31,5 +31,5 @@ object CODE { const val MANAGEMENT_INFORMATION_CODE = 605 const val BIG_DATA_MANAGEMENT_CODE = 606 - const val UNDECLARED_MAJOR_CODE = 701 + const val LIBERAL_MAJOR_CODE = 701 } \ No newline at end of file diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/standard/util/Department.kt b/app/src/main/java/com/dongyang/android/youdongknowme/standard/util/Department.kt index 617591c1..4edd45c2 100644 --- a/app/src/main/java/com/dongyang/android/youdongknowme/standard/util/Department.kt +++ b/app/src/main/java/com/dongyang/android/youdongknowme/standard/util/Department.kt @@ -6,13 +6,13 @@ sealed class Department( object Mechanical : Department("기계공학과", CODE.MECHANICAL_ENGINE_CODE) object MechanicalDesign : Department("기계설계공학과", CODE.MECHANICAL_DESIGN_CODE) object Automation : Department("자동화공학과", CODE.AUTOMATION_ENGINE_CODE) - object Robot : Department("로봇소프트웨어과", CODE.ROBOT_ENGINE_CODE) + object Robot : Department("로봇소프트웨어과", CODE.ROBOT_SOFTWARE_CODE) object Electrical : Department("전기공학과", CODE.ELECTRICAL_ENGINE_CODE) object InfoElectrical : Department("정보전자공학과", CODE.INFO_ELECTRONIC_ENGINE_CODE) object Semiconductor : Department("반도체전자공학과", CODE.SEMICONDUCTOR_ENGINE_CODE) object InfoCommunication : Department("정보통신공학과", CODE.INFO_COMMUNICATION_ENGINE_CODE) object FireManagement : Department("소방안전관리과", CODE.FIRE_MANAGEMENT_CODE) - object ComputerInfo : Department("웹응용소프트웨어공학과", CODE.COMPUTER_INFO_ENGINE_CODE) + object WebAppSoftware : Department("웹응용소프트웨어공학과", CODE.WEB_APP_SOFTWARE_ENGINE_CODE) object ComputerSoftware : Department("컴퓨터소프트웨어공학과", CODE.COMPUTER_SOFTWARE_ENGINE_CODE) object Artificial : Department("인공지능소프트웨어학과", CODE.ARTIFICIAL_ENGINE_CODE) object Biochemical : Department("생명화학공학과", CODE.BIOCHEMICAL_ENGINE_CODE) @@ -27,7 +27,7 @@ sealed class Department( object HotelTourism : Department("호텔관광학과", CODE.HOTEL_TOURISM_CODE) object BusinessInfo : Department("경영정보학과", CODE.MANAGEMENT_INFORMATION_CODE) object BigDataManagement : Department("빅데이터경영과", CODE.BIG_DATA_MANAGEMENT_CODE) - object UndeclaredMajor : Department("자유전공학과", CODE.UNDECLARED_MAJOR_CODE) + object UndeclaredMajor : Department("자유전공학과", CODE.LIBERAL_MAJOR_CODE) companion object { fun getDepartment(department: String): Department { @@ -41,7 +41,7 @@ sealed class Department( "반도체전자공학과" -> Semiconductor "정보통신공학과" -> InfoCommunication "소방안전관리과" -> FireManagement - "웹응용소프트웨어공학과" -> ComputerInfo + "웹응용소프트웨어공학과" -> WebAppSoftware "컴퓨터소프트웨어공학과" -> ComputerSoftware "인공지능소프트웨어학과" -> Artificial "생명화학공학과" -> Biochemical diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/standard/util/Mapping.kt b/app/src/main/java/com/dongyang/android/youdongknowme/standard/util/Mapping.kt index dab80262..c6375322 100644 --- a/app/src/main/java/com/dongyang/android/youdongknowme/standard/util/Mapping.kt +++ b/app/src/main/java/com/dongyang/android/youdongknowme/standard/util/Mapping.kt @@ -32,9 +32,9 @@ fun mapDepartmentKoreanToCode(department: String): Int { "기계공학과" -> CODE.MECHANICAL_ENGINE_CODE "기계설계공학과" -> CODE.MECHANICAL_DESIGN_CODE "자동화공학과" -> CODE.AUTOMATION_ENGINE_CODE - "로봇공학과" -> CODE.ROBOT_ENGINE_CODE + "로봇공학과" -> CODE.ROBOT_SOFTWARE_CODE "컴퓨터소프트웨어공학과" -> CODE.COMPUTER_SOFTWARE_ENGINE_CODE - "컴퓨터정보공학과" -> CODE.COMPUTER_INFO_ENGINE_CODE + "컴퓨터정보공학과" -> CODE.WEB_APP_SOFTWARE_ENGINE_CODE "인공지능소프트웨어공학과" -> CODE.ARTIFICIAL_ENGINE_CODE "전기공학과" -> CODE.ELECTRICAL_ENGINE_CODE "정보전자공학과" -> CODE.INFO_ELECTRONIC_ENGINE_CODE From 0ec4bde847c535083cba78f2bce0e5f6ac5e084f Mon Sep 17 00:00:00 2001 From: m6z1 Date: Mon, 17 Feb 2025 17:59:24 +0900 Subject: [PATCH 5/5] =?UTF-8?q?refactor:=20object=20=EC=83=81=EC=88=98=20?= =?UTF-8?q?=EB=84=A4=EC=9D=B4=EB=B0=8D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../android/youdongknowme/standard/util/Department.kt | 4 ++-- .../dongyang/android/youdongknowme/standard/util/Mapping.kt | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/standard/util/Department.kt b/app/src/main/java/com/dongyang/android/youdongknowme/standard/util/Department.kt index 4edd45c2..6b234aa6 100644 --- a/app/src/main/java/com/dongyang/android/youdongknowme/standard/util/Department.kt +++ b/app/src/main/java/com/dongyang/android/youdongknowme/standard/util/Department.kt @@ -27,7 +27,7 @@ sealed class Department( object HotelTourism : Department("호텔관광학과", CODE.HOTEL_TOURISM_CODE) object BusinessInfo : Department("경영정보학과", CODE.MANAGEMENT_INFORMATION_CODE) object BigDataManagement : Department("빅데이터경영과", CODE.BIG_DATA_MANAGEMENT_CODE) - object UndeclaredMajor : Department("자유전공학과", CODE.LIBERAL_MAJOR_CODE) + object Liberal : Department("자유전공학과", CODE.LIBERAL_MAJOR_CODE) companion object { fun getDepartment(department: String): Department { @@ -56,7 +56,7 @@ sealed class Department( "호텔관광학과" -> HotelTourism "경영정보학과" -> BusinessInfo "빅데이터경영과" -> BigDataManagement - "자유전공학과" -> UndeclaredMajor + "자유전공학과" -> Liberal else -> throw IllegalArgumentException("올바른 타입이 아닙니다.") } } diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/standard/util/Mapping.kt b/app/src/main/java/com/dongyang/android/youdongknowme/standard/util/Mapping.kt index c6375322..d85f5350 100644 --- a/app/src/main/java/com/dongyang/android/youdongknowme/standard/util/Mapping.kt +++ b/app/src/main/java/com/dongyang/android/youdongknowme/standard/util/Mapping.kt @@ -32,9 +32,9 @@ fun mapDepartmentKoreanToCode(department: String): Int { "기계공학과" -> CODE.MECHANICAL_ENGINE_CODE "기계설계공학과" -> CODE.MECHANICAL_DESIGN_CODE "자동화공학과" -> CODE.AUTOMATION_ENGINE_CODE - "로봇공학과" -> CODE.ROBOT_SOFTWARE_CODE + "로봇소프트웨어과" -> CODE.ROBOT_SOFTWARE_CODE "컴퓨터소프트웨어공학과" -> CODE.COMPUTER_SOFTWARE_ENGINE_CODE - "컴퓨터정보공학과" -> CODE.WEB_APP_SOFTWARE_ENGINE_CODE + "웹응용소프트웨어공학과" -> CODE.WEB_APP_SOFTWARE_ENGINE_CODE "인공지능소프트웨어공학과" -> CODE.ARTIFICIAL_ENGINE_CODE "전기공학과" -> CODE.ELECTRICAL_ENGINE_CODE "정보전자공학과" -> CODE.INFO_ELECTRONIC_ENGINE_CODE @@ -51,6 +51,7 @@ fun mapDepartmentKoreanToCode(department: String): Int { "호텔관광학과" -> CODE.HOTEL_TOURISM_CODE "경영정보학과" -> CODE.MANAGEMENT_INFORMATION_CODE "빅데이터경영과" -> CODE.BIG_DATA_MANAGEMENT_CODE + "자유전공학과" -> CODE.LIBERAL_MAJOR_CODE else -> throw IllegalArgumentException("올바른 타입이 아닙니다.") } } \ No newline at end of file