diff --git a/config.gradle b/config.gradle index fd07584843..ce651c5fef 100644 --- a/config.gradle +++ b/config.gradle @@ -133,7 +133,7 @@ targetSdkVersion : 22, jetbrainsannotationsjava5 : "org.jetbrains:annotations-java5:15.0", // 统一登录 - accountsdk : "com.zhidao.accountservice:account-sdk:1.0.11", + accountsdk : "com.zhidao.accountservice:account-sdk:1.0.14", // crash crashSdk : "com.zhidaoauto.crash.log:library:1.0.5", kotlinstdlibjdk7 : "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${kotlin_version}", diff --git a/foudations/mogo-base-services-apk/src/main/java/com/mogo/base/services/passport/PassportManager.java b/foudations/mogo-base-services-apk/src/main/java/com/mogo/base/services/passport/PassportManager.java index a1f374e4af..624c97c390 100644 --- a/foudations/mogo-base-services-apk/src/main/java/com/mogo/base/services/passport/PassportManager.java +++ b/foudations/mogo-base-services-apk/src/main/java/com/mogo/base/services/passport/PassportManager.java @@ -10,6 +10,7 @@ import com.mogo.service.passport.IMogoPassportManager; import com.mogo.service.passport.IMogoTicketCallback; import com.mogo.utils.logger.Logger; import com.zhidao.account.sdk.AccountClientManager; +import com.zhidao.account.sdk.BusinessType; import com.zhidao.account.sdk.Environment; import com.zhidao.account.sdk.callback.TicketInfoCallback; import com.zhidao.account.sdk.network.NetEnvironManager; @@ -70,16 +71,12 @@ class PassportManager implements IMogoPassportManager { } private static void getTicket( TicketInfoCallback callback ) { - if ( DebugConfig.isLauncher() ) { - AccountClientManager.getTicket( callback ); - } else { - AccountClientManager.getAppTicket( callback ); - } + AccountClientManager.getTicket( callback ); } @Override public void init( Context context ) { - AccountClientManager.init( context.getApplicationContext(), getNetEnvironment(), NetEnvironManager.OS_2C, "os2.0-launcher" ); + AccountClientManager.init( context.getApplicationContext(), getNetEnvironment(), BusinessType.toc_login, "os2.0-launcher" ); } private Environment getNetEnvironment() { diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/listener/CallProviderResponseAdapter.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/listener/CallProviderResponseAdapter.java new file mode 100644 index 0000000000..6fa008de0e --- /dev/null +++ b/modules/mogo-module-media/src/main/java/com/mogo/module/media/listener/CallProviderResponseAdapter.java @@ -0,0 +1,106 @@ +package com.mogo.module.media.listener; + +import com.mogo.module.carchattingprovider.ICallProviderResponse; + +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +public +/** + * @author congtaowang + * @since 2020/9/24 + *

+ * 描述 + */ +abstract class CallProviderResponseAdapter implements ICallProviderResponse { + + @Override + public void addFriend( boolean b ) { + + } + + @Override + public void callInvokeError( @NotNull String s ) { + + } + + @Override + public void callStatus( int i ) { + + } + + @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 ) { + + } +}