changed the callchat impl and update

.idea/gradle.xml

@@ -77,7 +77,6 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
-        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>

config.gradle

@@ -106,8 +106,8 @@ ext {
             moduleextensions           : "com.mogo.module:module-extensions:${MOGO_MODULE_EXTENSIONS_VERSION}",
             carcall                    : "com.mogo.module.carchatting:module-carchatting:${CARCHATTING_VERSION}",
             carcallprovider            : "com.mogo.module.carchatting:module-carchatting-provider:${CARCHATTINGPROVIDER_VERSION}",
-            callchat                   : "com.mogo.module.carchatout:module-carchatting:1.4.8",
+            callchat                   : "com.mogo.module.carchatout:module-carchatting:1.6.4-SNAPSHOT",
-            callchatprovider           : "com.mogo.module.carchatout:module-carchatting-provider:1.0.6",
+            callchatprovider           : "com.mogo.module.carchatout:module-carchatting-provider:1.1.7",
 
             guideshow                  : "com.mogo.module:module-guide:${MOGO_MODULE_GUIDESHOW_VERSION}",
             // V2X

modules/mogo-module-media/src/main/java/com/mogo/module/media/listener/CallProviderResponseAdapter.java

@@ -1,102 +0,0 @@
-package com.mogo.module.media.listener;
-
-
-import com.zhidao.carchattingprovider.ICallProviderResponse;
-
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-public
-/**
- * @author congtaowang
- * @since 2020/9/24
- * <p>
- * 描述
- */
-abstract class CallProviderResponseAdapter implements ICallProviderResponse {
-
-    @Override
-    public void addFriend( boolean b ) {
-
-    }
-
-    @Override
-    public void callInvokeError( @NotNull String s ) {
-
-    }
-
-    @Override
-    public void canCall( boolean b ) {
-
-    }
-
-    @Override
-    public void hideUserWindowError( @NotNull String s ) {
-
-    }
-
-    @Override
-    public void invisibleUser( boolean b ) {
-
-    }
-
-    @Override
-    public void isFriend( boolean b ) {
-
-    }
-
-    @Override
-    public void isOnLine( boolean b, @Nullable String s ) {
-
-    }
-
-    @Override
-    public void userInfoCallBack( @Nullable String s, @Nullable String s1 ) {
-
-    }
-
-    @Override
-    public void userWindowStatus( boolean b ) {
-
-    }
-
-    @Override
-    public void call( @NotNull String s ) {
-
-    }
-
-    @Override
-    public void cancelMatch( boolean b ) {
-
-    }
-
-    @Override
-    public void error( @NotNull String s ) {
-
-    }
-
-    @Override
-    public void hangUp( boolean b ) {
-
-    }
-
-    @Override
-    public void invokeCallData( @NotNull String s ) {
-
-    }
-
-    @Override
-    public void match( @NotNull String s ) {
-
-    }
-
-    @Override
-    public void matchInvokeResult( boolean b, @NotNull String s ) {
-
-    }
-
-    @Override
-    public void mute( boolean b ) {
-
-    }
-}

modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java

@@ -18,7 +18,6 @@ import com.mogo.module.media.MediaConstants;
 import com.mogo.module.media.R;
 import com.mogo.module.media.ServiceMediaHandler;
 import com.mogo.module.media.constants.MusicConstant;
-import com.mogo.module.media.listener.CallProviderResponseAdapter;
 import com.mogo.module.media.listener.NoDoubleClickListener;
 import com.mogo.module.media.model.MediaInfoData;
 import com.mogo.module.media.presenter.BaseMediaPresenter;
@@ -33,6 +32,7 @@ import com.mogo.utils.WindowUtils;
 import com.mogo.utils.glide.GlideApp;
 import com.mogo.utils.logger.Logger;
 import com.tencent.wecarflow.flowoutside.sdk.FlowPlayControl;
+import com.zhidao.carchattingprovider.ICallChatResponse;
 import com.zhidao.carchattingprovider.ICallProviderResponse;
 
 /**
@@ -86,7 +86,7 @@ public class MediaWindow2 implements IMusicView , IMogoStatusChangedListener {
         ServiceMediaHandler.getIMogoStatusManager().registerStatusChangedListener(MediaConstants.MODULE_TYPE, StatusDescriptor.ACC_STATUS, this);
 
         // 车聊聊才是王
-        mCallProviderResponse = new CallProviderResponseAdapter(){
+        mCallProviderResponse = new ICallChatResponse(){
             @Override
             public void callWindowStatus( boolean b ) {
                 Logger.d( TAG, "callWindowStatus: "+ b);

modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/CallProviderResponseImpl.java

@@ -1,107 +0,0 @@
-package com.mogo.module.service.marker;
-
-
-import com.zhidao.carchattingprovider.ICallProviderResponse;
-
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-
-/**
- * @author congtaowang
- * @since 2020/9/28
- *
- * 描述
- */
-public abstract class CallProviderResponseImpl implements ICallProviderResponse {
-
-    @Override
-    public void addFriend( boolean b ) {
-
-    }
-
-    @Override
-    public void callInvokeError( @NotNull String s ) {
-
-    }
-
-    @Override
-    public void callWindowStatus( boolean b ) {
-
-    }
-
-    @Override
-    public void canCall( boolean b ) {
-
-    }
-
-    @Override
-    public void hideUserWindowError( @NotNull String s ) {
-
-    }
-
-    @Override
-    public void invisibleUser( boolean b ) {
-
-    }
-
-    @Override
-    public void isFriend( boolean b ) {
-
-    }
-
-    @Override
-    public void isOnLine( boolean b, @Nullable String s ) {
-
-    }
-
-    @Override
-    public void userInfoCallBack( @Nullable String s, @Nullable String s1 ) {
-
-    }
-
-    @Override
-    public void userWindowStatus( boolean b ) {
-
-    }
-
-    @Override
-    public void call( @NotNull String s ) {
-
-    }
-
-    @Override
-    public void cancelMatch( boolean b ) {
-
-    }
-
-    @Override
-    public void error( @NotNull String s ) {
-
-    }
-
-    @Override
-    public void hangUp( boolean b ) {
-
-    }
-
-    @Override
-    public void invokeCallData( @NotNull String s ) {
-
-    }
-
-    @Override
-    public void match( @NotNull String s ) {
-
-    }
-
-    @Override
-    public void matchInvokeResult( boolean b, @NotNull String s ) {
-
-    }
-
-    @Override
-    public void mute( boolean b ) {
-
-    }
-}

modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java

@@ -42,6 +42,7 @@ import com.mogo.utils.ThreadPoolService;
 import com.mogo.utils.UiThreadHandler;
 import com.mogo.utils.WorkThreadHandler;
 import com.mogo.utils.logger.Logger;
+import com.zhidao.carchattingprovider.ICallChatResponse;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -112,7 +113,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener,
         MarkerServiceHandler.getActionManager().registerBizActionDoneListener( this );
         MarkerServiceHandler.getApis().getRegisterCenterApi().registerADASControlStatusChangedListener( TAG, this );
 
-        CallChatApi.getInstance().getApiProvider().registerUserWindowStatusListener( TAG, mContext, new CallProviderResponseImpl() {
+        CallChatApi.getInstance().getApiProvider().registerUserWindowStatusListener( TAG, mContext, new ICallChatResponse() {
 
             @Override
             public void userWindowStatus( boolean show ) {

modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/ChartingUtil.java

@@ -6,7 +6,6 @@ import com.mogo.module.common.entity.MarkerUserInfo;
 import com.mogo.module.v2x.V2XConst;
 import com.mogo.module.v2x.V2XServiceManager;
 import com.mogo.utils.logger.Logger;
-import com.mogo.utils.network.utils.Util;
 import com.zhidao.carchattingprovider.CallChattingProviderConstant;
 import com.zhidao.carchattingprovider.ICallChatResponse;
 
@@ -79,6 +78,11 @@ public class ChartingUtil {
                     V2XUtils.getApp(),
                     sn,
                     new ICallChatResponse() {
+                        @Override
+                        public void refuse(boolean b, int i) {
+
+                        }
+
                         @Override
                         public void isOnLine(boolean onLine, @Nullable String errorMsg) {
                             Logger.e(V2XConst.MODULE_NAME, "isOnLine：" + onLine + "  errorMsg：" + errorMsg);
@@ -107,7 +111,6 @@ public class ChartingUtil {
                         @Override
                         public void canCall(boolean onLine) {
                             Logger.e(V2XConst.MODULE_NAME, "isOnLine：" + onLine);
-
                             if (chartStatusListener != null) {
                                 chartStatusListener.canCall(onLine);
                             }
@@ -116,6 +119,5 @@ public class ChartingUtil {
         } catch (Exception e) {
             e.printStackTrace();
         }
-
     }
 }