Merge branch 'dev' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into dev
# Conflicts: # app/build.gradle
Showing
app/src/main/gen/com/ydl/component/R.java
0 → 100644
m-course/.gitignore
0 → 100644
m-course/build.gradle
0 → 100644
m-course/modular.gradle
0 → 100644
m-course/proguard-rules.pro
0 → 100644
m-course/src/main/AndroidManifest.xml
0 → 100644
1.51 KB
1.38 KB
18.2 KB
m-course/src/main/res/values/colors.xml
0 → 100644
m-course/src/main/res/values/strings.xml
0 → 100644
1.21 KB
m-course/src/xlzx/res/values/colors.xml
0 → 100644
3.02 KB
m-course/src/ydl/res/values/colors.xml
0 → 100644
m-muse/.gitignore
0 → 100644
m-muse/build.gradle
0 → 100644
m-muse/modular.gradle
0 → 100644
m-muse/proguard-rules.pro
0 → 100644
m-muse/src/main/AndroidManifest.xml
0 → 100644
171 KB
138 KB
349 KB
119 KB
m-muse/src/main/res/values/strings.xml
0 → 100644
ydl-media/src/main/gen/com/ydl/media/R.java
0 → 100644
ydl-net/src/main/gen/com/ydl/ydlnet/R.java
0 → 100644
ydl-pay/.gitignore
0 → 100644
ydl-pay/build.gradle
0 → 100644
ydl-pay/proguard-rules.pro
0 → 100644
ydl-pay/src/main/AndroidManifest.xml
0 → 100644
ydl-pay/src/main/res/values/strings.xml
0 → 100644
ydl-platform/libs/flutter-muse.aar
0 → 100644
File added