Merge pull request #234 from jwfing/master

一些小的修改

Author: jwfing

CHANGELOG.md

@@ -5,6 +5,19 @@ Following is change logs for recently release versions, you can refer to [releas
 > Warning:
 > DONOT upgrade java-websocket to 1.15.0(or above), bcz it doesn't work on Android 5.1 or earlier version.
 
+## 8.2.16 release
+
+#### Break changes
+- None
+
+#### New features
+- add new module mixpush-honor: Honor notification supporting by vendor.
+- enable CACHE_THEN_NETWORK policy for query#find.
+
+#### Optimization and fixed bugs
+- change Gson type adapter for some classes, avoid to use internal tools;
+- other optimizations.
+
 ## 8.2.15 release
 
 #### Break changes
@@ -14,7 +27,7 @@ Following is change logs for recently release versions, you can refer to [releas
 - None
 
 #### Optimization and fixed bugs
-- fixed: revert java-websocket version to 1.14.1, for websocketclient crashed on part of old android versions(before 6.0);
+- fixed: revert java-websocket version to 1.4.1, for websocketclient crashed on part of old android versions(before 6.0);
 
 
 ## 8.2.14 release

android-sdk/build.gradle

@@ -6,6 +6,7 @@ buildscript {
         google()
         jcenter()
         maven {url 'http://developer.huawei.com/repo/'}
+        maven { url 'https://developer.hihonor.com/repo/' }
         mavenLocal()
     }
     dependencies {
@@ -25,12 +26,13 @@ allprojects {
         google()
         jcenter()
         maven {url 'http://developer.huawei.com/repo/'}
+        maven { url 'https://developer.hihonor.com/repo/' }
         mavenLocal()
     }
 }
 
 ext {
-    sdkVersion = "8.2.15"
+    sdkVersion = "8.2.16"
     supportLibVersion = "26.1.0"
     converterVersion = "2.1.0"
     rxandroidVersion = "2.1.1"

android-sdk/gradle.properties

@@ -15,7 +15,7 @@ org.gradle.jvmargs=-Xmx1536m
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-VERSION_NAME=8.2.15
+VERSION_NAME=8.2.16
 VERSION_CODE=2695
 GROUP=cn.leancloud
 

android-sdk/mixpush-android/build.gradle

@@ -72,6 +72,7 @@ dependencies {
     implementation project(':mixpush-oppo')
     implementation project(':mixpush-vivo')
     implementation project(':mixpush-xiaomi')
+    implementation project(':mixpush-honor')
 
     implementation("cn.leancloud:realtime-core:${rootProject.ext.sdkVersion}")
 

android-sdk/mixpush-android/src/main/java/cn/leancloud/LCMixPushManager.java

@@ -104,6 +104,72 @@ public static void registerXiaomiPush(Context context, String miAppId, String mi
         isInternationalVendor, customizedReceiver);
   }
 
+  /**
+   * 注册荣耀推送
+   * @param application 应用上下文
+   */
+  public static void registerHonorPush(Context application) {
+    cn.leancloud.honor.LCMixPushManager.registerHonorPush(application);
+  }
+
+  /**
+   * 注册荣耀推送
+   * @param application 应用上下文
+   * @param profile 推送配置
+   */
+  public static void registerHonorPush(Context application, String profile) {
+    cn.leancloud.honor.LCMixPushManager.registerHonorPush(application, profile);
+  }
+
+  /**
+   * 打开通知栏状态
+   * @param callback 回调函数
+   */
+  public static void turnOnHonorPush(LCCallback<Void> callback) {
+    cn.leancloud.honor.LCMixPushManager.turnOnHonorPush(callback);
+  }
+
+  /**
+   * 关闭通知栏状态
+   * @param callback 回调函数
+   */
+  public static void turnOffHonorPush(LCCallback<Void> callback) {
+    cn.leancloud.honor.LCMixPushManager.turnOffHonorPush(callback);
+  }
+
+  /**
+   * 校验当前系统是否支持 Honor PUSH
+   * @return true or false.
+   */
+  public static boolean isSupportHonorPush() {
+    return cn.leancloud.honor.LCMixPushManager.isSupportHonorPush();
+  }
+
+  /**
+   * 查询应用是否允许显示通知栏消息，可以通过 getHonorPushStatus 查询当前应用通知栏状态。
+   * @param callback 回调函数
+   */
+  public static void getHonorPushStatus(LCCallback<Boolean> callback) {
+    cn.leancloud.honor.LCMixPushManager.getHonorPushStatus(callback);
+  }
+
+  /**
+   * 获取 PushToken
+   * @param callback 回调函数
+   */
+  public static void getHonorPushToken(LCCallback<String> callback) {
+    cn.leancloud.honor.LCMixPushManager.getHonorPushToken(callback);
+  }
+
+  /**
+   * 注销 PushToken
+   * 用户拒绝接受您应用的使用协议和隐私声明后，可以调用deletePushToken方法注销PushToken，注销成功后，客户端将不再接收到消息。
+   * @param callback 回调函数
+   */
+  public static void deleteHonorPushToken(LCCallback<Void> callback) {
+    cn.leancloud.honor.LCMixPushManager.deleteHonorPushToken(callback);
+  }
+
   /**
    * 初始化方法，建议在 Application onCreate 里面调用
    *

android-sdk/mixpush-hms/src/main/java/cn/leancloud/LCHMSMessageService.java

@@ -16,7 +16,7 @@
 public class LCHMSMessageService extends HmsMessageService {
   static final LCLogger LOGGER = LogUtil.getLogger(LCHMSMessageService.class);
 
-  static final String MIXPUSH_PRIFILE = "deviceProfile";
+  static final String MIXPUSH_PROFILE = "deviceProfile";
   static final String VENDOR = "HMS";
 
   public LCHMSMessageService() {
@@ -104,7 +104,7 @@ public static void updateAVInstallation(String hwToken) {
     if (!hwToken.equals(installation.getString(LCInstallation.REGISTRATION_ID))) {
       installation.put(LCInstallation.REGISTRATION_ID, hwToken);
     }
-    String localProfile = installation.getString(MIXPUSH_PRIFILE);
+    String localProfile = installation.getString(MIXPUSH_PROFILE);
     if (null == localProfile) {
       localProfile = "";
     }

android-sdk/mixpush-honor/.gitignore

@@ -0,0 +1 @@
+/build

android-sdk/mixpush-honor/build.gradle

@@ -0,0 +1,74 @@
+plugins {
+    id 'com.android.library'
+}
+
+android {
+    compileSdkVersion 29
+    buildToolsVersion "29.0.3"
+
+    defaultConfig {
+        minSdkVersion 19
+        targetSdkVersion 29
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles "consumer-rules.pro"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+
+    tasks.withType(Javadoc) {
+        failOnError false
+        options.addStringOption('Xdoclint:none', '-quiet')
+        options.addStringOption('encoding', 'UTF-8')
+        options.addStringOption('charSet', 'UTF-8')
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+}
+
+android.libraryVariants.all { variant ->
+    def javadoc = task("generate${variant.name}Javadoc", type: Javadoc) {
+        description "Generates Javadoc for $variant.name."
+        def compileTask = variant.hasProperty('javaCompileProvider')? variant.javaCompileProvider.get() : variant.javaCompile
+        source = compileTask.source
+        ext.androidJar = "${android.sdkDirectory}/platforms/${android.compileSdkVersion}/android.jar"
+        options.links("http://docs.oracle.com/javase/8/docs/api/");
+        options.links("http://d.android.com/reference/");
+        exclude '**/BuildConfig.java'
+        exclude '**/R.java'
+        failOnError false
+    }
+    def name = variant.buildType.name
+    def task = project.tasks.create "jar${name.capitalize()}", Jar
+    def compileTask = variant.hasProperty('javaCompileProvider')? variant.javaCompileProvider.get() : variant.javaCompile
+    task.dependsOn compileTask
+    task.dependsOn javadoc
+    task.from compileTask.destinationDir
+    task.exclude '**/BuildConfig.class'
+    task.exclude '**/R.class'
+    task.exclude '**/R$*.class'
+    artifacts.add('archives', task)
+}
+
+dependencies {
+    implementation project(':realtime-android')
+    implementation project(':storage-android')
+
+    implementation("cn.leancloud:realtime-core:${rootProject.ext.sdkVersion}")
+
+    implementation 'com.hihonor.mcs:push:7.0.39.303'
+
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+}
+
+apply from: '../maven_push.gradle'

android-sdk/mixpush-honor/consumer-rules.pro

@@ -0,0 +1,3 @@
+POM_NAME=mixpush-honor android Library
+POM_ARTIFACT_ID=mixpush-honor
+POM_PACKAGING=aar