-
Conflicts: core/dentity_verfication/src/main/AndroidManifest.xml core/dentity_verfication/src/main/res/values/strings.xml
-
Conflicts: core/dentity_verfication/src/main/res/values/color.xml core/dentity_verfication/src/main/res/values/strings.xml
-
2 基类增加沉浸状态栏方法
-
Conflicts: .idea/inspectionProfiles/Project_Default.xml
-
Conflicts: app/strike/build.gradle
-
2 优化mvp中view的判定
-
Conflicts: .idea/gradle.xml settings.gradle
-
2 修改播放器初始化逻辑