模块依赖优化
This commit is contained in:
wangcongtao
@@ -355,8 +355,6 @@ dependencies {
|
||||
implementation rootProject.ext.dependencies.modulesearch
|
||||
implementation rootProject.ext.dependencies.mogomoduleguide
|
||||
implementation rootProject.ext.dependencies.mogomoduleauth
|
||||
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
|
||||
@@ -371,7 +369,6 @@ dependencies {
|
||||
implementation project(':modules:mogo-module-common')
|
||||
implementation project(':modules:mogo-module-search')
|
||||
implementation project(':modules:mogo-module-authorize')
|
||||
implementation project(':modules:mogo-module-media')
|
||||
implementation project(':modules:mogo-module-service')
|
||||
implementation project(':modules:mogo-module-splash')
|
||||
implementation project(':modules:mogo-module-service')
|
||||
@@ -394,6 +391,7 @@ dependencies {
|
||||
apply from: "./functions/widgets.gradle"
|
||||
apply from: "./functions/tts.gradle"
|
||||
apply from: "./functions/backwidget.gradle"
|
||||
apply from: "./functions/mediaui.gradle"
|
||||
|
||||
// implementation group: "com.tencent.matrix", name: "matrix-android-lib", version: '0.6.6', changing: true
|
||||
// implementation group: "com.tencent.matrix", name: "matrix-android-commons", version: '0.6.6', changing: true
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// 辅助驾驶占位模块，目前部分车机不上辅助驾驶功能，使用该模块能力代替
|
||||
// 返回桌面悬浮按钮
|
||||
|
||||
project.dependencies {
|
||||
if (Boolean.valueOf(RELEASE)) {
|
||||
|
||||
9
app/functions/mediaui.gradle
Normal file
9
app/functions/mediaui.gradle
Normal file
@@ -0,0 +1,9 @@
|
||||
// 音乐播放模块
|
||||
|
||||
project.dependencies {
|
||||
if (Boolean.valueOf(RELEASE)) {
|
||||
launcherImplementation rootProject.ext.dependencies.modulemedia
|
||||
} else {
|
||||
launcherImplementation project(':modules:mogo-module-media')
|
||||
}
|
||||
}
|
||||
@@ -18,7 +18,6 @@ import com.mogo.module.common.MogoApisHandler;
|
||||
import com.mogo.module.common.MogoModule;
|
||||
import com.mogo.module.common.MogoModulePaths;
|
||||
import com.mogo.module.main.service.MogoMainService;
|
||||
import com.mogo.module.media.MediaConstants;
|
||||
import com.mogo.module.push.base.PushUIConstants;
|
||||
import com.mogo.module.service.ServiceConst;
|
||||
import com.mogo.module.share.constant.ShareConstants;
|
||||
@@ -68,7 +67,7 @@ public class MogoApplication extends AbsMogoApplication {
|
||||
|
||||
if ( DebugConfig.isLauncher() ) {
|
||||
MogoModulePaths.addModule( new MogoModule( MogoServicePaths.PATH_BACK, MogoServicePaths.PATH_BACK ) );
|
||||
MogoModulePaths.addModule( new MogoModule( MediaConstants.TAG, MediaConstants.MODULE_TYPE ) );
|
||||
MogoModulePaths.addModule( new MogoModule( MogoModulePaths.PATH_MEDIA, MogoModulePaths.PATH_MEDIA ) );
|
||||
}
|
||||
MogoModulePaths.addModule( new MogoModule( ServiceConst.PATH_TTS_CONFIG, ServiceConst.PATH_TTS_CONFIG ) );
|
||||
|
||||
|
||||
@@ -1,11 +1,13 @@
|
||||
package com.mogo.map.impl.amap;
|
||||
|
||||
import android.content.Context;
|
||||
import android.view.ViewGroup;
|
||||
|
||||
import com.amap.api.maps.MapView;
|
||||
import com.amap.api.navi.AMapNaviView;
|
||||
import com.mogo.commons.debug.DebugConfig;
|
||||
import com.mogo.map.IMogoMapView;
|
||||
import com.mogo.utils.logger.Logger;
|
||||
|
||||
public
|
||||
/**
|
||||
@@ -16,6 +18,8 @@ public
|
||||
*/
|
||||
class AMapViewHandler {
|
||||
|
||||
private static final String TAG = "AMapViewHandler";
|
||||
|
||||
private static IMogoMapView sMapView;
|
||||
|
||||
public static void createMapView( Context context ) {
|
||||
@@ -24,6 +28,7 @@ class AMapViewHandler {
|
||||
} else {
|
||||
sMapView = new AMapNaviViewWrapper( new AMapNaviView( context ) );
|
||||
}
|
||||
Logger.d( TAG, "初始化地图实例" );
|
||||
}
|
||||
|
||||
public static IMogoMapView getMapView() {
|
||||
|
||||
@@ -11,6 +11,7 @@ import androidx.annotation.Nullable;
|
||||
import com.mogo.module.common.map.CustomNaviInterrupter;
|
||||
import com.mogo.module.main.MainActivity;
|
||||
import com.mogo.utils.TipToast;
|
||||
import com.mogo.utils.UiThreadHandler;
|
||||
|
||||
/**
|
||||
* 针对独立应用形式，做单独定制
|
||||
@@ -83,4 +84,16 @@ public class MainIndependentActivity extends MainActivity {
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onDestroy() {
|
||||
super.onDestroy();
|
||||
forceStop();
|
||||
}
|
||||
|
||||
private void forceStop(){
|
||||
UiThreadHandler.postDelayed( ()->{
|
||||
System.exit( 0 );
|
||||
}, 1_000L );
|
||||
}
|
||||
}
|
||||
|
||||
@@ -36,6 +36,11 @@ public class MogoModulePaths {
|
||||
*/
|
||||
public static final String PATH_ENTRANCE = "/extension/entrance";
|
||||
|
||||
/**
|
||||
* 音乐播放入口
|
||||
*/
|
||||
public static final String PATH_MEDIA = "/media/ui";
|
||||
|
||||
/**
|
||||
* 添加卡片模块
|
||||
*
|
||||
|
||||
@@ -3,11 +3,13 @@ package com.mogo.module.main;
|
||||
import android.content.Intent;
|
||||
import android.os.Bundle;
|
||||
import android.util.Log;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.widget.FrameLayout;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.core.view.LayoutInflaterCompat;
|
||||
|
||||
import com.mogo.commons.context.ContextHolderUtil;
|
||||
import com.mogo.commons.debug.DebugConfig;
|
||||
@@ -30,6 +32,7 @@ import com.mogo.service.fragmentmanager.IMogoFragmentManager;
|
||||
import com.mogo.service.module.IMogoModuleProvider;
|
||||
import com.mogo.service.statusmanager.IMogoStatusManager;
|
||||
import com.mogo.skin.support.SkinMode;
|
||||
import com.mogo.utils.UiThreadHandler;
|
||||
import com.mogo.utils.logger.Logger;
|
||||
import com.zhidao.adasconfig.api.AdasConfigApiController;
|
||||
import com.zhidao.adasconfig.common.log.LoggerController;
|
||||
|
||||
@@ -0,0 +1,122 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<dimen name="module_media_music_state_location">872px</dimen>
|
||||
<dimen name="module_media_music_state_location_x">1067px</dimen>
|
||||
|
||||
<!-- lcc start-->
|
||||
<dimen name="module_media_back_width">660px</dimen>
|
||||
<dimen name="module_media_back_height">660px</dimen>
|
||||
<dimen name="module_media_back_radius">20px</dimen>
|
||||
<dimen name="module_media_share_full_screen_back_top">23px</dimen>
|
||||
<dimen name="module_media_share_share_icon_width">67.5px</dimen>
|
||||
<dimen name="module_media_share_full_screen_width">67.5px</dimen>
|
||||
<dimen name="module_media_share_full_screen_height">67.5px</dimen>
|
||||
<dimen name="module_media_share_full_screen_pading">10px</dimen>
|
||||
<dimen name="module_media_share_full_screen_margin_left_right">23px</dimen>
|
||||
<dimen name="module_media_share_back_top">116px</dimen>
|
||||
<dimen name="module_media_share_user_back_margin_left_right">30px</dimen>
|
||||
<dimen name="module_media_share_user_back_margin_height">145px</dimen>
|
||||
<dimen name="module_media_share_user_back_radius">20px</dimen>
|
||||
<dimen name="module_media_share_user_head_image_left">30px</dimen>
|
||||
<dimen name="module_media_share_user_head_image_width">90px</dimen>
|
||||
<dimen name="module_media_share_user_head_image_height">90px</dimen>
|
||||
<dimen name="module_media_share_user_name_back_margin_left">21px</dimen>
|
||||
<dimen name="module_media_share_user_name_back_margin_right">24px</dimen>
|
||||
<dimen name="module_media_share_user_from_size">23px</dimen>
|
||||
<dimen name="module_media_share_user_name_size">26px</dimen>
|
||||
<dimen name="module_media_share_user_of_share_size">30px</dimen>
|
||||
<dimen name="module_media_share_user_like_back_margin_right">16px</dimen>
|
||||
<dimen name="module_media_share_user_like_width">68px</dimen>
|
||||
<dimen name="module_media_share_user_like_height">68px</dimen>
|
||||
<dimen name="module_media_share_user_like_size">23px</dimen>
|
||||
<dimen name="module_media_share_media_back_top">35px</dimen>
|
||||
<dimen name="module_media_share_media_back_margin_left">56px</dimen>
|
||||
<dimen name="module_media_share_media_back_margin_right">56px</dimen>
|
||||
<dimen name="module_media_share_media_back_height">126px</dimen>
|
||||
<dimen name="module_media_share_media_image_radius">3px</dimen>
|
||||
<dimen name="module_media_share_media_image_height">116px</dimen>
|
||||
<dimen name="module_media_share_media_image_width">116px</dimen>
|
||||
<dimen name="module_media_share_media_name_back_left">22px</dimen>
|
||||
<dimen name="module_media_share_media_song_name_size">37.5px</dimen>
|
||||
<dimen name="module_media_share_media_singer_name_size">28px</dimen>
|
||||
<!-- lcc end-->
|
||||
|
||||
<!-- lidongxiu start-->
|
||||
<dimen name="module_media_share_fragment_width">790px</dimen>
|
||||
<dimen name="module_media_share_fragment_height">525px</dimen>
|
||||
<dimen name="module_media_share_fragment_title_padding_top">55px</dimen>
|
||||
<dimen name="module_media_share_fragment_title_padding_left">61px</dimen>
|
||||
<dimen name="module_media_share_fragment_bg_radius">20px</dimen>
|
||||
<dimen name="module_media_share_fragment_title_img_size">136px</dimen>
|
||||
<dimen name="module_media_share_fragment_title_img_right">20px</dimen>
|
||||
<dimen name="module_media_share_fragment_title_height">136px</dimen>
|
||||
<dimen name="module_media_share_fragment_title_padding">34px</dimen>
|
||||
<dimen name="module_media_share_fragment_title_scroll_tv1_size">40px</dimen>
|
||||
<dimen name="module_media_share_fragment_title_scroll_tv2_size">30px</dimen>
|
||||
<dimen name="module_media_share_fragment_center_text_size">34px</dimen>
|
||||
<dimen name="module_media_share_fragment_btn_size">40px</dimen>
|
||||
<dimen name="module_media_share_fragment_center_margin_top">60px</dimen>
|
||||
<dimen name="module_media_share_fragment_center_margin_bottom">96px</dimen>
|
||||
<dimen name="module_media_share_fragment_btn_height">130px</dimen>
|
||||
<dimen name="module_media_share_fragment_tv2_margin_top">4px</dimen>
|
||||
<dimen name="module_media_share_fragment_img_radius">6px</dimen>
|
||||
|
||||
<dimen name="module_media_pop_window_width">600px</dimen>
|
||||
<dimen name="module_media_pop_window_height">140px</dimen>
|
||||
<dimen name="module_media_pop_window_inner_height">112px</dimen>
|
||||
<dimen name="module_media_pop_window_inner_padding">30px</dimen>
|
||||
<dimen name="module_media_pop_window_anim_img_size">80px</dimen>
|
||||
<dimen name="module_media_pop_window_text_width">230px</dimen>
|
||||
<dimen name="module_media_pop_window_text_margin">14px</dimen>
|
||||
<dimen name="module_media_pop_window_text_top_size">35px</dimen>
|
||||
<dimen name="module_media_pop_window_text_bottom_size">24px</dimen>
|
||||
<dimen name="module_media_pop_window_control_img_size">56px</dimen>
|
||||
<dimen name="module_media_pop_window_control_margin_right">40px</dimen>
|
||||
<dimen name="module_media_pop_window_progress_height">8px</dimen>
|
||||
<dimen name="module_media_pop_window_radius">16px</dimen>
|
||||
<dimen name="module_media_pop_window_radius_margin">16px</dimen>
|
||||
<dimen name="module_media_toast_share_width">500px</dimen>
|
||||
<dimen name="module_media_toast_share_height">350px</dimen>
|
||||
<dimen name="module_media_toast_share_bg_radius">20px</dimen>
|
||||
<dimen name="module_media_toast_share_img_size">120px</dimen>
|
||||
<dimen name="module_media_toast_share_text_size">36px</dimen>
|
||||
<dimen name="module_media_toast_share_margin_top">20px</dimen>
|
||||
|
||||
<dimen name="module_media_card_width">660px</dimen>
|
||||
<dimen name="module_media_card_height">660px</dimen>
|
||||
<dimen name="module_media_card_radius">20px</dimen>
|
||||
<dimen name="module_media_card_radius_blur">22px</dimen>
|
||||
<dimen name="module_media_card_share_full_margin_top">22px</dimen>
|
||||
<dimen name="module_media_card_no_share_anim_width">348px</dimen>
|
||||
<dimen name="module_media_card_no_share_anim_height">348px</dimen>
|
||||
<dimen name="module_media_card_no_share_anim_img_width">226px</dimen>
|
||||
<dimen name="module_media_card_no_share_anim_img_height">226px</dimen>
|
||||
<dimen name="module_media_card_no_share_music_top_title_size">36px</dimen>
|
||||
<dimen name="module_media_card_no_share_music_bottom_title_size">28px</dimen>
|
||||
<dimen name="module_media_card_no_share_music_top_title_margin">4px</dimen>
|
||||
<dimen name="module_media_card_no_share_music_bottom_title_margin">2px</dimen>
|
||||
<dimen name="module_media_card_progress_height">11px</dimen>
|
||||
<dimen name="module_media_card_progress_time_text_size">22px</dimen>
|
||||
<dimen name="module_media_card_progress_time_text_margin_left">21px</dimen>
|
||||
<dimen name="module_media_card_progress_time_text_margin_right">4px</dimen>
|
||||
<dimen name="module_media_card_progress_time_text_margin_bottom">6px</dimen>
|
||||
<dimen name="module_media_card_control_icon_margin_bottom">2px</dimen>
|
||||
|
||||
<dimen name="module_media_card_control_icon_left_padding">15px</dimen>
|
||||
<dimen name="module_media_card_control_icon_size">78px</dimen>
|
||||
<dimen name="module_media_card_control_play_icon_size">107px</dimen>
|
||||
<dimen name="module_media_card_control_play_icon_margin">53px</dimen>
|
||||
<dimen name="module_media_card_progress_margin">2px</dimen>
|
||||
<dimen name="module_media_card_no_share_title_margin">64px</dimen>
|
||||
<dimen name="module_media_card_progress_bg_drawable_width">6px</dimen>
|
||||
<dimen name="module_media_card_progress_bg_drawable_height">12px</dimen>
|
||||
<dimen name="module_media_card_progress_pop_bg_drawable_width">6px</dimen>
|
||||
<dimen name="module_media_card_progress_pop_bg_drawable_height">8px</dimen>
|
||||
<dimen name="module_media_card_share_user_text_width_max">180px</dimen>
|
||||
|
||||
<dimen name="module_media_draw_rect_map_bottom">60px</dimen>
|
||||
<dimen name="module_media_draw_rect_map_left">750px</dimen>
|
||||
<dimen name="module_media_draw_rect_map_right">120px</dimen>
|
||||
<dimen name="module_media_draw_rect_map_top">270px</dimen>
|
||||
<dimen name="module_media_window_corner">30px</dimen>
|
||||
</resources>
|
||||
122
skin/mogo-skin-light/src/main/module-media-res/values/dimens.xml
Normal file
122
skin/mogo-skin-light/src/main/module-media-res/values/dimens.xml
Normal file
@@ -0,0 +1,122 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<dimen name="module_media_music_state_location">467px</dimen>
|
||||
<dimen name="module_media_music_state_location_x">573px</dimen>
|
||||
|
||||
<!-- lcc start-->
|
||||
<dimen name="module_media_back_width">352px</dimen>
|
||||
<dimen name="module_media_back_height">352px</dimen>
|
||||
<dimen name="module_media_back_radius">10.67px</dimen>
|
||||
<dimen name="module_media_share_full_screen_back_top">12px</dimen>
|
||||
<dimen name="module_media_share_share_icon_width">36px</dimen>
|
||||
<dimen name="module_media_share_full_screen_width">36px</dimen>
|
||||
<dimen name="module_media_share_full_screen_height">36px</dimen>
|
||||
<dimen name="module_media_share_full_screen_pading">5px</dimen>
|
||||
<dimen name="module_media_share_full_screen_margin_left_right">12px</dimen>
|
||||
<dimen name="module_media_share_back_top">62px</dimen>
|
||||
<dimen name="module_media_share_user_back_margin_left_right">16px</dimen>
|
||||
<dimen name="module_media_share_user_back_margin_height">78px</dimen>
|
||||
<dimen name="module_media_share_user_back_radius">10.6px</dimen>
|
||||
<dimen name="module_media_share_user_head_image_left">16px</dimen>
|
||||
<dimen name="module_media_share_user_head_image_width">48px</dimen>
|
||||
<dimen name="module_media_share_user_head_image_height">48px</dimen>
|
||||
<dimen name="module_media_share_user_name_back_margin_left">11px</dimen>
|
||||
<dimen name="module_media_share_user_name_back_margin_right">12px</dimen>
|
||||
<dimen name="module_media_share_user_from_size">12px</dimen>
|
||||
<dimen name="module_media_share_user_name_size">14px</dimen>
|
||||
<dimen name="module_media_share_user_of_share_size">16px</dimen>
|
||||
<dimen name="module_media_share_user_like_back_margin_right">8px</dimen>
|
||||
<dimen name="module_media_share_user_like_width">36px</dimen>
|
||||
<dimen name="module_media_share_user_like_height">36px</dimen>
|
||||
<dimen name="module_media_share_user_like_size">12px</dimen>
|
||||
<dimen name="module_media_share_media_back_top">18px</dimen>
|
||||
<dimen name="module_media_share_media_back_margin_left">30px</dimen>
|
||||
<dimen name="module_media_share_media_back_margin_right">30px</dimen>
|
||||
<dimen name="module_media_share_media_back_height">67.2px</dimen>
|
||||
<dimen name="module_media_share_media_image_radius">3px</dimen>
|
||||
<dimen name="module_media_share_media_image_height">62px</dimen>
|
||||
<dimen name="module_media_share_media_image_width">62px</dimen>
|
||||
<dimen name="module_media_share_media_name_back_left">12px</dimen>
|
||||
<dimen name="module_media_share_media_song_name_size">20px</dimen>
|
||||
<dimen name="module_media_share_media_singer_name_size">15px</dimen>
|
||||
<!-- lcc end-->
|
||||
|
||||
<!-- lidongxiu start-->
|
||||
<dimen name="module_media_share_fragment_width">421px</dimen>
|
||||
<dimen name="module_media_share_fragment_height">280px</dimen>
|
||||
<dimen name="module_media_share_fragment_title_padding_top">28px</dimen>
|
||||
<dimen name="module_media_share_fragment_title_padding_left">32.5px</dimen>
|
||||
<dimen name="module_media_share_fragment_bg_radius">11.5px</dimen>
|
||||
<dimen name="module_media_share_fragment_title_img_size">72.5px</dimen>
|
||||
<dimen name="module_media_share_fragment_title_img_right">10.7px</dimen>
|
||||
<dimen name="module_media_share_fragment_title_height">72.5px</dimen>
|
||||
<dimen name="module_media_share_fragment_title_padding">10px</dimen>
|
||||
<dimen name="module_media_share_fragment_title_scroll_tv1_size">22px</dimen>
|
||||
<dimen name="module_media_share_fragment_title_scroll_tv2_size">16px</dimen>
|
||||
<dimen name="module_media_share_fragment_center_text_size">18px</dimen>
|
||||
<dimen name="module_media_share_fragment_btn_size">22px</dimen>
|
||||
<dimen name="module_media_share_fragment_center_margin_top">32px</dimen>
|
||||
<dimen name="module_media_share_fragment_center_margin_bottom">51px</dimen>
|
||||
<dimen name="module_media_share_fragment_btn_height">68px</dimen>
|
||||
<dimen name="module_media_share_fragment_tv2_margin_top">2px</dimen>
|
||||
<dimen name="module_media_share_fragment_img_radius">3.2px</dimen>
|
||||
|
||||
<dimen name="module_media_pop_window_width">338px</dimen>
|
||||
<dimen name="module_media_pop_window_height">82px</dimen>
|
||||
<dimen name="module_media_pop_window_inner_height">60px</dimen>
|
||||
<dimen name="module_media_pop_window_inner_padding">18px</dimen>
|
||||
<dimen name="module_media_pop_window_anim_img_size">44px</dimen>
|
||||
<dimen name="module_media_pop_window_text_width">123px</dimen>
|
||||
<dimen name="module_media_pop_window_text_margin">10px</dimen>
|
||||
<dimen name="module_media_pop_window_text_top_size">18px</dimen>
|
||||
<dimen name="module_media_pop_window_text_bottom_size">14px</dimen>
|
||||
<dimen name="module_media_pop_window_control_img_size">30px</dimen>
|
||||
<dimen name="module_media_pop_window_control_margin_right">21px</dimen>
|
||||
<dimen name="module_media_pop_window_progress_height">4px</dimen>
|
||||
<dimen name="module_media_pop_window_radius">8px</dimen>
|
||||
<dimen name="module_media_pop_window_radius_margin">7px</dimen>
|
||||
|
||||
<dimen name="module_media_toast_share_width">267px</dimen>
|
||||
<dimen name="module_media_toast_share_height">187px</dimen>
|
||||
<dimen name="module_media_toast_share_bg_radius">10px</dimen>
|
||||
<dimen name="module_media_toast_share_img_size">64px</dimen>
|
||||
<dimen name="module_media_toast_share_text_size">18px</dimen>
|
||||
<dimen name="module_media_toast_share_margin_top">11px</dimen>
|
||||
|
||||
<dimen name="module_media_card_width">352px</dimen>
|
||||
<dimen name="module_media_card_height">352px</dimen>
|
||||
<dimen name="module_media_card_radius">10.5px</dimen>
|
||||
<dimen name="module_media_card_radius_blur">11px</dimen>
|
||||
<dimen name="module_media_card_share_full_margin_top">11.5px</dimen>
|
||||
<dimen name="module_media_card_no_share_anim_width">175px</dimen>
|
||||
<dimen name="module_media_card_no_share_anim_height">175px</dimen>
|
||||
<dimen name="module_media_card_no_share_anim_img_width">114px</dimen>
|
||||
<dimen name="module_media_card_no_share_anim_img_height">114px</dimen>
|
||||
<dimen name="module_media_card_no_share_music_top_title_size">20px</dimen>
|
||||
<dimen name="module_media_card_no_share_music_bottom_title_size">15px</dimen>
|
||||
<dimen name="module_media_card_no_share_music_top_title_margin">4px</dimen>
|
||||
<dimen name="module_media_card_no_share_music_bottom_title_margin">2px</dimen>
|
||||
<dimen name="module_media_card_progress_height">6px</dimen>
|
||||
<dimen name="module_media_card_progress_time_text_size">12px</dimen>
|
||||
<dimen name="module_media_card_progress_time_text_margin_left">11px</dimen>
|
||||
<dimen name="module_media_card_progress_time_text_margin_bottom">4px</dimen>
|
||||
<dimen name="module_media_card_control_icon_margin_bottom">1px</dimen>
|
||||
|
||||
<dimen name="module_media_card_control_icon_left_padding">8px</dimen>
|
||||
<dimen name="module_media_card_control_icon_size">44px</dimen>
|
||||
<dimen name="module_media_card_control_play_icon_size">62px</dimen>
|
||||
<dimen name="module_media_card_control_play_icon_margin">28px</dimen>
|
||||
<dimen name="module_media_card_progress_margin">1px</dimen>
|
||||
<dimen name="module_media_card_no_share_title_margin">35px</dimen>
|
||||
<dimen name="module_media_card_progress_bg_drawable_width">3.2px</dimen>
|
||||
<dimen name="module_media_card_progress_bg_drawable_height">6.4px</dimen>
|
||||
<dimen name="module_media_card_progress_pop_bg_drawable_width">3px</dimen>
|
||||
<dimen name="module_media_card_progress_pop_bg_drawable_height">4px</dimen>
|
||||
<dimen name="module_media_card_share_user_text_width_max">96px</dimen>
|
||||
|
||||
<dimen name="module_media_draw_rect_map_bottom">32px</dimen>
|
||||
<dimen name="module_media_draw_rect_map_left">400px</dimen>
|
||||
<dimen name="module_media_draw_rect_map_right">80px</dimen>
|
||||
<dimen name="module_media_draw_rect_map_top">150px</dimen>
|
||||
<dimen name="module_media_window_corner">16px</dimen>
|
||||
</resources>
|
||||
@@ -11,6 +11,7 @@ import androidx.appcompat.app.AppCompatDelegate;
|
||||
import androidx.appcompat.app.SkinAppCompatDelegateImpl;
|
||||
|
||||
import com.alibaba.android.arouter.facade.annotation.Route;
|
||||
import com.mogo.commons.AbsMogoApplication;
|
||||
import com.mogo.skin.support.IMogoSkinSupportInstaller;
|
||||
import com.mogo.skin.support.SkinMode;
|
||||
import com.mogo.skin.support.SkinSupportInstallerConstants;
|
||||
@@ -75,4 +76,9 @@ class SkinSupportInstaller implements IMogoSkinSupportInstaller {
|
||||
public void init( Context context ) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDestroy() {
|
||||
SkinActivityLifecycle.init( AbsMogoApplication.getApp() ).restoreOldFactory2( AbsMogoApplication.getApp() );
|
||||
}
|
||||
}
|
||||
|
||||
@@ -51,4 +51,9 @@ class SkinSupportInstaller implements IMogoSkinSupportInstaller {
|
||||
public void init( Context context ) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDestroy() {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -26,4 +26,6 @@ interface IMogoSkinSupportInstaller extends IProvider {
|
||||
AppCompatDelegate getSkinAppCompatDelegate( AppCompatActivity activity, AppCompatDelegate superDelegate, AppCompatCallback callback );
|
||||
|
||||
void onCompensateActivityCreated( Activity activity, Bundle savedInstanceState );
|
||||
|
||||
void onDestroy();
|
||||
}
|
||||
|
||||
@@ -17,6 +17,7 @@ import skin.support.observe.SkinObservable;
|
||||
import skin.support.observe.SkinObserver;
|
||||
import skin.support.utils.Slog;
|
||||
import skin.support.view.LayoutInflaterCompat;
|
||||
import skin.support.view.LayoutInflaterFactory;
|
||||
import skin.support.widget.SkinCompatSupportable;
|
||||
import skin.support.content.res.SkinCompatThemeUtils;
|
||||
|
||||
@@ -33,6 +34,9 @@ public class SkinActivityLifecycle implements Application.ActivityLifecycleCallb
|
||||
*/
|
||||
private WeakReference< Activity > mCurActivityRef;
|
||||
|
||||
private LayoutInflater.Factory2 mOldFactory2 = null;
|
||||
private LayoutInflater.Factory mOldFactory = null;
|
||||
|
||||
public static SkinActivityLifecycle init( Application application ) {
|
||||
if ( sInstance == null ) {
|
||||
synchronized ( SkinActivityLifecycle.class ) {
|
||||
@@ -109,6 +113,8 @@ public class SkinActivityLifecycle implements Application.ActivityLifecycleCallb
|
||||
private void installLayoutFactory( Context context ) {
|
||||
try {
|
||||
LayoutInflater layoutInflater = LayoutInflater.from( context );
|
||||
mOldFactory2 = layoutInflater.getFactory2();
|
||||
mOldFactory = layoutInflater.getFactory();
|
||||
LayoutInflaterCompat.setFactory2( layoutInflater, getSkinDelegate( context ) );
|
||||
} catch ( Throwable e ) {
|
||||
Slog.i( "SkinActivity", "A factory has already been set on this LayoutInflater" );
|
||||
@@ -201,4 +207,15 @@ public class SkinActivityLifecycle implements Application.ActivityLifecycleCallb
|
||||
mMarkNeedUpdate = false;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public void restoreOldFactory2(Context context){
|
||||
try {
|
||||
LayoutInflater layoutInflater = LayoutInflater.from( context );
|
||||
layoutInflater.setFactory2( mOldFactory2 );
|
||||
layoutInflater.setFactory( mOldFactory );
|
||||
} catch ( Throwable e ) {
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user