Skip to content

Commit 0709266

Browse files
committed
合并原仓库的推请求 JZ-Darkal#66
更新编译出错问题 JZ-Darkal#66
1 parent 7e7833b commit 0709266

File tree

178 files changed

+31540
-30058
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

178 files changed

+31540
-30058
lines changed

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
.gradle/
2+
.idea/
3+
*.iml
4+
build/
5+
local.properties

.travis.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ android:
1515
- android-sdk-license-.+
1616
- '.+'
1717
before_script:
18-
- wget http://services.gradle.org/distributions/gradle-4.4-all.zip
19-
- unzip gradle-4.4-all.zip
20-
- export GRADLE_HOME=$PWD/gradle-4.4
21-
- export PATH=$GRADLE_HOME/bin:$PATH
22-
- mkdir "$ANDROID_HOME/licenses" || true
23-
- echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license"
24-
- echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license"
25-
- echo no | android create avd --force -n test -t android-22 --abi armeabi-v7a
26-
- emulator -avd test -no-audio -no-window &
27-
- android-wait-for-emulator
28-
- adb shell input keyevent 82 &
18+
- wget http://services.gradle.org/distributions/gradle-4.4-all.zip
19+
- unzip gradle-4.4-all.zip
20+
- export GRADLE_HOME=$PWD/gradle-4.4
21+
- export PATH=$GRADLE_HOME/bin:$PATH
22+
- mkdir "$ANDROID_HOME/licenses" || true
23+
- echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license"
24+
- echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license"
25+
- echo no | android create avd --force -n test -t android-22 --abi armeabi-v7a
26+
- emulator -avd test -no-audio -no-window &
27+
- android-wait-for-emulator
28+
- adb shell input keyevent 82 &

app/app.iml

Lines changed: 0 additions & 182 deletions
This file was deleted.

app/build.gradle

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,26 @@ android {
5858
}
5959
productFlavors {
6060
}
61+
aaptOptions {
62+
cruncherEnabled = false
63+
useNewCruncher = false
64+
}
6165
lintOptions {
66+
checkReleaseBuilds false
6267
abortOnError false
68+
warningsAsErrors false
69+
disable "UnusedResources"
70+
textOutput "stdout"
71+
textReport true
6372
}
6473
}
6574

75+
tasks.withType(Javadoc) {
76+
options.addStringOption('Xdoclint:none', '-quiet')
77+
options.addStringOption('encoding', 'UTF-8')
78+
options.addStringOption('charSet', 'UTF-8')
79+
}
80+
6681
dependencies {
6782
implementation fileTree(include: ['*.jar'], dir: 'libs')
6883
// Bugly上报

app/doc/MCCMNCs v3.xlsx

95.4 KB
Binary file not shown.

0 commit comments

Comments
 (0)