diff --git a/OCH/mogo-och-taxi-passenger/build.gradle b/OCH/mogo-och-taxi-passenger/build.gradle index 1a20487736..65642e14a3 100644 --- a/OCH/mogo-och-taxi-passenger/build.gradle +++ b/OCH/mogo-och-taxi-passenger/build.gradle @@ -62,6 +62,7 @@ dependencies { implementation rootProject.ext.dependencies.mogo_core_data implementation rootProject.ext.dependencies.mogo_core_function_call implementation rootProject.ext.dependencies.mogo_core_function_v2x + implementation rootProject.ext.dependencies.mogo_core_res }else { implementation project(":core:mogo-core-utils") implementation project(":foudations:mogo-commons") @@ -69,6 +70,7 @@ dependencies { implementation project(':core:mogo-core-data') implementation project(':core:mogo-core-function-call') implementation project(':core:function-impl:mogo-core-function-v2x') + implementation project(':core:mogo-core-res') } } diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerArrivedView.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerArrivedView.kt index 08f1d072f5..9238bd5744 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerArrivedView.kt +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerArrivedView.kt @@ -15,11 +15,14 @@ import com.amap.api.navi.view.PoiInputSearchWidget import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.util.OverlayViewUtils +import com.mogo.eagle.core.widget.media.video.SimpleVideoPlayer import com.mogo.och.common.module.wigets.OCHBorderShadowLayout import com.mogo.och.taxi.passenger.R import com.mogo.och.taxi.passenger.callback.ITaxiPassengerCommonCallback import com.mogo.och.taxi.passenger.callback.ITaxiPassengerScoreCallback -import com.mogo.och.taxi.passenger.utils.view.FrameSurfaceView +import com.shuyu.gsyvideoplayer.builder.GSYVideoOptionBuilder +import com.shuyu.gsyvideoplayer.listener.GSYSampleCallBack +import com.shuyu.gsyvideoplayer.utils.GSYVideoType import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.Disposable @@ -51,107 +54,15 @@ class TaxiPassengerArrivedView :RelativeLayout, View.OnClickListener { private lateinit var ivStarFourth: ImageView private lateinit var ivStarFifth: ImageView private lateinit var ivAnimalList: ImageView - private lateinit var svFrame: FrameSurfaceView + private lateinit var svpFrame: SimpleVideoPlayer private var subscribe: Disposable?=null private var orderNo = "" - var right_res_id = arrayListOf( - R.drawable.tail_ani_0000, - R.drawable.tail_ani_0001, - R.drawable.tail_ani_0002, - R.drawable.tail_ani_0003, - R.drawable.tail_ani_0004, - R.drawable.tail_ani_0005, - R.drawable.tail_ani_0006, - R.drawable.tail_ani_0007, - R.drawable.tail_ani_0008, - R.drawable.tail_ani_0009, - R.drawable.tail_ani_0010, - R.drawable.tail_ani_0011, - R.drawable.tail_ani_0012, - R.drawable.tail_ani_0013, - R.drawable.tail_ani_0014, - R.drawable.tail_ani_0015, - R.drawable.tail_ani_0016, - R.drawable.tail_ani_0017, - R.drawable.tail_ani_0018, - R.drawable.tail_ani_0019, - R.drawable.tail_ani_0020, - R.drawable.tail_ani_0021, - R.drawable.tail_ani_0022, - R.drawable.tail_ani_0023, - R.drawable.tail_ani_0024, - R.drawable.tail_ani_0025, - R.drawable.tail_ani_0026, - R.drawable.tail_ani_0027, - R.drawable.tail_ani_0028, - R.drawable.tail_ani_0029, - R.drawable.tail_ani_0030, - R.drawable.tail_ani_0031, - R.drawable.tail_ani_0032, - R.drawable.tail_ani_0033, - R.drawable.tail_ani_0034, - R.drawable.tail_ani_0035, - R.drawable.tail_ani_0036, - R.drawable.tail_ani_0037, - R.drawable.tail_ani_0038, - R.drawable.tail_ani_0039, - R.drawable.tail_ani_0040, - R.drawable.tail_ani_0041, - R.drawable.tail_ani_0042, - R.drawable.tail_ani_0043, - R.drawable.tail_ani_0044, - R.drawable.tail_ani_0045, - R.drawable.tail_ani_0046, - R.drawable.tail_ani_0047, - R.drawable.tail_ani_0048, - R.drawable.tail_ani_0049, - R.drawable.tail_ani_0050, - R.drawable.tail_ani_0051, - R.drawable.tail_ani_0052, - R.drawable.tail_ani_0053, - R.drawable.tail_ani_0054, - R.drawable.tail_ani_0055, - R.drawable.tail_ani_0056, - R.drawable.tail_ani_0057, - R.drawable.tail_ani_0058, - R.drawable.tail_ani_0059, - R.drawable.tail_ani_0060, - R.drawable.tail_ani_0061, - R.drawable.tail_ani_0062, - R.drawable.tail_ani_0063, - R.drawable.tail_ani_0064, - R.drawable.tail_ani_0065, - R.drawable.tail_ani_0066, - R.drawable.tail_ani_0067, - R.drawable.tail_ani_0068, - R.drawable.tail_ani_0069, - R.drawable.tail_ani_0070, - R.drawable.tail_ani_0071, - R.drawable.tail_ani_0072, - R.drawable.tail_ani_0073, - R.drawable.tail_ani_0074, - R.drawable.tail_ani_0075, - R.drawable.tail_ani_0076, - R.drawable.tail_ani_0077, - R.drawable.tail_ani_0078, - R.drawable.tail_ani_0079, - R.drawable.tail_ani_0080, - R.drawable.tail_ani_0081, - R.drawable.tail_ani_0082, - R.drawable.tail_ani_0083, - R.drawable.tail_ani_0084, - R.drawable.tail_ani_0085, - R.drawable.tail_ani_0086, - R.drawable.tail_ani_0087, - R.drawable.tail_ani_0088, - R.drawable.tail_ani_0089, - R.drawable.tail_ani_0090 - ) + private val gsyVideoOptionBuilder = GSYVideoOptionBuilder() var iTaxiPassengerScoreCallback: ITaxiPassengerScoreCallback?=null - @Volatile + var taxiPassengerCommonCallback: ITaxiPassengerCommonCallback?=null var left2Right: Animation = AnimationUtils.loadAnimation( context, R.anim.left_to_right @@ -176,21 +87,30 @@ class TaxiPassengerArrivedView :RelativeLayout, View.OnClickListener { ochShadowLayout = findViewById(R.id.och_shadow_layout) ochThankShadowLayout = findViewById(R.id.och_thank_shadow_layout) ivAnimalList = findViewById(R.id.iv_animal_list) - svFrame = findViewById(R.id.sv_frame) + svpFrame = findViewById(R.id.svp_frame) allStartOrdered = mutableListOf() initScore() findViewById(R.id.tv_please_score).setOnClickListener(this) - svFrame.setBitmapIds(right_res_id) - svFrame.setDuration(2000) - // debug 弹出 mArrivedEndStation.setOnLongClickListener { scoreSuccess() false } + + val url = "android.resource://" + context.packageName + "/" + R.raw.end_video + gsyVideoOptionBuilder.setUrl(url) + .setCacheWithPlay(false) + .setPlayTag("TaxiPassengerArrivedView") + .setVideoAllCallBack(object : GSYSampleCallBack() { + override fun onAutoComplete(url: String?, vararg objects: Any?) { + svpFrame.setBackgroundResource(R.drawable.tail_ani_0090) + } + }) + .build(svpFrame) + GSYVideoType.setShowType(GSYVideoType.SCREEN_TYPE_FULL) } private fun initScore() { @@ -218,6 +138,7 @@ class TaxiPassengerArrivedView :RelativeLayout, View.OnClickListener { } override fun onDetachedFromWindow() { + svpFrame.setBackgroundResource(R.drawable.tail_ani_0000) super.onDetachedFromWindow() show = false subscribe?.let { @@ -322,14 +243,11 @@ class TaxiPassengerArrivedView :RelativeLayout, View.OnClickListener { ochThankShadowLayout.visibility = View.GONE ivAnimalList.visibility = View.GONE - //play frame animation by FrameSurfaceView which is much more memory-efficient than AnimationDrawable - svFrame.setRepeatTimes(0) - svFrame.setFrameFinishCallback { + svpFrame.startButton.performClick() + postDelayed({ ochShadowLayout.visibility = View.VISIBLE - svFrame.setBackgroundResource(R.drawable.tail_ani_0090) ochShadowLayout.startAnimation(left2Right) - } - svFrame.start() + },1928) showThanks = false this.orderNo = orderId @@ -378,8 +296,9 @@ class TaxiPassengerArrivedView :RelativeLayout, View.OnClickListener { * 评论失败 重置状态 */ fun scoreFail(){ - tvFeel.text = "" - resetStar() + scoreSuccess() +// tvFeel.text = "" +// resetStar() } private fun resetStar() { diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java index 8cd1589268..aa54f8d5ae 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java @@ -116,14 +116,10 @@ public class TaxiPassengerBaseFragment extends MvpFragment { + //showOrHideArrivedEndLayout(true, "北京北京北京", "1527481606997577728"); + //showOrHidePressengerCheckPager(true, "开始站点开", "开始站点开始站点开始", "2", "京A888888", "18811539480"); + //CallerHmiManager.INSTANCE.showToolsView(); }); } @@ -281,7 +277,7 @@ public class TaxiPassengerBaseFragment extends MvpFragment bitmapIds = new ArrayList<>(); - /** - * the index of bitmap resource which is decoding - */ - private int bitmapIdIndex; - /** - * the index of frame which is drawing - */ - private AtomicInteger frameIndex; - /** - * decoded bitmaps stores in this queue - * consumer is drawing thread, producer is decoding thread. - */ - private LinkedBlockingQueue decodedBitmaps = new LinkedBlockingQueue(bufferSize); - /** - * bitmaps already drawn by canvas stores in this queue - * consumer is decoding thread, producer is drawing thread. - */ - private LinkedBlockingQueue drawnBitmaps = new LinkedBlockingQueue(bufferSize); - /** - * the thread for decoding bitmaps - */ - private HandlerThread decodeThread; - /** - * the Runnable describes how to decode one bitmap - */ - private DecodeRunnable decodeRunnable; - /** - * this handler helps to decode bitmap one after another - */ - private Handler handler; - private BitmapFactory.Options options; - private Paint paint = new Paint(); - private Rect srcRect; - private Rect dstRect = new Rect(); - private int defaultWidth; - private int defaultHeight; - - private FrameFinishCallback frameFinishCallback; - - public FrameSurfaceView(Context context) { - super(context); - } - - public FrameSurfaceView(Context context, AttributeSet attrs) { - super(context, attrs); - } - - public FrameSurfaceView(Context context, AttributeSet attrs, int defStyleAttr) { - super(context, attrs, defStyleAttr); - } - - public void setRepeatTimes(int repeatTimes) { - this.repeatTimes = repeatTimes; - } - - @Override - protected void init() { - super.init(); - options = new BitmapFactory.Options(); - options.inMutable = true; - decodeThread = new HandlerThread(DECODE_THREAD_NAME); - frameIndex = new AtomicInteger(); - frameIndex.set(INVALID_INDEX); - } - - @Override - protected void onLayout(boolean changed, int left, int top, int right, int bottom) { - super.onLayout(changed, left, top, right, bottom); - dstRect.set(0, 0, getWidth(), getHeight()); - } - - @Override - protected int getDefaultWidth() { - return defaultWidth; - } - - @Override - protected int getDefaultHeight() { - return defaultHeight; - } - - @Override - protected void onFrameDrawFinish() { - } - - /** - * set the duration of frame animation - * - * @param duration time in milliseconds - */ - public void setDuration(int duration) { - int frameDuration = duration / bitmapIds.size(); - setFrameDuration(frameDuration); - } - - /** - * set the materials of frame animation which is an array of bitmap resource id - * - * @param bitmapIds an array of bitmap resource id - */ - public void setBitmapIds(List bitmapIds) { - if (bitmapIds == null || bitmapIds.size() == 0) { - return; - } - this.bitmapIds = bitmapIds; - //by default, take the first bitmap's dimension into consideration - getBitmapDimension(bitmapIds.get(bitmapIdIndex)); - preloadFrames(); - decodeRunnable = new DecodeRunnable(bitmapIdIndex, bitmapIds, options); - } - - private void getBitmapDimension(int bitmapId) { - final BitmapFactory.Options options = new BitmapFactory.Options(); - options.inJustDecodeBounds = true; - BitmapFactory.decodeResource(this.getResources(), bitmapId, options); - defaultWidth = options.outWidth; - defaultHeight = options.outHeight; - srcRect = new Rect(0, 0, defaultWidth, defaultHeight); - //we have to re-measure to make defaultWidth in use in onMeasure() - requestLayout(); - } - - /** - * load the first several frames of animation before it is started - */ - private void preloadFrames() { - decodeAndPutBitmap(bitmapIds.get(bitmapIdIndex++), options, new LinkedBitmap()); - decodeAndPutBitmap(bitmapIds.get(bitmapIdIndex++), options, new LinkedBitmap()); - } - - /** - * recycle the bitmap used by frame animation. - * Usually it should be invoked when the ui of frame animation is no longer visible - */ - public void destroy() { - if (drawnBitmaps != null) { - drawnBitmaps.clear(); - } - if (decodeThread != null) { - decodeThread.quit(); - decodeThread = null; - } - if (handler != null) { - handler = null; - } - } - - @Override - protected void onFrameDraw(Canvas canvas) { - clearCanvas(canvas); - if (!isStart()) { - return; - } - if (!isFinish()) { - drawOneFrame(canvas); - } else { - onFrameAnimationEnd(); - if (repeatTimes != 0 && repeatTimes == INFINITE) { - start(); - } else if (repeatedCount < repeatTimes) { - start(); - repeatedCount++; - } else { - repeatedCount = 0; - } - } - } - - /** - * draw a single frame which is a bitmap - * - * @param canvas - */ - private void drawOneFrame(Canvas canvas) { - LinkedBitmap linkedBitmap = getDecodedBitmap(); - if (linkedBitmap != null) { - canvas.drawBitmap(linkedBitmap.bitmap, srcRect, dstRect, paint); - } - putDrawnBitmap(linkedBitmap); - frameIndex.incrementAndGet(); - if(isFinish()&&frameFinishCallback!=null){ - runOnUIThread(() -> frameFinishCallback.onFinishCallback()); - } - } - - /** - * invoked when frame animation is done - */ - private void onFrameAnimationEnd() { - reset(); - } - - /** - * reset the index of frame, preparing for the next frame animation - */ - private void reset() { - frameIndex.set(INVALID_INDEX); - } - - /** - * whether frame animation is finished - * - * @return true: animation is finished, false: animation is doing - */ - private boolean isFinish() { - return frameIndex.get() >= bitmapIds.size() - 1; - } - - /** - * whether frame animation is started - * - * @return true: animation is started, false: animation is not started - */ - private boolean isStart() { - return frameIndex.get() != INVALID_INDEX; - } - - /** - * start frame animation from the first frame - */ - public void start() { - frameIndex.compareAndSet(INVALID_INDEX, 0); - if (decodeThread == null) { - decodeThread = new HandlerThread(DECODE_THREAD_NAME); - } - if (!decodeThread.isAlive()) { - decodeThread.start(); - } - if (handler == null) { - handler = new Handler(decodeThread.getLooper()); - } - if (decodeRunnable != null) { - decodeRunnable.setIndex(0); - } - handler.post(decodeRunnable); - } - - - /** - * clear out the drawing on canvas,preparing for the next frame - * * @param canvas - */ - private void clearCanvas(Canvas canvas) { - paint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.CLEAR)); - canvas.drawPaint(paint); - paint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC)); - } - - /** - * decode bitmap by BitmapFactory.decodeStream(), it is about twice faster than BitmapFactory.decodeResource() - * - * @param resId the bitmap resource - * @param options - * @return - */ - private Bitmap decodeBitmap(int resId, BitmapFactory.Options options) { - options.inScaled = false; - InputStream inputStream = getResources().openRawResource(resId); - return BitmapFactory.decodeStream(inputStream, null, options); - } - - /** - * reuse bitmap in drawnBitmaps to decode new bitmap - * - * @param resId - * @param options - */ - private void decodedBitmapByReuse(int resId, BitmapFactory.Options options) { - LinkedBitmap linkedBitmap = getDrawnBitmap(); - if (linkedBitmap == null) { - linkedBitmap = new LinkedBitmap(); - } - options.inBitmap = linkedBitmap.bitmap; - decodeAndPutBitmap(resId, options, linkedBitmap); - } - - /** - * decode bitmap and put it into decodedBitmaps - * - * @param resId - * @param options - * @param linkedBitmap - */ - private void decodeAndPutBitmap(int resId, BitmapFactory.Options options, LinkedBitmap linkedBitmap) { - Bitmap bitmap = decodeBitmap(resId, options); - linkedBitmap.bitmap = bitmap; - try { - decodedBitmaps.put(linkedBitmap); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - - private void putDrawnBitmap(LinkedBitmap bitmap) { - drawnBitmaps.offer(bitmap); - } - - /** - * get bitmap which already drawn by canvas - * - * @return - */ - private LinkedBitmap getDrawnBitmap() { - LinkedBitmap bitmap = null; - try { - bitmap = drawnBitmaps.take(); - } catch (InterruptedException e) { - e.printStackTrace(); - } - return bitmap; - } - - /** - * get decoded bitmap in the decoded bitmap queue - * it might block due to new bitmap is not ready - * - * @return - */ - private LinkedBitmap getDecodedBitmap() { - LinkedBitmap bitmap = null; - try { - bitmap = decodedBitmaps.take(); - } catch (InterruptedException e) { - e.printStackTrace(); - } - return bitmap; - } - - public FrameFinishCallback getFrameFinishCallback() { - return frameFinishCallback; - } - - public void setFrameFinishCallback(FrameFinishCallback frameFinishCallback) { - this.frameFinishCallback = frameFinishCallback; - } - - private class DecodeRunnable implements Runnable { - - private int index; - private List bitmapIds; - private BitmapFactory.Options options; - - public DecodeRunnable(int index, List bitmapIds, BitmapFactory.Options options) { - this.index = index; - this.bitmapIds = bitmapIds; - this.options = options; - } - - public void setIndex(int index) { - this.index = index; - } - - @Override - public void run() { - decodedBitmapByReuse(bitmapIds.get(index), options); - index++; - if (index < bitmapIds.size()) { - handler.post(this); - } else { - index = 0; - } - } - } -} diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/view/LinkedBitmap.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/view/LinkedBitmap.java deleted file mode 100644 index 0de56b7ba5..0000000000 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/view/LinkedBitmap.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.mogo.och.taxi.passenger.utils.view; - -import android.graphics.Bitmap; - -/** - * a structure used by LinkedBlockingQueue to keep bitmap - */ -public class LinkedBitmap { - public Bitmap bitmap; - public LinkedBitmap next; - -} \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/view/LinkedBlockingQueue.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/view/LinkedBlockingQueue.java deleted file mode 100644 index 7a02d44d89..0000000000 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/view/LinkedBlockingQueue.java +++ /dev/null @@ -1,205 +0,0 @@ -package com.mogo.och.taxi.passenger.utils.view; - - -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.locks.Condition; -import java.util.concurrent.locks.ReentrantLock; - -public class LinkedBlockingQueue { - /** - * Current number of elements - */ - private final AtomicInteger count = new AtomicInteger(); - /** - * Lock held by take, poll, etc - */ - private final ReentrantLock takeLock = new ReentrantLock(); - - /** - * Wait queue for waiting takes - */ - private final Condition notEmpty = takeLock.newCondition(); - - /** - * Lock held by put, offer, etc - */ - private final ReentrantLock putLock = new ReentrantLock(); - - /** - * Wait queue for waiting puts - */ - private final Condition notFull = putLock.newCondition(); - /** - * The capacity bound, or Integer.MAX_VALUE if none - */ - private final int capacity; - /** - * the first element in the queue - */ - private LinkedBitmap head; - /** - * the last element int the queue - */ - private LinkedBitmap tail; - - - public LinkedBlockingQueue(int capacity) { - if (capacity <= 0) throw new IllegalArgumentException(); - this.capacity = capacity; - } - - public void put(LinkedBitmap bitmap) throws InterruptedException { - if (bitmap == null) throw new NullPointerException(); - // Note: convention in all put/take/etc is to preset local var - // holding count negative to indicate failure unless set. - int c = -1; - final ReentrantLock putLock = this.putLock; - final AtomicInteger count = this.count; - putLock.lockInterruptibly(); - try { - /* - * Note that count is used in wait guard even though it is - * not protected by lock. This works because count can - * only decrease at this point (all other puts are shut - * out by lock), and we (or some other waiting put) are - * signalled if it ever changes from capacity. Similarly - * for all other uses of count in other wait guards. - */ - while (count.get() == capacity) { - notFull.await(); - } - enqueue(bitmap); - c = count.getAndIncrement(); - if (c + 1 < capacity) - notFull.signal(); - } finally { - putLock.unlock(); - } - if (c == 0) - signalNotEmpty(); - } - - public boolean offer(LinkedBitmap bitmap) { - if (bitmap == null) throw new NullPointerException(); - final AtomicInteger count = this.count; - if (count.get() == capacity) - return false; - int c = -1; - final ReentrantLock putLock = this.putLock; - putLock.lock(); - try { - if (count.get() < capacity) { - enqueue(bitmap); - c = count.getAndIncrement(); - if (c + 1 < capacity) - notFull.signal(); - } - } finally { - putLock.unlock(); - } - if (c == 0) - signalNotEmpty(); - return c >= 0; - } - - public LinkedBitmap take() throws InterruptedException { - LinkedBitmap x; - int c = -1; - final AtomicInteger count = this.count; - final ReentrantLock takeLock = this.takeLock; - takeLock.lockInterruptibly(); - try { - while (count.get() == 0) { - notEmpty.await(); - } - x = dequeue(); - c = count.getAndDecrement(); - if (c > 1) - notEmpty.signal(); - } finally { - takeLock.unlock(); - } - if (c == capacity) - signalNotFull(); - return x; - } - - /** - * insert element into the end of queue - * - * @param bitmap - */ - private void enqueue(LinkedBitmap bitmap) { - if (head == null) { - head = bitmap; - tail = bitmap; - bitmap.next = null; - } else { - tail.next = bitmap; - bitmap.next = null; - } - } - - /** - * get and remove the first element of the queue - * - * @return - */ - private LinkedBitmap dequeue() { - LinkedBitmap p = head; - if (p == null) { - return null; - } else { - head = head.next; - } - return p; - } - - /** - * Signals a waiting take. Called only from put/offer (which do not - * otherwise ordinarily lock takeLock.) - */ - private void signalNotEmpty() { - final ReentrantLock takeLock = this.takeLock; - takeLock.lock(); - try { - notEmpty.signal(); - } finally { - takeLock.unlock(); - } - } - - /** - * Signals a waiting put. Called only from take/poll. - */ - private void signalNotFull() { - final ReentrantLock putLock = this.putLock; - putLock.lock(); - try { - notFull.signal(); - } finally { - putLock.unlock(); - } - } - - /** - * recycle the bitmaps one by one - */ - public void clear() { - LinkedBitmap p = head; - if (p == null) { - return; - } - while (p != null) { - if (p.bitmap != null) { - p.bitmap.recycle(); - } - p.bitmap = null; - p = p.next; - } - } - - public Integer getCount() { - return count.get(); - } -} \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/view/MethodUtil.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/view/MethodUtil.java deleted file mode 100644 index 7df1853286..0000000000 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/view/MethodUtil.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.mogo.och.taxi.passenger.utils.view; - -import android.os.SystemClock; -import android.util.Log; - -public class MethodUtil { - /** - * calculate the time consumed by runnable invocation, print log in millisecond - * - * @param runnable - */ - public static long time(Runnable runnable) { - long start = SystemClock.elapsedRealtime(); - runnable.run(); - long end = SystemClock.elapsedRealtime(); - long span = end - start; - Log.v("ttaylor", "MethodUtil.time()" + " time span = " + span + " ms"); - return span; - } -} diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/view/NumberUtil.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/view/NumberUtil.java deleted file mode 100644 index 76b8d45b5c..0000000000 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/view/NumberUtil.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.mogo.och.taxi.passenger.utils.view; - -import android.text.TextUtils; -import android.util.Log; - -public class NumberUtil { - - private static long total; - private static int times; - - private static String tag; - - /** - * calculate the average of a series long number and print it - * @param tag - * @param l - */ - public static void average(String tag, Long l) { - if (!TextUtils.isEmpty(tag) && !tag.equals(NumberUtil.tag)) { - reset(); - NumberUtil.tag = tag; - } - times++; - total += l; - Log.v("ttaylor", "Average.average() " + NumberUtil.tag + " average = " + (total / times)); - } - - private static void reset() { - total = 0; - times = 0; - } -} \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/anim/alpha_hide_show.xml b/OCH/mogo-och-taxi-passenger/src/main/res/anim/alpha_hide_show.xml index b22df1d9f5..ddb2eaf470 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/anim/alpha_hide_show.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/anim/alpha_hide_show.xml @@ -1,3 +1,3 @@ \ No newline at end of file + android:duration="1000" android:fromAlpha="0" android:toAlpha="1" /> \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/anim/left_to_right.xml b/OCH/mogo-och-taxi-passenger/src/main/res/anim/left_to_right.xml index a3fbfd8d32..5d345730d9 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/anim/left_to_right.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/anim/left_to_right.xml @@ -1,7 +1,7 @@ \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/anim/right_to_left.xml b/OCH/mogo-och-taxi-passenger/src/main/res/anim/right_to_left.xml index cda1a0f99c..18bc75b16e 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/anim/right_to_left.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/anim/right_to_left.xml @@ -1,7 +1,7 @@ \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_map_arrow.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_map_arrow.png index bb4a45f34d..1297e5e7ae 100644 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_map_arrow.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_map_arrow.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_map_arrow.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_map_arrow.png index bb4a45f34d..1297e5e7ae 100644 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_map_arrow.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_map_arrow.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_arrived_ani.xml b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_arrived_ani.xml deleted file mode 100644 index cce2361910..0000000000 --- a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_arrived_ani.xml +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_score_success.xml b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_score_success.xml index 48ccdcfe95..06ec998707 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_score_success.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_score_success.xml @@ -2,41 +2,41 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0000.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0000.jpg deleted file mode 100755 index 2890c08ef4..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0000.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0000.webp b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0000.webp new file mode 100644 index 0000000000..dc6d9e6bcd Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0000.webp differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0001.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0001.jpg deleted file mode 100755 index 14ee21e5a0..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0001.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0002.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0002.jpg deleted file mode 100755 index 14ee21e5a0..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0002.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0003.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0003.jpg deleted file mode 100755 index 14ee21e5a0..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0003.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0004.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0004.jpg deleted file mode 100755 index 14ee21e5a0..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0004.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0005.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0005.jpg deleted file mode 100755 index 14ee21e5a0..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0005.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0006.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0006.jpg deleted file mode 100755 index 14ee21e5a0..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0006.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0007.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0007.jpg deleted file mode 100755 index 14ee21e5a0..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0007.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0008.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0008.jpg deleted file mode 100755 index 14ee21e5a0..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0008.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0009.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0009.jpg deleted file mode 100755 index 14ee21e5a0..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0009.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0010.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0010.jpg deleted file mode 100755 index 8490db8e20..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0010.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0011.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0011.jpg deleted file mode 100755 index 4b87758271..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0011.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0012.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0012.jpg deleted file mode 100755 index 736b624c40..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0012.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0013.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0013.jpg deleted file mode 100755 index 711639e5e3..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0013.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0014.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0014.jpg deleted file mode 100755 index cd9769540f..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0014.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0015.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0015.jpg deleted file mode 100755 index d41f338b6f..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0015.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0016.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0016.jpg deleted file mode 100755 index 2a0f87cbbe..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0016.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0017.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0017.jpg deleted file mode 100755 index 2f144379bc..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0017.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0018.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0018.jpg deleted file mode 100755 index 1dc6945239..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0018.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0019.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0019.jpg deleted file mode 100755 index 20a9e7d175..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0019.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0020.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0020.jpg deleted file mode 100755 index 94572374e6..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0020.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0021.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0021.jpg deleted file mode 100755 index 3fda64b043..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0021.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0022.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0022.jpg deleted file mode 100755 index 37ee00f042..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0022.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0023.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0023.jpg deleted file mode 100755 index 8478160592..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0023.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0024.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0024.jpg deleted file mode 100755 index a75bb92607..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0024.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0025.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0025.jpg deleted file mode 100755 index 8247f9304f..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0025.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0026.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0026.jpg deleted file mode 100755 index e562fe3f0f..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0026.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0027.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0027.jpg deleted file mode 100755 index a71a21b8fb..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0027.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0028.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0028.jpg deleted file mode 100755 index 94648a95c9..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0028.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0029.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0029.jpg deleted file mode 100755 index 1c4062365b..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0029.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0030.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0030.jpg deleted file mode 100755 index 2508aa055f..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0030.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0031.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0031.jpg deleted file mode 100755 index 3d1d1d9690..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0031.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0032.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0032.jpg deleted file mode 100755 index 2f9a6da815..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0032.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0033.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0033.jpg deleted file mode 100755 index a4b500e9e0..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0033.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0034.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0034.jpg deleted file mode 100755 index 5d455a830a..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0034.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0035.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0035.jpg deleted file mode 100755 index 88a9083b8d..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0035.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0036.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0036.jpg deleted file mode 100755 index 3e118fe969..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0036.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0037.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0037.jpg deleted file mode 100755 index be9bc118af..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0037.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0038.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0038.jpg deleted file mode 100755 index 4c5771c0bd..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0038.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0039.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0039.jpg deleted file mode 100755 index 9a693b6907..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0039.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0040.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0040.jpg deleted file mode 100755 index 6c7d8bdc08..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0040.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0041.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0041.jpg deleted file mode 100755 index 8235428c28..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0041.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0042.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0042.jpg deleted file mode 100755 index 1e65aee6d8..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0042.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0043.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0043.jpg deleted file mode 100755 index 51bddad08f..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0043.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0044.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0044.jpg deleted file mode 100755 index 5714b176d1..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0044.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0045.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0045.jpg deleted file mode 100755 index edad1ee27e..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0045.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0046.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0046.jpg deleted file mode 100755 index abc24eb5d9..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0046.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0047.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0047.jpg deleted file mode 100755 index 995d9a1d4c..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0047.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0048.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0048.jpg deleted file mode 100755 index 99e2139d5b..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0048.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0049.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0049.jpg deleted file mode 100755 index cef0f721a3..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0049.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0050.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0050.jpg deleted file mode 100755 index 86cd759172..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0050.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0051.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0051.jpg deleted file mode 100755 index bb0763d485..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0051.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0052.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0052.jpg deleted file mode 100755 index e41bb7be37..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0052.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0053.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0053.jpg deleted file mode 100755 index f825caa976..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0053.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0054.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0054.jpg deleted file mode 100755 index 74dd1f544d..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0054.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0055.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0055.jpg deleted file mode 100755 index 0f37ca5a8f..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0055.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0056.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0056.jpg deleted file mode 100755 index a25aeb81f5..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0056.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0057.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0057.jpg deleted file mode 100755 index b038c99abd..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0057.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0058.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0058.jpg deleted file mode 100755 index 396a715aca..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0058.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0059.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0059.jpg deleted file mode 100755 index 71d589d4ff..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0059.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0060.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0060.jpg deleted file mode 100755 index b83216fda5..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0060.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0061.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0061.jpg deleted file mode 100755 index ca94243c8e..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0061.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0062.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0062.jpg deleted file mode 100755 index ada2672745..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0062.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0063.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0063.jpg deleted file mode 100755 index fa5949386d..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0063.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0064.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0064.jpg deleted file mode 100755 index dab3b49419..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0064.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0065.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0065.jpg deleted file mode 100755 index befb8ee4e7..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0065.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0066.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0066.jpg deleted file mode 100755 index 275b35700d..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0066.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0067.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0067.jpg deleted file mode 100755 index 70b3fa9874..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0067.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0068.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0068.jpg deleted file mode 100755 index b1b6b868f5..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0068.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0069.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0069.jpg deleted file mode 100755 index b1aca0ff04..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0069.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0070.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0070.jpg deleted file mode 100755 index 5c88932a37..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0070.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0071.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0071.jpg deleted file mode 100755 index 8ec5072801..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0071.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0072.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0072.jpg deleted file mode 100755 index 81401a5361..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0072.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0073.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0073.jpg deleted file mode 100755 index 8cd873e754..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0073.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0074.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0074.jpg deleted file mode 100755 index 7fe75f74e1..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0074.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0075.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0075.jpg deleted file mode 100755 index e718159739..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0075.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0076.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0076.jpg deleted file mode 100755 index 9c76dda713..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0076.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0077.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0077.jpg deleted file mode 100755 index e64a1b0cbf..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0077.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0078.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0078.jpg deleted file mode 100755 index 099cc47713..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0078.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0079.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0079.jpg deleted file mode 100755 index de4bbaf360..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0079.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0080.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0080.jpg deleted file mode 100755 index a9ee1c2f8e..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0080.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0081.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0081.jpg deleted file mode 100755 index d393a3d0b4..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0081.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0082.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0082.jpg deleted file mode 100755 index 822e4d4ce5..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0082.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0083.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0083.jpg deleted file mode 100755 index 21bb38294c..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0083.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0084.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0084.jpg deleted file mode 100755 index cd802473ac..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0084.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0085.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0085.jpg deleted file mode 100755 index cd802473ac..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0085.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0086.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0086.jpg deleted file mode 100755 index cd802473ac..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0086.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0087.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0087.jpg deleted file mode 100755 index cd802473ac..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0087.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0088.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0088.jpg deleted file mode 100755 index cd802473ac..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0088.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0089.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0089.jpg deleted file mode 100755 index cd802473ac..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0089.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0090.jpg b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0090.jpg deleted file mode 100755 index cd802473ac..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0090.jpg and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0090.webp b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0090.webp new file mode 100644 index 0000000000..5bc925da38 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0090.webp differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml index b18d8e59c5..f97c97de3d 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml @@ -7,12 +7,10 @@ android:layout_height="match_parent" tools:ignore="MissingDefaultResource"> - diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml index 01f53c043f..3e6850fea4 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml @@ -46,12 +46,12 @@ android:layout_width="300px" android:layout_height="76px" android:layout_gravity="center" - android:layout_marginLeft="@dimen/dp_40" - android:layout_marginBottom="@dimen/dp_40" + android:layout_marginRight="@dimen/dp_40" + android:layout_marginBottom="@dimen/dp_50" android:background="@drawable/taxi_p_mogologo_nor" - android:visibility="gone" + app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintLeft_toLeftOf="parent" /> + app:layout_constraintEnd_toEndOf="parent" />