diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 924066e..f00fd17 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -35,8 +35,9 @@
tools:targetApi="31">
+
@@ -44,10 +45,12 @@
-
-
-
+
+
+
+
+
=24){
//图片的保存路径
- imageUri= FileProvider.getUriForFile(four.this,"com.example.takephoto.fileprovider",output);
+ imageUri= FileProvider.getUriForFile(PictureSearchActivity.this,"com.example.takephoto.fileprovider",output);
}
else { imageUri=Uri.fromFile(output);
}
@@ -84,9 +82,6 @@ public class four extends AppCompatActivity {
});
-// String str = ImgCombination.imgCombination();
-// String name=str.substring(str.indexOf("name")+7,str.indexOf("\"}"));
-// String odds=str.substring(str.indexOf("score")+7,str.indexOf(","));
}
public void saveImageToGallery(Context context, Bitmap bitmap) {
@@ -148,41 +143,11 @@ public class four extends AppCompatActivity {
//将图片保存
bitmap= BitmapFactory.decodeStream(getContentResolver().openInputStream(imageUri));
iv_photo.setImageBitmap(bitmap);
- saveImageToGallery(four.this,bitmap);
+ saveImageToGallery(PictureSearchActivity.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");
-// FileOutputStream fOut = null;
-// fOut = new FileOutputStream(f);
-// bitmap.compress(Bitmap.CompressFormat.JPEG,100, fOut);
-
-
-// ToIngredient to_in=new ToIngredient();
-
-// ImgCombination img1=new ImgCombination();
-// String str1 =img1.imgCombination();
-// ToIngredient ii= new ToIngredient();
-// String aa=ii.x();
-
-// String name=str.substring(str.indexOf("name")+7,str.indexOf("\"}"));
-// TextView t1=()findViewById(R.id.textView11);
-// t1.setText(str1);
-
-// ImgCombination img=new ImgCombination();
-// String str11 = img.imgCombination();
-// t1.setText("####"+str11);
-
-
-
+ t1.setText("图片保存位置:"+"\n"+a+"\n"+"识别结果:"+"\n"+str);
}catch (FileNotFoundException e){
e.printStackTrace();
}
diff --git a/app/src/main/java/com/example/ceshi/WebViewActivity.java b/app/src/main/java/com/example/ceshi/WebViewActivity.java
index c832e2b..95796a5 100644
--- a/app/src/main/java/com/example/ceshi/WebViewActivity.java
+++ b/app/src/main/java/com/example/ceshi/WebViewActivity.java
@@ -7,15 +7,12 @@ 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
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_web_view);
+ setContentView(R.layout.web_view_activity);
mWebView = (WebView) findViewById(R.id.web_view);
Intent intent = getIntent();
String url = null;//"https://baike.baidu.com/item/"+intent.getStringExtra("url"); //"https://baidu.com/";//
diff --git a/app/src/main/java/com/example/ceshi/second.java b/app/src/main/java/com/example/ceshi/WordSearchActivity.java
similarity index 79%
rename from app/src/main/java/com/example/ceshi/second.java
rename to app/src/main/java/com/example/ceshi/WordSearchActivity.java
index 8934a68..e3cc2c3 100644
--- a/app/src/main/java/com/example/ceshi/second.java
+++ b/app/src/main/java/com/example/ceshi/WordSearchActivity.java
@@ -8,20 +8,20 @@ import android.widget.EditText;
import androidx.appcompat.app.AppCompatActivity;
-public class second extends AppCompatActivity {
+public class WordSearchActivity extends AppCompatActivity {
private EditText mEditUrl;
private Button mBtnOpen;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- setContentView(R.layout.secondview);
+ setContentView(R.layout.word_search_activity);
mEditUrl = (EditText) findViewById(R.id.edit_url);
mBtnOpen = (Button) findViewById(R.id.btn_open);
mBtnOpen.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- Intent intent = new Intent(second.this, WebViewActivity.class);
+ Intent intent = new Intent(WordSearchActivity.this, WebViewActivity.class);
String url = mEditUrl.getText().toString();
intent.putExtra("url", url);
startActivity(intent);
diff --git a/app/src/main/java/com/example/ceshi/collection.java b/app/src/main/java/com/example/ceshi/collection.java
deleted file mode 100644
index 123c49c..0000000
--- a/app/src/main/java/com/example/ceshi/collection.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.example.ceshi;
-
-import android.content.Intent;
-import android.view.View;
-import android.widget.Button;
-import androidx.appcompat.app.AppCompatActivity;
-import android.os.Bundle;
-public class collection extends AppCompatActivity {
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.collview);
- }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/baidu/ai/aip/AuthService.java b/app/src/main/java/com/transfer/AuthService.java
similarity index 99%
rename from app/src/main/java/com/baidu/ai/aip/AuthService.java
rename to app/src/main/java/com/transfer/AuthService.java
index f0be876..32738a5 100644
--- a/app/src/main/java/com/baidu/ai/aip/AuthService.java
+++ b/app/src/main/java/com/transfer/AuthService.java
@@ -1,4 +1,4 @@
-package com.baidu.ai.aip;
+package com.transfer;
import org.json.JSONObject;
diff --git a/app/src/main/java/com/baidu/ai/aip/ImgCombination.java b/app/src/main/java/com/transfer/ImgCombination.java
similarity index 98%
rename from app/src/main/java/com/baidu/ai/aip/ImgCombination.java
rename to app/src/main/java/com/transfer/ImgCombination.java
index 8624e90..12c7e9a 100644
--- a/app/src/main/java/com/baidu/ai/aip/ImgCombination.java
+++ b/app/src/main/java/com/transfer/ImgCombination.java
@@ -1,5 +1,5 @@
-package com.baidu.ai.aip;
+package com.transfer;
import com.baidu.ai.aip.utils.HttpUtil;
import com.baidu.ai.aip.utils.GsonUtils;
diff --git a/app/src/main/java/com/baidu/ai/aip/Ingredient.java b/app/src/main/java/com/transfer/Ingredient.java
similarity index 98%
rename from app/src/main/java/com/baidu/ai/aip/Ingredient.java
rename to app/src/main/java/com/transfer/Ingredient.java
index 710f936..fc1002a 100644
--- a/app/src/main/java/com/baidu/ai/aip/Ingredient.java
+++ b/app/src/main/java/com/transfer/Ingredient.java
@@ -1,5 +1,5 @@
-package com.baidu.ai.aip;
+package com.transfer;
import android.graphics.Bitmap;
diff --git a/app/src/main/java/com/baidu/ai/aip/ToIngredient.java b/app/src/main/java/com/transfer/ToIngredient.java
similarity index 86%
rename from app/src/main/java/com/baidu/ai/aip/ToIngredient.java
rename to app/src/main/java/com/transfer/ToIngredient.java
index 6938477..8c8fde3 100644
--- a/app/src/main/java/com/baidu/ai/aip/ToIngredient.java
+++ b/app/src/main/java/com/transfer/ToIngredient.java
@@ -1,7 +1,4 @@
-package com.baidu.ai.aip;
-
-import com.baidu.ai.aip.ImgCombination;
-import com.example.ceshi.four;
+package com.transfer;
public class ToIngredient{
String name_odds="AAAAAAAAAAAA";
diff --git a/app/src/main/res/layout/collect_activity.xml b/app/src/main/res/layout/collect_activity.xml
new file mode 100644
index 0000000..e00a79d
--- /dev/null
+++ b/app/src/main/res/layout/collect_activity.xml
@@ -0,0 +1,121 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/collview.xml b/app/src/main/res/layout/collview.xml
deleted file mode 100644
index 0321482..0000000
--- a/app/src/main/res/layout/collview.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
diff --git a/app/src/main/res/layout/firstview.xml b/app/src/main/res/layout/main_activity.xml
similarity index 98%
rename from app/src/main/res/layout/firstview.xml
rename to app/src/main/res/layout/main_activity.xml
index 64ed500..9eb9267 100644
--- a/app/src/main/res/layout/firstview.xml
+++ b/app/src/main/res/layout/main_activity.xml
@@ -5,7 +5,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- tools:context=".first">
+ tools:context=".MainActivity">
diff --git a/app/src/main/res/layout/fourview.xml b/app/src/main/res/layout/picture_search_activity.xml
similarity index 94%
rename from app/src/main/res/layout/fourview.xml
rename to app/src/main/res/layout/picture_search_activity.xml
index 31267bc..d55f118 100644
--- a/app/src/main/res/layout/fourview.xml
+++ b/app/src/main/res/layout/picture_search_activity.xml
@@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
- tools:context=".four">
+ tools:context=".PictureSearchActivity">