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 7e1a443476..fc6970f275 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,32 +5,32 @@ import com.mogo.module.v2x.R; public class AnimationResources { public static final int loadingRes[] = { - 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, +// 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/view/V2XNetworkLoadingView.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XNetworkLoadingView.java index a73c2c4ccc..0f2a51fd87 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XNetworkLoadingView.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XNetworkLoadingView.java @@ -6,6 +6,7 @@ import android.view.LayoutInflater; import android.view.View; import android.widget.Button; import android.widget.ImageView; +import android.widget.ProgressBar; import android.widget.RelativeLayout; import android.widget.TextView; @@ -17,7 +18,7 @@ import com.mogo.module.v2x.utils.animation.V2XAnimationManager; public class V2XNetworkLoadingView extends RelativeLayout { - private ImageView loadView; + private ProgressBar loadView; private TextView textView; private V2XAnimationManager v2XAnimationManager; public Button refresButton; @@ -32,7 +33,10 @@ public class V2XNetworkLoadingView extends RelativeLayout { super(context, attrs); LayoutInflater.from(context).inflate(R.layout.v2x_network_loading_item, this); initView(); - setLoadingImage(AnimationResources.loadingRes); + /* + 添加动画图片资源 + * */ +// setLoadingImage(AnimationResources.loadingRes); } public V2XNetworkLoadingView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) { 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 deleted file mode 100644 index cc52297fe2..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0000.jpg and /dev/null 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 deleted file mode 100644 index 1c2891a003..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0002.jpg and /dev/null 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 deleted file mode 100644 index 33cc4076b6..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0004.jpg and /dev/null 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 deleted file mode 100644 index 031866594d..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0006.jpg and /dev/null 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 deleted file mode 100644 index 5bae20de40..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0008.jpg and /dev/null 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 deleted file mode 100644 index 28cd979b2b..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0010.jpg and /dev/null 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 deleted file mode 100644 index 2527cd5e8b..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0012.jpg and /dev/null 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 deleted file mode 100644 index 931b9ab3b8..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0014.jpg and /dev/null 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 deleted file mode 100644 index 66f35aae0f..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0016.jpg and /dev/null 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 deleted file mode 100644 index 006cdf3549..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0018.jpg and /dev/null 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 deleted file mode 100644 index abd537c11e..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0020.jpg and /dev/null 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 deleted file mode 100644 index 6c12c96a67..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0022.jpg and /dev/null 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 deleted file mode 100644 index 9b9987ef28..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0024.jpg and /dev/null 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 deleted file mode 100644 index 4c20aaee9a..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0025.jpg and /dev/null 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 deleted file mode 100644 index 3697d21490..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0027.jpg and /dev/null 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 deleted file mode 100644 index aba33759ab..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0029.jpg and /dev/null 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 deleted file mode 100644 index d8a4ac1140..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0031.jpg and /dev/null 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 deleted file mode 100644 index 39dc6d7476..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0033.jpg and /dev/null 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 deleted file mode 100644 index cccc5d1ec8..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0035.jpg and /dev/null 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 deleted file mode 100644 index e0de64c12a..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0037.jpg and /dev/null 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 deleted file mode 100644 index 4a434eaf7a..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0039.jpg and /dev/null 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 deleted file mode 100644 index 19a043e5ac..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0041.jpg and /dev/null 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 deleted file mode 100644 index fab3f819ea..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0043.jpg and /dev/null 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 deleted file mode 100644 index 083b86bb58..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0045.jpg and /dev/null 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 deleted file mode 100644 index 995685a59d..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0047.jpg and /dev/null 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 deleted file mode 100644 index 04338fd473..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0048.jpg and /dev/null differ diff --git a/modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml b/modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml index 12dc8dd6aa..457cb123cc 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml @@ -7,14 +7,14 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - 82px 16px 117px - 200px + 100px 150px 48px 17px diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml index 2c46bd98ac..2c8f472e72 100644 --- a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml @@ -58,7 +58,7 @@ 30px 140px 219px - 400px + 200px 281px 90px 28px diff --git a/modules/mogo-module-v2x/src/main/res/values/colors.xml b/modules/mogo-module-v2x/src/main/res/values/colors.xml index ab2038889e..7df2cc766f 100644 --- a/modules/mogo-module-v2x/src/main/res/values/colors.xml +++ b/modules/mogo-module-v2x/src/main/res/values/colors.xml @@ -18,5 +18,4 @@ #000000 #FFF - \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/values/dimens.xml b/modules/mogo-module-v2x/src/main/res/values/dimens.xml index ca37a6f59e..a6544a61fc 100644 --- a/modules/mogo-module-v2x/src/main/res/values/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values/dimens.xml @@ -60,7 +60,7 @@ 82px 16px 117px - 200px + 100px 150px 48px 17px