gitproject

Author	SHA1	Message	Date
伍洲行	858e6ee843	Merge branch 'master' of https://bdgit.educoder.net/pvqcyimsk/gitproject # Conflicts: # src/MyApplication/.idea/vcs.xml # src/MyApplication/app/build.gradle # src/MyApplication/app/src/MyApplication/app/src/main/java/com/example/myapplication/WNaviGuideActivity.java # src/MyApplication/app/src/MyApplication/app/src/main/java/com/example/myapplication/yuyin.java # src/MyApplication/app/src/MyApplication/app/src/main/res/layout/activity_itemfound.xml # src/MyApplication/app/src/MyApplication/app/src/main/res/layout/activity_yuyin.xml # src/MyApplication/app/src/MyApplication/app/src/main/res/layout/activity_zhaoxun.xml	2 years ago
伍洲行	dc6c5d2ffa	complete	2 years ago
伍洲行	77e47bdbdf	最终完成版	2 years ago
omar	b959add47a	最后一次修订，已完成找寻部分全部功能	2 years ago
omar	0dab53f55b	map	2 years ago
伍洲行	b536be4092	语音识别做完	2 years ago
omar	5a9d4e959b	baidujar	2 years ago
omar	d4ae6d1c66	导入baidujar	2 years ago
omar	8242cce9a2	跳转待修	2 years ago
omar	0b4b10ddf6	test git	2 years ago
omar	ff40b156dc	phonecall——class	2 years ago
伍洲行	b856ddad75	伍洲行	2 years ago
伍洲行	6e3fd3caa8	1	2 years ago
伍洲行	95dc226e7e	GUI	2 years ago
伍洲行	f5771a9cfa	111.txt	2 years ago
pvqcyimsk	254880ed20	Initial commit	2 years ago