Merge pull request #13 from yocdev/feature/ingore-huawei-210623

屏蔽华为推送，修复部分bug

Author: kaisavx

android/build.gradle

@@ -1,26 +1,27 @@
 
 buildscript {
     repositories {
+        google()
         jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.3.1'
+        classpath 'com.android.tools.build:gradle:3.4.0'
     }
 }
 
 apply plugin: 'com.android.library'
 
 android {
 
-    compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    compileSdkVersion 28
+    buildToolsVersion "28.0.3"
 
     defaultConfig {
-        minSdkVersion 16
-        targetSdkVersion 22
-        versionCode 1
-        versionName "1.0"
+        minSdkVersion 17
+        targetSdkVersion 28
+        versionCode 2
+        versionName "1.1"
     }
     lintOptions {
         abortOnError false
@@ -29,6 +30,7 @@ android {
 }
 
 repositories {
+    google()
     maven {url 'http://developer.huawei.com/repo/'}
     mavenCentral()
 }

android/src/main/java/me/youchai/rnpush/huawei/HuaweiPushService.java

@@ -1,61 +1,61 @@
 package me.youchai.rnpush.huawei;
 
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.huawei.hms.api.ConnectionResult;
-import com.huawei.hms.api.HuaweiApiAvailability;
-import com.huawei.hms.api.HuaweiApiClient;
-import com.huawei.hms.support.api.client.PendingResult;
-import com.huawei.hms.support.api.client.ResultCallback;
-import com.huawei.hms.support.api.push.HuaweiPush;
-import com.huawei.hms.support.api.push.TokenResult;
+//import com.huawei.hms.api.ConnectionResult;
+//import com.huawei.hms.api.HuaweiApiAvailability;
+//import com.huawei.hms.api.HuaweiApiClient;
+//import com.huawei.hms.support.api.client.PendingResult;
+//import com.huawei.hms.support.api.client.ResultCallback;
+//import com.huawei.hms.support.api.push.HuaweiPush;
+//import com.huawei.hms.support.api.push.TokenResult;
 
 import java.util.List;
 
 import me.youchai.rnpush.Notification;
 import me.youchai.rnpush.PushService;
 import me.youchai.rnpush.utils.Logger;
 
-public class HuaweiPushService extends PushService implements HuaweiApiClient.ConnectionCallbacks, HuaweiApiClient.OnConnectionFailedListener {
+public class HuaweiPushService extends PushService /*implements HuaweiApiClient.ConnectionCallbacks, HuaweiApiClient.OnConnectionFailedListener*/ {
 
   private ReactApplicationContext _rac;
-  private HuaweiApiClient _client;
+//  private HuaweiApiClient _client;
 
   public HuaweiPushService(ReactApplicationContext ctx) {
     _rac = ctx;
   }
 
   @Override
   public void init() {
-    if (_client == null) {
-      _client = new HuaweiApiClient.Builder(_rac)
-          .addApi(HuaweiPush.PUSH_API)
-          .addConnectionCallbacks(this)
-          .addOnConnectionFailedListener(this)
-          .build();
-    }
-    if (!_client.isConnected()) {
-      _client.connect();
-    }
+//    if (_client == null) {
+//      _client = new HuaweiApiClient.Builder(_rac)
+//          .addApi(HuaweiPush.PUSH_API)
+//          .addConnectionCallbacks(this)
+//          .addOnConnectionFailedListener(this)
+//          .build();
+//    }
+//    if (!_client.isConnected()) {
+//      _client.connect();
+//    }
   }
 
   @Override
   public void stop() {
-    if (_client == null) {
-      return;
-    }
-    if (_client.isConnected()) {
-      _client.disconnect();
-    }
+//    if (_client == null) {
+//      return;
+//    }
+//    if (_client.isConnected()) {
+//      _client.disconnect();
+//    }
   }
 
   @Override
   public void resume() {
-    if (_client == null) {
-      return;
-    }
-    if (!_client.isConnected()) {
-      _client.connect();
-    }
+//    if (_client == null) {
+//      return;
+//    }
+//    if (!_client.isConnected()) {
+//      _client.connect();
+//    }
   }
 
   @Override
@@ -93,30 +93,30 @@ public void cancelAllLocalNotifications() {
     Logger.i("not supported");
   }
 
-  @Override
-  public void onConnected() {
-    Logger.i("Huawei push service connected");
-    PendingResult<TokenResult> re = HuaweiPush.HuaweiPushApi.getToken(_client);
-    re.setResultCallback(new ResultCallback<TokenResult>() {
-      @Override
-      public void onResult(TokenResult result) {
-        Logger.i("get token result status: " + result.getStatus());
-        Logger.i("get token result: " + result.getTokenRes());
-      }
-    });
-  }
-
-  @Override
-  public void onConnectionSuspended(int cause) {
-    Logger.i("Huawei push service suspended: " + cause);
-  }
-
-  @Override
-  public void onConnectionFailed(ConnectionResult result) {
-    Logger.i("Huawei push service connect failed: " + result.getErrorCode());
-    if(HuaweiApiAvailability.getInstance().isUserResolvableError(result.getErrorCode())) {
-      HuaweiApiAvailability.getInstance()
-          .resolveError(_rac.getCurrentActivity(), result.getErrorCode(), 1000);
-    }
-  }
+//  @Override
+//  public void onConnected() {
+//    Logger.i("Huawei push service connected");
+//    PendingResult<TokenResult> re = HuaweiPush.HuaweiPushApi.getToken(_client);
+//    re.setResultCallback(new ResultCallback<TokenResult>() {
+//      @Override
+//      public void onResult(TokenResult result) {
+//        Logger.i("get token result status: " + result.getStatus());
+//        Logger.i("get token result: " + result.getTokenRes());
+//      }
+//    });
+//  }
+//
+//  @Override
+//  public void onConnectionSuspended(int cause) {
+//    Logger.i("Huawei push service suspended: " + cause);
+//  }
+//
+//  @Override
+//  public void onConnectionFailed(ConnectionResult result) {
+//    Logger.i("Huawei push service connect failed: " + result.getErrorCode());
+//    if(HuaweiApiAvailability.getInstance().isUserResolvableError(result.getErrorCode())) {
+//      HuaweiApiAvailability.getInstance()
+//          .resolveError(_rac.getCurrentActivity(), result.getErrorCode(), 1000);
+//    }
+//  }
 }