Merge branch 'master' of https://github.com/nksteven/flutter-zendesk

Author: nksteven

android/src/main/java/com/codeheadlabs/zendesk/MethodCallHandlerImpl.java

@@ -4,28 +4,54 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Build;
+import android.os.Handler;
+import android.os.Message;
 import android.provider.Settings;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+
+import com.zendesk.service.ZendeskCallback;
 import com.zopim.android.sdk.api.ZopimChat;
 import com.zopim.android.sdk.api.ZopimChatApi;
+import com.zopim.android.sdk.data.LivechatAgentsPath;
+import com.zopim.android.sdk.data.LivechatChatLogPath;
+import com.zopim.android.sdk.data.observers.ChatLogObserver;
+import com.zopim.android.sdk.model.ChatLog;
+import com.zopim.android.sdk.model.PushData;
 import com.zopim.android.sdk.model.VisitorInfo;
 import com.zopim.android.sdk.prechat.ZopimChatActivity;
 import com.zopim.android.sdk.util.AppInfo;
 import com.zopim.android.sdk.widget.ChatWidgetService;
 
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
 import androidx.annotation.RequiresApi;
 import io.flutter.Log;
 import io.flutter.plugin.common.MethodCall;
+import io.flutter.plugin.common.MethodChannel;
 import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
 import io.flutter.plugin.common.MethodChannel.Result;
 
 public class MethodCallHandlerImpl implements MethodCallHandler {
 
   @Nullable
   private Activity activity;
+  int initCount= 0;
+  private MethodChannel methodCallHandler;
+
+  Handler mhandler=new Handler(){
+    @Override
+    public void dispatchMessage(Message msg) {
+      methodCallHandler.invokeMethod("UnreadListener",msg.what);
+    }
+  };
 
+  void setMethodCall(MethodChannel methodCallHandler){
+    this.methodCallHandler=methodCallHandler;
+  }
   void setActivity(@Nullable Activity activity) {
     this.activity = activity;
   }
@@ -68,6 +94,7 @@ public void onMethodCall(@NonNull MethodCall call, @NonNull Result result) {
     }
   }
 
+
   private void closeChatWidget(Result result) {
     Log.d("closeChatWidget","closeChatWidget");
     ChatWidgetService.stopService(activity);
@@ -86,6 +113,11 @@ private void handleInit(MethodCall call, Result result) {
     result.success(true);
   }
 
+  public void getInitCountMessage(){
+    initCount=LivechatChatLogPath.getInstance().countMessages(new ChatLog.Type[]{ChatLog.Type.CHAT_MSG_AGENT});
+    Log.d("onActivity","initCount=="+initCount);
+  }
+
 
   private void handleSetVisitorInfo(MethodCall call, Result result) {
     VisitorInfo.Builder builder = new VisitorInfo.Builder();
@@ -112,6 +144,7 @@ private void handleSetVisitorInfo(MethodCall call, Result result) {
       }
     }
     ZopimChat.setVisitorInfo(builder.build());
+
     result.success(true);
   }
 
@@ -126,7 +159,7 @@ private void handleSetToken(MethodCall call, Result result) {
   }
 
   private void handleStartChat(MethodCall call, Result result) {
-    Log.d("handleStartChat","handleStartChat  activity="+(activity==null));
+    ZopimChatApi.getDataSource().addChatLogObserver(mChannelLogObserver);
     if (activity != null) {
       Intent intent = new Intent(activity, ZopimChatActivity.class);
       activity.startActivity(intent);
@@ -181,4 +214,17 @@ private void checkSystemAlertPermission(Result result) {
     }
   }
 
+  ChatLogObserver mChannelLogObserver = new ChatLogObserver() {
+    public void update(LinkedHashMap<String, ChatLog> chatLog) {
+      if(!ZendeskPlugin.isFore){
+        int currentCount = LivechatChatLogPath.getInstance().countMessages(new ChatLog.Type[]{ChatLog.Type.CHAT_MSG_AGENT});
+        if(initCount==0){
+          initCount=LivechatChatLogPath.getInstance().countMessages(new ChatLog.Type[]{ChatLog.Type.CHAT_MSG_AGENT});
+        }
+        final int unread = currentCount-initCount;
+        mhandler.sendEmptyMessage(unread);
+      }
+    }
+  };
+
 }

android/src/main/java/com/codeheadlabs/zendesk/ZendeskPlugin.java

@@ -5,6 +5,8 @@
 import android.os.Bundle;
 import android.util.Log;
 
+import com.zopim.android.sdk.api.ZopimChatApi;
+import com.zopim.android.sdk.prechat.ZopimChatActivity;
 import com.zopim.android.sdk.widget.ChatWidgetService;
 
 import androidx.annotation.NonNull;
@@ -19,14 +21,16 @@
 /**
  * ZendeskPlugin
  */
-public class ZendeskPlugin implements FlutterPlugin, ActivityAware  {
+public class ZendeskPlugin implements FlutterPlugin, ActivityAware , Application.ActivityLifecycleCallbacks {
 
   private MethodChannel channel;
   private MethodCallHandlerImpl methodCallHandler = new MethodCallHandlerImpl();
   private Activity activity;
+  public static boolean isFore=false;
 
   public ZendeskPlugin(Activity activity) {
     this.activity=activity;
+    activity.getApplication().registerActivityLifecycleCallbacks(this);
   }
 
   public static void registerWith(Registrar registrar) {
@@ -49,6 +53,7 @@ private void startListening(BinaryMessenger messenger) {
     channel = new MethodChannel(messenger, "com.codeheadlabs.zendesk");
     channel.setMethodCallHandler(methodCallHandler);
     methodCallHandler.setActivity(activity);
+    methodCallHandler.setMethodCall(channel);
   }
 
   @Override
@@ -72,4 +77,50 @@ public void onDetachedFromActivity() {
   }
 
 
+  @Override
+  public void onActivityCreated(Activity activity, Bundle savedInstanceState) {
+
+  }
+
+  @Override
+  public void onActivityStarted(Activity activity) {
+    if(activity instanceof ZopimChatActivity){
+      isFore=true;
+    }
+    Log.d("onActivity","onActivityStarted,activity="+activity);
+  }
+
+  @Override
+  public void onActivityResumed(Activity activity) {
+    if(activity instanceof ZopimChatActivity){
+      isFore=true;
+    }
+    Log.d("onActivity","onActivityResumed,activity="+activity);
+  }
+
+  @Override
+  public void onActivityPaused(Activity activity) {
+    if(activity instanceof ZopimChatActivity){
+      isFore=false;
+      methodCallHandler.getInitCountMessage();
+    }
+  }
+
+  @Override
+  public void onActivityStopped(Activity activity) {
+    Log.d("onActivity","onActivityStopped,activity="+activity);
+    if(activity instanceof ZopimChatActivity){
+      isFore=false;
+    }
+  }
+
+  @Override
+  public void onActivitySaveInstanceState(Activity activity, Bundle outState) {
+    Log.d("onActivity","onActivitySaveInstanceState,activity="+activity);
+  }
+
+  @Override
+  public void onActivityDestroyed(Activity activity) {
+    Log.d("onActivity","onActivityDestroyed,activity="+activity);
+  }
 }

lib/zendesk.dart

@@ -3,10 +3,14 @@ import 'dart:ui';
 
 import 'package:flutter/services.dart';
 
+typedef Future<dynamic> UnReadListener(int unRead);
+
 class Zendesk {
   static const MethodChannel _channel =
       const MethodChannel('com.codeheadlabs.zendesk');
 
+  UnReadListener _unReadListener;
+
   Future<void> init(String accountKey,
       {String department, String appName}) async {
     await _channel.invokeMethod('init', <String, String>{
@@ -61,4 +65,24 @@ class Zendesk {
   Future<String> version() async {
     return _channel.invokeMethod<String>('version');
   }
+
+  void addUnreadListener(UnReadListener unReadListener) {
+    _unReadListener = unReadListener;
+    _channel.setMethodCallHandler(_handleMethod);
+  }
+
+  Future<dynamic> _handleMethod(MethodCall call) async {
+    switch (call.method) {
+      case "UnreadListener":
+        int unRead = call.arguments;
+        if (_unReadListener != null) {
+          _unReadListener(unRead);
+        }
+    }
+  }
+
+  Future<void> onReceiveMessage() async {
+    print("flutter:onReceiveMessage");
+    await _channel.invokeMethod('onReceivedChatMessage');
+  }
 }

pubspec.yaml

@@ -1,6 +1,6 @@
 name: zendesk
 description: Flutter interface for Zendesk Mobile SDK
-version: 1.0.4
+version: 1.0.5
 author: Jon Keating <jon@licq.org>
 homepage: https://github.com/emostar/flutter-zendesk