diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/animation/AnimationResources.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/animation/AnimationResources.java index e8f134e908..7e1a443476 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/animation/AnimationResources.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/animation/AnimationResources.java @@ -5,8 +5,32 @@ import com.mogo.module.v2x.R; public class AnimationResources { public static final int loadingRes[] = { - R.drawable.icon_enthusiasm_choose, - R.drawable.icon_enthusiasm_unchoose, + R.drawable.v_to_x_loading_car0000, + R.drawable.v_to_x_loading_car0002, + R.drawable.v_to_x_loading_car0004, + R.drawable.v_to_x_loading_car0006, + R.drawable.v_to_x_loading_car0008, + R.drawable.v_to_x_loading_car0010, + R.drawable.v_to_x_loading_car0012, + R.drawable.v_to_x_loading_car0014, + R.drawable.v_to_x_loading_car0016, + R.drawable.v_to_x_loading_car0018, + R.drawable.v_to_x_loading_car0020, + R.drawable.v_to_x_loading_car0022, + R.drawable.v_to_x_loading_car0024, + R.drawable.v_to_x_loading_car0025, + R.drawable.v_to_x_loading_car0027, + R.drawable.v_to_x_loading_car0029, + R.drawable.v_to_x_loading_car0031, + R.drawable.v_to_x_loading_car0033, + R.drawable.v_to_x_loading_car0035, + R.drawable.v_to_x_loading_car0037, + R.drawable.v_to_x_loading_car0039, + R.drawable.v_to_x_loading_car0041, + R.drawable.v_to_x_loading_car0043, + R.drawable.v_to_x_loading_car0045, + R.drawable.v_to_x_loading_car0047, + R.drawable.v_to_x_loading_car0048, }; } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/animation/V2XAnimationManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/animation/V2XAnimationManager.java index ff5ac0f781..ad0c6401ca 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/animation/V2XAnimationManager.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/animation/V2XAnimationManager.java @@ -51,7 +51,6 @@ public class V2XAnimationManager implements Animation { } public void release() { - delegate = null; } } diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/loading_image.gif b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/loading_image.gif new file mode 100644 index 0000000000..5e3b79bbed Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/loading_image.gif differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0000.jpg b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0000.jpg new file mode 100644 index 0000000000..cc52297fe2 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0000.jpg differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0002.jpg b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0002.jpg new file mode 100644 index 0000000000..1c2891a003 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0002.jpg differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0004.jpg b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0004.jpg new file mode 100644 index 0000000000..33cc4076b6 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0004.jpg differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0006.jpg b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0006.jpg new file mode 100644 index 0000000000..031866594d Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0006.jpg differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0008.jpg b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0008.jpg new file mode 100644 index 0000000000..5bae20de40 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0008.jpg differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0010.jpg b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0010.jpg new file mode 100644 index 0000000000..28cd979b2b Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0010.jpg differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0012.jpg b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0012.jpg new file mode 100644 index 0000000000..2527cd5e8b Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0012.jpg differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0014.jpg b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0014.jpg new file mode 100644 index 0000000000..931b9ab3b8 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0014.jpg differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0016.jpg b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0016.jpg new file mode 100644 index 0000000000..66f35aae0f Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0016.jpg differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0018.jpg b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0018.jpg new file mode 100644 index 0000000000..006cdf3549 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0018.jpg differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0020.jpg b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0020.jpg new file mode 100644 index 0000000000..abd537c11e Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0020.jpg differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0022.jpg b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0022.jpg new file mode 100644 index 0000000000..6c12c96a67 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0022.jpg differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0024.jpg b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0024.jpg new file mode 100644 index 0000000000..9b9987ef28 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0024.jpg differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0025.jpg b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0025.jpg new file mode 100644 index 0000000000..4c20aaee9a Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0025.jpg differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0027.jpg b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0027.jpg new file mode 100644 index 0000000000..3697d21490 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0027.jpg differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0029.jpg b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0029.jpg new file mode 100644 index 0000000000..aba33759ab Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0029.jpg differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0031.jpg b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0031.jpg new file mode 100644 index 0000000000..d8a4ac1140 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0031.jpg differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0033.jpg b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0033.jpg new file mode 100644 index 0000000000..39dc6d7476 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0033.jpg differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0035.jpg b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0035.jpg new file mode 100644 index 0000000000..cccc5d1ec8 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0035.jpg differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0037.jpg b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0037.jpg new file mode 100644 index 0000000000..e0de64c12a Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0037.jpg differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0039.jpg b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0039.jpg new file mode 100644 index 0000000000..4a434eaf7a Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0039.jpg differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0041.jpg b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0041.jpg new file mode 100644 index 0000000000..19a043e5ac Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0041.jpg differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0043.jpg b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0043.jpg new file mode 100644 index 0000000000..fab3f819ea Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0043.jpg differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0045.jpg b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0045.jpg new file mode 100644 index 0000000000..083b86bb58 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0045.jpg differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0047.jpg b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0047.jpg new file mode 100644 index 0000000000..995685a59d Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0047.jpg differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0048.jpg b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0048.jpg new file mode 100644 index 0000000000..04338fd473 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0048.jpg differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/loading_image.gif b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/loading_image.gif new file mode 100644 index 0000000000..5e3b79bbed Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/loading_image.gif differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable/loading_image.gif b/modules/mogo-module-v2x/src/main/res/drawable/loading_image.gif new file mode 100644 index 0000000000..5e3b79bbed Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable/loading_image.gif differ diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml index b620452a8c..912877da4b 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml @@ -54,6 +54,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerInParent="true" + android:clickable="false" android:layout_toLeftOf="@id/road_case_useless_num" android:gravity="center" android:paddingRight="5px" /> @@ -75,6 +76,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerInParent="true" + android:clickable="false" android:layout_toLeftOf="@id/road_case_useful_num" android:paddingRight="5px" /> diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_recylerview.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_recylerview.xml index 1865215bb2..545abf7aaa 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_recylerview.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_recylerview.xml @@ -26,10 +26,9 @@