diff --git a/app/build.gradle b/app/build.gradle index 12c0199..d4fdabe 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -19,8 +19,8 @@ android { // minSdkVersion 26 minSdkVersion 21 targetSdkVersion 25 - versionCode 24 - versionName "2.1.6" + versionCode 26 + versionName "2.1.7" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" // ndk { @@ -94,7 +94,8 @@ android { buildConfigField "String", "BASE_URL", '"https://oa.live.educlouddata.com/api"' buildConfigField "String", "APP_NAME", '"一体化平台(开发)"' buildConfigField "String", "MP_APPID", '"wxbb397ddae71bb14c"' - buildConfigField "String", "WS_URL", '"ws://192.168.69.114:9801/"' +// buildConfigField "String", "WS_URL", '"ws://192.168.69.114:9801/"' + buildConfigField "String", "WS_URL", '"wss://oa.live.educlouddata.com/ws2api/"' } yzx_test { diff --git a/app/src/main/java/com/yzx/escreen/config/YzxInterface.kt b/app/src/main/java/com/yzx/escreen/config/YzxInterface.kt index e32d953..03b7a6c 100644 --- a/app/src/main/java/com/yzx/escreen/config/YzxInterface.kt +++ b/app/src/main/java/com/yzx/escreen/config/YzxInterface.kt @@ -14,7 +14,8 @@ object YzxInterface { const val INTERFACE_GET_STU_LEAVE_LIST= "/edu/attendance/teacher/listStudentLeaveRequest"//获取学生请假列表 const val INTERFACE_GET_STU_LEAVE_INFO_DETAIL= "/edu/attendance/getStudentLeaveRequestDetail" //获取学生的请假信息详情 const val INTERFACE_GET_TEACHER_INFO= "/rights/teacherWork/getTeacherByUserId"//获取人员信息 - const val INTERFACE_STUDENT_GET_SHOW_BOX_LIST= "/edu/attendance/student/getStudentLeaveIds" //获取需要弹出的数据 + const val INTERFACE_STUDENT_GET_SHOW_BOX_LIST_OLD= "/edu/attendance/student/getStudentLeaveIds" //获取需要弹出的数据 + const val INTERFACE_STUDENT_GET_SHOW_BOX_LIST= "/edu/attendance/student/getStudentLeaveIdsV2" //获取需要弹出的数据 const val INTERFACE_STUDENT_POST_LEAVE_VACATION= "/edu/attendance/student/studentLeaveVacation"//人工销假操作 /** * 学籍异动