1. 新增BaseDialog,解决关闭dialog时，activity已经关闭导致崩溃问题 2. 修复技防措施界面MenuNewGitActivit...

riku

2020-08-27 bb0fd6a7c69f439e4896b71cacc7fa33a1ff25d7

 app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuNewGitActivity.kt

@@ -156,9 +156,9 @@
        //加载预置数据
        val gittypeList =  DbFactory.getInstance().gittypeDao.queryBuilder()
                .where(
                        GittypeDao.Properties.Tasktype.eq(subTask?.type) ,
                        GittypeDao.Properties.Scensetype.eq(scene?.type),
                        GittypeDao.Properties.Districtname.eq(subTask?.districtname)
                        GittypeDao.Properties.Tasktype.eq(subTask?.type ?: ""),
                        GittypeDao.Properties.Scensetype.eq(scene?.type ?: ""),
                        GittypeDao.Properties.Districtname.eq(subTask?.districtname ?: "")
                ).orderAsc(GittypeDao.Properties.Typeid).list()
        if (gittypeList.size == 0) {
            val gittype1 = Gittype()