yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1. 解决部分模块耦合问题

Browse Source 
2. 重新规划模块依赖关系
3. 解决主页左侧遮罩颜色问题
This commit is contained in:
wangcongtao
2020-11-11 16:57:20 +08:00
parent 980d8a408d
commit 307858f9aa
15 changed files with 44 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/build.gradle
View File

@@ -339,13 +339,14 @@ dependencies {
implementation rootProject.ext.dependencies.modulemedia
implementation rootProject.ext.dependencies.moduleservice
implementation rootProject.ext.dependencies.modulesplash
implementation rootProject.ext.dependencies.mogoservice
implementation rootProject.ext.dependencies.moduleV2x
implementation rootProject.ext.dependencies.moduleshare
implementation rootProject.ext.dependencies.tanluupload
implementation rootProject.ext.dependencies.mogomonitor
implementation rootProject.ext.dependencies.mogomoduleback
implementation rootProject.ext.dependencies.guideshow
implementation rootProject.ext.dependencies.moduleextensions
} else {
implementation project(':foudations:mogo-commons')
implementation project(':modules:mogo-module-common')
@@ -354,13 +355,14 @@ dependencies {
implementation project(':modules:mogo-module-media')
implementation project(':modules:mogo-module-service')
implementation project(':modules:mogo-module-splash')
implementation project(':modules:mogo-module-service')
implementation project(':modules:mogo-module-v2x')
implementation project(':modules:mogo-module-share')
implementation project(':libraries:tanlulib')
implementation project(':modules:mogo-module-monitor')
implementation project(':modules:mogo-module-back')
implementation project(':modules:mogo-module-guide')
implementation project(':modules:mogo-module-extensions')
}
apply from: "./functions/perform.gradle"

6
app/functions/perform.gradle
View File

@@ -4,8 +4,14 @@ project.dependencies {
if (Boolean.valueOf(RELEASE)) {
launcherImplementation rootProject.ext.dependencies.modulemainlauncher
independentImplementation rootProject.ext.dependencies.modulemainindependent
// 仅launcher需要引入该模块
launcherImplementation rootProject.ext.dependencies.moduleapps
} else {
launcherImplementation project(':main-extensions:mogo-module-main-launcher')
independentImplementation project(':main-extensions:mogo-module-main-independent')
// 仅launcher需要引入该模块
launcherImplementation project(':modules:mogo-module-apps')
}
}

17
foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java
View File

@@ -143,16 +143,13 @@ public class AbsMogoApplication extends Application {
NetConfig.instance().setSignaturePrefix( Constants.SIGN_PREFIX )
.setPublicParams( ParamsUtil.getStaticParams() )
.setHostnameVerifier( new AllAllowedHostnameVerifier() )
.addNetworkInterceptor( new Interceptor() {
@Override
public Response intercept( Chain chain ) throws IOException {
Request original = chain.request();
Request request = original.newBuilder()
.header( "token", SpStorage.getTicket() )
.method( original.method(), original.body() )
.build();
return chain.proceed( request );
}
.addNetworkInterceptor( chain -> {
Request original = chain.request();
Request request = original.newBuilder()
.header( "token", SpStorage.getTicket() )
.method( original.method(), original.body() )
.build();
return chain.proceed( request );
} )
.setLoggable( DebugConfig.isDebug() );
}

13
foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java
View File

@@ -282,4 +282,17 @@ public class DebugConfig {
public static boolean isIsSupportLauncherCardRefreshStrategy() {
return isSupportLauncherCardRefreshStrategy;
}
/**
* 是否需要刷新个人信息
*/
private static boolean needRequestUserInfo = false;
public static void setNeedRequestUserInfo( boolean needRequestUserInfo ) {
DebugConfig.needRequestUserInfo = needRequestUserInfo;
}
public static boolean isNeedRequestUserInfo() {
return needRequestUserInfo;
}
}

4
main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java
View File

@@ -8,8 +8,8 @@ import android.view.View;
import androidx.annotation.Nullable;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.map.uicontroller.EnumMapUI;
import com.mogo.module.extensions.utils.ExtensionsConfig;
import com.mogo.module.main.MainActivity;
import com.mogo.module.main.cards.MogoModulesManager;
import com.mogo.service.intent.IMogoIntentListener;
@@ -26,7 +26,7 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
@Override
protected void onCreate( @Nullable Bundle savedInstanceState ) {
super.onCreate( savedInstanceState );
ExtensionsConfig.setNeedRequestUserInfo( true );
DebugConfig.setNeedRequestUserInfo( true );
}
@Override

5
modules/mogo-module-common/src/main/java/com/mogo/module/common/MogoModulePaths.java
View File

@@ -31,6 +31,11 @@ public class MogoModulePaths {
@Keep
public static final String PATH_MODULE_APPS = "/appslist/ui";
/**
* 快捷操作入口：定位、
*/
public static final String PATH_ENTRANCE = "/extension/entrance";
/**
* 添加卡片模块
*

8
modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsModuleConst.java
View File

@@ -7,13 +7,7 @@ package com.mogo.module.extensions;
* 描述
*/
public class ExtensionsModuleConst {
/**
* 快捷操作入口：定位、
*/
public static final String PATH_ENTRANCE = "/extension/entrance";
public static final String TYPE = "extension";
public static final String TYPE_ENTRANCE = "entrance";

5
modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java
View File

@@ -7,6 +7,7 @@ import androidx.annotation.NonNull;
import androidx.lifecycle.LifecycleOwner;
import com.alibaba.android.arouter.launcher.ARouter;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.commons.mvp.Presenter;
import com.mogo.commons.network.Utils;
import com.mogo.module.common.MogoApisHandler;
@@ -18,12 +19,10 @@ import com.mogo.module.extensions.net.UserInfoNetApiServices;
import com.mogo.module.extensions.userinfo.UserInfo;
import com.mogo.module.extensions.userinfo.UserInfoConstant;
import com.mogo.module.extensions.userinfo.UserInfoResponse;
import com.mogo.module.extensions.utils.ExtensionsConfig;
import com.mogo.module.extensions.weather.Phenomena;
import com.mogo.module.extensions.weather.WeatherCallback;
import com.mogo.module.extensions.weather.WeatherInfo;
import com.mogo.module.extensions.weather.WeatherModel;
import com.mogo.service.IMogoServiceApis;
import com.mogo.service.MogoServicePaths;
import com.mogo.service.network.IMogoNetwork;
import com.mogo.service.statusmanager.IMogoMsgCenter;
@@ -103,7 +102,7 @@ public class EntrancePresenter extends Presenter<EntranceView> implements Weathe
if (userInfo != null) {
mView.renderUserInfo(userInfo);
}
if(ExtensionsConfig.needRequestUserInfo()){
if( DebugConfig.isNeedRequestUserInfo()){
// 相当于每次onResume都会请求一下个人信息，目的是能够相对及时的同步手机端的个人信息修改
requestUserInfo();
}

4
modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceProvider.java
View File

@@ -12,7 +12,7 @@ import com.mogo.map.listener.IMogoMapListener;
import com.mogo.map.location.IMogoLocationListener;
import com.mogo.map.marker.IMogoMarkerClickListener;
import com.mogo.map.navi.IMogoNaviListener;
import com.mogo.module.extensions.ExtensionsModuleConst;
import com.mogo.module.common.MogoModulePaths;
import com.mogo.service.module.IMogoModuleLifecycle;
import com.mogo.service.module.IMogoModuleProvider;
import com.mogo.service.module.ModuleType;
@@ -23,7 +23,7 @@ import com.mogo.service.module.ModuleType;
* <p>
* 描述
*/
@Route( path = ExtensionsModuleConst.PATH_ENTRANCE )
@Route( path = MogoModulePaths.PATH_ENTRANCE )
public class EntranceProvider implements IMogoModuleProvider {
EntranceFragment mFragment;

20
modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/ExtensionsConfig.java
View File

@@ -1,20 +0,0 @@
package com.mogo.module.extensions.utils;
/**
* 个性化config
*
* @author tongchenfei
*/
public class ExtensionsConfig {
public static final String NEED_REQUEST_USER_INFO = "NEED_REQUEST_USER_INFO";
private static boolean needRequestUserInfo = false;
public static boolean needRequestUserInfo() {
return needRequestUserInfo;
}
public static void setNeedRequestUserInfo(boolean needRequestUserInfo) {
ExtensionsConfig.needRequestUserInfo = needRequestUserInfo;
}
}

207
modules/mogo-module-extensions/src/main/res/drawable/module_ext_frame_anim_voice.xml
View File

@@ -1,207 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<animation-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:drawable="@drawable/mogo_tts_icon_00000"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00001"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00002"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00003"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00004"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00005"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00006"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00007"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00008"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00009"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00010"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00011"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00012"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00013"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00014"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00015"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00016"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00017"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00018"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00019"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00020"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00021"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00022"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00023"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00024"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00025"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00026"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00027"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00028"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00029"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00030"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00031"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00032"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00033"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00034"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00035"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00036"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00037"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00038"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00039"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00040"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00041"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00042"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00043"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00044"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00045"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00046"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00047"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00048"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00049"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00050"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00051"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00052"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00053"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00054"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00055"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00056"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00057"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00058"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00059"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00060"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00061"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00062"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00063"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00064"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00065"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00066"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00067"
android:duration="100" />
</animation-list>

6
modules/mogo-module-main/build.gradle
View File

@@ -48,21 +48,15 @@ dependencies {
api rootProject.ext.dependencies.modulecommon
api rootProject.ext.dependencies.modulemap
api rootProject.ext.dependencies.mogoserviceapi
api rootProject.ext.dependencies.mogoservice
api rootProject.ext.dependencies.moduleservice
api rootProject.ext.dependencies.moduleapps
api rootProject.ext.dependencies.moduleextensions
compileOnly rootProject.ext.dependencies.skinsupport
} else {
api project(":foudations:mogo-utils")
api project(":foudations:mogo-commons")
api project(':modules:mogo-module-common')
api project(':modules:mogo-module-map')
api project(':modules:mogo-module-service')
api project(':services:mogo-service-api')
api project(':services:mogo-service')
api project(':modules:mogo-module-apps')
api project(':modules:mogo-module-extensions')
compileOnly project(':skin:mogo-skin-support')
}
}

1
modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
View File

@@ -223,7 +223,6 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
}
protected void loadContainerModules() {
// MogoModulesManager.getInstance().loadExtensionsModule( R.id.module_main_id_header_fragment_container );
MogoModulesManager.getInstance().loadEntrancesModule( R.id.module_main_id_entrance_fragment_container );
MogoModulesManager.getInstance().loadEventPanelModule( R.id.module_main_id_event_panel_fragment_container );
MogoModulesManager.getInstance().loadLeftPanelModule( R.id.module_main_id_left_panel_fragment_container );

5
modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java
View File

@@ -6,12 +6,9 @@ import android.content.Context;
import androidx.fragment.app.Fragment;
import com.alibaba.android.arouter.launcher.ARouter;
import com.alibaba.idst.nls.internal.utils.L;
import com.mogo.module.common.MogoModule;
import com.mogo.module.common.MogoModulePaths;
import com.mogo.module.extensions.ExtensionsModuleConst;
import com.mogo.module.main.MainActivity;
import com.mogo.service.IMogoServiceApis;
import com.mogo.service.MogoServicePaths;
import com.mogo.service.module.IMogoModuleProvider;
import com.mogo.utils.ResourcesHelper;
@@ -123,7 +120,7 @@ public class MogoModulesManager implements MogoModulesHandler {
@Override
public void loadEntrancesModule( int containerId ) {
IMogoModuleProvider provider = ( IMogoModuleProvider ) ARouter.getInstance()
.build( ExtensionsModuleConst.PATH_ENTRANCE )
.build( MogoModulePaths.PATH_ENTRANCE )
.navigation( getContext() );
addFragment( provider, containerId );
}

2
skin/mogo-skin-light/src/main/module-main-res/drawable/module_main_dw_left_frame_bkg_light.xml
View File

@@ -2,7 +2,7 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape>
<gradient android:centerX="0.5" android:centerY="0.5" android:angle="0" android:endColor="#00ffffff" android:startColor="#ffffff" android:type="linear" />
<gradient android:centerX="0.5" android:centerY="0.5" android:angle="0" android:endColor="#00f0f0f0" android:startColor="#f0f0f0" android:type="linear" />
</shape>
</item>
</selector>