合并来自bimromatic/master的拉取请求#8
1:增加AndroidManifest合并替换标签 2:增加isAppMode判断
This commit is contained in:
@ -19,7 +19,8 @@
|
|||||||
android:roundIcon="@mipmap/ic_launcher_round"
|
android:roundIcon="@mipmap/ic_launcher_round"
|
||||||
android:supportsRtl="true"
|
android:supportsRtl="true"
|
||||||
android:theme="@style/base_AppTheme"
|
android:theme="@style/base_AppTheme"
|
||||||
tools:ignore="UnusedAttribute">
|
tools:ignore="UnusedAttribute"
|
||||||
|
tools:replace="android:name,android:label,android:icon, android:theme,android:allowBackup">
|
||||||
|
|
||||||
<!-- 屏幕适配基准DP -->
|
<!-- 屏幕适配基准DP -->
|
||||||
<meta-data
|
<meta-data
|
||||||
|
|||||||
@ -4,7 +4,12 @@
|
|||||||
|
|
||||||
import com.quyunshuo.androidbaseframemvvm.buildsrc.*
|
import com.quyunshuo.androidbaseframemvvm.buildsrc.*
|
||||||
|
|
||||||
apply plugin: 'com.android.library'
|
if (ProjectBuildConfig.isAppMode){
|
||||||
|
apply plugin: 'com.android.application'
|
||||||
|
}else {
|
||||||
|
apply plugin: 'com.android.library'
|
||||||
|
}
|
||||||
|
|
||||||
apply plugin: 'kotlin-android'
|
apply plugin: 'kotlin-android'
|
||||||
apply plugin: 'kotlin-kapt'
|
apply plugin: 'kotlin-kapt'
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user