Skip to content

T
TangKuPos
Switch branch/tag
History Find file
  • 姜敏's avatar
    Merge remote-tracking branch 'origin/master' · 4a0175ec
    姜敏 authored 
    # Conflicts:
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/com/xingdata/zzdpos/ui/main/fragment/CasherFragment.java
#	app/src/main/java/com/xingdata/zzdpos/util/SystemUtil.java
    4a0175ec
Name
Last commit
 Last update
..
activity_announcement.xml Loading commit data...
activity_error_dialog.xml Loading commit data...
activity_feed_back.xml Loading commit data...
activity_help.xml Loading commit data...
activity_integral.xml Loading commit data...
activity_login.xml Loading commit data...
activity_main.xml Loading commit data...
activity_payment.xml Loading commit data...
activity_return_ticket.xml Loading commit data...
activity_server_err.xml Loading commit data...
activity_settle.xml Loading commit data...
activity_splash.xml Loading commit data...
activity_vip.xml Loading commit data...
dialog_base.xml Loading commit data...
dialog_handover.xml Loading commit data...
dialog_integral_exchange_setting.xml Loading commit data...
dialog_integral_get_setting.xml Loading commit data...
dialog_loading.xml Loading commit data...
dialog_prompt.xml Loading commit data...
dialog_ticket_add_setting.xml Loading commit data...
dialog_upgrade.xml Loading commit data...
fragment_announcement.xml Loading commit data...
fragment_base.xml Loading commit data...
fragment_binding_counter.xml Loading commit data...
fragment_casher.xml Loading commit data...
fragment_choice_store.xml Loading commit data...
fragment_create_store.xml Loading commit data...
fragment_input_password.xml Loading commit data...
fragment_integral_main.xml Loading commit data...
fragment_myself.xml Loading commit data...
fragment_pay_cash.xml Loading commit data...
fragment_pay_result.xml Loading commit data...
fragment_payment.xml Loading commit data...
fragment_service.xml Loading commit data...
fragment_settle.xml Loading commit data...
fragment_sign_in.xml Loading commit data...
fragment_sms_code.xml Loading commit data...
fragment_viplevel_title.xml Loading commit data...
item_announcement_detail.xml Loading commit data...
item_integral.xml Loading commit data...
item_menu_bottom.xml Loading commit data...
item_menu_detail.xml Loading commit data...
item_myself_string.xml Loading commit data...
item_pay.xml Loading commit data...
item_return_ticket.xml Loading commit data...
item_string.xml Loading commit data...
pickerview_custom_options.xml Loading commit data...
popupwindow_downlist.xml Loading commit data...
title.xml Loading commit data...
title_appback.xml Loading commit data...
title_search.xml Loading commit data...
toast.xml Loading commit data...
view_calculator.xml Loading commit data...
view_empty.xml Loading commit data...
view_inputer.xml Loading commit data...