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

Merge branch 'qa_light' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into qa_light

Browse Source
This commit is contained in:
unknown
2020-09-17 18:52:39 +08:00
parent aac1a7033b f65a93a224
commit 1378cb808d
19 changed files with 61 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt
View File

@@ -212,9 +212,9 @@ class CosStatusController : CosStatusCallback {
latitude = latitude
) { success ->
CosCallbackMapController.unregisterCallbacks(map)
CosCallbackMapController.mainService?.let {
CosCallbackMapController.mainService?.sendCustomResult(success)
}
// CosCallbackMapController.mainService?.let {
// CosCallbackMapController.mainService?.sendCustomResult(success)
// }
Log.d(TAG, "type = $type ----success = $success")
if (success) {
//分享成功，并打点，如果是上报拥堵，需要takeVideo

10
libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt
View File

@@ -66,11 +66,11 @@ class MainService : Service() {
private var mLatitude: Double = 0.0
//发送主动上报结果广播给外部
fun sendCustomResult(result: Boolean) {
var intent = Intent(customResultAction)
intent.putExtra("isSuccess", result)
sendBroadcast(intent)
}
// fun sendCustomResult(result: Boolean) {
// var intent = Intent(customResultAction)
// intent.putExtra("isSuccess", result)
// sendBroadcast(intent)
// }
override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
Log.d(TAG, "onStartCommand -----------> ")

17
modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/AnimCircleImageView.java
View File

@@ -18,6 +18,7 @@ import android.widget.ImageView;
import com.mogo.module.common.utils.CarSeries;
import com.mogo.skin.support.IMogoSkinCompatSupportable;
import com.mogo.skin.support.helper.MogoSkinCompatHelperDelegate;
import com.mogo.skin.support.helper.MogoSkinCompatImageHelperDelegate;
@SuppressLint("AppCompatCustomView")
@@ -30,6 +31,8 @@ public class AnimCircleImageView extends ImageView implements IMogoSkinCompatSup
int defaultHeight;
int diameter;
int radius;
PaintFlagsDrawFilter drawFilter = new PaintFlagsDrawFilter(0, Paint.ANTI_ALIAS_FLAG|Paint.FILTER_BITMAP_FLAG);
Paint mPaint = new Paint(Paint.ANTI_ALIAS_FLAG | Paint.DITHER_FLAG);
MogoSkinCompatImageHelperDelegate imageHelper;
@@ -81,6 +84,7 @@ public class AnimCircleImageView extends ImageView implements IMogoSkinCompatSup
@Override
public void setImageResource(int resId) {
super.setImageResource(resId);
Log.d("AnimCircle", "setImageResource: " + MogoSkinCompatHelperDelegate.isSupport());
imageHelper.setImageResource(resId);
mDrawbleSrc = getDrawable();
output = null;
@@ -112,7 +116,7 @@ public class AnimCircleImageView extends ImageView implements IMogoSkinCompatSup
@Override
protected void onDraw(Canvas canvas) {
Log.d("AnimCircle", "onDraw====");
// Log.d("AnimCircle", "onDraw====");
try {
if (mDrawbleSrc == null) {
return;
@@ -131,7 +135,8 @@ public class AnimCircleImageView extends ImageView implements IMogoSkinCompatSup
defaultWidth = getWidth();
diameter = (defaultHeight > defaultWidth ? defaultWidth : defaultHeight);
radius = diameter / 2;
mBitmapOut = getCuttedPicture(mDrawbleSrc);
// mBitmapOut = getCuttedPicture(mDrawbleSrc);
mBitmapOut = ((BitmapDrawable) mDrawbleSrc).getBitmap();
Paint paint = new Paint();
Rect rect = new Rect(0, 0, mBitmapOut.getWidth(),
@@ -156,9 +161,9 @@ public class AnimCircleImageView extends ImageView implements IMogoSkinCompatSup
if (isRotateEnable) {
currentDegree = (currentDegree + mRotateAngleStep) % 360;
canvas.save();
canvas.setDrawFilter(new PaintFlagsDrawFilter(0, Paint.ANTI_ALIAS_FLAG|Paint.FILTER_BITMAP_FLAG));
canvas.setDrawFilter(drawFilter);
canvas.rotate(currentDegree, defaultWidth / 2, defaultHeight / 2);
canvas.drawBitmap(output, defaultWidth / 2 - radius, defaultHeight / 2 - radius, null);
canvas.drawBitmap(output, defaultWidth / 2 - radius, defaultHeight / 2 - radius, mPaint);
canvas.restore();
if (isRotateEnable) {
removeCallbacks(loopInvalidate);
@@ -167,9 +172,9 @@ public class AnimCircleImageView extends ImageView implements IMogoSkinCompatSup
}
} else {
canvas.save();
canvas.setDrawFilter(new PaintFlagsDrawFilter(0, Paint.ANTI_ALIAS_FLAG|Paint.FILTER_BITMAP_FLAG));
canvas.setDrawFilter(drawFilter);
canvas.rotate(currentDegree, defaultWidth / 2, defaultHeight / 2);
canvas.drawBitmap(output, defaultWidth / 2 - radius, defaultHeight / 2 - radius, null);
canvas.drawBitmap(output, defaultWidth / 2 - radius, defaultHeight / 2 - radius, mPaint);
canvas.restore();
}
} catch (Exception e) {

14
modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java
View File

@@ -12,6 +12,7 @@ import android.widget.TextView;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.commons.voice.AIAssist;
import com.mogo.commons.voice.IMogoVoiceCmdCallBack;
import com.mogo.module.common.glide.SkinAbleBitmapTarget;
import com.mogo.module.media.MediaConstants;
import com.mogo.module.media.R;
import com.mogo.module.media.ServiceMediaHandler;
@@ -92,6 +93,11 @@ public class MediaWindow2 implements IMusicView {
return;
}
if(!ServiceMediaHandler.getIMogoStatusManager().isMainPageOnResume()){
Log.d(TAG, "not in front");
return;
}
if (!mHasAddWindow) {
mHasAddWindow = true;
mWindowView =
@@ -199,10 +205,14 @@ public class MediaWindow2 implements IMusicView {
if (mCircleImg != null) {
if(mMediaInfoData!=null&&mMediaInfoData.getMediaImg()!=null&&!mMediaInfoData.getMediaImg().isEmpty()) {
int size =
mContext.getResources().getDimensionPixelSize(R.dimen.module_media_pop_window_anim_img_size);
Logger.d(TAG, "overload: " + size);
com.bumptech.glide.request.RequestOptions options =
new com.bumptech.glide.request.RequestOptions()
.placeholder(R.drawable.module_media_default_music_img);
// GlideApp.with(mContext).applyDefaultRequestOptions(options).load(mMediaInfoData.getMediaImg()).into(mCircleImg);
.placeholder(R.drawable.module_media_default_music_img).error(R.drawable.module_media_default_music_img).override(size, size);
GlideApp.with(mContext).asBitmap().apply(options).load(mMediaInfoData.getMediaImg()).into(new SkinAbleBitmapTarget(mCircleImg, options));
// GlideApp.with(mContext).applyDefaultRequestOptions(options).load(mMediaInfoData.getMediaImg()).into(new SkinAbleBitmapTarget(mCircleImg, options));
}else{
mCircleImg.setImageResource(R.drawable.module_media_default_music_img);
}

BIN
modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_window_alert_bg.9.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 588 B

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_window_alert_bg.9.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 588 B

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_window_alert_bg.9.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

2
modules/mogo-module-media/src/main/res/values-xhdpi/dimens.xml
View File

@@ -65,7 +65,7 @@
<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">90px</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>

2
modules/mogo-module-media/src/main/res/values/dimens.xml
View File

@@ -65,7 +65,7 @@
<dimen name="module_media_pop_window_height">76.7px</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">48px</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>

1
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java
View File

@@ -55,6 +55,7 @@ public class V2XScenarioHistoryFragment
mEmptyView = findViewById(R.id.viewEmpty);
mClHistoryList = findViewById(R.id.clHistoryList);
mRecyclerView = findViewById(R.id.recyclerView);
mRecyclerView.addItemDecoration(new SpacesItemDecoration((int) getResources().getDimension(R.dimen.share_item_padding)));
mV2XScenarioHistoryAdapter = new V2XScenarioHistoryAdapter(mV2XHistoryScenarioData);
mRecyclerView.setAdapter(mV2XScenarioHistoryAdapter);
mRecyclerView.addItemDecoration(new SpacesItemDecoration(14));

2
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
View File

@@ -13,6 +13,7 @@ import androidx.recyclerview.widget.RecyclerView;
import com.mogo.commons.mvp.MvpFragment;
import com.mogo.module.v2x.R;
import com.mogo.module.v2x.SpacesItemDecoration;
import com.mogo.module.v2x.adapter.V2XShareEventAdapter;
import com.mogo.module.v2x.entity.panel.V2XShareEventDescription;
import com.mogo.module.v2x.entity.panel.V2XShareEventItem;
@@ -61,6 +62,7 @@ public class V2XShareEventsFragment extends MvpFragment<V2XShareEventsFragment,
private void initRecyclerView() {
recyclerView = mRootView.findViewById(R.id.road_case_share_list);
recyclerView.addItemDecoration(new SpacesItemDecoration((int) getResources().getDimension(R.dimen.share_item_padding)));
adapter = new V2XShareEventAdapter(getActivity(), dataArrayList, this);
recyclerView.setAdapter(adapter);
LinearLayoutManager linearLayoutManager =

8
modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml
View File

@@ -5,18 +5,20 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/v2x_alert_window_bg"
android:padding="@dimen/dp_25"
android:paddingTop="@dimen/dp_20"
android:paddingBottom="@dimen/dp_20"
app:roundLayoutRadius="@dimen/dp_30">
<com.mogo.module.v2x.view.RoundLayout
android:id="@+id/rlRoadEventImg"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginStart="@dimen/dp_20"
android:background="@color/v2x_555A_F5F5"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:roundLayoutRadius="@dimen/dp_30">
app:roundLayoutRadius="@dimen/dp_18">
<com.mogo.service.imageloader.MogoImageView
android:id="@+id/ivEventImg"
@@ -109,7 +111,7 @@
android:id="@+id/ivEventHead"
android:layout_width="@dimen/dp_55"
android:layout_height="@dimen/dp_55"
android:layout_marginEnd="@dimen/dp_33"
android:layout_marginEnd="@dimen/dp_28"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/tvEventTypeTitle"
app:miv_borderColor="#4cffffff"

6
modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml
View File

@@ -11,12 +11,12 @@
android:id="@+id/tagEventType"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_24"
android:layout_marginStart="@dimen/module_v2x_surrounding_item_bottom_image_height"
android:layout_marginTop="@dimen/dp_24"
android:background="@drawable/bg_v2x_event_type_read"
android:gravity="center"
android:paddingLeft="@dimen/dp_10"
android:paddingTop="@dimen/dp_3"
android:paddingTop="@dimen/dp_5"
android:paddingRight="@dimen/dp_10"
android:paddingBottom="@dimen/dp_3"
android:text="违章停车"
@@ -50,7 +50,7 @@
android:layout_marginStart="@dimen/dp_24"
android:layout_marginEnd="@dimen/dp_16"
android:src="@drawable/icon_illegal_parking"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintLeft_toLeftOf="@+id/tagEventType"
app:layout_constraintTop_toBottomOf="@+id/tagEventType"
app:layout_constraintTop_toTopOf="@+id/tvAddress" />

1
modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml
View File

@@ -2,6 +2,7 @@
<androidx.constraintlayout.widget.ConstraintLayout 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:id="@+id/rlContent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/bg_v2x_event_list_item">

6
modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_description.xml
View File

@@ -3,8 +3,8 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="20px"
android:layout_marginRight="20px"
android:layout_marginLeft="@dimen/dp_50"
android:layout_marginRight="@dimen/dp_50"
android:layout_marginBottom="14px"
android:background="@drawable/bg_v2x_event_description"
android:orientation="vertical">
@@ -19,7 +19,7 @@
android:paddingLeft="20px"
android:paddingTop="10px"
android:text="小窍门：分享路况，点赞其他车主，有助于提高热心指数"
android:textColor="#FFFFFF"
android:textColor="#CCFFFFFF"
android:textSize="@dimen/share_top_text_size">
</TextView>

12
modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml
View File

@@ -4,16 +4,16 @@
android:id="@+id/road_case_liset_item"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="20px"
android:layout_marginRight="20px"
android:layout_marginBottom="14px"
android:layout_marginLeft="@dimen/dp_50"
android:layout_marginRight="@dimen/dp_50"
android:layout_marginBottom="@dimen/dp_14"
android:background="@drawable/bg_v2x_event_list_item">
<TextView
android:id="@+id/road_case_style"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginLeft="@dimen/dp_36"
android:layout_marginTop="@dimen/dp_24"
android:background="@drawable/bg_v2x_event_type_read"
android:gravity="center"
@@ -80,7 +80,7 @@
android:lines="1"
android:text="东城区北三环附近维多欧美"
android:textColor="@color/v2x_FFF_333"
android:textSize="@dimen/dp_34" />
android:textSize="@dimen/dp_32" />
<TextView
android:id="@+id/road_case_share_time"
@@ -94,5 +94,5 @@
android:gravity="left"
android:text="时间:"
android:textColor="@color/v2x_FFF_666"
android:textSize="@dimen/dp_30" />
android:textSize="@dimen/share_item_text_size" />
</RelativeLayout>

2
modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail.xml
View File

@@ -24,7 +24,7 @@
android:layout_width="@dimen/dp_88"
android:layout_height="@dimen/dp_88"
android:layout_marginEnd="@dimen/dp_28"
android:layout_marginBottom="@dimen/dp_28"
android:layout_marginBottom="@dimen/dp_65"
android:background="@drawable/icon_window_close2"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent" />

3
modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
View File

@@ -76,5 +76,6 @@
<dimen name="v2x_panel_btn_translationY">-8px</dimen>
<dimen name="module_v2x_panel_tab_height">84px</dimen>
<dimen name="v2x_panel_loading_top">120px</dimen>
<dimen name="share_item_text_size">16px</dimen>
<dimen name="share_item_padding">20px</dimen>
</resources>

5
modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
View File

@@ -64,7 +64,7 @@
<dimen name="v2x_share_btn_width">281px</dimen>
<dimen name="v2x_share_btn_height">90px</dimen>
<dimen name="v2x_index_rating_top">28px</dimen>
<dimen name="share_top_text_size">30px</dimen>
<dimen name="share_top_text_size">28px</dimen>
<dimen name="share_des_num_size">67.5px</dimen>
<dimen name="share_index_des_size">30px</dimen>
<dimen name="share_empty_btn_padding">40px</dimen>
@@ -75,5 +75,8 @@
<dimen name="v2x_panel_btn_image_width">114px</dimen>
<dimen name="module_v2x_panel_tab_height">158px</dimen>
<dimen name="v2x_panel_loading_top">300px</dimen>
<dimen name="share_item_text_size">26px</dimen>
<dimen name="share_item_padding">25px</dimen>
</resources>