Merge remote-tracking branch 'origin/dev' into dev

Browse Source

# Conflicts:
#	modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00000.png
#	modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00001.png
#	modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00002.png
#	modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00003.png
#	modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00004.png
#	modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00005.png
#	modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00006.png
#	modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00007.png
#	modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00008.png
#	modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00009.png
#	modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00010.png
#	modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00011.png
#	modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00012.png
#	modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00013.png
#	modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00015.png
#	modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00017.png
#	modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00018.png
#	modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00019.png
#	modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00020.png
#	modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00023.png

...

This commit is contained in:

董宏宇

2020-11-24 19:35:21 +08:00

parent 8581edf1e8 65398c4cfe

commit 21c9d1a8ea

104 changed files with 327 additions and 151 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00014.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 58 KiB

BIN

modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00016.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 58 KiB

BIN

modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00021.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 59 KiB

BIN

modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00022.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 60 KiB

BIN

modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00024.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 60 KiB

BIN

modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00025.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 60 KiB

BIN

modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00026.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 60 KiB

BIN

modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00027.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 62 KiB

BIN

modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00028.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 64 KiB

BIN

modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00029.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 68 KiB

BIN

modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00030.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 70 KiB

BIN

modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00031.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 72 KiB

BIN

modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00032.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 75 KiB

BIN

modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00033.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 76 KiB

BIN

modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00034.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 78 KiB

BIN

modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00035.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 79 KiB

BIN

modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00036.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 82 KiB

BIN

modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00037.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 83 KiB

BIN

modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00038.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 84 KiB

BIN

modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00039.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 85 KiB

BIN

modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00040.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 86 KiB

BIN

modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00041.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 86 KiB

BIN

modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00042.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 87 KiB

BIN

modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00043.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 87 KiB

BIN

modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00044.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 88 KiB

BIN

modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00045.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 87 KiB

BIN

modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00046.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 87 KiB

BIN

modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00047.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 85 KiB

BIN

modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00048.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 58 KiB