新增部分功能的白天模式资源

This commit is contained in:
wangcongtao
2020-09-02 14:52:29 +08:00
parent bc4dd4547d
commit 933d0baf67
33 changed files with 99 additions and 49 deletions

View File

@@ -20,6 +20,6 @@
android:layout_marginTop="@dimen/module_apps_app_name_marginTop"
android:gravity="center"
android:maxLines="2"
android:textColor="#FFFFFF"
android:textColor="@color/module_apps_id_app_name_textColor"
android:textSize="@dimen/module_apps_app_name_textSize" />
</LinearLayout>

View File

@@ -16,6 +16,7 @@
<color name="bg_common">#080625</color>
<color name="txt_blue">#3E7FFC</color>
<color name="module_app_page_bkg_color">#0C0C0C</color>
<color name="module_app_page_bkg_color">#E6000000</color>
<color name="module_apps_id_app_name_textColor">#FFFFFF</color>
</resources>

View File

@@ -24,6 +24,6 @@
<dimen name="module_apps_navigator_icon_width">78px</dimen>
<dimen name="module_apps_navigator_icon_height">78px</dimen>
<dimen name="module_apps_navigator_icon_divider">17px</dimen>
<dimen name="module_apps_voice_icon_width">60px</dimen>
<dimen name="module_apps_voice_icon_height">60px</dimen>
<dimen name="module_apps_voice_icon_width">55px</dimen>
<dimen name="module_apps_voice_icon_height">55px</dimen>
</resources>

View File

@@ -108,8 +108,8 @@ class MessageHistoryFragment extends MvpFragment< MessageHistoryView, MessageHis
if ( size > 0 && size < mHistoryList.getChildCount() ) {
return;
}
mClear.setVisibility( show ? View.VISIBLE : View.GONE );
}
mClear.setVisibility( show ? View.VISIBLE : View.GONE );
}
};
mViewModel = new MessageViewModel( list -> {
@@ -126,6 +126,8 @@ class MessageHistoryFragment extends MvpFragment< MessageHistoryView, MessageHis
mHistoryList.setItemAnimator( new PushItemAnimator() );
mHistoryList.addOnItemTouchListener( new SwipeItemLayout.OnSwipeItemTouchListener( getContext() ) );
mRootView.setOnClickListener( view -> {
} );
GlobalToolsKt.getApis( getContext() ).getMsgCenterApi().registerMsgCenterListener( this );
}

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#FA36374A"/>
<solid android:color="#F710121E"/>
<corners android:radius="@dimen/module_push_panel_corner"/>
</shape>

View File

@@ -9,7 +9,6 @@
android:layout_marginLeft="@dimen/module_push_panel_marginRight"
android:paddingLeft="@dimen/module_push_panel_paddingLeft"
android:paddingRight="@dimen/module_push_panel_paddingLeft"
android:paddingBottom="@dimen/module_push_panel_paddingBottom"
android:background="@drawable/module_push_message_activity_background"
android:layout_gravity="center_vertical">
@@ -44,7 +43,7 @@
android:layout_gravity="center"
android:gravity="center"
android:text="暂无消息"
android:textColor="@android:color/white"
android:textColor="@color/module_push_panel_title_textColor"
android:textSize="@dimen/module_push_activity_not_data_text_size" />
<TextView
@@ -56,7 +55,7 @@
android:background="@drawable/module_push_activity_clear_bg"
android:gravity="center"
android:text="清空历史消息"
android:textColor="@android:color/white"
android:textColor="@color/module_push_panel_title_textColor"
android:textSize="@dimen/module_push_title_text_size"
android:visibility="gone"
tools:visibility="visible" />

View File

@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<com.mogo.module.push.view.SwipeItemLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingBottom="@dimen/module_push_content_only_line_space">
android:paddingBottom="@dimen/module_push_panel_paddingBottom">
<FrameLayout
android:layout_width="match_parent"
@@ -32,15 +33,15 @@
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/module_push_image_margin_top"
android:layout_marginTop="@dimen/module_push_item_title_margin_top"
android:layout_marginBottom="@dimen/module_push_item_title_margin_bottom"
android:ellipsize="end"
android:gravity="left"
android:maxLines="1"
android:text="push title"
android:textColor="@color/module_push_item_title_textColor"
android:textSize="@dimen/module_push_title_text_size"
app:layout_constraintBottom_toTopOf="@+id/module_push_item_content"
android:textStyle="bold"
app:layout_constraintLeft_toRightOf="@+id/module_push_item_app_icon"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintWidth_max="@dimen/module_push_item_content_width"
app:layout_goneMarginBottom="@dimen/module_push_item_title_gone_margin_bottom" />
@@ -49,20 +50,19 @@
android:layout_width="@dimen/module_push_item_content_width"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/module_push_item_content_margin_end"
android:layout_marginBottom="@dimen/module_push_item_content_margin_bottom"
android:ellipsize="end"
android:gravity="left"
android:maxLines="1"
android:text="发现系统新版本共140.3M。部分功能优化,建议下载升级。"
android:textColor="@color/module_push_item_content_textColor"
android:textSize="@dimen/module_push_item_content_text_size"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="@+id/module_push_item_title" />
app:layout_constraintStart_toStartOf="@+id/module_push_item_title"
app:layout_constraintTop_toBottomOf="@+id/module_push_item_title"
tools:text="发现系统新版本共140.3M。部分功能优化,建议下载升级。" />
<com.mogo.service.imageloader.MogoImageView
android:id="@+id/module_push_item_image"
android:layout_width="@dimen/module_push_message_item_image_size"
android:layout_height="@dimen/module_push_message_item_image_size"
android:layout_width="@dimen/module_push_item_image_width"
android:layout_height="@dimen/module_push_item_image_height"
android:layout_marginEnd="@dimen/module_push_message_item_image_margin_end"
android:scaleType="centerCrop"
app:layout_constraintBottom_toBottomOf="parent"
@@ -75,14 +75,14 @@
android:id="@+id/module_push_item_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/module_push_item_time_textSize"
android:layout_marginEnd="@dimen/module_push_image_margin_top"
android:maxLines="1"
android:text="3:20"
android:layout_marginTop="@dimen/module_push_item_time_textSize"
android:textColor="@color/module_push_item_time_textColor"
android:textSize="@dimen/module_push_massage_time_text_size"
app:layout_constraintLeft_toLeftOf="@+id/module_push_item_content"
app:layout_constraintTop_toBottomOf="@+id/module_push_item_content" />
app:layout_constraintTop_toBottomOf="@+id/module_push_item_content"
tools:text="3:20" />
</androidx.constraintlayout.widget.ConstraintLayout>
</FrameLayout>
@@ -98,7 +98,7 @@
android:layout_marginStart="@dimen/module_push_button_margin_top"
android:background="@drawable/module_push_recycler_item_background"
android:gravity="center"
android:text="清除"
android:text="@string/module_push_str_delete"
android:textColor="@color/module_push_item_title_textColor"
android:textSize="@dimen/module_push_title_text_size" />
</FrameLayout>

View File

@@ -14,7 +14,7 @@
<dimen name="module_push_timer_margin_top">18px</dimen>
<dimen name="module_push_image_width">320px</dimen>
<dimen name="module_push_image_height">180px</dimen>
<dimen name="module_push_image_margin_top">21px</dimen>
<dimen name="module_push_image_margin_top">16px</dimen>
<dimen name="module_push_content_only_width">320px</dimen>
<dimen name="module_push_content_only_height">160px</dimen>
<dimen name="module_push_content_only_line_space">9px</dimen>
@@ -34,15 +34,15 @@
<dimen name="module_push_message_item_height">100px</dimen>
<dimen name="module_push_message_app_icon_size">64px</dimen>
<dimen name="module_push_message_margin_start">24px</dimen>
<dimen name="module_push_item_title_margin_top">12px</dimen>
<dimen name="module_push_item_title_margin_top">16px</dimen>
<dimen name="module_push_item_title_gone_margin_bottom">44px</dimen>
<dimen name="module_push_item_title_margin_bottom">2px</dimen>
<dimen name="module_push_item_content_margin_end">20px</dimen>
<dimen name="module_push_item_content_margin_bottom">27px</dimen>
<dimen name="module_push_item_content_text_size">16px</dimen>
<dimen name="module_push_message_item_image_size">64px</dimen>
<dimen name="module_push_message_item_image_margin_end">100px</dimen>
<dimen name="module_push_massage_time_text_size">12px</dimen>
<dimen name="module_push_message_item_image_margin_end">8px</dimen>
<dimen name="module_push_massage_time_text_size">16px</dimen>
<dimen name="module_push_image_margin_bottom">22px</dimen>
<dimen name="module_push_button_radius">27px</dimen>
@@ -50,7 +50,7 @@
<dimen name="module_push_timer_thickness">1.5px</dimen>
<dimen name="module_push_clear_bg_radius">24px</dimen>
<dimen name="module_push_image_radius">10px</dimen>
<dimen name="module_push_item_image_radius">4px</dimen>
<dimen name="module_push_item_image_radius">8px</dimen>
<dimen name="module_push_item_content_width">560px</dimen>
<dimen name="module_push_ui_height">194px</dimen>
<dimen name="module_push_ui_image_width">266px</dimen>
@@ -95,4 +95,6 @@
<dimen name="module_push_panel_corner">16px</dimen>
<dimen name="module_push_panel_item_corner">12px</dimen>
<dimen name="module_push_item_time_textSize">5px</dimen>
<dimen name="module_push_item_image_width">118px</dimen>
<dimen name="module_push_item_image_height">86px</dimen>
</resources>

View File

@@ -14,7 +14,7 @@
<dimen name="module_push_timer_margin_top">18px</dimen>
<dimen name="module_push_image_width">320px</dimen>
<dimen name="module_push_image_height">180px</dimen>
<dimen name="module_push_image_margin_top">21px</dimen>
<dimen name="module_push_image_margin_top">16px</dimen>
<dimen name="module_push_content_only_width">320px</dimen>
<dimen name="module_push_content_only_height">160px</dimen>
<dimen name="module_push_content_only_line_space">9px</dimen>
@@ -34,15 +34,15 @@
<dimen name="module_push_message_item_height">100px</dimen>
<dimen name="module_push_message_app_icon_size">64px</dimen>
<dimen name="module_push_message_margin_start">24px</dimen>
<dimen name="module_push_item_title_margin_top">12px</dimen>
<dimen name="module_push_item_title_margin_top">16px</dimen>
<dimen name="module_push_item_title_gone_margin_bottom">44px</dimen>
<dimen name="module_push_item_title_margin_bottom">2px</dimen>
<dimen name="module_push_item_content_margin_end">20px</dimen>
<dimen name="module_push_item_content_margin_bottom">27px</dimen>
<dimen name="module_push_item_content_text_size">16px</dimen>
<dimen name="module_push_message_item_image_size">64px</dimen>
<dimen name="module_push_message_item_image_margin_end">100px</dimen>
<dimen name="module_push_massage_time_text_size">12px</dimen>
<dimen name="module_push_message_item_image_margin_end">8px</dimen>
<dimen name="module_push_massage_time_text_size">16px</dimen>
<dimen name="module_push_image_margin_bottom">22px</dimen>
<dimen name="module_push_button_radius">27px</dimen>
@@ -50,7 +50,7 @@
<dimen name="module_push_timer_thickness">1.5px</dimen>
<dimen name="module_push_clear_bg_radius">24px</dimen>
<dimen name="module_push_image_radius">10px</dimen>
<dimen name="module_push_item_image_radius">4px</dimen>
<dimen name="module_push_item_image_radius">8px</dimen>
<dimen name="module_push_item_content_width">560px</dimen>
<dimen name="module_push_ui_height">194px</dimen>
<dimen name="module_push_ui_image_width">266px</dimen>
@@ -95,4 +95,6 @@
<dimen name="module_push_panel_corner">16px</dimen>
<dimen name="module_push_panel_item_corner">12px</dimen>
<dimen name="module_push_item_time_textSize">5px</dimen>
<dimen name="module_push_item_image_width">118px</dimen>
<dimen name="module_push_item_image_height">86px</dimen>
</resources>

View File

@@ -14,7 +14,7 @@
<dimen name="module_push_timer_margin_top">34px</dimen>
<dimen name="module_push_image_width">600px</dimen>
<dimen name="module_push_image_height">338px</dimen>
<dimen name="module_push_image_margin_top">40px</dimen>
<dimen name="module_push_image_margin_top">30px</dimen>
<dimen name="module_push_content_only_width">605px</dimen>
<dimen name="module_push_content_only_height">300px</dimen>
<dimen name="module_push_content_only_line_space">16px</dimen>
@@ -34,7 +34,7 @@
<dimen name="module_push_message_item_height">180px</dimen>
<dimen name="module_push_message_app_icon_size">120px</dimen>
<dimen name="module_push_message_margin_start">50px</dimen>
<dimen name="module_push_item_title_margin_top">21px</dimen>
<dimen name="module_push_item_title_margin_top">22px</dimen>
<dimen name="module_push_item_title_margin_bottom">6px</dimen>
<dimen name="module_push_item_title_gone_margin_bottom">84px</dimen>
@@ -42,7 +42,7 @@
<dimen name="module_push_item_content_margin_bottom">52px</dimen>
<dimen name="module_push_item_content_text_size">28px</dimen>
<dimen name="module_push_message_item_image_size">120px</dimen>
<dimen name="module_push_message_item_image_margin_end">180px</dimen>
<dimen name="module_push_message_item_image_margin_end">11px</dimen>
<dimen name="module_push_massage_time_text_size">26px</dimen>
<dimen name="module_push_image_margin_bottom">42px</dimen>
<dimen name="module_push_button_radius">51px</dimen>
@@ -50,7 +50,7 @@
<dimen name="module_push_timer_thickness">3px</dimen>
<dimen name="module_push_clear_bg_radius">45px</dimen>
<dimen name="module_push_image_radius">20px</dimen>
<dimen name="module_push_item_image_radius">8px</dimen>
<dimen name="module_push_item_image_radius">16px</dimen>
<dimen name="module_push_item_content_width">1000px</dimen>
<dimen name="module_push_ui_height">350px</dimen>
<dimen name="module_push_ui_image_width">480px</dimen>
@@ -95,4 +95,6 @@
<dimen name="module_push_panel_corner">29px</dimen>
<dimen name="module_push_panel_item_corner">22px</dimen>
<dimen name="module_push_item_time_textSize">11px</dimen>
<dimen name="module_push_item_image_width">212px</dimen>
<dimen name="module_push_item_image_height">154px</dimen>
</resources>

View File

@@ -3,5 +3,5 @@
<color name="module_push_panel_title_textColor">#FFFFFFFF</color>
<color name="module_push_item_title_textColor">#FFFFFF</color>
<color name="module_push_item_content_textColor">#B2FFFFFF</color>
<color name="module_push_item_time_textColor">#B2FFFFFF</color>
<color name="module_push_item_time_textColor">#999999</color>
</resources>

View File

@@ -14,7 +14,7 @@
<dimen name="module_push_timer_margin_top">18px</dimen>
<dimen name="module_push_image_width">320px</dimen>
<dimen name="module_push_image_height">180px</dimen>
<dimen name="module_push_image_margin_top">21px</dimen>
<dimen name="module_push_image_margin_top">16px</dimen>
<dimen name="module_push_content_only_width">320px</dimen>
<dimen name="module_push_content_only_height">160px</dimen>
<dimen name="module_push_content_only_line_space">9px</dimen>
@@ -34,15 +34,15 @@
<dimen name="module_push_message_item_height">100px</dimen>
<dimen name="module_push_message_app_icon_size">64px</dimen>
<dimen name="module_push_message_margin_start">24px</dimen>
<dimen name="module_push_item_title_margin_top">12px</dimen>
<dimen name="module_push_item_title_margin_top">16px</dimen>
<dimen name="module_push_item_title_gone_margin_bottom">44px</dimen>
<dimen name="module_push_item_title_margin_bottom">2px</dimen>
<dimen name="module_push_item_content_margin_end">20px</dimen>
<dimen name="module_push_item_content_margin_bottom">27px</dimen>
<dimen name="module_push_item_content_text_size">16px</dimen>
<dimen name="module_push_message_item_image_size">64px</dimen>
<dimen name="module_push_message_item_image_margin_end">100px</dimen>
<dimen name="module_push_massage_time_text_size">12px</dimen>
<dimen name="module_push_message_item_image_margin_end">8px</dimen>
<dimen name="module_push_massage_time_text_size">16px</dimen>
<dimen name="module_push_image_margin_bottom">22px</dimen>
<dimen name="module_push_button_radius">27px</dimen>
@@ -50,7 +50,7 @@
<dimen name="module_push_timer_thickness">1.5px</dimen>
<dimen name="module_push_clear_bg_radius">24px</dimen>
<dimen name="module_push_image_radius">10px</dimen>
<dimen name="module_push_item_image_radius">4px</dimen>
<dimen name="module_push_item_image_radius">8px</dimen>
<dimen name="module_push_item_content_width">560px</dimen>
<dimen name="module_push_ui_height">194px</dimen>
<dimen name="module_push_ui_image_width">266px</dimen>
@@ -95,4 +95,6 @@
<dimen name="module_push_panel_corner">16px</dimen>
<dimen name="module_push_panel_item_corner">12px</dimen>
<dimen name="module_push_item_time_textSize">5px</dimen>
<dimen name="module_push_item_image_width">118px</dimen>
<dimen name="module_push_item_image_height">86px</dimen>
</resources>

View File

@@ -1,3 +1,4 @@
<resources>
<string name="app_name">mogo-module-push</string>
<string name="module_push_str_delete">清除</string>
</resources>

View File

@@ -149,13 +149,13 @@ class NaviSettingFragment : BaseFragment(), OnCheckedChangeListener {
SettingManager.mapType = checkedId
when (checkedId) {
R.id.rb_navi_day -> {
SearchApisHolder.getUiControllerApis().changeMapMode(EnumMapUI.Type_Light)
SearchApisHolder.getApis().adasControllerApi.changeAdasControlMode(EnumMapUI.Type_Light)
}
R.id.rb_navi_night -> {
SearchApisHolder.getUiControllerApis().changeMapMode(EnumMapUI.Type_Night)
SearchApisHolder.getApis().adasControllerApi.changeAdasControlMode(EnumMapUI.Type_Night)
}
R.id.rb_navi_auto -> {
SearchApisHolder.getUiControllerApis().changeMapMode(EnumMapUI.Type_AUTO_LIGHT_Night)
SearchApisHolder.getApis().adasControllerApi.changeAdasControlMode(EnumMapUI.Type_AUTO_LIGHT_Night)
}
}
}

View File

@@ -36,6 +36,7 @@ import com.mogo.module.service.utils.ViewUtils;
import com.mogo.service.adas.IMogoADASControlStatusChangedListener;
import com.mogo.service.connection.IMogoOnMessageListener;
import com.mogo.service.module.IMogoBizActionDoneListener;
import com.mogo.utils.AppUtils;
import com.mogo.utils.ResourcesHelper;
import com.mogo.utils.ThreadPoolService;
import com.mogo.utils.UiThreadHandler;
@@ -959,7 +960,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener,
switch ( mapUI ) {
case Type_Light:
case Type_Night:
if ( !MarkerServiceHandler.getApis().getStatusManagerApi().isMainPageOnResume() ) {
if ( !AppUtils.isAppForeground( mContext ) ) {
return;
}
if ( mLastDataResult != null ) {

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

View File

@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="false">
<shape android:shape="rectangle">
<!-- 填充的颜色 -->
<solid android:color="#4D333333" />
<!-- 设置矩形的四个角为弧形 -->
<!-- android:radius 弧形的半径 -->
<corners android:radius="90px" />
</shape>
</item>
<item android:state_selected="true">
<shape android:shape="rectangle">
<!-- 填充的颜色 -->
<solid android:color="#333333" />
<!-- 设置矩形的四个角为弧形 -->
<!-- android:radius 弧形的半径 -->
<corners android:radius="90px" />
</shape>
</item>
</selector>

View File

@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="module_app_page_bkg_color_light">#B2F5F5F5</color>
<color name="module_app_page_bkg_color_light">#F5F5F5</color>
<color name="module_apps_id_app_name_textColor_light">#333333</color>
</resources>

Binary file not shown.

After

Width:  |  Height:  |  Size: 444 B

View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="@dimen/module_push_clear_bg_radius" />
<solid android:color="#FEFEFF"/>
</shape>

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#FFFFFF"/>
<solid android:color="#E6F5F5F5"/>
<corners android:radius="@dimen/module_push_panel_corner"/>
</shape>

View File

@@ -2,4 +2,5 @@
<resources>
<dimen name="module_push_panel_corner">16px</dimen>
<dimen name="module_push_panel_item_corner">12px</dimen>
<dimen name="module_push_clear_bg_radius">24px</dimen>
</resources>

View File

@@ -2,4 +2,5 @@
<resources>
<dimen name="module_push_panel_corner">16px</dimen>
<dimen name="module_push_panel_item_corner">12px</dimen>
<dimen name="module_push_clear_bg_radius">24px</dimen>
</resources>

View File

@@ -2,4 +2,5 @@
<resources>
<dimen name="module_push_panel_corner">29px</dimen>
<dimen name="module_push_panel_item_corner">22px</dimen>
<dimen name="module_push_clear_bg_radius">45px</dimen>
</resources>

View File

@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="module_push_panel_title_textColor_light">#333333</color>
<color name="module_push_item_title_textColor_light">#333333</color>
<color name="module_push_item_content_textColor_light">#666666</color>
<color name="module_push_item_time_textColor_light">#666666</color>
<color name="module_push_item_time_textColor_light">#999999</color>
</resources>

View File

@@ -2,4 +2,5 @@
<resources>
<dimen name="module_push_panel_corner">16px</dimen>
<dimen name="module_push_panel_item_corner">12px</dimen>
<dimen name="module_push_clear_bg_radius">24px</dimen>
</resources>

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB