Compare commits
8 Commits
jiangyuwei
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
92ee55ad2d | ||
|
|
b8507aa536 | ||
|
|
1c55b40f9e | ||
|
|
a5e5c526a9 | ||
|
|
f9ed1012f2 | ||
|
|
d140116e1f | ||
|
|
e86e8c4c4e | ||
|
|
be3abe90b1 |
@@ -212,38 +212,31 @@ public class ClassifierCamera extends AppCompatActivity {
|
|||||||
public void run() {
|
public void run() {
|
||||||
String result = null;
|
String result = null;
|
||||||
try {
|
try {
|
||||||
if (code == MATERAIL_CODE) {
|
// if (code == MATERAIL_CODE) {
|
||||||
// MaterialClassifier materialClassifier = new MaterialClassifier();
|
// // MaterialClassifier materialClassifier = new MaterialClassifier();
|
||||||
// JSONObject jsonObject = materialClassifier.plantDetect(data);
|
// // JSONObject jsonObject = materialClassifier.plantDetect(data);
|
||||||
// result = jsonObject.getJSONArray("objects")
|
// //
|
||||||
// .getJSONObject(0).getString("value");
|
// Logger.d(result);
|
||||||
// translate(result);
|
// JSONObject jsonObject = new JSONObject(result);
|
||||||
result = WebUtil.HttpPost(ConstantUtils.BD_MATERIAL_URL,
|
// JSONArray resultObject = jsonObject.getJSONArray("result");
|
||||||
ConstantUtils.BD_ACCESS_TOKEN, param);
|
// jsonObject = resultObject.getJSONObject(0);
|
||||||
Logger.d(result);
|
// ClassifyResult classifyResult = new ClassifyResult(ClassifyResult.MATERIAL);
|
||||||
JSONObject jsonObject = new JSONObject(result);
|
// classifyResult.setName(jsonObject.getString("name"));
|
||||||
JSONArray resultObject = jsonObject.getJSONArray("result");
|
// resultList.add(classifyResult);
|
||||||
jsonObject = resultObject.getJSONObject(0);
|
// refreshUI();
|
||||||
ClassifyResult classifyResult = new ClassifyResult(ClassifyResult.MATERIAL);
|
// } else if (code == DISH_CODE) {
|
||||||
classifyResult.setName(jsonObject.getString("name"));
|
// ClassifyResult classifyResult = new ClassifyResult(ClassifyResult.DISH);
|
||||||
resultList.add(classifyResult);
|
// JSONArray resultObject = jsonObject.getJSONArray("result");
|
||||||
refreshUI();
|
// jsonObject = resultObject.getJSONObject(0);
|
||||||
} else if (code == DISH_CODE) {
|
// classifyResult.setCalorie(jsonObject.getInt("calorie"));
|
||||||
result = WebUtil.HttpPost(ConstantUtils.BD_DISH_URL,
|
// Logger.d(jsonObject.getInt("calorie"));
|
||||||
ConstantUtils.BD_ACCESS_TOKEN, param);
|
// classifyResult.setHas_calorie(jsonObject.getBoolean("has_calorie"));
|
||||||
JSONObject jsonObject = new JSONObject(result);
|
// classifyResult.setProbability(jsonObject.getDouble("probability"));
|
||||||
ClassifyResult classifyResult = new ClassifyResult(ClassifyResult.DISH);
|
// classifyResult.setName(jsonObject.getString("name"));
|
||||||
JSONArray resultObject = jsonObject.getJSONArray("result");
|
// classifyResult.getMenu();
|
||||||
jsonObject = resultObject.getJSONObject(0);
|
// classifyResult.setImgPath(picturePath);
|
||||||
classifyResult.setCalorie(jsonObject.getInt("calorie"));
|
// resultList.add(classifyResult);
|
||||||
Logger.d(jsonObject.getInt("calorie"));
|
// refreshUI();
|
||||||
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 {
|
} else {
|
||||||
Logger.e("拍照code为-1");
|
Logger.e("拍照code为-1");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -277,9 +277,6 @@ public class ConstantUtils {
|
|||||||
public static String BD_SECRET_KEY = "EEXe6pG7QGVdrqDM8eR0S3RY2WPf4Gwn";
|
public static String BD_SECRET_KEY = "EEXe6pG7QGVdrqDM8eR0S3RY2WPf4Gwn";
|
||||||
public static String BD_ACCESS_TOKEN = "";
|
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<>();
|
// public static ArrayList<ClassifyResult> testData = new ArrayList<>();
|
||||||
//
|
//
|
||||||
// static {
|
// static {
|
||||||
|
|||||||
Reference in New Issue
Block a user