• fengruiyu's avatar
    Merge branch 'dev_1.0.0' of http://39.97.65.143:81/android/android_street into fry_dev · 3064d4a4
    fengruiyu authored
     Conflicts:
    	app/src/main/res/mipmap-xhdpi/icon_backvip5.png
    	app/src/main/res/mipmap-xhdpi/icon_card.webp
    	app/src/main/res/mipmap-xhdpi/icon_card1.webp
    	app/src/main/res/mipmap-xhdpi/icon_card2.webp
    	app/src/main/res/mipmap-xhdpi/icon_card3.webp
    	app/src/main/res/mipmap-xhdpi/icon_card4.webp
    	app/src/main/res/mipmap-xhdpi/icon_card5.webp
    	app/src/main/res/mipmap-xhdpi/icon_card6.webp
    	app/src/main/res/mipmap-xhdpi/icon_card7.webp
    	app/src/main/res/mipmap-xhdpi/icon_privilege6.png
    3064d4a4
Name
Last commit
Last update
..
activity_aboutus.xml Loading commit data...
activity_bindmobile.xml Loading commit data...
activity_detailed.xml Loading commit data...
activity_google_map.xml Loading commit data...
activity_guide.xml Loading commit data...
activity_historical_image.xml Loading commit data...
activity_login.xml Loading commit data...
activity_main.xml Loading commit data...
activity_mints_web_view.xml Loading commit data...
activity_moresettings.xml Loading commit data...
activity_openvip.xml Loading commit data...
activity_panoramic.xml Loading commit data...
activity_permissions.xml Loading commit data...
activity_search_map.xml Loading commit data...
activity_splash.xml Loading commit data...
dialog_backvip.xml Loading commit data...
dialog_power.xml Loading commit data...
dialog_showbenfit.xml Loading commit data...
enter_destination_adapter.xml Loading commit data...
fragment_featured_experience.xml Loading commit data...
fragment_free_zone.xml Loading commit data...
fragment_home.xml Loading commit data...
fragment_my.xml Loading commit data...
fragment_vr.xml Loading commit data...
include_header.xml Loading commit data...
include_privilege_show.xml Loading commit data...
include_start_show.xml Loading commit data...
item_enter_destination_adapter.xml Loading commit data...
item_grid_benfit_adpater.xml Loading commit data...
item_grid_map_adapter.xml Loading commit data...
item_grid_payment_adpater.xml Loading commit data...
item_grid_vrmap_adapter.xml Loading commit data...
item_history.xml Loading commit data...
item_history_record_adapter.xml Loading commit data...
item_history_record_name.xml Loading commit data...
item_home_button.xml Loading commit data...
item_popular_scene_adapter.xml Loading commit data...
item_search_after.xml Loading commit data...
item_settings.xml Loading commit data...
layout_popupwindow.xml Loading commit data...
main_dialog_download_fragment.xml Loading commit data...
main_update_dialog.xml Loading commit data...
progress_horizontal.xml Loading commit data...
view_data_page1.xml Loading commit data...
view_data_page2.xml Loading commit data...
view_data_page3.xml Loading commit data...
view_data_page4.xml Loading commit data...
view_data_page5.xml Loading commit data...
view_data_page6.xml Loading commit data...
view_data_page7.xml Loading commit data...
view_data_page8.xml Loading commit data...
widget_cover_flow.xml Loading commit data...