Skip to content

S
ShenghuoquanBusiness
Switch branch/tag
History Find file
  • shiyl's avatar
    Merge branch 'dev' into dev_commodity · 859fd465
    shiyl authored 
    # Conflicts:
#	CommonLib/Common/src/main/java/com/yidian/common/AppConfig.kt
#	CommonLib/Common/src/main/res/layout/layout_common_toolbar.xml
#	CommonLib/Common/src/main/res/values/colors.xml
#	Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/FlashActivity.kt
#	Components/newscontent/src/main/res/layout/activity_system_setting.xml
#	app/src/main/java/com/shenghuoquan/business/YdSubwayApplication.kt
#	config/config.gradle
    859fd465
Name
Last commit
 Last update
..
dialog_common.xml Loading commit data...
dialog_common_hint.xml Loading commit data...
dialog_loading.xml Loading commit data...
dialog_normal.xml Loading commit data...
empty_view.xml Loading commit data...
item_chameleon_group.xml Loading commit data...
item_common_daily_card.xml Loading commit data...
item_daily_head_card.xml Loading commit data...
item_flash_head.xml Loading commit data...
item_flash_head_card.xml Loading commit data...
item_load_no_more.xml Loading commit data...
item_podcast_daily_card.xml Loading commit data...
item_polymer_chameleon_card.xml Loading commit data...
item_subscribe_head.xml Loading commit data...
item_subscribe_head_card.xml Loading commit data...
item_subscribe_head_text_card.xml Loading commit data...
layout_common_toolbar.xml Loading commit data...
layout_refresh.xml Loading commit data...
layout_refresh_footer.xml Loading commit data...
layout_service_addr_map_marker.xml Loading commit data...
layout_toolbar_menu.xml Loading commit data...
list_view_item.xml Loading commit data...
panel_view.xml Loading commit data...
refresh_toast_layout.xml Loading commit data...
test_databinding.xml Loading commit data...
toast_layout.xml Loading commit data...