diff --git a/.idea/misc.xml b/.idea/misc.xml
index 703e5d4b89..8a8f75bfe2 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -5,7 +5,7 @@
-
+
diff --git a/app/build.gradle b/app/build.gradle
index 6c342f9507..36a27fea8e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,8 +61,9 @@ dependencies {
// implementation rootProject.ext.dependencies.moduledemo
// implementation rootProject.ext.dependencies.moduledemo2
- implementation rootProject.ext.dependencies.modulechattingprovider
- implementation rootProject.ext.dependencies.modulechatting
+ implementation rootProject.ext.dependencies.carcallprovider
+ implementation rootProject.ext.dependencies.carcall
+ implementation rootProject.ext.dependencies.modulemedia
implementation rootProject.ext.dependencies.moduleonlinecar
diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java
index 8ac0fd9188..c34b0e72b4 100644
--- a/app/src/main/java/com/mogo/launcher/MogoApplication.java
+++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java
@@ -6,8 +6,10 @@ import androidx.multidex.MultiDex;
import com.mogo.commons.AbsMogoApplication;
import com.mogo.commons.debug.DebugConfig;
+import com.mogo.module.carchatting.card.CallChatConstant;
import com.mogo.module.common.MogoModule;
import com.mogo.module.common.MogoModulePaths;
+import com.mogo.module.media.MediaConstants;
import com.mogo.module.onlinecar.OnLineCarConstants;
import com.mogo.module.tanlu.constant.TanluConstants;
@@ -27,7 +29,8 @@ public class MogoApplication extends AbsMogoApplication {
DebugConfig.setNetMode( DebugConfig.NET_MODE_QA );
MogoModulePaths.addModule(new MogoModule(OnLineCarConstants.TAG, "CARD_TYPE_ROAD_ONLINECAR"));
MogoModulePaths.addModule( new MogoModule( TanluConstants.TAG, "CARD_TYPE_ROAD_CODITION" ) );
-// MogoModulePaths.addModule(new MogoModule( CallChatConstant.PROVIDER, CallChatConstant.MODULE_NAME));
+ MogoModulePaths.addModule(new MogoModule( CallChatConstant.PROVIDER, CallChatConstant.MODULE_NAME));
+ MogoModulePaths.addModule(new MogoModule( MediaConstants.TAG, MediaConstants.MODULE_TYPE) );
}
@Override
diff --git a/config.gradle b/config.gradle
index 909fd6986b..65bcc71e55 100644
--- a/config.gradle
+++ b/config.gradle
@@ -94,10 +94,11 @@ ext {
moduleapps : "com.mogo.module:module-apps:${MOGO_MODULE_APPS_VERSION}",
mogoconnection : "com.mogo.connection:mogo-connection:${MOGO_CONNECTION_VERSION}",
moduleextensions : "com.mogo.module:module-extensions:${MOGO_MODULE_EXTENSIONS_VERSION}",
- modulechatting : "com.mogo.module.carchatting:module-carchatting:${CARCHATTING_VERSION}",
- modulechattingprovider : "com.mogo.module.carchatting:module-carchatting-provider:${CARCHATTINGPROVIDER_VERSION}",
+ carcall : "com.mogo.module.carchatting:module-carchatting:${CARCHATTING_VERSION}",
+ carcallprovider : "com.mogo.module.carchatting:module-carchatting-provider:${CARCHATTINGPROVIDER_VERSION}",
// 在线车辆
moduleonlinecar : "com.mogo.module:module-onlinecar:${MOGO_MODULE_ONLINECAR_VERSION}",
+ modulemedia : "com.mogo.module:module-media:${MOGO_MODULE_MEDIA_VERSION}",
// 长链
socketsdk : 'com.zhidao.socketsdk:socketsdk:2.1.0',
@@ -108,6 +109,6 @@ ext {
jetbrainsannotationsjava5: "org.jetbrains:annotations-java5:15.0",
// 统一登录
- accountsdk : "com.zhidao.accountservice:account-sdk:1.0.2",
+ accountsdk : "com.zhidao.accountservice:account-sdk:1.0.4",
]
}
\ No newline at end of file
diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/ThreadPoolService.java b/foudations/mogo-utils/src/main/java/com/mogo/utils/ThreadPoolService.java
index 3fb2341761..b94b28b555 100644
--- a/foudations/mogo-utils/src/main/java/com/mogo/utils/ThreadPoolService.java
+++ b/foudations/mogo-utils/src/main/java/com/mogo/utils/ThreadPoolService.java
@@ -5,7 +5,7 @@ import java.util.concurrent.Executors;
public class ThreadPoolService {
- private static final ExecutorService SERVICE = Executors.newScheduledThreadPool( 1 );
+ private static final ExecutorService SERVICE = Executors.newScheduledThreadPool( 3 );
private ThreadPoolService() {
}
diff --git a/gradle.properties b/gradle.properties
index 0cc8c4f309..63b2f24080 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -47,4 +47,5 @@ MOGO_MODULE_EXTENSIONS_VERSION=1.0.0-SNAPSHOT
CARCHATTING_VERSION=1.0.0-SNAPSHOT
CARCHATTINGPROVIDER_VERSION=1.0.0-SNAPSHOT
MOGO_MODULE_ONLINECAR_VERSION=1.0.0-SNAPSHOT
+MOGO_MODULE_MEDIA_VERSION=1.0.0-SNAPSHOT
diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
index 69cedcc90d..bd5e9486d3 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
@@ -2,6 +2,7 @@ package com.mogo.module.extensions.entrance;
import android.os.Bundle;
import android.view.View;
+import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@@ -22,6 +23,8 @@ import com.mogo.service.fragmentmanager.FragmentDescriptor;
import com.mogo.service.fragmentmanager.IMogoFragmentManager;
import com.mogo.service.map.IMogoMapService;
import com.mogo.service.module.IMogoModuleProvider;
+import com.mogo.service.windowview.IMogoWindowManager;
+import com.mogo.utils.TipToast;
/**
* @author congtaowang
@@ -78,6 +81,12 @@ public class EntranceFragment extends MvpFragment< EntranceView, EntrancePresent
mHome = findViewById( R.id.module_entrance_id_home );
mHome.setOnClickListener( view -> {
+ TextView textView = new TextView(getActivity());
+ textView.setText("我是window");
+ textView.setOnClickListener(c -> {
+ TipToast.shortTip("我是window");
+ });
+ ( ( IMogoWindowManager ) ARouter.getInstance().build( MogoServicePaths.PATH_WINDOW_MANAGER ).navigation( getContext() ) ).addView(100,textView,200,200,false);
} );
mCompany = findViewById( R.id.module_entrance_id_company );
diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml
index 3e7786b42a..d21d892790 100644
--- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml
+++ b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml
@@ -121,7 +121,7 @@
android:id="@+id/module_entrance_id_move2_current_location"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_90"
- android:background="@drawable/module_ext_dw_bottom_corner_bkg"
+ android:background="@drawable/module_ext_dw_common_corner_bkg"
android:gravity="center">