diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index ae53ae6294..eb2904532e 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -8,7 +8,7 @@ import com.mogo.commons.AbsMogoApplication; import com.mogo.demo.module.map.DemoConstants; import com.mogo.demo.module.map2.Demo2Constants; import com.mogo.module.common.MogoModulePaths; -import com.mogo.tanlu.TanluConstants; +import com.mogo.tanlu.constant.TanluConstants; /** * @author congtaowang diff --git a/demo/mogo-module-tanlu/src/main/java/com/mogo/tanlu/TanluConstants.java b/demo/mogo-module-tanlu/src/main/java/com/mogo/tanlu/constant/TanluConstants.java similarity index 82% rename from demo/mogo-module-tanlu/src/main/java/com/mogo/tanlu/TanluConstants.java rename to demo/mogo-module-tanlu/src/main/java/com/mogo/tanlu/constant/TanluConstants.java index 8eafc95191..85da40785d 100644 --- a/demo/mogo-module-tanlu/src/main/java/com/mogo/tanlu/TanluConstants.java +++ b/demo/mogo-module-tanlu/src/main/java/com/mogo/tanlu/constant/TanluConstants.java @@ -1,4 +1,4 @@ -package com.mogo.tanlu; +package com.mogo.tanlu.constant; /** * @author congtaowang diff --git a/demo/mogo-module-tanlu/src/main/java/com/mogo/tanlu/TanluCardViewFragment.java b/demo/mogo-module-tanlu/src/main/java/com/mogo/tanlu/fragment/TanluCardViewFragment.java similarity index 78% rename from demo/mogo-module-tanlu/src/main/java/com/mogo/tanlu/TanluCardViewFragment.java rename to demo/mogo-module-tanlu/src/main/java/com/mogo/tanlu/fragment/TanluCardViewFragment.java index 3dd94740b6..f65d4863b0 100644 --- a/demo/mogo-module-tanlu/src/main/java/com/mogo/tanlu/TanluCardViewFragment.java +++ b/demo/mogo-module-tanlu/src/main/java/com/mogo/tanlu/fragment/TanluCardViewFragment.java @@ -1,4 +1,4 @@ -package com.mogo.tanlu; +package com.mogo.tanlu.fragment; import android.graphics.Bitmap; import android.graphics.BitmapFactory; @@ -28,6 +28,8 @@ import com.mogo.map.search.poisearch.IMogoPoiSearchListener; import com.mogo.map.search.poisearch.MogoPoiResult; import com.mogo.map.uicontroller.EnumMapUI; import com.mogo.service.module.IMogoModuleLifecycle; +import com.mogo.tanlu.R; +import com.mogo.tanlu.constant.TanluConstants; import com.mogo.utils.TipToast; import com.mogo.utils.logger.Logger; @@ -75,13 +77,9 @@ public class TanluCardViewFragment extends MvpFragment> protected void initViews() { position = getArguments().getInt("position"); - mNaviMode = findViewById(R.id.demo_module_id_navi_mode); - TanluServiceHandler.getPoiSearch().setPoiSearchListener(this); mLocation = TanluServiceHandler.getLocationClient().getLastKnowLocation(); - m2D3D = findViewById(R.id.demo_module_id_2d3d); - mLocInfo = findViewById(R.id.demo_module_id_loc_info); mLoc = findViewById(R.id.demo_module_id_loc); mLoc.setOnClickListener( @@ -161,78 +159,6 @@ public class TanluCardViewFragment extends MvpFragment> } }); - findViewById(R.id.demo_module_id_start_navi).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - TanluServiceHandler.getNavi().startNavi(!mNaviMode.isChecked()); - } - }); - - findViewById(R.id.demo_module_id_stop_navi).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - TanluServiceHandler.getNavi().stopNavi(); - } - }); - - findViewById(R.id.demo_module_id_traffic).setOnClickListener(new View.OnClickListener() { - - private boolean enable = true; - - @Override - public void onClick(View v) { - TanluServiceHandler.getMapUIController().setTrafficEnabled(enable = !enable); - } - }); - - findViewById(R.id.demo_module_id_zoom_in).setOnClickListener(new View.OnClickListener() { - - @Override - public void onClick(View v) { - TanluServiceHandler.getMapUIController().changeZoom(true); - } - }); - - findViewById(R.id.demo_module_id_zoom_out).setOnClickListener(new View.OnClickListener() { - - @Override - public void onClick(View v) { - TanluServiceHandler.getMapUIController().changeZoom(false); - } - }); - - findViewById(R.id.demo_module_id_day_light).setOnClickListener(new View.OnClickListener() { - - @Override - public void onClick(View v) { - TanluServiceHandler.getMapUIController().changeMapMode(EnumMapUI.Type_Light); - } - }); - - findViewById(R.id.demo_module_id_day_night).setOnClickListener(new View.OnClickListener() { - - @Override - public void onClick(View v) { - TanluServiceHandler.getMapUIController().changeMapMode(EnumMapUI.Type_Night); - } - }); - - findViewById(R.id.demo_module_id_display_overlay).setOnClickListener(new View.OnClickListener() { - - @Override - public void onClick(View v) { - TanluServiceHandler.getMapUIController().displayOverview(); - } - }); - - findViewById(R.id.demo_module_id_reverse_lock).setOnClickListener(new View.OnClickListener() { - - @Override - public void onClick(View v) { - TanluServiceHandler.getMapUIController().recoverLockMode(); - } - }); - TanluServiceHandler.getLocationClient().addLocationListener(new IMogoLocationListener() { @Override public void onLocationChanged(MogoLocation location) { @@ -267,11 +193,14 @@ public class TanluCardViewFragment extends MvpFragment> }; } + //TODO C位事件 @Override public void onPerform() { Logger.d(TAG, "卡片2有效"); + } + //TODO 离开C位事件 @Override public void onDisable() { Logger.d(TAG, "卡片2无效"); diff --git a/demo/mogo-module-tanlu/src/main/java/com/mogo/tanlu/TanluCardViewProvider.java b/demo/mogo-module-tanlu/src/main/java/com/mogo/tanlu/fragment/TanluCardViewProvider.java similarity index 93% rename from demo/mogo-module-tanlu/src/main/java/com/mogo/tanlu/TanluCardViewProvider.java rename to demo/mogo-module-tanlu/src/main/java/com/mogo/tanlu/fragment/TanluCardViewProvider.java index cff3d92473..962c671af2 100644 --- a/demo/mogo-module-tanlu/src/main/java/com/mogo/tanlu/TanluCardViewProvider.java +++ b/demo/mogo-module-tanlu/src/main/java/com/mogo/tanlu/fragment/TanluCardViewProvider.java @@ -1,4 +1,4 @@ -package com.mogo.tanlu; +package com.mogo.tanlu.fragment; import android.content.Context; import android.os.Bundle; @@ -12,6 +12,7 @@ import com.mogo.map.location.IMogoLocationListener; import com.mogo.map.navi.IMogoNaviListener; import com.mogo.service.module.IMogoModuleLifecycle; import com.mogo.service.module.IMogoModuleProvider; +import com.mogo.tanlu.constant.TanluConstants; import com.mogo.utils.logger.Logger; /** @@ -24,7 +25,6 @@ import com.mogo.utils.logger.Logger; public class TanluCardViewProvider implements IMogoModuleProvider { private static final String TAG = "TanluCardViewProvider"; - private TanluCardViewFragment fragment; @Override @@ -42,7 +42,7 @@ public class TanluCardViewProvider implements IMogoModuleProvider { @Override public String getModuleName() { - return TanluConstants.TAG; + return "CARD_TYPE_ROAD_CODITION"; } @Override diff --git a/demo/mogo-module-tanlu/src/main/java/com/mogo/tanlu/TanluInfoWindowAdapter.java b/demo/mogo-module-tanlu/src/main/java/com/mogo/tanlu/fragment/TanluInfoWindowAdapter.java similarity index 98% rename from demo/mogo-module-tanlu/src/main/java/com/mogo/tanlu/TanluInfoWindowAdapter.java rename to demo/mogo-module-tanlu/src/main/java/com/mogo/tanlu/fragment/TanluInfoWindowAdapter.java index ffa9a0d294..654903888b 100644 --- a/demo/mogo-module-tanlu/src/main/java/com/mogo/tanlu/TanluInfoWindowAdapter.java +++ b/demo/mogo-module-tanlu/src/main/java/com/mogo/tanlu/fragment/TanluInfoWindowAdapter.java @@ -1,4 +1,4 @@ -package com.mogo.tanlu; +package com.mogo.tanlu.fragment; import android.content.Context; import android.graphics.Bitmap; @@ -16,6 +16,7 @@ import com.mogo.map.search.geo.MogoPoiItem; import com.mogo.service.imageloader.IMogoImageLoaderListener; import com.mogo.service.imageloader.IMogoImageloader; import com.mogo.service.imageloader.MogoImageView; +import com.mogo.tanlu.R; import com.mogo.utils.WindowUtils; import com.mogo.utils.logger.Logger; import java.text.SimpleDateFormat; diff --git a/demo/mogo-module-tanlu/src/main/java/com/mogo/tanlu/TanluServiceHandler.java b/demo/mogo-module-tanlu/src/main/java/com/mogo/tanlu/fragment/TanluServiceHandler.java similarity index 98% rename from demo/mogo-module-tanlu/src/main/java/com/mogo/tanlu/TanluServiceHandler.java rename to demo/mogo-module-tanlu/src/main/java/com/mogo/tanlu/fragment/TanluServiceHandler.java index cd7591ab19..1128cd336b 100644 --- a/demo/mogo-module-tanlu/src/main/java/com/mogo/tanlu/TanluServiceHandler.java +++ b/demo/mogo-module-tanlu/src/main/java/com/mogo/tanlu/fragment/TanluServiceHandler.java @@ -1,4 +1,4 @@ -package com.mogo.tanlu; +package com.mogo.tanlu.fragment; import android.content.Context; diff --git a/demo/mogo-module-tanlu/src/main/java/com/mogo/tanlu/view/AutoZoomInImageView.kt b/demo/mogo-module-tanlu/src/main/java/com/mogo/tanlu/view/AutoZoomInImageView.kt new file mode 100644 index 0000000000..acffffcb2b --- /dev/null +++ b/demo/mogo-module-tanlu/src/main/java/com/mogo/tanlu/view/AutoZoomInImageView.kt @@ -0,0 +1,229 @@ +package com.mogo.tanlu.view + +import android.animation.Animator +import android.animation.ValueAnimator +import android.content.Context +import android.graphics.Matrix +import android.graphics.drawable.Drawable +import android.util.AttributeSet +import android.util.Log +import android.view.View +import android.widget.ImageView + +class AutoZoomInImageView : ImageView { + + companion object { + const val TAG = "AutoZoomInImageView" + } + + private var mDrawableW: Int = 0 + private var mDrawableH: Int = 0 + private var mImageViewW: Int = 0 + private var mImageViewH: Int = 0 + private var mDurationMillis = 3000L + + private var mValues = FloatArray(9) + var isInit: Boolean = false + private var mScaleDelta = 0.2f + private var va: ValueAnimator = ValueAnimator.ofFloat(0f, mScaleDelta) + + private lateinit var mDrawable: Drawable + private lateinit var mMatrix: Matrix + + private var onStart: (View.() -> Unit)? = null + + private var onUpdate: ((view: View, progress: Float) -> Unit)? = null + + private var onEnd: (View.() -> Unit)? = null + + infix fun onStart(onStart: View.() -> Unit) :AutoZoomInImageView{ + this.onStart = onStart + return this + } + + infix fun onUpdate(onUpdate: (view: View, progress: Float) -> Unit) :AutoZoomInImageView{ + this.onUpdate = onUpdate + return this + } + + infix fun onEnd(onEnd: View.() -> Unit):AutoZoomInImageView { + this.onEnd = onEnd + return this + } + + constructor(context: Context?) : super(context) { + this.scaleType = ScaleType.MATRIX + } + + constructor(context: Context?, attrs: AttributeSet?) : super(context, attrs) { + this.scaleType = ScaleType.MATRIX + } + + constructor(context: Context?, attrs: AttributeSet?, defStyleAttr: Int) : super( + context, + attrs, + defStyleAttr + ) { + this.scaleType = ScaleType.MATRIX + } + + + fun init(): AutoZoomInImageView { + initInternalValues() + initPicturePosition() + isInit = true + return this + } + + fun init(drawable: Drawable) { + initInternalValues(drawable) + initPicturePosition() + } + + private fun initInternalValues() { + mDrawable = drawable + + if (mDrawable == null) { + throw IllegalArgumentException("please set the source of AutoZoomInImageView") + } + + mDrawableW = mDrawable.intrinsicWidth + mDrawableH = mDrawable.intrinsicHeight + + mImageViewW = measuredWidth + mImageViewH = measuredHeight + + mMatrix = imageMatrix + mMatrix.getValues(mValues) + } + + private fun initInternalValues(drawable: Drawable) { + mDrawable = drawable + + if (mDrawable == null) { + throw IllegalArgumentException("please set the source of AutoZoomInImageView") + } + + mDrawableW = mDrawable.intrinsicWidth + mDrawableH = mDrawable.intrinsicHeight + + mImageViewW = measuredWidth + mImageViewH = measuredHeight + + mMatrix = imageMatrix + mMatrix.getValues(mValues) + } + + private fun initPicturePosition() { + updateMatrixValuesOrigin( + mMatrix, + mValues, + mDrawableW.toFloat(), + mDrawableH.toFloat(), + mImageViewW.toFloat(), + mImageViewH.toFloat() + ) + imageMatrix = mMatrix + } + + fun setDurationMillis(durationMillis: Long): AutoZoomInImageView { + mDurationMillis = durationMillis + return this + } + + fun startZoomInByScaleDelta(scaleDelta: Float = 0.2f, duration: Long = 3000) { + val oriScaleX = mValues[0] + val oriScaleY = mValues[4] + + va.addUpdateListener { animation -> + val value = animation.animatedValue as Float + onUpdate?.invoke(this@AutoZoomInImageView, value / scaleDelta) + updateMatrixValuesSpan( + mValues, + mDrawableW.toFloat(), + mDrawableH.toFloat(), + mImageViewW.toFloat(), + mImageViewH.toFloat(), + oriScaleX, + oriScaleY, + value + ) + mMatrix.setValues(mValues) + imageMatrix = mMatrix + } + va.addListener(object : Animator.AnimatorListener { + override fun onAnimationStart(animation: Animator) { + onStart?.invoke(this@AutoZoomInImageView) + } + + override fun onAnimationEnd(animation: Animator) { + onEnd?.invoke(this@AutoZoomInImageView) + } + + override fun onAnimationCancel(animation: Animator) {} + override fun onAnimationRepeat(animation: Animator) {} + }) + va.duration = duration + va.start() + } + + fun zoomPause() { + if (va.isRunning) { + Log.d(TAG, "pause") + va.pause() + } + } + + + fun zoomResume() { + if (va.isStarted && va.isPaused) { + Log.d(TAG, "resume") + va.resume() + } else { + Log.d(TAG, "restart") + va.start() + } + } + + private fun updateMatrixValuesOrigin( + outMatrix: Matrix?, + outValues: FloatArray?, + drawW: Float, + drawH: Float, + imageW: Float, + imageH: Float + ) { + if (outMatrix == null || outValues == null) { + throw IllegalArgumentException("please set the source of AutoZoomInImageView's matrix and values") + } + outMatrix.reset() + + if (imageH * drawW > drawH * imageW) { + val scale1 = imageH / drawH + val offset1 = (drawW * scale1 - imageW) / 2 + outMatrix.postScale(scale1, scale1) + outMatrix.postTranslate(-offset1, 0f) + } else { + val scale2 = imageW / drawW + val offset2 = (drawH * scale2 - imageH) / 2 + outMatrix.postScale(scale2, scale2) + outMatrix.postTranslate(0f, -offset2) + } + outMatrix.getValues(outValues) + } + + private fun updateMatrixValuesSpan( + outValues: FloatArray, + drawW: Float, drawH: Float, + imageW: Float, imageH: Float, + oriScaleX: Float, oriScaleY: Float, + scaleDelta: Float + ) { + outValues[0] = oriScaleX * (1 + scaleDelta) + outValues[4] = oriScaleY * (1 + scaleDelta) + val offsetwidth = (drawW * outValues[0] - imageW) / 2 + outValues[2] = -offsetwidth + val offsetHeight = (drawH * outValues[4] - imageH) / 2 + outValues[5] = -offsetHeight + } +} \ No newline at end of file diff --git a/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_bus.png b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_bus.png new file mode 100755 index 0000000000..66f73f4454 Binary files /dev/null and b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_bus.png differ diff --git a/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_car.png b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_car.png new file mode 100755 index 0000000000..b12b10c83f Binary files /dev/null and b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_car.png differ diff --git a/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_end.png b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_end.png new file mode 100755 index 0000000000..5503dc5a28 Binary files /dev/null and b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_end.png differ diff --git a/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_man.png b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_man.png new file mode 100755 index 0000000000..16842d5d12 Binary files /dev/null and b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_man.png differ diff --git a/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_ride.png b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_ride.png new file mode 100755 index 0000000000..2fa5633c59 Binary files /dev/null and b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_ride.png differ diff --git a/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_0_arrow.png b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_0_arrow.png new file mode 100755 index 0000000000..21793fea2b Binary files /dev/null and b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_0_arrow.png differ diff --git a/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_1_arrow.png b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_1_arrow.png new file mode 100755 index 0000000000..d7d832857f Binary files /dev/null and b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_1_arrow.png differ diff --git a/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_2_arrow.png b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_2_arrow.png new file mode 100755 index 0000000000..c1d019b4ae Binary files /dev/null and b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_2_arrow.png differ diff --git a/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_3_arrow.png b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_3_arrow.png new file mode 100755 index 0000000000..b3318ad436 Binary files /dev/null and b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_3_arrow.png differ diff --git a/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_4_arrow.png b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_4_arrow.png new file mode 100755 index 0000000000..038e63f485 Binary files /dev/null and b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_4_arrow.png differ diff --git a/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_5_arrow.png b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_5_arrow.png new file mode 100755 index 0000000000..e15ce84e87 Binary files /dev/null and b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_5_arrow.png differ diff --git a/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_6_arrow.png b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_6_arrow.png new file mode 100755 index 0000000000..9f3540757a Binary files /dev/null and b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_6_arrow.png differ diff --git a/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_7_arrow.png b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_7_arrow.png new file mode 100755 index 0000000000..cef675f06f Binary files /dev/null and b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_7_arrow.png differ diff --git a/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_8_arrow.png b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_8_arrow.png new file mode 100755 index 0000000000..c4d67d38a4 Binary files /dev/null and b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_8_arrow.png differ diff --git a/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_9_arrow.png b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_9_arrow.png new file mode 100755 index 0000000000..3c92f82f0d Binary files /dev/null and b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_9_arrow.png differ diff --git a/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_start.png b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_start.png new file mode 100755 index 0000000000..cd716c8840 Binary files /dev/null and b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_start.png differ diff --git a/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_through.png b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_through.png new file mode 100755 index 0000000000..e636b446c1 Binary files /dev/null and b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_through.png differ diff --git a/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/app_icon.png b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/app_icon.png new file mode 100644 index 0000000000..c97be4be12 Binary files /dev/null and b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/app_icon.png differ diff --git a/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/default_image.png b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/default_image.png new file mode 100644 index 0000000000..fdc210cd25 Binary files /dev/null and b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/default_image.png differ diff --git a/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/dir1.png b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/dir1.png new file mode 100755 index 0000000000..fec3f4ec69 Binary files /dev/null and b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/dir1.png differ diff --git a/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/dir10.png b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/dir10.png new file mode 100755 index 0000000000..34c2228f6c Binary files /dev/null and b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/dir10.png differ diff --git a/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/dir11.png b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/dir11.png new file mode 100755 index 0000000000..df9e8dc67c Binary files /dev/null and b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/dir11.png differ diff --git a/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/dir12.png b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/dir12.png new file mode 100755 index 0000000000..a4ba8c22cb Binary files /dev/null and b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/dir12.png differ diff --git a/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/dir13.png b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/dir13.png new file mode 100755 index 0000000000..39ad870c5f Binary files /dev/null and b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/dir13.png differ diff --git a/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/dir14.png b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/dir14.png new file mode 100755 index 0000000000..a3c1632562 Binary files /dev/null and b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/dir14.png differ diff --git a/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/dir15.png b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/dir15.png new file mode 100755 index 0000000000..c99fb65b94 Binary files /dev/null and b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/dir15.png differ diff --git a/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/dir16.png b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/dir16.png new file mode 100755 index 0000000000..86898c2144 Binary files /dev/null and b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/dir16.png differ diff --git a/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/dir2.png b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/dir2.png new file mode 100755 index 0000000000..750b6fbb7e Binary files /dev/null and b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/dir2.png differ diff --git a/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/dir3.png b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/dir3.png new file mode 100755 index 0000000000..8cbe886e81 Binary files /dev/null and b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/dir3.png differ diff --git a/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/dir4.png b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/dir4.png new file mode 100755 index 0000000000..cfe7d6c0fb Binary files /dev/null and b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/dir4.png differ diff --git a/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/dir5.png b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/dir5.png new file mode 100755 index 0000000000..e465d5eec2 Binary files /dev/null and b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/dir5.png differ diff --git a/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/dir6.png b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/dir6.png new file mode 100755 index 0000000000..0d2f3c0360 Binary files /dev/null and b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/dir6.png differ diff --git a/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/dir7.png b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/dir7.png new file mode 100755 index 0000000000..e53c9ff451 Binary files /dev/null and b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/dir7.png differ diff --git a/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/dir8.png b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/dir8.png new file mode 100755 index 0000000000..edfdbe1df0 Binary files /dev/null and b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/dir8.png differ diff --git a/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/dir9.png b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/dir9.png new file mode 100755 index 0000000000..a762d0b74a Binary files /dev/null and b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/dir9.png differ diff --git a/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/dir_end.png b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/dir_end.png new file mode 100755 index 0000000000..f3cb78aed4 Binary files /dev/null and b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/dir_end.png differ diff --git a/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/dir_start.png b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/dir_start.png new file mode 100755 index 0000000000..4d2a797823 Binary files /dev/null and b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/dir_start.png differ diff --git a/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/dir_station.png b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/dir_station.png new file mode 100755 index 0000000000..2ed622283b Binary files /dev/null and b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/dir_station.png differ diff --git a/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/ic_refresh.png b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/ic_refresh.png new file mode 100644 index 0000000000..d86c3f8024 Binary files /dev/null and b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/ic_refresh.png differ diff --git a/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/ic_snapshot_ph.png b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/ic_snapshot_ph.png new file mode 100644 index 0000000000..281f1bb163 Binary files /dev/null and b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/ic_snapshot_ph.png differ diff --git a/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/join_checkbox_bg.png b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/join_checkbox_bg.png new file mode 100755 index 0000000000..89d00803c5 Binary files /dev/null and b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/join_checkbox_bg.png differ diff --git a/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/live_exit.png b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/live_exit.png new file mode 100644 index 0000000000..7d9b50f159 Binary files /dev/null and b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/live_exit.png differ diff --git a/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/location_city_image.png b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/location_city_image.png new file mode 100644 index 0000000000..ce5515c529 Binary files /dev/null and b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/location_city_image.png differ diff --git a/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/main_solid_left_page_up_normal.png b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/main_solid_left_page_up_normal.png new file mode 100644 index 0000000000..9c1a2a4aea Binary files /dev/null and b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/main_solid_left_page_up_normal.png differ diff --git a/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/main_solid_left_page_up_press.png b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/main_solid_left_page_up_press.png new file mode 100644 index 0000000000..d927b18877 Binary files /dev/null and b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/main_solid_left_page_up_press.png differ diff --git a/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/main_solid_right_page_up_normal.png b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/main_solid_right_page_up_normal.png new file mode 100644 index 0000000000..dda526f475 Binary files /dev/null and b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/main_solid_right_page_up_normal.png differ diff --git a/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/main_solid_right_page_up_press.png b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/main_solid_right_page_up_press.png new file mode 100644 index 0000000000..2289209d9a Binary files /dev/null and b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/main_solid_right_page_up_press.png differ diff --git a/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/mainpage_location_img.png b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/mainpage_location_img.png new file mode 100644 index 0000000000..7a463ac3ab Binary files /dev/null and b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/mainpage_location_img.png differ diff --git a/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/map_location_normal.png b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/map_location_normal.png new file mode 100644 index 0000000000..53f5b5a14a Binary files /dev/null and b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/map_location_normal.png differ diff --git a/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/map_location_press.png b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/map_location_press.png new file mode 100644 index 0000000000..e3e430c8d6 Binary files /dev/null and b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/map_location_press.png differ diff --git a/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/not_join_checkbox_bg.png b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/not_join_checkbox_bg.png new file mode 100755 index 0000000000..663addd255 Binary files /dev/null and b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/not_join_checkbox_bg.png differ diff --git a/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/public_arrow_back_iv.png b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/public_arrow_back_iv.png new file mode 100644 index 0000000000..cd7159e219 Binary files /dev/null and b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/public_arrow_back_iv.png differ diff --git a/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/search_information_normal.png b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/search_information_normal.png new file mode 100644 index 0000000000..69529ef0bd Binary files /dev/null and b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/search_information_normal.png differ diff --git a/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/search_information_press.png b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/search_information_press.png new file mode 100644 index 0000000000..8338cc95ae Binary files /dev/null and b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/search_information_press.png differ diff --git a/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/video_loading_img.png b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/video_loading_img.png new file mode 100644 index 0000000000..48be2bdd18 Binary files /dev/null and b/demo/mogo-module-tanlu/src/main/res/drawable-ldpi/video_loading_img.png differ diff --git a/demo/mogo-module-tanlu/src/main/res/drawable/loading_bg.xml b/demo/mogo-module-tanlu/src/main/res/drawable/loading_bg.xml new file mode 100644 index 0000000000..24614c444e --- /dev/null +++ b/demo/mogo-module-tanlu/src/main/res/drawable/loading_bg.xml @@ -0,0 +1,16 @@ + + + + + + \ No newline at end of file diff --git a/demo/mogo-module-tanlu/src/main/res/drawable/selector_bg_btn_enlarge.xml b/demo/mogo-module-tanlu/src/main/res/drawable/selector_bg_btn_enlarge.xml new file mode 100644 index 0000000000..d293f7d7c9 --- /dev/null +++ b/demo/mogo-module-tanlu/src/main/res/drawable/selector_bg_btn_enlarge.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/demo/mogo-module-tanlu/src/main/res/drawable/shape_bg_222533_6px_bottom.xml b/demo/mogo-module-tanlu/src/main/res/drawable/shape_bg_222533_6px_bottom.xml new file mode 100644 index 0000000000..dfd8fcc00b --- /dev/null +++ b/demo/mogo-module-tanlu/src/main/res/drawable/shape_bg_222533_6px_bottom.xml @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/demo/mogo-module-tanlu/src/main/res/drawable/shape_bg_222533_6px_top.xml b/demo/mogo-module-tanlu/src/main/res/drawable/shape_bg_222533_6px_top.xml new file mode 100644 index 0000000000..98b3b02467 --- /dev/null +++ b/demo/mogo-module-tanlu/src/main/res/drawable/shape_bg_222533_6px_top.xml @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/demo/mogo-module-tanlu/src/main/res/layout/tanlu_card_view.xml b/demo/mogo-module-tanlu/src/main/res/layout/tanlu_card_view.xml index 34723f1bc6..03c7c97f3b 100644 --- a/demo/mogo-module-tanlu/src/main/res/layout/tanlu_card_view.xml +++ b/demo/mogo-module-tanlu/src/main/res/layout/tanlu_card_view.xml @@ -36,7 +36,6 @@ @@ -54,104 +53,5 @@ android:text="当前位置" /> - - - -