diff --git a/app/build.gradle b/app/build.gradle
index 5814565..8484e5b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -20,8 +20,6 @@ android {
manifestPlaceholders = [
XIAOMI_APP_ID : "2882303761520224743",
XIAOMI_APP_KEY: "5762022470743",
-
- HUAWEI_APP_ID : "107729977",
]
}
@@ -53,6 +51,7 @@ android {
jvmTarget = '11'
}
}
+
dependencies {
implementation fileTree(dir: 'libs', includes: ['*.jar', '*.aar'])
@@ -66,4 +65,4 @@ dependencies {
// implementation 'cn.org.bjca.trus:push:0.0.1.011'
implementation project(path: ':push')
-}
\ No newline at end of file
+}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e2c5037..a7a8aec 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,6 +9,7 @@
android:fullBackupContent="@xml/backup_rules"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
+ android:usesCleartextTraffic="true"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.PushDemo"
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
deleted file mode 100644
index eca70cf..0000000
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
deleted file mode 100644
index eca70cf..0000000
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/xml/data_extraction_rules.xml b/app/src/main/res/xml/data_extraction_rules.xml
index 9ee9997..6cebe05 100644
--- a/app/src/main/res/xml/data_extraction_rules.xml
+++ b/app/src/main/res/xml/data_extraction_rules.xml
@@ -5,7 +5,7 @@
-->
-
diff --git a/build.gradle b/build.gradle
index e2d02eb..79e1c6a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,5 +13,16 @@ plugins {
id 'com.android.application' version '7.3.1' apply false
id 'com.android.library' version '7.3.1' apply false
id 'org.jetbrains.kotlin.android' version '1.7.20' apply false
+ id "org.sonarqube" version "3.5.0.2730"
}
apply from: "config.gradle"
+
+
+subprojects {
+ sonar {
+ properties {
+ property "sonar.sources", "src/main"
+ }
+ }
+}
+project.tasks["sonar"].dependsOn "anotherTask"
diff --git a/gradle.properties b/gradle.properties
index 1a982b5..8d6765d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -21,4 +21,8 @@ kotlin.code.style=official
# Enables namespacing of each library's R class so that its R class includes only the
# resources declared in the library itself and none from the library's dependencies,
# thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
\ No newline at end of file
+android.nonTransitiveRClass=true
+systemProp.sonar.projectKey=PushDemo
+systemProp.sonar.host.url=http://localhost:9000
+systemProp.sonar.login=sqp_d53e92346d9d4dd18a78e029e56ddd0c3d1b2324
+
diff --git a/push/src/main/AndroidManifest.xml b/push/src/main/AndroidManifest.xml
index c29dbd1..e9d8bb2 100644
--- a/push/src/main/AndroidManifest.xml
+++ b/push/src/main/AndroidManifest.xml
@@ -21,14 +21,11 @@
-
-
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/push/src/main/java/cn/org/bjca/trust/push/message/client/ImClient.kt b/push/src/main/java/cn/org/bjca/trust/push/message/client/ImClient.kt
index 1fd5f62..5e28c2a 100644
--- a/push/src/main/java/cn/org/bjca/trust/push/message/client/ImClient.kt
+++ b/push/src/main/java/cn/org/bjca/trust/push/message/client/ImClient.kt
@@ -74,9 +74,6 @@ class ImClient : ImClientInterface {
}
override fun deliveryComplete(token: IMqttDeliveryToken?) {
- LogHelper.e(
- "----------IM::deliveryComplete-------------"
- )
}
override fun connectComplete(reconnect: Boolean, serverURI: String) {
diff --git a/settings.gradle b/settings.gradle
index 5dd01aa..e56b5a6 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,5 +1,9 @@
pluginManagement {
repositories {
+ maven {
+ url 'http://127.0.0.1:1022/repository/gradle-plugin/'
+ allowInsecureProtocol true
+ }
maven { url 'https://developer.huawei.com/repo/' }
maven {