shen/NutritionMaster
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: shen:jiangyuwei
Branches Tags
shen:master shen:jiangyuwei shen:develop shen:beijin shen:wangtianrui shen:zhaolizhi shen:qinchuji
...
pull from: shen:master
Branches Tags
shen:master shen:jiangyuwei shen:develop shen:beijin shen:wangtianrui shen:zhaolizhi shen:qinchuji

8 Commits
jiangyuwei ... master

Author SHA1 Message Date
ScorpioMiku
92ee55ad2d Update ClassifierCamera.java 2020-12-15 16:55:02 +08:00
ScorpioMiku
b8507aa536 Update ConstantUtils.java 2020-12-15 16:52:37 +08:00
ScorpioMiku
1c55b40f9e Update README.md 2020-07-15 09:15:02 +08:00
ScorpioMiku
a5e5c526a9 Update README.md 2019-12-17 08:18:32 +08:00
ScorpioMiku
f9ed1012f2 Merge branch 'jiangyuwei' 2019-03-04 21:25:37 +08:00
ScorpioMiku
d140116e1f Merge branch 'jiangyuwei' of https://github.com/wangtianrui/NutritionMaster into jiangyuwei 2019-03-04 21:25:16 +08:00
ScorpioMiku
e86e8c4c4e Merge branch 'master' of https://github.com/wangtianrui/NutritionMaster 2019-03-04 21:15:26 +08:00
ScorpioMiku
be3abe90b1 Merge branch 'jiangyuwei' of https://github.com/wangtianrui/NutritionMaster into jiangyuwei 2019-03-04 21:01:25 +08:00
3 changed files with 26 additions and 36 deletions
Expand all files Collapse all files

57
NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/camera/ClassifierCamera.java
View File

@@ -212,38 +212,31 @@ public class ClassifierCamera extends AppCompatActivity {
public void run() {
String result = null;
try {
if (code == MATERAIL_CODE) {
// MaterialClassifier materialClassifier = new MaterialClassifier();
// JSONObject jsonObject = materialClassifier.plantDetect(data);
// result = jsonObject.getJSONArray("objects")
// .getJSONObject(0).getString("value");
// translate(result);
result = WebUtil.HttpPost(ConstantUtils.BD_MATERIAL_URL,
ConstantUtils.BD_ACCESS_TOKEN, param);
Logger.d(result);
JSONObject jsonObject = new JSONObject(result);
JSONArray resultObject = jsonObject.getJSONArray("result");
jsonObject = resultObject.getJSONObject(0);
ClassifyResult classifyResult = new ClassifyResult(ClassifyResult.MATERIAL);
classifyResult.setName(jsonObject.getString("name"));
resultList.add(classifyResult);
refreshUI();
} else if (code == DISH_CODE) {
result = WebUtil.HttpPost(ConstantUtils.BD_DISH_URL,
ConstantUtils.BD_ACCESS_TOKEN, param);
JSONObject jsonObject = new JSONObject(result);
ClassifyResult classifyResult = new ClassifyResult(ClassifyResult.DISH);
JSONArray resultObject = jsonObject.getJSONArray("result");
jsonObject = resultObject.getJSONObject(0);
classifyResult.setCalorie(jsonObject.getInt("calorie"));
Logger.d(jsonObject.getInt("calorie"));
classifyResult.setHas_calorie(jsonObject.getBoolean("has_calorie"));
classifyResult.setProbability(jsonObject.getDouble("probability"));
classifyResult.setName(jsonObject.getString("name"));
classifyResult.getMenu();
classifyResult.setImgPath(picturePath);
resultList.add(classifyResult);
refreshUI();
// if (code == MATERAIL_CODE) {
// // MaterialClassifier materialClassifier = new MaterialClassifier();
// // JSONObject jsonObject = materialClassifier.plantDetect(data);
// //
// Logger.d(result);
// JSONObject jsonObject = new JSONObject(result);
// JSONArray resultObject = jsonObject.getJSONArray("result");
// jsonObject = resultObject.getJSONObject(0);
// ClassifyResult classifyResult = new ClassifyResult(ClassifyResult.MATERIAL);
// classifyResult.setName(jsonObject.getString("name"));
// resultList.add(classifyResult);
// refreshUI();
// } else if (code == DISH_CODE) {
// ClassifyResult classifyResult = new ClassifyResult(ClassifyResult.DISH);
// JSONArray resultObject = jsonObject.getJSONArray("result");
// jsonObject = resultObject.getJSONObject(0);
// classifyResult.setCalorie(jsonObject.getInt("calorie"));
// Logger.d(jsonObject.getInt("calorie"));
// classifyResult.setHas_calorie(jsonObject.getBoolean("has_calorie"));
// classifyResult.setProbability(jsonObject.getDouble("probability"));
// classifyResult.setName(jsonObject.getString("name"));
// classifyResult.getMenu();
// classifyResult.setImgPath(picturePath);
// resultList.add(classifyResult);
// refreshUI();
} else {
Logger.e("拍照code为-1");
}

3
NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/ConstantUtils.java
View File

@@ -277,9 +277,6 @@ public class ConstantUtils {
public static String BD_SECRET_KEY = "EEXe6pG7QGVdrqDM8eR0S3RY2WPf4Gwn";
public static String BD_ACCESS_TOKEN = "";
public static String BD_DISH_URL = "https://aip.baidubce.com/rest/2.0/image-classify/v2/dish";
public static String BD_MATERIAL_URL = "https://aip.baidubce.com/rest/2.0/image-classify/v1/classify/ingredient";
// public static ArrayList<ClassifyResult> testData = new ArrayList<>();
//
// static {

2
README.md
View File

@@ -402,4 +402,4 @@
* 拍照 菜品识别 识别 烤鸭 土豆丝 鱼香肉丝 红烧肉 炒面 (动态调量,修改当天余额)
* 拍照 食材识别 胡萝卜 白萝卜 姜 长条茄子 菜花 (根据用户的信息,并且是多搜索)
* 周定制(最左边的fragment)
* 周定制(最左边的fragment)