Merge pull request #477 from RedrockMobile/GuoXR/bugfix

🐛 修护课表事务 item 在长按扩展时如果触发展开中午或傍晚时间段导致崩溃

.github/workflows/main.yml

@@ -22,7 +22,7 @@ jobs:
  - name: Set up Python
  uses: actions/setup-python@v2
  with:
- python-version: '3.7'
+ python-version: '3.9'
 
  - name: Install python dependency
  run: pip install beautifulsoup4
@@ -111,7 +111,7 @@ jobs:
  - name: Set up Python
  uses: actions/setup-python@v2
  with:
- python-version: '3.7'
+ python-version: '3.9'
 
  - name: Install python dependence
  run: pip install beautifulsoup4

module_course/lib_course/src/main/java/com/mredrock/cyxbs/lib/course/item/overlap/AbstractOverlapSingleDayItem.kt

@@ -325,6 +325,11 @@ abstract class AbstractOverlapSingleDayItem : IOverlapItem, OverlapHelper.IOverl
  if (sideType == SideType.ROW) {
  val lp = layoutParams as NetLayoutParams
  if (which in lp.startRow .. lp.endRow) {
+ if (lp.rowCount != netLayout.rowCount) {
+ // refreshOverlap() 方法中虽然会同步 lp 跟 netLayout，但有点靠后了
+ // 这里会因为不同步在设置比重时出现问题，所以这里先进行同步
+ netLayout.setRowColumnCount(lp.rowCount, lp.columnCount)
+ }
  netLayout.setRowShowWeight(which - lp.startRow, newWeight)
  }
  }

module_course/src/main/java/com/mredrock/cyxbs/course/page/course/model/StuLessonRepository.kt

@@ -1,7 +1,6 @@
 package com.mredrock.cyxbs.course.page.course.model
 
 import androidx.annotation.WorkerThread
-import androidx.collection.ArrayMap
 import androidx.core.content.edit
 import com.mredrock.cyxbs.api.account.IAccountService
 import com.mredrock.cyxbs.api.course.ILessonService
@@ -70,8 +69,6 @@ object StuLessonRepository {
  .switchMap { value ->
  // 使用 switchMap 可以停止之前学号的订阅
  value.nullUnless(Observable.just(emptyList())) { stuNum ->
- android.util.Log.d("ggg", "${Exception().stackTrace[0].run { "$fileName:$lineNumber" }} -> " +
- "observeSelfLesson: stuNum = $stuNum")
  if (ILessonService.isUseLocalSaveLesson) {
  LessonDataBase.stuLessonDao
  .observeLesson(stuNum)