songw created new branch master at usoft-andriod/XZC_productionline
3 weeks ago
songw created repository usoft-andriod/XZC_productionline
3 weeks ago
songw pushed to master at usoft-andriod/HUAYUN-DATA-COLLETION
b86f288d26 华研的更新
- df30cb17ee Merge remote-tracking branch 'origin/master'
# Conflicts:
# pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/anim_slide_in_from_bottom.xml.flat
# pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/anim_slide_in_from_top.xml.flat
# pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/anim_slide_out_to_bottom.xml.flat
# pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/anim_slide_out_to_top.xml.flat
# pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/drawable_indicator_bg_bottom.xml.flat
# pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/drawable_indicator_bg_top.xml.flat
# pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/layout_pull_to_refresh_header_horizontal.xml.flat
# pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/layout_pull_to_refresh_header_vertical.xml.flat
# pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
# pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/LoadingLayoutProxy.class
# pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/OverscrollHelper$1.class
# pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/OverscrollHelper.class
# pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshAdapterViewBase$1.class
# pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshAdapterViewBase.class
# pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshBase$4.class
# pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshBase.class
# pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshExpandableListView.class
# pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshGridView.class
# pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshHorizontalScrollView.class
# pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshListView$1.class
# pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshListView$InternalListView.class
# pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshListView.class
# pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshScrollView.class
# pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshWebView$1.class
# pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshWebView.class
# pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/extras/SoundPullEventListener.class
# pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/internal/FlipLoadingLayout$1.class
# pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/internal/FlipLoadingLayout.class
# pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/internal/IndicatorLayout$1.class
# pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/internal/IndicatorLayout.class
# pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/internal/LoadingLayout$1.class
# pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/internal/LoadingLayout.class
# pda_libs/pulltoreflashlibrary/build/outputs/logs/manifest-merger-debug-report.txt
- 0922511427 华研的更新
- View comparison for these 3 commits »
1 month ago
songw pushed to master at usoft-andriod/ESOP-STANDARD
- 46d724e059 esop的提交
- c08ffcaa4a 修改界面参数
- View comparison for these 2 commits »
1 month ago