diff --git a/foudations/mogo-connection/src/androidTest/java/com/mogo/connection/ExampleInstrumentedTest.java b/foudations/mogo-connection/src/androidTest/java/com/mogo/connection/ExampleInstrumentedTest.java deleted file mode 100644 index 1cd82231e4..0000000000 --- a/foudations/mogo-connection/src/androidTest/java/com/mogo/connection/ExampleInstrumentedTest.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.mogo.connection; - -import android.content.Context; - -import androidx.test.platform.app.InstrumentationRegistry; -import androidx.test.ext.junit.runners.AndroidJUnit4; - -import org.junit.Test; -import org.junit.runner.RunWith; - -import static org.junit.Assert.*; - -/** - * Instrumented test, which will execute on an Android device. - * - * @see Testing documentation - */ -@RunWith( AndroidJUnit4.class ) -public class ExampleInstrumentedTest { - @Test - public void useAppContext() { - // Context of the app under test. - Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); - - assertEquals( "com.mogo.connection.test", appContext.getPackageName() ); - } -} diff --git a/foudations/mogo-connection/src/test/java/com/mogo/connection/ExampleUnitTest.java b/foudations/mogo-connection/src/test/java/com/mogo/connection/ExampleUnitTest.java deleted file mode 100644 index 95f78e9701..0000000000 --- a/foudations/mogo-connection/src/test/java/com/mogo/connection/ExampleUnitTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.mogo.connection; - -import org.junit.Test; - -import static org.junit.Assert.*; - -/** - * Example local unit test, which will execute on the development machine (host). - * - * @see Testing documentation - */ -public class ExampleUnitTest { - @Test - public void addition_isCorrect() { - assertEquals( 4, 2 + 2 ); - } -} \ No newline at end of file diff --git a/foudations/mogo-utils/src/androidTest/java/com/mogo/utils/ExampleInstrumentedTest.java b/foudations/mogo-utils/src/androidTest/java/com/mogo/utils/ExampleInstrumentedTest.java deleted file mode 100644 index dca1040e3f..0000000000 --- a/foudations/mogo-utils/src/androidTest/java/com/mogo/utils/ExampleInstrumentedTest.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.mogo.utils; - -import android.content.Context; - -import androidx.test.platform.app.InstrumentationRegistry; -import androidx.test.ext.junit.runners.AndroidJUnit4; - -import org.junit.Test; -import org.junit.runner.RunWith; - -import static org.junit.Assert.*; - -/** - * Instrumented test, which will execute on an Android device. - * - * @see Testing documentation - */ -@RunWith( AndroidJUnit4.class ) -public class ExampleInstrumentedTest { - @Test - public void useAppContext() { - // Context of the app under test. - Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); - - assertEquals( "com.mogo.utils.test", appContext.getPackageName() ); - } -} diff --git a/foudations/mogo-utils/src/test/java/com/mogo/utils/ExampleUnitTest.java b/foudations/mogo-utils/src/test/java/com/mogo/utils/ExampleUnitTest.java deleted file mode 100644 index f20b6cb3c3..0000000000 --- a/foudations/mogo-utils/src/test/java/com/mogo/utils/ExampleUnitTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.mogo.utils; - -import org.junit.Test; - -import static org.junit.Assert.*; - -/** - * Example local unit test, which will execute on the development machine (host). - * - * @see Testing documentation - */ -public class ExampleUnitTest { - @Test - public void addition_isCorrect() { - assertEquals( 4, 2 + 2 ); - } -} \ No newline at end of file diff --git a/libraries/map-amap/src/androidTest/java/com/mogo/map/impl/amap/ExampleInstrumentedTest.java b/libraries/map-amap/src/androidTest/java/com/mogo/map/impl/amap/ExampleInstrumentedTest.java deleted file mode 100644 index 22b8ff07dd..0000000000 --- a/libraries/map-amap/src/androidTest/java/com/mogo/map/impl/amap/ExampleInstrumentedTest.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.mogo.map.impl.amap; - -import android.content.Context; - -import androidx.test.platform.app.InstrumentationRegistry; -import androidx.test.ext.junit.runners.AndroidJUnit4; - -import org.junit.Test; -import org.junit.runner.RunWith; - -import static org.junit.Assert.*; - -/** - * Instrumented test, which will execute on an Android device. - * - * @see Testing documentation - */ -@RunWith( AndroidJUnit4.class ) -public class ExampleInstrumentedTest { - @Test - public void useAppContext() { - // Context of the app under test. - Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); - - assertEquals( "com.mogo.map.impl.amap.test", appContext.getPackageName() ); - } -} diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviListenerAdapter.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviListenerAdapter.java index 5af657e925..8797390c50 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviListenerAdapter.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviListenerAdapter.java @@ -121,6 +121,7 @@ public class NaviListenerAdapter extends AMapNaviListenerAdapter { if ( aMapCalcRouteResult != null ) { Logger.i( TAG, PathPlanningErrorCodeConstants.getErrorMsg( aMapCalcRouteResult.getErrorCode() ) ); } + MogoNaviListenerHandler.getInstance().onoCalculateFailed(); } @Override @@ -129,6 +130,7 @@ public class NaviListenerAdapter extends AMapNaviListenerAdapter { Logger.i( TAG, "导航规划成功" ); setStopped( false ); mNaviOverlayHelper.showCalculatedPaths(); + MogoNaviListenerHandler.getInstance().onCalculateSuccess(); } @Override diff --git a/libraries/map-amap/src/test/java/com/mogo/map/impl/amap/ExampleUnitTest.java b/libraries/map-amap/src/test/java/com/mogo/map/impl/amap/ExampleUnitTest.java deleted file mode 100644 index 96de1338ec..0000000000 --- a/libraries/map-amap/src/test/java/com/mogo/map/impl/amap/ExampleUnitTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.mogo.map.impl.amap; - -import org.junit.Test; - -import static org.junit.Assert.*; - -/** - * Example local unit test, which will execute on the development machine (host). - * - * @see Testing documentation - */ -public class ExampleUnitTest { - @Test - public void addition_isCorrect() { - assertEquals( 4, 2 + 2 ); - } -} \ No newline at end of file diff --git a/libraries/map-baidu/src/androidTest/java/com/mogo/map/impl/baidu/ExampleInstrumentedTest.java b/libraries/map-baidu/src/androidTest/java/com/mogo/map/impl/baidu/ExampleInstrumentedTest.java deleted file mode 100644 index e992dc945b..0000000000 --- a/libraries/map-baidu/src/androidTest/java/com/mogo/map/impl/baidu/ExampleInstrumentedTest.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.mogo.map.impl.baidu; - -import android.content.Context; - -import androidx.test.platform.app.InstrumentationRegistry; -import androidx.test.ext.junit.runners.AndroidJUnit4; - -import org.junit.Test; -import org.junit.runner.RunWith; - -import static org.junit.Assert.*; - -/** - * Instrumented test, which will execute on an Android device. - * - * @see Testing documentation - */ -@RunWith( AndroidJUnit4.class ) -public class ExampleInstrumentedTest { - @Test - public void useAppContext() { - // Context of the app under test. - Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); - - assertEquals( "com.mogo.map.impl.baidu.test", appContext.getPackageName() ); - } -} diff --git a/libraries/mogo-map-api/src/androidTest/java/com/mogo/map/api/ExampleInstrumentedTest.java b/libraries/mogo-map-api/src/androidTest/java/com/mogo/map/api/ExampleInstrumentedTest.java deleted file mode 100644 index 22aedb9196..0000000000 --- a/libraries/mogo-map-api/src/androidTest/java/com/mogo/map/api/ExampleInstrumentedTest.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.mogo.map.api; - -import android.content.Context; - -import androidx.test.platform.app.InstrumentationRegistry; -import androidx.test.ext.junit.runners.AndroidJUnit4; - -import org.junit.Test; -import org.junit.runner.RunWith; - -import static org.junit.Assert.*; - -/** - * Instrumented test, which will execute on an Android device. - * - * @see Testing documentation - */ -@RunWith( AndroidJUnit4.class ) -public class ExampleInstrumentedTest { - @Test - public void useAppContext() { - // Context of the app under test. - Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); - - assertEquals( "com.mogo.map.api.test", appContext.getPackageName() ); - } -} diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/IMogoNaviListener.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/IMogoNaviListener.java index 6282dc2d62..762e5d4f91 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/IMogoNaviListener.java +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/IMogoNaviListener.java @@ -34,4 +34,14 @@ public interface IMogoNaviListener { * 导航停止：包括到达目的地和主动停止导航 */ void onStopNavi(); + + /** + * 路径规划成功 + */ + void onCalculateSuccess(); + + /** + * 路径规划失败 + */ + void onoCalculateFailed(); } diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/MogoNaviListenerHandler.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/MogoNaviListenerHandler.java index 65d61abbf9..f3a29328f9 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/MogoNaviListenerHandler.java +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/MogoNaviListenerHandler.java @@ -77,4 +77,18 @@ public class MogoNaviListenerHandler implements IMogoNaviListener, IMogoNaviList mDelegateListener.onStopNavi(); } } + + @Override + public void onCalculateSuccess() { + if ( mDelegateListener != null ) { + mDelegateListener.onCalculateSuccess(); + } + } + + @Override + public void onoCalculateFailed() { + if ( mDelegateListener != null ) { + mDelegateListener.onoCalculateFailed(); + } + } } diff --git a/libraries/mogo-map-api/src/test/java/com/mogo/map/api/ExampleUnitTest.java b/libraries/mogo-map-api/src/test/java/com/mogo/map/api/ExampleUnitTest.java deleted file mode 100644 index fb12024212..0000000000 --- a/libraries/mogo-map-api/src/test/java/com/mogo/map/api/ExampleUnitTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.mogo.map.api; - -import org.junit.Test; - -import static org.junit.Assert.*; - -/** - * Example local unit test, which will execute on the development machine (host). - * - * @see Testing documentation - */ -public class ExampleUnitTest { - @Test - public void addition_isCorrect() { - assertEquals( 4, 2 + 2 ); - } -} \ No newline at end of file diff --git a/modules/mogo-module-apps/src/androidTest/java/com/mogo/mogo/module/apps/ExampleInstrumentedTest.java b/modules/mogo-module-apps/src/androidTest/java/com/mogo/mogo/module/apps/ExampleInstrumentedTest.java deleted file mode 100644 index ded34c927b..0000000000 --- a/modules/mogo-module-apps/src/androidTest/java/com/mogo/mogo/module/apps/ExampleInstrumentedTest.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.mogo.mogo.module.apps; - -import android.content.Context; - -import androidx.test.platform.app.InstrumentationRegistry; -import androidx.test.ext.junit.runners.AndroidJUnit4; - -import org.junit.Test; -import org.junit.runner.RunWith; - -import static org.junit.Assert.*; - -/** - * Instrumented test, which will execute on an Android device. - * - * @see Testing documentation - */ -@RunWith( AndroidJUnit4.class ) -public class ExampleInstrumentedTest { - @Test - public void useAppContext() { - // Context of the app under test. - Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); - - assertEquals( "com.mogo.mogo.module.apps.test", appContext.getPackageName() ); - } -} diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsFragment.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsFragment.java index 42ef51dff1..ab3dab1cc5 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsFragment.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsFragment.java @@ -10,6 +10,7 @@ import androidx.viewpager.widget.ViewPager; import com.alibaba.android.arouter.launcher.ARouter; import com.mogo.commons.mvp.MvpFragment; import com.mogo.module.apps.model.AppInfo; +import com.mogo.module.apps.view.LinePageIndicator; import com.mogo.service.MogoServicePaths; import com.mogo.service.fragmentmanager.IMogoFragmentManager; import com.mogo.utils.logger.Logger; @@ -35,6 +36,7 @@ public class AppsFragment extends MvpFragment< AppsView, AppsPresenter > impleme private IMogoFragmentManager mMogoFragmentManager; private View mLoadingView; + private LinePageIndicator mIndicator; @Override protected int getLayoutId() { @@ -66,6 +68,7 @@ public class AppsFragment extends MvpFragment< AppsView, AppsPresenter > impleme // mBottomSheetBehavior.setState( BottomSheetBehavior.STATE_COLLAPSED ); mLoadingView = findViewById( R.id.module_apps_id_loading ); mLoadingView.setVisibility( View.VISIBLE ); + mIndicator = findViewById( R.id.module_apps_id_indicator ); } @NonNull @@ -93,6 +96,7 @@ public class AppsFragment extends MvpFragment< AppsView, AppsPresenter > impleme } else { mAppsPagerAdapter.setPagedApps( appInfos ); } + mIndicator.setViewPager( mAppsPager ); mLoadingView.setVisibility( View.GONE ); } } diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/view/LinePageIndicator.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/view/LinePageIndicator.java new file mode 100644 index 0000000000..5805586a92 --- /dev/null +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/view/LinePageIndicator.java @@ -0,0 +1,455 @@ +/* + * Copyright (C) 2012 Jake Wharton + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.mogo.module.apps.view; + +import android.content.Context; +import android.content.res.Resources; +import android.content.res.TypedArray; +import android.graphics.Canvas; +import android.graphics.Paint; +import android.graphics.drawable.Drawable; +import android.os.Parcel; +import android.os.Parcelable; +import android.util.AttributeSet; +import android.view.MotionEvent; +import android.view.View; +import android.view.ViewConfiguration; +import androidx.core.view.MotionEventCompat; +import androidx.core.view.ViewConfigurationCompat; +import androidx.viewpager.widget.ViewPager; + +import com.mogo.module.apps.R; + +/** + * Draws a line for each page. The current page line is colored differently + * than the unselected page lines. + */ +public class LinePageIndicator extends View implements PageIndicator { + private static final int INVALID_POINTER = -1; + + private final Paint mPaintUnselected = new Paint(Paint.ANTI_ALIAS_FLAG); + private final Paint mPaintSelected = new Paint(Paint.ANTI_ALIAS_FLAG); + private ViewPager mViewPager; + private ViewPager.OnPageChangeListener mListener; + private int mCurrentPage; + private boolean mCentered; + private float mLineWidth; + private float mGapWidth; + + private int mTouchSlop; + private float mLastMotionX = -1; + private int mActivePointerId = INVALID_POINTER; + private boolean mIsDragging; + + + public LinePageIndicator(Context context) { + this(context, null); + } + + public LinePageIndicator(Context context, AttributeSet attrs) { + this(context, attrs, R.attr.vpiLinePageIndicatorStyle); + } + + public LinePageIndicator(Context context, AttributeSet attrs, int defStyle) { + super(context, attrs, defStyle); + if (isInEditMode()) { + return; + } + + final Resources res = getResources(); + + //Load defaults from resources + final int defaultSelectedColor = res.getColor(R.color.default_line_indicator_selected_color); + final int defaultUnselectedColor = res.getColor(R.color.default_line_indicator_unselected_color); + final float defaultLineWidth = res.getDimension(R.dimen.default_line_indicator_line_width); + final float defaultGapWidth = res.getDimension(R.dimen.default_line_indicator_gap_width); + final float defaultStrokeWidth = res.getDimension(R.dimen.default_line_indicator_stroke_width); + final boolean defaultCentered = res.getBoolean(R.bool.default_line_indicator_centered); + + //Retrieve styles attributes + TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.LinePageIndicator, defStyle, 0); + + mCentered = a.getBoolean(R.styleable.LinePageIndicator_centered, defaultCentered); + mLineWidth = a.getDimension(R.styleable.LinePageIndicator_lineWidth, defaultLineWidth); + mGapWidth = a.getDimension(R.styleable.LinePageIndicator_gapWidth, defaultGapWidth); + setStrokeWidth(a.getDimension(R.styleable.LinePageIndicator_strokeWidth, defaultStrokeWidth)); + mPaintUnselected.setColor(a.getColor(R.styleable.LinePageIndicator_unselectedColor, defaultUnselectedColor)); + mPaintSelected.setColor(a.getColor(R.styleable.LinePageIndicator_selectedColor, defaultSelectedColor)); + + Drawable background = a.getDrawable(R.styleable.LinePageIndicator_android_background); + if (background != null) { + setBackgroundDrawable(background); + } + + a.recycle(); + + final ViewConfiguration configuration = ViewConfiguration.get(context); + mTouchSlop = ViewConfigurationCompat.getScaledPagingTouchSlop(configuration); + } + + + public void setCentered(boolean centered) { + mCentered = centered; + invalidate(); + } + + public boolean isCentered() { + return mCentered; + } + + public void setUnselectedColor(int unselectedColor) { + mPaintUnselected.setColor(unselectedColor); + invalidate(); + } + + public int getUnselectedColor() { + return mPaintUnselected.getColor(); + } + + public void setSelectedColor(int selectedColor) { + mPaintSelected.setColor(selectedColor); + invalidate(); + } + + public int getSelectedColor() { + return mPaintSelected.getColor(); + } + + public void setLineWidth(float lineWidth) { + mLineWidth = lineWidth; + invalidate(); + } + + public float getLineWidth() { + return mLineWidth; + } + + public void setStrokeWidth(float lineHeight) { + mPaintSelected.setStrokeWidth(lineHeight); + mPaintUnselected.setStrokeWidth(lineHeight); + invalidate(); + } + + public float getStrokeWidth() { + return mPaintSelected.getStrokeWidth(); + } + + public void setGapWidth(float gapWidth) { + mGapWidth = gapWidth; + invalidate(); + } + + public float getGapWidth() { + return mGapWidth; + } + + @Override + protected void onDraw(Canvas canvas) { + super.onDraw(canvas); + + if (mViewPager == null) { + return; + } + final int count = mViewPager.getAdapter().getCount(); + if (count == 0) { + return; + } + + if (mCurrentPage >= count) { + setCurrentItem(count - 1); + return; + } + + final float lineWidthAndGap = mLineWidth + mGapWidth; + final float indicatorWidth = (count * lineWidthAndGap) - mGapWidth; + final float paddingTop = getPaddingTop(); + final float paddingLeft = getPaddingLeft(); + final float paddingRight = getPaddingRight(); + + float verticalOffset = paddingTop + ((getHeight() - paddingTop - getPaddingBottom()) / 2.0f); + float horizontalOffset = paddingLeft; + if (mCentered) { + horizontalOffset += ((getWidth() - paddingLeft - paddingRight) / 2.0f) - (indicatorWidth / 2.0f); + } + + //Draw stroked circles + for (int i = 0; i < count; i++) { + float dx1 = horizontalOffset + (i * lineWidthAndGap); + float dx2 = dx1 + mLineWidth; + canvas.drawLine(dx1, verticalOffset, dx2, verticalOffset, (i == mCurrentPage) ? mPaintSelected : mPaintUnselected); + } + } + + public boolean onTouchEvent(MotionEvent ev) { + if (super.onTouchEvent(ev)) { + return true; + } + if ((mViewPager == null) || (mViewPager.getAdapter().getCount() == 0)) { + return false; + } + + final int action = ev.getAction() & MotionEventCompat.ACTION_MASK; + switch (action) { + case MotionEvent.ACTION_DOWN: + mActivePointerId = MotionEventCompat.getPointerId(ev, 0); + mLastMotionX = ev.getX(); + break; + + case MotionEvent.ACTION_MOVE: { + final int activePointerIndex = MotionEventCompat.findPointerIndex(ev, mActivePointerId); + final float x = MotionEventCompat.getX(ev, activePointerIndex); + final float deltaX = x - mLastMotionX; + + if (!mIsDragging) { + if (Math.abs(deltaX) > mTouchSlop) { + mIsDragging = true; + } + } + + if (mIsDragging) { + mLastMotionX = x; + if (mViewPager.isFakeDragging() || mViewPager.beginFakeDrag()) { + mViewPager.fakeDragBy(deltaX); + } + } + + break; + } + + case MotionEvent.ACTION_CANCEL: + case MotionEvent.ACTION_UP: + if (!mIsDragging) { + final int count = mViewPager.getAdapter().getCount(); + final int width = getWidth(); + final float halfWidth = width / 2f; + final float sixthWidth = width / 6f; + + if ((mCurrentPage > 0) && (ev.getX() < halfWidth - sixthWidth)) { + if (action != MotionEvent.ACTION_CANCEL) { + mViewPager.setCurrentItem(mCurrentPage - 1); + } + return true; + } else if ((mCurrentPage < count - 1) && (ev.getX() > halfWidth + sixthWidth)) { + if (action != MotionEvent.ACTION_CANCEL) { + mViewPager.setCurrentItem(mCurrentPage + 1); + } + return true; + } + } + + mIsDragging = false; + mActivePointerId = INVALID_POINTER; + if (mViewPager.isFakeDragging()) { + mViewPager.endFakeDrag(); + } + break; + + case MotionEventCompat.ACTION_POINTER_DOWN: { + final int index = MotionEventCompat.getActionIndex(ev); + mLastMotionX = MotionEventCompat.getX(ev, index); + mActivePointerId = MotionEventCompat.getPointerId(ev, index); + break; + } + + case MotionEventCompat.ACTION_POINTER_UP: + final int pointerIndex = MotionEventCompat.getActionIndex(ev); + final int pointerId = MotionEventCompat.getPointerId(ev, pointerIndex); + if (pointerId == mActivePointerId) { + final int newPointerIndex = pointerIndex == 0 ? 1 : 0; + mActivePointerId = MotionEventCompat.getPointerId(ev, newPointerIndex); + } + mLastMotionX = MotionEventCompat.getX(ev, MotionEventCompat.findPointerIndex(ev, mActivePointerId)); + break; + default: + break; + } + + return true; + } + + @Override + public void setViewPager(ViewPager viewPager) { + if (mViewPager == viewPager) { + return; + } + if (mViewPager != null) { + //Clear us from the old pager. + // mViewPager.setOnPageChangeListener(null); + } + if (viewPager.getAdapter() == null) { + throw new IllegalStateException("ViewPager does not have adapter instance."); + } + mViewPager = viewPager; + mViewPager.setOnPageChangeListener(this); + invalidate(); + } + + @Override + public void setViewPager(ViewPager view, int initialPosition) { + setViewPager(view); + setCurrentItem(initialPosition); + } + + @Override + public void setCurrentItem(int item) { + if (mViewPager == null) { + throw new IllegalStateException("ViewPager has not been bound."); + } + mViewPager.setCurrentItem(item); + mCurrentPage = item; + invalidate(); + } + + @Override + public void notifyDataSetChanged() { + invalidate(); + } + + @Override + public void onPageScrollStateChanged(int state) { + if (mListener != null) { + mListener.onPageScrollStateChanged(state); + } + } + + @Override + public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { + if (mListener != null) { + mListener.onPageScrolled(position, positionOffset, positionOffsetPixels); + } + } + + @Override + public void onPageSelected(int position) { + mCurrentPage = position; + invalidate(); + + if (mListener != null) { + mListener.onPageSelected(position); + } + } + + @Override + public void setOnPageChangeListener(ViewPager.OnPageChangeListener listener) { + mListener = listener; + } + + @Override + protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { + setMeasuredDimension(measureWidth(widthMeasureSpec), measureHeight(heightMeasureSpec)); + } + + /** + * Determines the width of this view + * + * @param measureSpec + * A measureSpec packed into an int + * @return The width of the view, honoring constraints from measureSpec + */ + private int measureWidth(int measureSpec) { + float result; + int specMode = MeasureSpec.getMode(measureSpec); + int specSize = MeasureSpec.getSize(measureSpec); + + if ((specMode == MeasureSpec.EXACTLY) || (mViewPager == null)) { + //We were told how big to be + result = specSize; + } else { + //Calculate the width according the views count + final int count = mViewPager.getAdapter().getCount(); + result = getPaddingLeft() + getPaddingRight() + (count * mLineWidth) + ((count - 1) * mGapWidth); + //Respect AT_MOST value if that was what is called for by measureSpec + if (specMode == MeasureSpec.AT_MOST) { + result = Math.min(result, specSize); + } + } + return (int)Math.ceil(result); + } + + /** + * Determines the height of this view + * + * @param measureSpec + * A measureSpec packed into an int + * @return The height of the view, honoring constraints from measureSpec + */ + private int measureHeight(int measureSpec) { + float result; + int specMode = MeasureSpec.getMode(measureSpec); + int specSize = MeasureSpec.getSize(measureSpec); + + if (specMode == MeasureSpec.EXACTLY) { + //We were told how big to be + result = specSize; + } else { + //Measure the height + result = mPaintSelected.getStrokeWidth() + getPaddingTop() + getPaddingBottom(); + //Respect AT_MOST value if that was what is called for by measureSpec + if (specMode == MeasureSpec.AT_MOST) { + result = Math.min(result, specSize); + } + } + return (int)Math.ceil(result); + } + + @Override + public void onRestoreInstanceState(Parcelable state) { + SavedState savedState = (SavedState)state; + super.onRestoreInstanceState(savedState.getSuperState()); + mCurrentPage = savedState.currentPage; + requestLayout(); + } + + @Override + public Parcelable onSaveInstanceState() { + Parcelable superState = super.onSaveInstanceState(); + SavedState savedState = new SavedState(superState); + savedState.currentPage = mCurrentPage; + return savedState; + } + + static class SavedState extends BaseSavedState { + int currentPage; + + public SavedState(Parcelable superState) { + super(superState); + } + + private SavedState(Parcel in) { + super(in); + currentPage = in.readInt(); + } + + @Override + public void writeToParcel(Parcel dest, int flags) { + super.writeToParcel(dest, flags); + dest.writeInt(currentPage); + } + + @SuppressWarnings("UnusedDeclaration") + public static final Creator CREATOR = new Creator() { + @Override + public SavedState createFromParcel(Parcel in) { + return new SavedState(in); + } + + @Override + public SavedState[] newArray(int size) { + return new SavedState[size]; + } + }; + } +} \ No newline at end of file diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/view/PageIndicator.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/view/PageIndicator.java new file mode 100644 index 0000000000..bc6148071a --- /dev/null +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/view/PageIndicator.java @@ -0,0 +1,64 @@ +/* + * Copyright (C) 2011 Patrik Akerfeldt + * Copyright (C) 2011 Jake Wharton + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.mogo.module.apps.view; + + +import androidx.viewpager.widget.ViewPager; + +/** + * A PageIndicator is responsible to show an visual indicator on the total views + * number and the current visible view. + */ +public interface PageIndicator extends ViewPager.OnPageChangeListener { + /** + * Bind the indicator to a ViewPager. + * + * @param view + */ + void setViewPager( ViewPager view ); + + /** + * Bind the indicator to a ViewPager. + * + * @param view + * @param initialPosition + */ + void setViewPager( ViewPager view, int initialPosition ); + + /** + *

Set the current page of both the ViewPager and indicator.

+ * + *

This must be used if you need to set the page before + * the views are drawn on screen (e.g., default start page).

+ * + * @param item + */ + void setCurrentItem( int item ); + + /** + * Set a page change listener which will receive forwarded events. + * + * @param listener + */ + void setOnPageChangeListener( ViewPager.OnPageChangeListener listener ); + + /** + * Notify the indicator that the fragment list has changed. + */ + void notifyDataSetChanged(); +} diff --git a/modules/mogo-module-apps/src/main/res/layout/module_apps_fragment_apps.xml b/modules/mogo-module-apps/src/main/res/layout/module_apps_fragment_apps.xml index 86f95931b2..4c20aba8b2 100644 --- a/modules/mogo-module-apps/src/main/res/layout/module_apps_fragment_apps.xml +++ b/modules/mogo-module-apps/src/main/res/layout/module_apps_fragment_apps.xml @@ -31,6 +31,17 @@ android:layout_height="match_parent" android:layout_marginTop="@dimen/dp_210" /> + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-apps/src/main/res/values/page_indicator_values.xml b/modules/mogo-module-apps/src/main/res/values/page_indicator_values.xml new file mode 100644 index 0000000000..d770d81352 --- /dev/null +++ b/modules/mogo-module-apps/src/main/res/values/page_indicator_values.xml @@ -0,0 +1,25 @@ + + + @dimen/dp_15 + 12dp + 4dp + 1dp + #FF33B5E5 + #FFBBBBBB + true + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-apps/src/test/java/com/mogo/mogo/module/apps/ExampleUnitTest.java b/modules/mogo-module-apps/src/test/java/com/mogo/mogo/module/apps/ExampleUnitTest.java deleted file mode 100644 index bd173ae99b..0000000000 --- a/modules/mogo-module-apps/src/test/java/com/mogo/mogo/module/apps/ExampleUnitTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.mogo.mogo.module.apps; - -import org.junit.Test; - -import static org.junit.Assert.*; - -/** - * Example local unit test, which will execute on the development machine (host). - * - * @see Testing documentation - */ -public class ExampleUnitTest { - @Test - public void addition_isCorrect() { - assertEquals( 4, 2 + 2 ); - } -} \ No newline at end of file diff --git a/modules/mogo-module-common/src/androidTest/java/com/mogo/module/common/ExampleInstrumentedTest.java b/modules/mogo-module-common/src/androidTest/java/com/mogo/module/common/ExampleInstrumentedTest.java deleted file mode 100644 index 6480075289..0000000000 --- a/modules/mogo-module-common/src/androidTest/java/com/mogo/module/common/ExampleInstrumentedTest.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.mogo.module.common; - -import android.content.Context; - -import androidx.test.platform.app.InstrumentationRegistry; -import androidx.test.ext.junit.runners.AndroidJUnit4; - -import org.junit.Test; -import org.junit.runner.RunWith; - -import static org.junit.Assert.*; - -/** - * Instrumented test, which will execute on an Android device. - * - * @see Testing documentation - */ -@RunWith( AndroidJUnit4.class ) -public class ExampleInstrumentedTest { - @Test - public void useAppContext() { - // Context of the app under test. - Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); - - assertEquals( "com.mogo.module.common.test", appContext.getPackageName() ); - } -} diff --git a/modules/mogo-module-common/src/test/java/com/mogo/module/common/ExampleUnitTest.java b/modules/mogo-module-common/src/test/java/com/mogo/module/common/ExampleUnitTest.java deleted file mode 100644 index 368976ae89..0000000000 --- a/modules/mogo-module-common/src/test/java/com/mogo/module/common/ExampleUnitTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.mogo.module.common; - -import org.junit.Test; - -import static org.junit.Assert.*; - -/** - * Example local unit test, which will execute on the development machine (host). - * - * @see Testing documentation - */ -public class ExampleUnitTest { - @Test - public void addition_isCorrect() { - assertEquals( 4, 2 + 2 ); - } -} \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/androidTest/java/com/mogo/module/extensions/ExampleInstrumentedTest.java b/modules/mogo-module-extensions/src/androidTest/java/com/mogo/module/extensions/ExampleInstrumentedTest.java deleted file mode 100644 index 860f712d30..0000000000 --- a/modules/mogo-module-extensions/src/androidTest/java/com/mogo/module/extensions/ExampleInstrumentedTest.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.mogo.module.extensions; - -import android.content.Context; - -import androidx.test.platform.app.InstrumentationRegistry; -import androidx.test.ext.junit.runners.AndroidJUnit4; - -import org.junit.Test; -import org.junit.runner.RunWith; - -import static org.junit.Assert.*; - -/** - * Instrumented test, which will execute on an Android device. - * - * @see Testing documentation - */ -@RunWith( AndroidJUnit4.class ) -public class ExampleInstrumentedTest { - @Test - public void useAppContext() { - // Context of the app under test. - Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); - - assertEquals( "com.mogo.module.extensions.test", appContext.getPackageName() ); - } -} diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java index d516520fcc..371e555035 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java @@ -153,4 +153,14 @@ public class EntranceFragment extends MvpFragment< EntranceView, EntrancePresent mNaviInfo.setVisibility( View.GONE ); mExitNavi.setVisibility( View.GONE ); } + + @Override + public void onCalculateSuccess() { + + } + + @Override + public void onoCalculateFailed() { + + } } diff --git a/modules/mogo-module-extensions/src/main/res/drawable/module_ext_anim_frame_voice.xml b/modules/mogo-module-extensions/src/main/res/drawable/module_ext_anim_frame_voice.xml new file mode 100644 index 0000000000..48d4c76465 --- /dev/null +++ b/modules/mogo-module-extensions/src/main/res/drawable/module_ext_anim_frame_voice.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/drawable/module_map_dw_bottom_corner_bkg.xml b/modules/mogo-module-extensions/src/main/res/drawable/module_ext_dw_bottom_corner_bkg.xml similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable/module_map_dw_bottom_corner_bkg.xml rename to modules/mogo-module-extensions/src/main/res/drawable/module_ext_dw_bottom_corner_bkg.xml diff --git a/modules/mogo-module-extensions/src/main/res/drawable/module_map_dw_common_corner_bkg.xml b/modules/mogo-module-extensions/src/main/res/drawable/module_ext_dw_common_corner_bkg.xml similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable/module_map_dw_common_corner_bkg.xml rename to modules/mogo-module-extensions/src/main/res/drawable/module_ext_dw_common_corner_bkg.xml diff --git a/modules/mogo-module-extensions/src/main/res/drawable/module_map_dw_left_corner_bkg.xml b/modules/mogo-module-extensions/src/main/res/drawable/module_ext_dw_left_corner_bkg.xml similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable/module_map_dw_left_corner_bkg.xml rename to modules/mogo-module-extensions/src/main/res/drawable/module_ext_dw_left_corner_bkg.xml diff --git a/modules/mogo-module-extensions/src/main/res/drawable/module_map_dw_navi_info_extras_bkg.xml b/modules/mogo-module-extensions/src/main/res/drawable/module_ext_dw_navi_info_extras_bkg.xml similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable/module_map_dw_navi_info_extras_bkg.xml rename to modules/mogo-module-extensions/src/main/res/drawable/module_ext_dw_navi_info_extras_bkg.xml diff --git a/modules/mogo-module-extensions/src/main/res/drawable/module_map_dw_navi_info_panel_bkg.xml b/modules/mogo-module-extensions/src/main/res/drawable/module_ext_dw_navi_info_panel_bkg.xml similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable/module_map_dw_navi_info_panel_bkg.xml rename to modules/mogo-module-extensions/src/main/res/drawable/module_ext_dw_navi_info_panel_bkg.xml diff --git a/modules/mogo-module-extensions/src/main/res/drawable/module_map_dw_right_corner_bkg.xml b/modules/mogo-module-extensions/src/main/res/drawable/module_ext_dw_right_corner_bkg.xml similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable/module_map_dw_right_corner_bkg.xml rename to modules/mogo-module-extensions/src/main/res/drawable/module_ext_dw_right_corner_bkg.xml diff --git a/modules/mogo-module-extensions/src/main/res/drawable/module_map_dw_top_corner_bkg.xml b/modules/mogo-module-extensions/src/main/res/drawable/module_ext_dw_top_corner_bkg.xml similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable/module_map_dw_top_corner_bkg.xml rename to modules/mogo-module-extensions/src/main/res/drawable/module_ext_dw_top_corner_bkg.xml diff --git a/modules/mogo-module-extensions/src/main/res/drawable/module_map_dw_upload_road_condition_bkg.xml b/modules/mogo-module-extensions/src/main/res/drawable/module_ext_dw_upload_road_condition_bkg.xml similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable/module_map_dw_upload_road_condition_bkg.xml rename to modules/mogo-module-extensions/src/main/res/drawable/module_ext_dw_upload_road_condition_bkg.xml diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml index be17991ae9..3e7786b42a 100644 --- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml +++ b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml @@ -10,7 +10,7 @@ android:layout_height="@dimen/dp_90" android:layout_marginLeft="@dimen/dp_32" android:layout_marginTop="@dimen/dp_2" - android:background="@drawable/module_map_dw_common_corner_bkg" + android:background="@drawable/module_ext_dw_common_corner_bkg" android:drawableLeft="@drawable/module_map_ic_search" android:drawablePadding="@dimen/dp_16" android:gravity="center_vertical" @@ -29,7 +29,7 @@ android:layout_height="@dimen/dp_90" android:layout_marginLeft="@dimen/dp_32" android:layout_marginTop="@dimen/dp_2" - android:background="@drawable/module_map_dw_common_corner_bkg" + android:background="@drawable/module_ext_dw_common_corner_bkg" android:gravity="center_vertical" app:layout_constraintLeft_toRightOf="@+id/module_entrance_id_search" app:layout_constraintTop_toTopOf="parent"> @@ -38,7 +38,7 @@ android:id="@+id/module_entrance_id_home" android:layout_width="@dimen/dp_100" android:layout_height="@dimen/dp_90" - android:background="@drawable/module_map_dw_left_corner_bkg"> + android:background="@drawable/module_ext_dw_left_corner_bkg"> @@ -121,7 +121,7 @@ android:id="@+id/module_entrance_id_move2_current_location" android:layout_width="match_parent" android:layout_height="@dimen/dp_90" - android:background="@drawable/module_map_dw_bottom_corner_bkg" + android:background="@drawable/module_ext_dw_bottom_corner_bkg" android:gravity="center"> Testing documentation - */ -public class ExampleUnitTest { - @Test - public void addition_isCorrect() { - assertEquals( 4, 2 + 2 ); - } -} \ No newline at end of file diff --git a/modules/mogo-module-main/src/androidTest/java/com/mogo/module/main/ExampleInstrumentedTest.java b/modules/mogo-module-main/src/androidTest/java/com/mogo/module/main/ExampleInstrumentedTest.java deleted file mode 100644 index 22ac8c2ef4..0000000000 --- a/modules/mogo-module-main/src/androidTest/java/com/mogo/module/main/ExampleInstrumentedTest.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.mogo.module.main; - -import android.content.Context; - -import androidx.test.platform.app.InstrumentationRegistry; -import androidx.test.ext.junit.runners.AndroidJUnit4; - -import org.junit.Test; -import org.junit.runner.RunWith; - -import static org.junit.Assert.*; - -/** - * Instrumented test, which will execute on an Android device. - * - * @see Testing documentation - */ -@RunWith( AndroidJUnit4.class ) -public class ExampleInstrumentedTest { - @Test - public void useAppContext() { - // Context of the app under test. - Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); - - assertEquals( "com.mogo.module.main.test", appContext.getPackageName() ); - } -} diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java index 90fcdaa8ba..11f524e3e4 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java @@ -199,6 +199,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme @Override public boolean onMarkerClicked( IMogoMarker marker ) { switch2( marker.getOwner() ); + mMogoModuleHandler.onMarkerReceive(marker.getOwner(),marker); return false; } diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesHandler.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesHandler.java index 41c4ec0712..73d83521f3 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesHandler.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesHandler.java @@ -3,6 +3,7 @@ package com.mogo.module.main.cards; import com.mogo.map.listener.IMogoMapListener; import com.mogo.map.location.IMogoLocationClient; import com.mogo.map.location.IMogoLocationListener; +import com.mogo.map.marker.IMogoMarker; import com.mogo.map.marker.IMogoMarkerClickListener; import com.mogo.map.navi.IMogoNaviListener; import com.mogo.service.module.IMogoModuleProvider; @@ -72,4 +73,12 @@ public interface MogoModulesHandler extends IMogoMapListener, * 销毁 */ void destroy(); + + + /** + * 卡片接收到Marker传入数据 + * @param cardType + * @param marker + */ + void onMarkerReceive(String cardType, IMogoMarker marker); } diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java index 95c3dfe253..5ae3e5c9fc 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java @@ -14,6 +14,7 @@ import com.mogo.map.MogoLatLng; import com.mogo.map.listener.IMogoMapListener; import com.mogo.map.location.IMogoLocationListener; import com.mogo.map.location.MogoLocation; +import com.mogo.map.marker.IMogoMarker; import com.mogo.map.model.MogoPoi; import com.mogo.map.navi.IMogoNaviListener; import com.mogo.map.navi.MogoNaviInfo; @@ -21,8 +22,6 @@ import com.mogo.map.uicontroller.EnumMapUI; import com.mogo.module.common.MogoModule; import com.mogo.module.common.MogoModulePaths; import com.mogo.module.main.MainActivity; -import com.mogo.module.main.receiver.MogoReceiver; -import com.mogo.module.service.ServiceConst; import com.mogo.service.module.IMogoModuleLifecycle; import com.mogo.service.module.IMogoModuleProvider; import com.mogo.service.module.ModuleType; @@ -437,4 +436,24 @@ public class MogoModulesManager implements MogoModulesHandler, mMapLoadedCallback = null; mEnableModuleName = null; } + + @Override + public void onCalculateSuccess() { + + } + + @Override + public void onoCalculateFailed() { + } + + @Override + public void onMarkerReceive( String cardType, IMogoMarker marker ) { + for ( IMogoModuleProvider value : mModuleProviders.values() ) { + if ( value.getModuleName().equals( cardType ) ) { + if ( value.getMarkerClickListener() != null ) { + value.getMarkerClickListener().onMarkerClicked( marker ); + } + } + } + } } diff --git a/modules/mogo-module-main/src/test/java/com/mogo/module/main/ExampleUnitTest.java b/modules/mogo-module-main/src/test/java/com/mogo/module/main/ExampleUnitTest.java deleted file mode 100644 index 02a566aa4c..0000000000 --- a/modules/mogo-module-main/src/test/java/com/mogo/module/main/ExampleUnitTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.mogo.module.main; - -import org.junit.Test; - -import static org.junit.Assert.*; - -/** - * Example local unit test, which will execute on the development machine (host). - * - * @see Testing documentation - */ -public class ExampleUnitTest { - @Test - public void addition_isCorrect() { - assertEquals( 4, 2 + 2 ); - } -} \ No newline at end of file diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java index 7e57af5d2c..70f0e26c1e 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java @@ -9,7 +9,13 @@ import com.mogo.map.marker.IMogoMarkerManager; import com.mogo.map.marker.MogoMarkerOptions; import com.mogo.map.navi.IMogoNavi; import com.mogo.map.uicontroller.IMogoMapUIController; +import com.mogo.module.service.entity.MarkerCarChat; +import com.mogo.module.service.entity.MarkerCardResult; +import com.mogo.module.service.entity.MarkerExploreWay; +import com.mogo.module.service.entity.MarkerLocation; +import com.mogo.module.service.entity.MarkerOnlineCar; import com.mogo.module.service.entity.MarkerResponse; +import com.mogo.module.service.entity.MarkerShareMusic; import com.mogo.module.service.marker.MapMarkerView; import com.mogo.module.service.marker.MarkerInfoWindowAdapter; import com.mogo.service.MogoServicePaths; @@ -20,6 +26,8 @@ import com.mogo.service.map.IMogoMapService; import com.mogo.utils.TipToast; import com.mogo.utils.logger.Logger; +import java.util.ArrayList; +import java.util.List; import java.util.Random; /** @@ -32,7 +40,7 @@ import java.util.Random; public class MarkerServiceHandler { private static final String TAG = "MarkerServiceHandler"; - private static MogoMarkerClickListener mogoMarkerClickListener; + private static MoGoMarkerClickListener mogoMarkerClickListener; private static IMogoMapService mMapService; private static IMogoMarkerManager mMarkerManager; @@ -54,8 +62,7 @@ public class MarkerServiceHandler { markerInfoWindowAdapter = new MarkerInfoWindowAdapter(context, getNavi(), getImageloader()); mMapUIController = mMapService.getMapUIController(); - - mogoMarkerClickListener = new MogoMarkerClickListener(); + mogoMarkerClickListener = new MoGoMarkerClickListener(); // 长连接 mMogoSocketManager = (IMogoSocketManager) ARouter.getInstance().build(MogoServicePaths.PATH_SOCKET_MANAGER).navigation(); @@ -67,14 +74,58 @@ public class MarkerServiceHandler { } @Override - public void onMsgReceived(MarkerResponse obj) { - Logger.e("donghongyu", "===" + obj); + public void onMsgReceived(MarkerResponse response) { + Logger.e(TAG, "===" + response); - for (int i = 0; i < 10; i++) { - drawMapMarker(); + getMarkerManager().removeMarkers(); + + // 解析不同的Marker类型，然后对应的进行绘制 + if (response != null && response.getResult() != null) { + MarkerCardResult markerCardResult = response.getResult(); + + List carChat = markerCardResult.getCarChat(); + List onlineCar = markerCardResult.getOnlineCar(); + List exploreWay = markerCardResult.getExploreWay(); + List shareMusic = markerCardResult.getShareMusic(); + + ArrayList optionsList = new ArrayList<>(); + + if (carChat != null) { + for (MarkerCarChat markerCarChat : carChat) { + MarkerLocation markerLocation = markerCarChat.getLocation(); + drawMapMarker(markerCarChat.getType(), markerLocation, optionsList); + } + } + + if (onlineCar != null) { + for (MarkerOnlineCar markerOnlineCar : onlineCar) { + MarkerLocation markerLocation = markerOnlineCar.getLocation(); + drawMapMarker(markerOnlineCar.getType(), markerLocation, optionsList); + } + } + + if (exploreWay != null) { + for (MarkerExploreWay markerExploreWay : exploreWay) { + MarkerLocation markerLocation = markerExploreWay.getLocation(); + drawMapMarker(markerExploreWay.getType(), markerLocation, optionsList); + } + } + + if (shareMusic != null) { + for (MarkerShareMusic markerShareMusic : shareMusic) { + MarkerLocation markerLocation = markerShareMusic.getLocation(); + drawMapMarker(markerShareMusic.getType(), markerLocation, optionsList); + } + } + + List iMogoMarkers = getMarkerManager().addMarkers(TAG, optionsList, true); + for (IMogoMarker iMogoMarker : iMogoMarkers) { + iMogoMarker.setInfoWindowAdapter(markerInfoWindowAdapter); + iMogoMarker.setOnMarkerClickListener(mogoMarkerClickListener); + } } - } + } }); } @@ -106,7 +157,7 @@ public class MarkerServiceHandler { /** * 地图上的Marker点击回调 */ - static class MogoMarkerClickListener implements IMogoMarkerClickListener { + static class MoGoMarkerClickListener implements IMogoMarkerClickListener { @Override public boolean onMarkerClicked(IMogoMarker marker) { @@ -117,14 +168,39 @@ public class MarkerServiceHandler { } - public static void drawMapMarker() { - TipToast.shortTip("绘制Marker"); + /** + * 绘制Marker + * + * @param markerTag Marker类型 + * http://gitlab.zhidaoauto.com/ecos/yycp-service/CarLauncher-Docs/blob/master/%E5%8D%A1%E7%89%87%E7%B1%BB%E5%9E%8B%E5%AE%9A%E4%B9%89.md + * @param markerLocation 要绘制Marker的位置信息 + * @param optionsList 要加入的Marker集合 + */ + public static void drawMapMarker(String markerTag, MarkerLocation markerLocation, + ArrayList optionsList) { + Logger.e(markerTag, "绘制Marker====markerTag：" + markerTag); MapMarkerView mapMarkerView = new MapMarkerView(mContext); MogoMarkerOptions options = new MogoMarkerOptions() .icon(mapMarkerView) - .owner(TAG) + .owner(markerTag) + .latitude(markerLocation.getLat()) + .longitude(markerLocation.getLon()); + + optionsList.add(options); + } + + + //TODO 这里是用来测试的 + public static void drawMapMarker() { + Logger.e(TAG, "=====绘制Marker===="); + + MapMarkerView mapMarkerView = new MapMarkerView(mContext); + + MogoMarkerOptions options = new MogoMarkerOptions() + .icon(mapMarkerView) + .owner("CARD_TYPE_USER_DATA") .latitude(39.574525d + new Random().nextDouble()) .longitude(116.21733d + new Random().nextDouble()); IMogoMarker marker = getMarkerManager().addMarker(TAG, options); @@ -132,5 +208,8 @@ public class MarkerServiceHandler { marker.setOnMarkerClickListener(mogoMarkerClickListener); getMapUIController().changeZoom(false); + + getMapUIController().changeZoom(10); + } } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServiceProvider.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServiceProvider.java index 943c415cc4..d8188ccdb1 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServiceProvider.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServiceProvider.java @@ -458,6 +458,16 @@ public class MogoServiceProvider implements IMogoModuleProvider, } } + @Override + public void onCalculateSuccess() { + + } + + @Override + public void onoCalculateFailed() { + + } + public IMogoMarkerClickListener getMarkerClickListener() { return null; } diff --git a/modules/mogo-module-tanlu/src/test/java/com/zhidao/tanlu/ExampleUnitTest.java b/modules/mogo-module-tanlu/src/test/java/com/zhidao/tanlu/ExampleUnitTest.java deleted file mode 100644 index c1e9a4fcc5..0000000000 --- a/modules/mogo-module-tanlu/src/test/java/com/zhidao/tanlu/ExampleUnitTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.zhidao.tanlu; - -import org.junit.Test; - -import static org.junit.Assert.*; - -/** - * Example local unit test, which will execute on the development machine (host). - * - * @see Testing documentation - */ -public class ExampleUnitTest { - @Test - public void addition_isCorrect() { - assertEquals(4, 2 + 2); - } -} \ No newline at end of file diff --git a/services/mogo-service/src/androidTest/java/com/mogo/service/map/ExampleInstrumentedTest.java b/services/mogo-service/src/androidTest/java/com/mogo/service/map/ExampleInstrumentedTest.java deleted file mode 100644 index 44238af9f8..0000000000 --- a/services/mogo-service/src/androidTest/java/com/mogo/service/map/ExampleInstrumentedTest.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.mogo.service.map; - -import android.content.Context; - -import androidx.test.platform.app.InstrumentationRegistry; -import androidx.test.ext.junit.runners.AndroidJUnit4; - -import org.junit.Test; -import org.junit.runner.RunWith; - -import static org.junit.Assert.*; - -/** - * Instrumented test, which will execute on an Android device. - * - * @see Testing documentation - */ -@RunWith( AndroidJUnit4.class ) -public class ExampleInstrumentedTest { - @Test - public void useAppContext() { - // Context of the app under test. - Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); - - assertEquals( "com.mogo.service.amap.test", appContext.getPackageName() ); - } -}