Merge branch 'dev' into demo/shunyi_v2v_merge
# Conflicts: # app/src/main/java/com/mogo/launcher/MogoApplication.java # config.gradle # foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java # modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java # modules/mogo-module-extensions/src/main/res/values-mdpi/dimens.xml # modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml # modules/mogo-module-extensions/src/main/res/values/dimens.xml # modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java # modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml # modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml # modules/mogo-module-v2x/src/main/res/values/dimens.xml # services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java # services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java # upload.sh
This commit is contained in:
@@ -30,9 +30,10 @@ import com.mogo.service.passport.IMogoPassportManager;
|
||||
import com.mogo.service.share.IMogoShareManager;
|
||||
import com.mogo.service.statusmanager.IMogoMsgCenter;
|
||||
import com.mogo.service.statusmanager.IMogoStatusManager;
|
||||
import com.mogo.service.strategy.IMogoOnlineCarListPanelProvider;
|
||||
import com.mogo.service.strategy.IMogoRefreshStrategyController;
|
||||
import com.mogo.service.tanlu.IMogoTanluProvider;
|
||||
import com.mogo.service.tanlu.IMogoTanluUiProvider;
|
||||
import com.mogo.service.share.IMogoTanluProvider;
|
||||
import com.mogo.service.share.IMogoTanluUiProvider;
|
||||
import com.mogo.service.windowview.IMogoTopViewManager;
|
||||
import com.mogo.service.windowview.IMogoWindowManager;
|
||||
import com.mogo.skin.support.IMogoSkinSupportInstaller;
|
||||
@@ -58,6 +59,7 @@ public interface IMogoServiceApis extends IProvider {
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@Deprecated
|
||||
IMogoCardManager getCardManagerApi();
|
||||
|
||||
/**
|
||||
@@ -269,4 +271,10 @@ public interface IMogoServiceApis extends IProvider {
|
||||
* @return
|
||||
*/
|
||||
IMogoCrashWarnProvider getCrashWarnProvider();
|
||||
|
||||
/**
|
||||
* 在线车辆面板
|
||||
* @return
|
||||
*/
|
||||
IMogoOnlineCarListPanelProvider getOnlineCarPanelApi();
|
||||
}
|
||||
|
||||
@@ -261,4 +261,9 @@ public class MogoServicePaths {
|
||||
* 悬浮小控件
|
||||
*/
|
||||
public static final String PATH_WIDGETS = "/widgets/provider";
|
||||
|
||||
/**
|
||||
* 在线好友面板
|
||||
*/
|
||||
public static final String PATH_ONLINE_CAR_PANEL = "/onlinecar/panel";
|
||||
}
|
||||
|
||||
@@ -68,4 +68,11 @@ public interface IMogoADASController extends IProvider {
|
||||
* @return
|
||||
*/
|
||||
EnumMapUI getCurrentSkinMode();
|
||||
|
||||
/**
|
||||
* 给adas传递数据
|
||||
*
|
||||
* @param json
|
||||
*/
|
||||
void notifyAdas( String json );
|
||||
}
|
||||
|
||||
@@ -8,6 +8,7 @@ import com.alibaba.android.arouter.facade.template.IProvider;
|
||||
* <p>
|
||||
* 卡片管理
|
||||
*/
|
||||
@Deprecated
|
||||
public interface IMogoCardManager extends IProvider {
|
||||
|
||||
/**
|
||||
|
||||
@@ -17,4 +17,6 @@ public
|
||||
interface IFragmentProvider extends IProvider {
|
||||
|
||||
Fragment createFragment( FragmentActivity activity, int containerId, Bundle date );
|
||||
|
||||
public void onDestroy();
|
||||
}
|
||||
|
||||
@@ -43,6 +43,11 @@ public interface IMogoFragmentManager extends IProvider {
|
||||
*/
|
||||
void registerMainFragmentStackTransactionListener( FragmentStackTransactionListener listener );
|
||||
|
||||
/**
|
||||
* 主页移除栈变化监听
|
||||
*/
|
||||
void unregisterMainFragmentStackTransactionListener();
|
||||
|
||||
/**
|
||||
* 其他注册栈变化监听
|
||||
*
|
||||
@@ -67,9 +72,10 @@ public interface IMogoFragmentManager extends IProvider {
|
||||
|
||||
/**
|
||||
* 缓存历史消息
|
||||
*
|
||||
* @param layoutId
|
||||
*/
|
||||
void initMessageHistoryContainerId(int layoutId);
|
||||
void initMessageHistoryContainerId( int layoutId );
|
||||
|
||||
int getMessageHistoryContainerId();
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@ package com.mogo.service.module;
|
||||
|
||||
import android.content.Context;
|
||||
import android.os.Bundle;
|
||||
import android.util.Log;
|
||||
import android.view.View;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
@@ -13,6 +14,8 @@ import com.mogo.map.location.IMogoLocationListener;
|
||||
import com.mogo.map.marker.IMogoMarkerClickListener;
|
||||
import com.mogo.map.navi.IMogoNaviListener;
|
||||
|
||||
import java.util.logging.Logger;
|
||||
|
||||
/**
|
||||
* @author congtaowang
|
||||
* @since 2019-12-24
|
||||
@@ -128,4 +131,8 @@ public interface IMogoModuleProvider extends IProvider {
|
||||
default String getAppName() {
|
||||
return "";
|
||||
}
|
||||
|
||||
default void onDestroy(){
|
||||
Log.d( "IMogoModuleProvider", "onDestroy" );
|
||||
}
|
||||
}
|
||||
|
||||
@@ -25,4 +25,6 @@ public interface IMogoShareManager extends IProvider {
|
||||
* @param context 待重置的上下文
|
||||
*/
|
||||
void resetContext(Context context);
|
||||
|
||||
void releaseContext();
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.mogo.service.tanlu;
|
||||
package com.mogo.service.share;
|
||||
|
||||
import com.alibaba.android.arouter.facade.template.IProvider;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.mogo.service.tanlu;
|
||||
package com.mogo.service.share;
|
||||
|
||||
import com.alibaba.android.arouter.facade.template.IProvider;
|
||||
import com.mogo.map.MogoLatLng;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.mogo.service.tanlu;
|
||||
package com.mogo.service.share;
|
||||
|
||||
import com.mogo.map.MogoLatLng;
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
package com.mogo.service.strategy;
|
||||
|
||||
import androidx.annotation.IdRes;
|
||||
import androidx.fragment.app.FragmentActivity;
|
||||
|
||||
import com.alibaba.android.arouter.facade.template.IProvider;
|
||||
|
||||
public
|
||||
/**
|
||||
* @author congtaowang
|
||||
* @since 2020/9/21
|
||||
*
|
||||
* 描述
|
||||
*/
|
||||
interface IMogoOnlineCarListPanelProvider extends IProvider {
|
||||
|
||||
void initContainer( @IdRes int containerId, FragmentActivity activity );
|
||||
|
||||
void showPanel();
|
||||
|
||||
void hidePanel();
|
||||
|
||||
void clear();
|
||||
}
|
||||
Reference in New Issue
Block a user