diff --git a/app/release/app-release.apk b/app/release/app-release.apk index 7749c52..4c7f185 100644 Binary files a/app/release/app-release.apk and b/app/release/app-release.apk differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4d867a2..46c0fd3 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,8 +2,19 @@ + + + + + + + + + + + + @@ -23,9 +37,9 @@ - + + - - - + \ No newline at end of file diff --git a/app/src/main/java/com/baidu/ai/aip/ImgCombination.java b/app/src/main/java/com/baidu/ai/aip/ImgCombination.java index 16dd236..4c7900d 100644 --- a/app/src/main/java/com/baidu/ai/aip/ImgCombination.java +++ b/app/src/main/java/com/baidu/ai/aip/ImgCombination.java @@ -20,6 +20,9 @@ public class ImgCombination { * https://ai.baidu.com/file/470B3ACCA3FE43788B5A963BF0B625F3 * 下载 */ + public String imgCombinatio(){ + return "QEEEEEE"; + } public String imgCombination() { // 请求url String url = "https://aip.baidubce.com/api/v1/solution/direct/imagerecognition/combination"; @@ -45,7 +48,7 @@ public class ImgCombination { } catch (Exception e) { e.printStackTrace(); } - return null; + return "FORS"; } } \ No newline at end of file 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 631342b..a0529b3 100644 --- a/app/src/main/java/com/baidu/ai/aip/ToIngredient.java +++ b/app/src/main/java/com/baidu/ai/aip/ToIngredient.java @@ -4,14 +4,18 @@ 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=str.substring(str.indexOf("name")+7,str.indexOf("\"}")); String odds=str.substring(str.indexOf("score")+7,str.indexOf(",")); - String name_odds="有"+odds.substring(0,4)+"的概率是"+name; + name_odds="aaaa";//"有"+odds.substring(0,4)+"的概率是"+name; System.out.println("有"+odds.substring(0,4)+"的概率是"+name); } + public String x(){ + name_odds="bbbb"; + 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 new file mode 100644 index 0000000..1b3a1bc --- /dev/null +++ b/app/src/main/java/com/example/ceshi/WebViewActivity.java @@ -0,0 +1,32 @@ +package com.example.ceshi; + +import android.content.Intent; +import android.os.Bundle; +import android.webkit.WebView; +import android.webkit.WebViewClient; + +import androidx.appcompat.app.AppCompatActivity; + +public class WebViewActivity extends AppCompatActivity { + private WebView mWebView; + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_web_view); + mWebView = (WebView) findViewById(R.id.web_view); + Intent intent = getIntent(); + String url = "http://www.baidu.com";//intent.getStringExtra("url"); + mWebView.loadUrl(url); + mWebView.getSettings().setJavaScriptEnabled(true); + mWebView.setWebViewClient(new WebViewClient(){ + }); + } + @Override + public void onBackPressed() { + if (mWebView != null && mWebView.canGoBack()){ + mWebView.goBack(); + }else { + super.onBackPressed(); + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/ceshi/four.java b/app/src/main/java/com/example/ceshi/four.java index 35344ba..f405e14 100644 --- a/app/src/main/java/com/example/ceshi/four.java +++ b/app/src/main/java/com/example/ceshi/four.java @@ -18,21 +18,38 @@ import androidx.core.content.FileProvider; import com.baidu.ai.aip.ImgCombination; import com.baidu.ai.aip.ToIngredient; +import com.baidu.ai.aip.Ingredient; import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; + + public class four extends AppCompatActivity { final int TAKE_PHOTO=1; ImageView iv_photo; Uri imageUri; + TextView t1; @Override - protected void onCreate(Bundle savedInstanceState) { + protected void onCreate(Bundle savedInstanceState){ super.onCreate(savedInstanceState); setContentView(R.layout.fourview); + Button btn_1=findViewById(R.id.btn_takephoto); iv_photo=findViewById(R.id.img_photo); + t1=findViewById(R.id.textView11); + + + //ToIngredient ii= new ToIngredient(); + + ImgCombination img=new ImgCombination(); + //String str11 = img.imgCombination(); + Ingredient a=new Ingredient(); + // "{\"result_num\":5,\"result\":[{\"score\":0.6307158,\"name\":\"砀山酥梨\"},{\"score\":0.19453917,\"name\":\"砀山梨\"},{\"score\":0.06309598,\"name\":\"北丰梨\"},{\"score\":0.062131744,\"name\":\"雪梨\"},{\"score\":0.0255048,\"name\":\"梨\"}],\"log_id\":1582269295467236738}\n"; + //t1.setText("A"+str11+"B"); + t1.setText("###"+Ingredient.ingredient()); + btn_1.setOnClickListener(new View.OnClickListener() { @Override @@ -65,6 +82,9 @@ public class four extends AppCompatActivity { } + + @Override + protected void onActivityResult(int requestCode,int resultCode,Intent data) { super.onActivityResult(requestCode, resultCode, data); switch (requestCode){ @@ -84,8 +104,8 @@ public class four extends AppCompatActivity { //// 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); + //TextView t1=()findViewById(R.id.textView11); + //t1.setText(str1); }catch (FileNotFoundException e){ e.printStackTrace(); } diff --git a/app/src/main/java/com/example/ceshi/second.java b/app/src/main/java/com/example/ceshi/second.java index 1d095c0..700300a 100644 --- a/app/src/main/java/com/example/ceshi/second.java +++ b/app/src/main/java/com/example/ceshi/second.java @@ -1,13 +1,33 @@ package com.example.ceshi; +import android.content.Intent; import android.os.Bundle; +import android.view.View; +import android.widget.Button; +import android.widget.EditText; + import androidx.appcompat.app.AppCompatActivity; public class second extends AppCompatActivity { + private EditText mEditUrl; + private Button mBtnOpen; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.secondview); + + 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); + String url = "http://www.baidu.com";//mEditUrl.getText().toString(); + intent.putExtra("url", url); + startActivity(intent); + } + }); } -} \ No newline at end of file +} + diff --git a/app/src/main/res/layout/activity_web_view.xml b/app/src/main/res/layout/activity_web_view.xml new file mode 100644 index 0000000..c726555 --- /dev/null +++ b/app/src/main/res/layout/activity_web_view.xml @@ -0,0 +1,9 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/secondview.xml b/app/src/main/res/layout/secondview.xml index aa72d88..aaa4847 100644 --- a/app/src/main/res/layout/secondview.xml +++ b/app/src/main/res/layout/secondview.xml @@ -1,27 +1,46 @@ - + - + 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" /> + + + +