部分微调

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')
-}
+}

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"

app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>

app/src/main/res/xml/data_extraction_rules.xml

@@ -5,7 +5,7 @@
 -->
 <data-extraction-rules>
     <cloud-backup>
-        <!-- TODO: Use <include> and <exclude> to control what is backed up.
+        <!--
         <include .../>
         <exclude .../>
         -->

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"

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
+android.nonTransitiveRClass=true
+systemProp.sonar.projectKey=PushDemo
+systemProp.sonar.host.url=http://localhost:9000
+systemProp.sonar.login=sqp_d53e92346d9d4dd18a78e029e56ddd0c3d1b2324
+

push/src/main/AndroidManifest.xml

@@ -21,14 +21,11 @@
         </service>
 
 
-        <meta-data
-            android:name="XIAOMI_APP_ID"
-            android:value="_${XIAOMI_APP_ID}" />
-        <meta-data
-            android:name="XIAOMI_APP_KEY"
-            android:value="${XIAOMI_APP_KEY}" />
-        <meta-data
-            android:name="HUAWEI_APP_ID"
-            android:value="_${HUAWEI_APP_ID}" />
+<!--        <meta-data-->
+<!--            android:name="XIAOMI_APP_ID"-->
+<!--            android:value="_${XIAOMI_APP_ID}" />-->
+<!--        <meta-data-->
+<!--            android:name="XIAOMI_APP_KEY"-->
+<!--            android:value="${XIAOMI_APP_KEY}" />-->
     </application>
 </manifest>

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) {

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 {