1. 修复多项可能引起空指针崩溃的bug； 2. 新建子任务时默认执行人员从全体人员改为当前用户； 3. 新建子任务时默认执行时间强制固定为总任务对应...

riku

2021-05-31 979d9cff22806f213b420452ab4a68fcbaf021b6

 app/src/main/java/cn/flightfeather/thirdapp/module/task/NewSubTaskViewModel.kt

@@ -418,16 +418,26 @@
                tguid = UUIDGenerator.generate16ShortUUID()
                tsguid = selectedTopTask?.tguid
                levelnum = null

                val cal = Calendar.getInstance()
                cal.time = Date()
                cal.set(Calendar.HOUR_OF_DAY, 0)
                cal.set(Calendar.MINUTE, 0)
                cal.set(Calendar.SECOND, 0)
                starttime = cal.time
                cal.set(Calendar.HOUR_OF_DAY, 23)
                cal.set(Calendar.MINUTE, 59)
                cal.set(Calendar.SECOND, 59)
                endtime = cal.time
                // 判断当前时间与总任务的时间段关系，不在总任务时间范围内时，使用总任务开始时间为默认时间，否则用当前时间为默认时间
                if (cal.time < starttime || cal.time > endtime) {
                    cal.time = starttime
                    cal.set(Calendar.HOUR_OF_DAY, 23)
                    cal.set(Calendar.MINUTE, 59)
                    cal.set(Calendar.SECOND, 59)
                    endtime = cal.time
                } else {
                    cal.set(Calendar.HOUR_OF_DAY, 0)
                    cal.set(Calendar.MINUTE, 0)
                    cal.set(Calendar.SECOND, 0)
                    starttime = cal.time
                    cal.set(Calendar.HOUR_OF_DAY, 23)
                    cal.set(Calendar.MINUTE, 59)
                    cal.set(Calendar.SECOND, 59)
                    endtime = cal.time
                }

                plannerguid = application.currentUser.guid
                plannerusername = application.currentUser.acountname
                plannerrealname = application.currentUser.realname