From f044cf9a2f29a981648725758a2e9e94ea871733 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Wed, 18 Oct 2023 14:11:55 +0800 Subject: [PATCH] [sonar] add impl --- .gitlab-ci.yml | 16 +++++++++++++ OCH/bus/passenger/build.gradle | 3 ++- OCH/charter/driver/build.gradle | 3 ++- .../driver/src/main/AndroidManifest.xml | 3 +-- OCH/charter/passenger/build.gradle | 4 +++- .../passenger/src/main/AndroidManifest.xml | 3 +-- .../mogo/och/data/ExampleInstrumentedTest.kt | 24 ------------------- .../java/com/mogo/och/data/ExampleUnitTest.kt | 17 ------------- .../src/main/AndroidManifest.xml | 4 ++-- OCH/shuttle/passenger/build.gradle | 4 +++- .../passenger/src/main/AndroidManifest.xml | 7 +++++- OCH/sweeper/sweeper-cloud/build.gradle | 2 ++ OCH/sweeper/sweeper/build.gradle | 3 +++ OCH/taxi/driver/src/main/AndroidManifest.xml | 5 +--- app/script/productFlavors/bus.gradle | 4 ++-- app/script/productFlavors/charter.gradle | 4 ++-- app/script/productFlavors/noop.gradle | 4 ++-- app/script/productFlavors/shuttle.gradle | 2 +- app/script/productFlavors/sweeperCloud.gradle | 4 ++-- .../productFlavors/sweeperOperate.gradle | 4 ++-- app/script/productFlavors/taxi.gradle | 2 +- app/script/productFlavors/taxiunmanned.gradle | 2 +- build.gradle | 17 ++++++------- codequality/sonar.gradle | 19 +++++++++++++++ .../badcase/biz/adapter/CaseListAdapter.kt | 2 +- .../badcase/biz/adapter/TopicListAdapter.kt | 2 +- .../src/main/AndroidManifest.xml | 7 +----- .../launcer/patch/ExampleInstrumentedTest.kt | 21 ---------------- .../com/mogo/launcer/patch/ExampleUnitTest.kt | 16 ------------- .../mogo/glide/utils/DiskLruCacheManager.java | 5 ++-- gradle.properties | 3 +++ .../autonavi/nge/guidance/LaneMarkTools.java | 2 +- 32 files changed, 93 insertions(+), 125 deletions(-) delete mode 100644 OCH/mogo-och-data/src/androidTest/java/com/mogo/och/data/ExampleInstrumentedTest.kt delete mode 100644 OCH/mogo-och-data/src/test/java/com/mogo/och/data/ExampleUnitTest.kt create mode 100644 codequality/sonar.gradle delete mode 100644 core/function-impl/mogo-core-function-patch/src/androidTest/java/com/mogo/launcer/patch/ExampleInstrumentedTest.kt delete mode 100644 core/function-impl/mogo-core-function-patch/src/test/java/com/mogo/launcer/patch/ExampleUnitTest.kt diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c4416b34c7..ab633b66ce 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,3 +25,19 @@ inspect java and kotlin codes: except: - master allow_failure: true + +sonarqube-check: + image: gradle:jre11-slim + variables: + SONAR_USER_HOME: "${CI_PROJECT_DIR}/.sonar" # Defines the location of the analysis task cache + GIT_DEPTH: "0" # Tells git to fetch all the branches of the project, required by the analysis task + cache: + key: "${CI_JOB_NAME}" + paths: + - .sonar/cache + script: gradle sonarqube + allow_failure: true + only: + - merge_requests + - $CI_COMMIT_BRANCH + - pushes \ No newline at end of file diff --git a/OCH/bus/passenger/build.gradle b/OCH/bus/passenger/build.gradle index 6732195e81..391d65936f 100644 --- a/OCH/bus/passenger/build.gradle +++ b/OCH/bus/passenger/build.gradle @@ -68,8 +68,9 @@ dependencies { implementation project(":OCH:mogo-och-common-module") compileOnly project(":libraries:mogo-map") implementation project(':core:mogo-core-res') - testImplementation 'junit:junit:4.12' + androidTestImplementation rootProject.ext.dependencies.androidxjunit + testImplementation rootProject.ext.dependencies.junit } apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString() \ No newline at end of file diff --git a/OCH/charter/driver/build.gradle b/OCH/charter/driver/build.gradle index 92631f28d4..f28ba4dcbd 100644 --- a/OCH/charter/driver/build.gradle +++ b/OCH/charter/driver/build.gradle @@ -64,7 +64,8 @@ dependencies { implementation project(":OCH:mogo-och-common-module") compileOnly project(":libraries:mogo-map") - testImplementation 'junit:junit:4.12' + androidTestImplementation rootProject.ext.dependencies.androidxjunit + testImplementation rootProject.ext.dependencies.junit } apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString() \ No newline at end of file diff --git a/OCH/charter/driver/src/main/AndroidManifest.xml b/OCH/charter/driver/src/main/AndroidManifest.xml index f9cccd9894..46a1d0cace 100644 --- a/OCH/charter/driver/src/main/AndroidManifest.xml +++ b/OCH/charter/driver/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ - + \ No newline at end of file diff --git a/OCH/charter/passenger/build.gradle b/OCH/charter/passenger/build.gradle index aca041d1ff..e84da8b7da 100644 --- a/OCH/charter/passenger/build.gradle +++ b/OCH/charter/passenger/build.gradle @@ -62,7 +62,9 @@ dependencies { implementation project(":OCH:mogo-och-common-module") compileOnly project(":libraries:mogo-map") implementation project(':core:mogo-core-res') - testImplementation 'junit:junit:4.12' + + androidTestImplementation rootProject.ext.dependencies.androidxjunit + testImplementation rootProject.ext.dependencies.junit } diff --git a/OCH/charter/passenger/src/main/AndroidManifest.xml b/OCH/charter/passenger/src/main/AndroidManifest.xml index e40c8b4775..05140a5254 100644 --- a/OCH/charter/passenger/src/main/AndroidManifest.xml +++ b/OCH/charter/passenger/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ - + \ No newline at end of file diff --git a/OCH/mogo-och-data/src/androidTest/java/com/mogo/och/data/ExampleInstrumentedTest.kt b/OCH/mogo-och-data/src/androidTest/java/com/mogo/och/data/ExampleInstrumentedTest.kt deleted file mode 100644 index 673a5dcfd3..0000000000 --- a/OCH/mogo-och-data/src/androidTest/java/com/mogo/och/data/ExampleInstrumentedTest.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.mogo.och.data - -import androidx.test.platform.app.InstrumentationRegistry -import androidx.test.ext.junit.runners.AndroidJUnit4 - -import org.junit.Test -import org.junit.runner.RunWith - -import org.junit.Assert.* - -/** - * Instrumented test, which will execute on an Android device. - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -@RunWith(AndroidJUnit4::class) -class ExampleInstrumentedTest { - @Test - fun useAppContext() { - // Context of the app under test. - val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("com.mogo.och.data.test", appContext.packageName) - } -} \ No newline at end of file diff --git a/OCH/mogo-och-data/src/test/java/com/mogo/och/data/ExampleUnitTest.kt b/OCH/mogo-och-data/src/test/java/com/mogo/och/data/ExampleUnitTest.kt deleted file mode 100644 index 294d55ae21..0000000000 --- a/OCH/mogo-och-data/src/test/java/com/mogo/och/data/ExampleUnitTest.kt +++ /dev/null @@ -1,17 +0,0 @@ -package com.mogo.och.data - -import org.junit.Test - -import org.junit.Assert.* - -/** - * Example local unit test, which will execute on the development machine (host). - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -class ExampleUnitTest { - @Test - fun addition_isCorrect() { - assertEquals(4, 2 + 2) - } -} \ No newline at end of file diff --git a/OCH/mogo-och-noop/src/main/AndroidManifest.xml b/OCH/mogo-och-noop/src/main/AndroidManifest.xml index a76961473f..35d80bdbc7 100644 --- a/OCH/mogo-och-noop/src/main/AndroidManifest.xml +++ b/OCH/mogo-och-noop/src/main/AndroidManifest.xml @@ -1,4 +1,4 @@ - + + \ No newline at end of file diff --git a/OCH/shuttle/passenger/build.gradle b/OCH/shuttle/passenger/build.gradle index fc31c43627..e10e559cf5 100644 --- a/OCH/shuttle/passenger/build.gradle +++ b/OCH/shuttle/passenger/build.gradle @@ -74,7 +74,9 @@ dependencies { implementation project(":OCH:mogo-och-common-module") compileOnly project(":libraries:mogo-map") implementation project(':core:mogo-core-res') - testImplementation 'junit:junit:4.12' + + androidTestImplementation rootProject.ext.dependencies.androidxjunit + testImplementation rootProject.ext.dependencies.junit } diff --git a/OCH/shuttle/passenger/src/main/AndroidManifest.xml b/OCH/shuttle/passenger/src/main/AndroidManifest.xml index e0687231c1..f35a9aa1b7 100644 --- a/OCH/shuttle/passenger/src/main/AndroidManifest.xml +++ b/OCH/shuttle/passenger/src/main/AndroidManifest.xml @@ -1,5 +1,10 @@ - + + + \ No newline at end of file diff --git a/OCH/sweeper/sweeper-cloud/build.gradle b/OCH/sweeper/sweeper-cloud/build.gradle index 499a56f6dc..a9b1d5ecce 100644 --- a/OCH/sweeper/sweeper-cloud/build.gradle +++ b/OCH/sweeper/sweeper-cloud/build.gradle @@ -62,6 +62,8 @@ dependencies { implementation project(":OCH:mogo-och-common-module") compileOnly project(":libraries:mogo-map") + androidTestImplementation rootProject.ext.dependencies.androidxjunit + testImplementation rootProject.ext.dependencies.junit } apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString() \ No newline at end of file diff --git a/OCH/sweeper/sweeper/build.gradle b/OCH/sweeper/sweeper/build.gradle index 499a56f6dc..1471267780 100644 --- a/OCH/sweeper/sweeper/build.gradle +++ b/OCH/sweeper/sweeper/build.gradle @@ -62,6 +62,9 @@ dependencies { implementation project(":OCH:mogo-och-common-module") compileOnly project(":libraries:mogo-map") + androidTestImplementation rootProject.ext.dependencies.androidxjunit + testImplementation rootProject.ext.dependencies.junit + } apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString() \ No newline at end of file diff --git a/OCH/taxi/driver/src/main/AndroidManifest.xml b/OCH/taxi/driver/src/main/AndroidManifest.xml index fb42392054..ae926fbcd8 100644 --- a/OCH/taxi/driver/src/main/AndroidManifest.xml +++ b/OCH/taxi/driver/src/main/AndroidManifest.xml @@ -1,5 +1,2 @@ - - - / + \ No newline at end of file diff --git a/app/script/productFlavors/bus.gradle b/app/script/productFlavors/bus.gradle index 1aeb2c155d..0597162542 100644 --- a/app/script/productFlavors/bus.gradle +++ b/app/script/productFlavors/bus.gradle @@ -8,9 +8,9 @@ project.android.productFlavors { // 标识 CHANNEL_VALUE_HEAD: "Bus", // 在启动的时候把Task给清空 - ACTIVITY_ROOT : true, +// ACTIVITY_ROOT : true, // Activity的朝向 - SCREEN_ORIENTATION:"landscape", +// SCREEN_ORIENTATION:"landscape", ] // ①标识 diff --git a/app/script/productFlavors/charter.gradle b/app/script/productFlavors/charter.gradle index b657f22013..1177dbf48f 100644 --- a/app/script/productFlavors/charter.gradle +++ b/app/script/productFlavors/charter.gradle @@ -8,9 +8,9 @@ project.android.productFlavors { manifestPlaceholders = [ CHANNEL_VALUE_HEAD: "Charter", // 在启动的时候把Task给清空 - ACTIVITY_ROOT : true, +// ACTIVITY_ROOT : true, // Activity的朝向 - SCREEN_ORIENTATION:"landscape", +// SCREEN_ORIENTATION:"landscape", ] // ①标识 buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"Charter\"" diff --git a/app/script/productFlavors/noop.gradle b/app/script/productFlavors/noop.gradle index 4c0e0dd5b6..5ffbeab9f6 100644 --- a/app/script/productFlavors/noop.gradle +++ b/app/script/productFlavors/noop.gradle @@ -7,9 +7,9 @@ project.android.productFlavors { // 标识 CHANNEL_VALUE_HEAD: "Noop", // 在启动的时候把Task给清空 - ACTIVITY_ROOT : true, +// ACTIVITY_ROOT : true, // Activity的朝向 - SCREEN_ORIENTATION:"landscape", +// SCREEN_ORIENTATION:"landscape", ] // ①标识 diff --git a/app/script/productFlavors/shuttle.gradle b/app/script/productFlavors/shuttle.gradle index 0ea25aec59..dbe16ce151 100644 --- a/app/script/productFlavors/shuttle.gradle +++ b/app/script/productFlavors/shuttle.gradle @@ -9,7 +9,7 @@ project.android.productFlavors { // 标识 CHANNEL_VALUE_HEAD: "Shuttle", // 在启动的时候把Task给清空 - ACTIVITY_ROOT : true, +// ACTIVITY_ROOT : true, ] // ①标识 diff --git a/app/script/productFlavors/sweeperCloud.gradle b/app/script/productFlavors/sweeperCloud.gradle index 5c9bbc338c..6ed013d84c 100644 --- a/app/script/productFlavors/sweeperCloud.gradle +++ b/app/script/productFlavors/sweeperCloud.gradle @@ -7,9 +7,9 @@ project.android.productFlavors { // 标识 CHANNEL_VALUE_HEAD: "Sweeper", // 在启动的时候把Task给清空 - ACTIVITY_ROOT : true, +// ACTIVITY_ROOT : true, // Activity的朝向 - SCREEN_ORIENTATION:"landscape", +// SCREEN_ORIENTATION:"landscape", ] // ①标识 diff --git a/app/script/productFlavors/sweeperOperate.gradle b/app/script/productFlavors/sweeperOperate.gradle index 9e14e1684e..0b28338337 100644 --- a/app/script/productFlavors/sweeperOperate.gradle +++ b/app/script/productFlavors/sweeperOperate.gradle @@ -7,9 +7,9 @@ project.android.productFlavors { // 标识 CHANNEL_VALUE_HEAD: "Sweeper", // 在启动的时候把Task给清空 - ACTIVITY_ROOT : true, +// ACTIVITY_ROOT : true, // Activity的朝向 - SCREEN_ORIENTATION:"landscape", +// SCREEN_ORIENTATION:"landscape", ] // ①标识 diff --git a/app/script/productFlavors/taxi.gradle b/app/script/productFlavors/taxi.gradle index 8a3ff987e2..6564946ad4 100644 --- a/app/script/productFlavors/taxi.gradle +++ b/app/script/productFlavors/taxi.gradle @@ -6,7 +6,7 @@ project.android.productFlavors { manifestPlaceholders = [ CHANNEL_VALUE_HEAD: "Taxi", // Activity的朝向 - SCREEN_ORIENTATION:"landscape", +// SCREEN_ORIENTATION:"landscape", ] // ①标识 buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"Taxi\"" diff --git a/app/script/productFlavors/taxiunmanned.gradle b/app/script/productFlavors/taxiunmanned.gradle index da4280e89c..84c7697b6a 100644 --- a/app/script/productFlavors/taxiunmanned.gradle +++ b/app/script/productFlavors/taxiunmanned.gradle @@ -6,7 +6,7 @@ project.android.productFlavors { manifestPlaceholders = [ CHANNEL_VALUE_HEAD: "Taxi", // Activity的朝向 - SCREEN_ORIENTATION:"landscape", +// SCREEN_ORIENTATION:"landscape", ] // ①标识 buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"Taxi\"" diff --git a/build.gradle b/build.gradle index 190f5f0714..61b458a85c 100644 --- a/build.gradle +++ b/build.gradle @@ -15,13 +15,9 @@ buildscript { maven { url 'https://maven.aliyun.com/repository/google' } maven { url 'https://maven.aliyun.com/repository/gradle-plugin' } maven { url 'https://maven.aliyun.com/repository/jcenter' } - - maven { - url "https://artifact.bytedance.com/repository/Volcengine/" - } - maven { - url "https://artifact.bytedance.com/repository/byteX/" - } + maven { url "https://plugins.gradle.org/m2/" } + maven { url "https://artifact.bytedance.com/repository/Volcengine/" } + maven { url "https://artifact.bytedance.com/repository/byteX/" } gradlePluginPortal() // mavenCentral() google() @@ -41,6 +37,7 @@ buildscript { classpath "io.github.knight-zxw:lancet-plugin:${lancetx_plugin_version}" classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.15.0" classpath 'com.mogo.cloud:matrix:1.0.0' + classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.4.0.2513' // classpath 'com.bytedance.btrace:rhea-gradle-plugin:2.0.0' } // 遇无法更新依赖情况（针对Snapshot无法刷新）然后sync project即可，刷新完成注释该代码 @@ -62,6 +59,7 @@ allprojects { maven { url 'https://maven.aliyun.com/repository/google' } maven { url 'https://maven.aliyun.com/repository/gradle-plugin' } maven { url 'https://maven.aliyun.com/repository/jcenter' } + maven { url 'https://plugins.gradle.org/m2/' } // mavenCentral() maven { @@ -73,7 +71,7 @@ allprojects { google() } - if (isCodeInspectEnable ) { + if (isCodeInspectEnable) { def basePath = new File(codequality, 'code_inspect_increment.gradle').path apply from: "$basePath" def pmdPath = new File(codequality, 'pmd.gradle').path @@ -85,6 +83,9 @@ allprojects { } } +apply plugin: 'jacoco' +apply from: rootProject.file('codequality/sonar.gradle') + task clean(type: Delete) { delete rootProject.buildDir } diff --git a/codequality/sonar.gradle b/codequality/sonar.gradle new file mode 100644 index 0000000000..f89383eec0 --- /dev/null +++ b/codequality/sonar.gradle @@ -0,0 +1,19 @@ +apply plugin: 'org.sonarqube' + +sonarqube { + properties { + property "sonar.log.level", "TRACE" + property "sonar.sourceEncoding", "UTF-8" + property "sonar.projectKey", "MoGoEagleEyeTest" + property "sonar.sources", "src/main/java" + property "sonar.binaries", "build/intermediates/classes" + property "sonar.qualitygate.wait", true + property "sonar.android.lint.report", false + property "sonar.scm.exclusions.disabled", false + property "sonar.scm.exclusions.file", "**/.gitignore" + property "sonar.exclusions", "**/AndroidManifest.xml, **/src/test/**, **/*.jar, **/*.aar, **/*.war, **/*.ear, **/*.rar, **/*.tgz, **/*.zip, **/src/test/java/**/*.java, **/src/test/java/**/*.kt, **/test/**/*, **/*Test.java, **/*Tests.java, **/*Test.kt, **/*.xml,*.xml, **/target/**, **/src/main/java/proto/**, **/build/**, build, build/**, **/db/dao/*.java, **/build/intermediates/**/*" +// property "sonar.java.coveragePlugin", "jacoco" +// property("sonar.coverage.jacoco.xmlReportPaths", "../../build/reports/jacocoTestReport.xml,../build/reports/jacocoTestReport.xml") + } +} + diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/adapter/CaseListAdapter.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/adapter/CaseListAdapter.kt index 8e211749b0..ed86507820 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/adapter/CaseListAdapter.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/adapter/CaseListAdapter.kt @@ -13,7 +13,7 @@ import com.zhjt.mogo_core_function_devatools.R * @description Case清单列表适配器 * @since: 2022/10/19 */ -class CaseListAdapter: RecyclerView.Adapter() { +open class CaseListAdapter: RecyclerView.Adapter() { private var data:List? = null private var caseClickListener: CaseClickListener?=null diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/adapter/TopicListAdapter.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/adapter/TopicListAdapter.kt index 33bb3ff608..e107e18b89 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/adapter/TopicListAdapter.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/adapter/TopicListAdapter.kt @@ -13,7 +13,7 @@ import com.zhjt.mogo_core_function_devatools.R * @description Topic列表适配器 * @since: 2022/10/19 */ -class TopicListAdapter: RecyclerView.Adapter() { +open class TopicListAdapter: RecyclerView.Adapter() { private var data:MutableList? = null private var topicClickListener: TopicClickListener? = null diff --git a/core/function-impl/mogo-core-function-hmi/src/main/AndroidManifest.xml b/core/function-impl/mogo-core-function-hmi/src/main/AndroidManifest.xml index 90ee278539..b3e12745bc 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/AndroidManifest.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/AndroidManifest.xml @@ -54,14 +54,13 @@ --> @@ -122,10 +121,6 @@ - - diff --git a/core/function-impl/mogo-core-function-patch/src/androidTest/java/com/mogo/launcer/patch/ExampleInstrumentedTest.kt b/core/function-impl/mogo-core-function-patch/src/androidTest/java/com/mogo/launcer/patch/ExampleInstrumentedTest.kt deleted file mode 100644 index 9390da3399..0000000000 --- a/core/function-impl/mogo-core-function-patch/src/androidTest/java/com/mogo/launcer/patch/ExampleInstrumentedTest.kt +++ /dev/null @@ -1,21 +0,0 @@ -package com.mogo.launcer.patch - -import androidx.test.platform.app.InstrumentationRegistry -import androidx.test.ext.junit.runners.AndroidJUnit4 - -import org.junit.Test -import org.junit.runner.RunWith - -import org.junit.Assert.* - -/** - * Instrumented test, which will execute on an Android device. - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -@RunWith(AndroidJUnit4::class) class ExampleInstrumentedTest { - @Test fun useAppContext() { // Context of the app under test. - val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("com.mogo.launcer.patch.test", appContext.packageName) - } -} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-patch/src/test/java/com/mogo/launcer/patch/ExampleUnitTest.kt b/core/function-impl/mogo-core-function-patch/src/test/java/com/mogo/launcer/patch/ExampleUnitTest.kt deleted file mode 100644 index bf47ec6404..0000000000 --- a/core/function-impl/mogo-core-function-patch/src/test/java/com/mogo/launcer/patch/ExampleUnitTest.kt +++ /dev/null @@ -1,16 +0,0 @@ -package com.mogo.launcer.patch - -import org.junit.Test - -import org.junit.Assert.* - -/** - * Example local unit test, which will execute on the development machine (host). - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -class ExampleUnitTest { - @Test fun addition_isCorrect() { - assertEquals(4, 2 + 2) - } -} \ No newline at end of file diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/glide/utils/DiskLruCacheManager.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/glide/utils/DiskLruCacheManager.java index 5742564602..35c53f36f2 100644 --- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/glide/utils/DiskLruCacheManager.java +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/glide/utils/DiskLruCacheManager.java @@ -22,7 +22,8 @@ import java.security.MessageDigest; public class DiskLruCacheManager { private DiskLruCache diskLruCache; - private static DiskLruCacheManager instance; + private static volatile DiskLruCacheManager instance; + private static final byte[] obj = new byte[0]; private final int MAX_CACHE_SIZE = 64 * 1024 * 1024; @@ -37,7 +38,7 @@ public class DiskLruCacheManager { public static DiskLruCacheManager getInstance(Context context) { if (instance == null) { - synchronized (DiskLruCacheManager.class) { + synchronized (obj) { if (instance == null) { instance = new DiskLruCacheManager(context.getApplicationContext()); } diff --git a/gradle.properties b/gradle.properties index 6101bac0ca..62aa8cc304 100644 --- a/gradle.properties +++ b/gradle.properties @@ -43,6 +43,9 @@ RELEASE_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-releases/ SNAPSHOT_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-snapshots/ USERNAME=xintai PASSWORD=xintai2018 +#sonar配置 +systemProp.sonar.host.url=https://sonarqube.zhidaoauto.com +systemProp.sonar.login=8c54651afe55516ee11edaf3d2aec5e560577096 # 编译模式: false - 依赖本地版本， true - 依赖 maven 版本 USE_MAVEN_PACKAGE=false ##plugin 插件 diff --git a/libraries/mapmodule/src/main/java/com/autonavi/nge/guidance/LaneMarkTools.java b/libraries/mapmodule/src/main/java/com/autonavi/nge/guidance/LaneMarkTools.java index 4145030de4..edc8149b8a 100644 --- a/libraries/mapmodule/src/main/java/com/autonavi/nge/guidance/LaneMarkTools.java +++ b/libraries/mapmodule/src/main/java/com/autonavi/nge/guidance/LaneMarkTools.java @@ -918,7 +918,7 @@ public class LaneMarkTools { return info; } - //直行 + 左转 + 右转ֱ�� + ��ת + ��ת + //直行 + 左转 + 右转 public BitmapInfo getRenderStraightAddLeftRightTurnLaneArrow(int isW) { int width = LANE_WIDTH;