From 900334d9aa32564599f4d4646cd834982fe3c9fa Mon Sep 17 00:00:00 2001 From: "z15755800224@163.com" Date: Tue, 25 Oct 2022 13:14:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=91=A8=E6=98=8A=E5=AE=8710.25?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/deploymentTargetDropDown.xml | 2 +- .../java/com/baidu/ai/aip/Ingredient.java | 8 ++- .../java/com/baidu/ai/aip/ToIngredient.java | 24 +++++---- .../com/example/ceshi/WebViewActivity.java | 10 +++- app/src/main/java/com/example/ceshi/four.java | 52 +++++++++++++------ .../main/java/com/example/ceshi/second.java | 2 +- app/src/main/res/layout/collview.xml | 31 ++++++----- app/src/main/res/layout/fourview.xml | 5 +- app/src/main/res/layout/secondview.xml | 19 +++---- 9 files changed, 95 insertions(+), 58 deletions(-) diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml index 1674049..642fd57 100644 --- a/.idea/deploymentTargetDropDown.xml +++ b/.idea/deploymentTargetDropDown.xml @@ -12,6 +12,6 @@ - + \ No newline at end of file diff --git a/app/src/main/java/com/baidu/ai/aip/Ingredient.java b/app/src/main/java/com/baidu/ai/aip/Ingredient.java index c74a54d..710f936 100644 --- a/app/src/main/java/com/baidu/ai/aip/Ingredient.java +++ b/app/src/main/java/com/baidu/ai/aip/Ingredient.java @@ -14,6 +14,10 @@ import java.net.URLEncoder; * 细粒度图像识别 */ public class Ingredient { + String aa; + public Ingredient(String a) { + aa=a; + } /** * 重要提示代码中所需工具类 @@ -29,8 +33,8 @@ public class Ingredient { String url = "https://aip.baidubce.com/rest/2.0/image-classify/v1/classify/ingredient"; try { // 本地文件路径 - String filePath = "手机存储/Pictures/p2.jpg"; - byte[] imgData = FileUtil.readFileByBytes(filePath); + //String filePath = "手机存储/Pictures/p2.jpg"; + byte[] imgData = FileUtil.readFileByBytes(aa); String imgStr = Base64Util.encode(imgData); String imgParam = URLEncoder.encode(imgStr, "UTF-8"); diff --git a/app/src/main/java/com/baidu/ai/aip/ToIngredient.java b/app/src/main/java/com/baidu/ai/aip/ToIngredient.java index a0529b3..6938477 100644 --- a/app/src/main/java/com/baidu/ai/aip/ToIngredient.java +++ b/app/src/main/java/com/baidu/ai/aip/ToIngredient.java @@ -4,18 +4,24 @@ import com.baidu.ai.aip.ImgCombination; import com.example.ceshi.four; public class ToIngredient{ - public static String name_odds="AAAAAAAAAAAA"; - public static void main(String[] args) { - ImgCombination img=new ImgCombination(); - String str = img.imgCombination(); + String name_odds="AAAAAAAAAAAA"; + String aa; + public ToIngredient(String a) { + aa=a; + } + public String ingredient(){ + + //ImgCombination img=new ImgCombination(); + //String str = img.imgCombination(); + + Ingredient im=new Ingredient(aa); + String str = im.ingredient(); String name=str.substring(str.indexOf("name")+7,str.indexOf("\"}")); String odds=str.substring(str.indexOf("score")+7,str.indexOf(",")); - name_odds="aaaa";//"有"+odds.substring(0,4)+"的概率是"+name; - System.out.println("有"+odds.substring(0,4)+"的概率是"+name); - } - public String x(){ - name_odds="bbbb"; + name_odds="有"+odds.substring(0,4)+"的概率是"+name; return name_odds; } + + } diff --git a/app/src/main/java/com/example/ceshi/WebViewActivity.java b/app/src/main/java/com/example/ceshi/WebViewActivity.java index 6a7818c..c832e2b 100644 --- a/app/src/main/java/com/example/ceshi/WebViewActivity.java +++ b/app/src/main/java/com/example/ceshi/WebViewActivity.java @@ -7,6 +7,9 @@ import android.webkit.WebViewClient; import androidx.appcompat.app.AppCompatActivity; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; + public class WebViewActivity extends AppCompatActivity { private WebView mWebView; @Override @@ -15,7 +18,12 @@ public class WebViewActivity extends AppCompatActivity { setContentView(R.layout.activity_web_view); mWebView = (WebView) findViewById(R.id.web_view); Intent intent = getIntent(); - String url = "https://wapbaike.baidu.com/";//intent.getStringExtra("url"); + String url = null;//"https://baike.baidu.com/item/"+intent.getStringExtra("url"); //"https://baidu.com/";// + //try { + url = "https://baike.baidu.com/item/"+intent.getStringExtra("url")+"?&ie=utf-8&oe=UTF-8&wd=";//+ URLEncoder.encode("西瓜","UTF-8"); + //} catch (UnsupportedEncodingException e) { + // e.printStackTrace(); + // } mWebView.loadUrl(url); mWebView.getSettings().setJavaScriptEnabled(true); mWebView.setWebViewClient(new WebViewClient(){ diff --git a/app/src/main/java/com/example/ceshi/four.java b/app/src/main/java/com/example/ceshi/four.java index 7d3563a..3c709cc 100644 --- a/app/src/main/java/com/example/ceshi/four.java +++ b/app/src/main/java/com/example/ceshi/four.java @@ -28,7 +28,7 @@ import java.io.File; import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; - +import java.util.Random; public class four extends AppCompatActivity { @@ -39,6 +39,7 @@ public class four extends AppCompatActivity { ImageView iv_photo; Uri imageUri; TextView t1; + String a="111"; @Override protected void onCreate(Bundle savedInstanceState){ @@ -94,11 +95,21 @@ public class four extends AppCompatActivity { Toast.makeText(this, "请至权限中心打开应用权限", Toast.LENGTH_SHORT).show(); } else { // 新建目录appDir，并把图片存到其下 - File appDir = new File(context.getExternalFilesDir(null).getPath()+ "BarcodeBitmap"); + File appDir = new File(context.getExternalFilesDir(null).getPath() + "BarcodeBitmap"); if (!appDir.exists()) { appDir.mkdir(); } - String fileName = "p2" + ".jpg"; + + Random random = new Random(); + //生成随机数的个数 + int random1 = 0; + for (int i = 0; i < 6; i++) { + random1 = random.nextInt(1000000); + } + + String fileName = String.format("%s.jpg", String.valueOf(random1)); + a = context.getExternalFilesDir(null).getPath() + "BarcodeBitmap/" + fileName; + File file = new File(appDir, fileName); try { FileOutputStream fos = new FileOutputStream(file); @@ -111,18 +122,18 @@ public class four extends AppCompatActivity { e.printStackTrace(); } - // 把file里面的图片插入到系统相册中 - try { - MediaStore.Images.Media.insertImage(context.getContentResolver(), - file.getAbsolutePath(), fileName, null); - } catch (FileNotFoundException e) { - e.printStackTrace(); - } - - Toast.makeText(this, fileName, Toast.LENGTH_LONG); - - // 通知相册更新 - context.sendBroadcast(new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE, Uri.fromFile(file))); +// // 把file里面的图片插入到系统相册中 +// try { +// MediaStore.Images.Media.insertImage(context.getContentResolver(), +// file.getAbsolutePath(), fileName, null); +// } catch (FileNotFoundException e) { +// e.printStackTrace(); +// } +// +// Toast.makeText(this, fileName, Toast.LENGTH_LONG); +// +// // 通知相册更新 +// context.sendBroadcast(new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE, Uri.fromFile(file))); } } @@ -137,9 +148,16 @@ public class four extends AppCompatActivity { //将图片保存 bitmap= BitmapFactory.decodeStream(getContentResolver().openInputStream(imageUri)); iv_photo.setImageBitmap(bitmap); - Ingredient qw=new Ingredient(); - t1.setText("###"+qw.ingredient()); saveImageToGallery(four.this,bitmap); + + Ingredient qw=new Ingredient(a); + //t1.setText("###"+qw.ingredient()); + //ToIngredient qw=new ToIngredient(a); + String str=qw.ingredient(); +// String name=str.substring(str.indexOf("name")+7,str.indexOf("\"}")); +// String odds=str.substring(str.indexOf("score")+7,str.indexOf(",")); +// String k="有"+odds.substring(0,4)+"的概率是"+name; + t1.setText("图片保存位置:"+"\n"+a+"\n"+"识别结果："+"\n"+str);//qw.ingredient()); //public void saveMyBitmap(Bitmap mBitmap,String bitName){\n\n // File f = new File( "/sdcard/baidu/"+"jpg1" + ".jpg"); diff --git a/app/src/main/java/com/example/ceshi/second.java b/app/src/main/java/com/example/ceshi/second.java index 700300a..8934a68 100644 --- a/app/src/main/java/com/example/ceshi/second.java +++ b/app/src/main/java/com/example/ceshi/second.java @@ -22,7 +22,7 @@ public class second extends AppCompatActivity { @Override public void onClick(View v) { Intent intent = new Intent(second.this, WebViewActivity.class); - String url = "http://www.baidu.com";//mEditUrl.getText().toString(); + String url = mEditUrl.getText().toString(); intent.putExtra("url", url); startActivity(intent); } diff --git a/app/src/main/res/layout/collview.xml b/app/src/main/res/layout/collview.xml index a2fc681..0321482 100644 --- a/app/src/main/res/layout/collview.xml +++ b/app/src/main/res/layout/collview.xml @@ -8,19 +8,22 @@ tools:context=".first"> + android:id="@+id/five" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="我的收藏" + android:textColor="#663399" + android:textSize="25dp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintRight_toRightOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="0.321" /> + + android:layout_width="407dp" + android:layout_height="100dp" + tools:ignore="MissingConstraints" + tools:layout_editor_absoluteX="2dp" + tools:layout_editor_absoluteY="16dp" /> diff --git a/app/src/main/res/layout/fourview.xml b/app/src/main/res/layout/fourview.xml index 65e0747..31267bc 100644 --- a/app/src/main/res/layout/fourview.xml +++ b/app/src/main/res/layout/fourview.xml @@ -24,9 +24,10 @@ android:id="@+id/textView11" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="no use" android:layout_below="@+id/img_photo" - android:layout_marginTop="34dp" app:backgroundTint="#4CAF50"/> + android:layout_marginTop="9dp" + android:text="no use" + app:backgroundTint="#4CAF50" /> /> diff --git a/app/src/main/res/layout/secondview.xml b/app/src/main/res/layout/secondview.xml index aaa4847..8e5054c 100644 --- a/app/src/main/res/layout/secondview.xml +++ b/app/src/main/res/layout/secondview.xml @@ -10,24 +10,22 @@ android:id="@+id/five" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginBottom="349dp" android:text="水果百科" - android:textColor="#663399" android:textSize="25dp" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintHorizontal_bias="0.497" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" - app:layout_constraintTop_toBottomOf="@+id/edit_url" - app:layout_constraintVertical_bias="0.499" /> + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="0.688" /> @@ -35,9 +33,8 @@ android:id="@+id/btn_open" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginBottom="573dp" + android:layout_marginTop="120dp" android:text="Button" - app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/edit_url" />