opt

2020-01-09 21:10:02 +08:00
parent 37046ecf05
commit 37c9477041
9 changed files with 34 additions and 13 deletions
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -5,7 +5,7 @@
      <configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" />
    </configurations>
  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
    <output url="file://$PROJECT_DIR$/build/classes" />
  </component>
  <component name="ProjectType">
--- 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
--- 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
--- 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",
    ]
 }
--- 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() {
    }
--- 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

--- 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 );
--- 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">

            <ImageView
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServiceProvider.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServiceProvider.java
@@ -38,6 +38,7 @@ import com.mogo.service.MogoServicePaths;
 import com.mogo.service.map.IMogoMapService;
 import com.mogo.service.module.IMogoModuleLifecycle;
 import com.mogo.service.module.IMogoModuleProvider;
+import com.mogo.service.module.IMogoRegisterCenter;
 import com.mogo.service.module.ModuleType;
 import com.mogo.service.statusmanager.IMogoStatusChangedListener;
 import com.mogo.service.statusmanager.IMogoStatusManager;
@@ -183,7 +184,7 @@ public class MogoServiceProvider implements IMogoModuleProvider,

    @Override
    public IMogoMapListener getMapListener() {
-        return this;
+        return null;
    }

    @Override
@@ -193,12 +194,12 @@ public class MogoServiceProvider implements IMogoModuleProvider,

    @Override
    public IMogoNaviListener getNaviListener() {
-        return this;
+        return null;
    }

    @Override
    public IMogoLocationListener getLocationListener() {
-        return this;
+        return null;
    }

    @NonNull
@@ -220,6 +221,11 @@ public class MogoServiceProvider implements IMogoModuleProvider,
        //TODO 初始化地图地图绘制大而全的Marker
        MarkerServiceHandler.init( mContext );
        registerAIReceiver( context );
+
+        IMogoRegisterCenter registerCenter = ( IMogoRegisterCenter ) ARouter.getInstance().build( MogoServicePaths.PATH_REGISTER_CENTER ).navigation( context );
+        registerCenter.registerMogoLocationListener( getModuleName(), this );
+        registerCenter.registerMogoNaviListener( getModuleName(), this );
+        registerCenter.registerMogoMapListener( getModuleName(), this );
    }

    private void registerAIReceiver( Context context ) {
@@ -460,7 +466,7 @@ public class MogoServiceProvider implements IMogoModuleProvider,

    @Override
    public void onCalculateSuccess() {
-        
+
    }

    @Override