22 Commits (develop_branch)

 

All Branches   

Search

Author	SHA1	Message	Date
王阮领先_git	d721e5db08	提交	2 years ago
王阮领先_git	31a478a575	实现数据库连接，数据库方法，功能测试	2 years ago
p5gy6sexf	9683ce0b89	Merge pull request '保留版本' (#4) from djm_branch into master	2 years ago
483170596	5fab72bde6	保留版本	2 years ago
483170596	0d8bc1aa45	Merge branch 'djm_branch' of https://bdgit.educoder.net/p5gy6sexf/FruitandVegetableGuide into djm_branch ... # Conflicts: # src/FruitandVegetableGuide/.idea/deploymentTargetDropDown.xml # src/FruitandVegetableGuide/app/src/main/java/com/example/fruitandvegetableguide/README.md # src/FruitandVegetableGuide/app/src/main/java/com/example/fruitandvegetableguide/ui/imgrecognition/PhotographScreen.kt # src/FruitandVegetableGuide/app/src/main/java/com/example/fruitandvegetableguide/ui/imgrecognition/RecognizeResultScreen.kt # src/FruitandVegetableGuide/app/src/main/java/com/example/fruitandvegetableguide/ui/imgrecognition/camerax/PhotoComponent.kt # src/FruitandVegetableGuide/app/src/main/java/com/example/fruitandvegetableguide/ui/imgrecognition/camerax/SelectPicture.kt # src/FruitandVegetableGuide/app/src/main/java/com/example/fruitandvegetableguide/ui/imgrecognition/camerax/TakePhoto.kt	2 years ago
483170596	a06e55f18c	3/3UI, 相册选取，拍照，识别	2 years ago
p5gy6sexf	a7627cd9e9	Merge pull request '211540882-10.26' (#3) from djm_branch into master	2 years ago
483170596	1ef3c698b7	3/3UI, 相册选取，拍照，识别	2 years ago
483170596	085c846399	阶段性——2/3UI	2 years ago
483170596	4288b4be6f	阶段性——1/3页面	2 years ago
p5gy6sexf	d427f829b0	Merge pull request '10.16 合并' (#2) from djm_branch into master	2 years ago
483170596	d879519b3d	完善页面路由和导航图，MainScreen小修	2 years ago
483170596	01ca834a3d	重写项目，改多activity为 单activity+多个可组合项 ； ... 使用navigation，增加页面路由	2 years ago
483170596	78d801942d	LoginActivity修改	2 years ago
p5gy6sexf	b26f442a47	Merge pull request '211540882' (#1) from djm_branch into master	2 years ago
483170596	c891238e4f	Merge branch 'djm_branch' of https://bdgit.educoder.net/p5gy6sexf/FruitandVegetableGuide into djm_branch ... # Conflicts: # src/FruitandVegetableGuide/app/build.gradle # src/FruitandVegetableGuide/app/src/main/AndroidManifest.xml # src/FruitandVegetableGuide/app/src/main/java/com/example/fruitandvegetableguide/ui/MainActivity.kt	2 years ago
483170596	77091ceff0	首页	2 years ago
483170596	caf2b05755	首页	2 years ago
483170596	0a8e202bad	试运行	2 years ago
483170596	0c1b2a7c62	登录页	2 years ago
483170596	ceda9946b5	创建项目	2 years ago
p5gy6sexf	e6b0b24561	Initial commit	2 years ago