diff --git a/.gitignore b/.gitignore index 520a863..90c1db4 100644 --- a/.gitignore +++ b/.gitignore @@ -53,3 +53,17 @@ google-services.json freeline.py freeline/ freeline_project_description.json + +.idea/compiler.xml + +.idea/copyright/profiles_settings.xml + +.idea/encodings.xml + +.idea/misc.xml + +.idea/modules.xml + +.idea/runConfigurations.xml + +.idea/vcs.xml diff --git a/README.md b/README.md index b8ce9d0..12851c1 100644 --- a/README.md +++ b/README.md @@ -1,79 +1,8 @@ -# DCS SDK（Java）开发者指南 +基于DuerOS的自定义Android应用 +基础代码来自https://github.com/dueros/dcs-sdk-java.git -## 声明 - -本开发指南为DuerOS Android DCS SDK v1.0的版本说明，该工程只做为dcs协议示例使用。本开源版本自2018-09-04起不再迭代维护。 -从降低开发者接入成本、减少不可控问题出现的角度出发，DuerOS未来将主推SDK集成方案。 - -DuerOS DCS Android SDK v1.6.3.0及以后的版本将在百度DuerOS开放平台提供下载链接： -https://dueros.baidu.com/didp/doc/dueros-conversational-service/sdk_markdown - -## DCS协议 - -DCS协议是DuerOS服务端与设备端之间的通讯协议，是一套把DuerOS的智能语音交互能力向所有设备开放的API，了解详情请看[DCS协议文档](http://developer.dueros.baidu.com/doc/dueros-conversational-service/introduction_markdown)。 - -## 摘要 - -DCS SDK提供DCS协议在设备端的实现，旨在降低设备接入DuerOS的开发成本。DCS SDK是完整的Sample App，可以直接在目标设备运行，并且源代码全部开源，开发者可以基于源码进行二次开发。 - -本文档介绍的DCS SDK（Java）是Java版本的实现，该版本目前支持Android系统。 - -## 1-前置条件 - -a.完成注册百度账号、开发者认证和产品创建（选择手机场景和Android平台）后，请保存client_id和client_secret - -![](images/client-id-secret.png) - -具体参考[控制台接入流程](http://developer.dueros.baidu.com/doc/overall/console-guide_markdown)。 - -b.在百度开发者中心配置OAuth的授权回调页 - 1. 到DuerOS开放平台控制台： https://dueros.baidu.com/didp/product/listview - 2. 点击所创建产品的“编辑”按钮，按钮在右侧 - 3. 点击OAUTH CONFIG URL，到百度开发者平台控制台 - 4. 在开发者平台控制台，点击左侧“安全设置” - 5. 在“授权回调页”输入框中输入"bdconnect://cancel,bdconnect://success"（不带双引号） - 6. 点击页面下方“确定”按钮 - -c.开发环境 - - Android Studio 2.2+ - - Gradle 2.2+ - - Android SDK 5.0+ (支持http/2) - - JDK 1.6+ - -## 2-克隆项目 - -```shell -git clone https://github.com/dueros/dcs-sdk-java.git -``` - -## 3-运行 - -a.通过Android Studio找到DcsSampleOAuthActivity.java，利用上述client_id进行替换 - -![](images/modify-client-id.png) - -b.运行（Android真机） - -![](images/login1.png) - -c.百度账号登录 - -![](images/login2.png) - -## 4-唤醒 - -说“小度小度”，成功唤醒后进入“录音中”状态，如下图： - -![](images/wakeup.png) - -## 5-和小度对话 - -a.通过唤醒或者单击“点击说话”进入录音状态， 问“北京天气怎么样”，DuerOS后端将发送stopListen指令，同时返回speak指令，播报北京天气。 - -b.问“播放刘若英的歌”, 返回play指令播放歌，可以从界面上进行“播放”、“暂停”、“上一首”和“下一首”操作。 - -## 6 SDK结构 +#DuerOS代码及功能结构： ![](images/sdk-architecture.png) ![](images/access-architecture.png) diff --git a/app/src/main/java/com/baidu/duer/dcs/androidapp/DcsSampleMainActivity.java b/app/src/main/java/com/baidu/duer/dcs/androidapp/DcsSampleMainActivity.java index 6df0f57..c9715cb 100644 --- a/app/src/main/java/com/baidu/duer/dcs/androidapp/DcsSampleMainActivity.java +++ b/app/src/main/java/com/baidu/duer/dcs/androidapp/DcsSampleMainActivity.java @@ -22,6 +22,7 @@ import android.net.Uri; import android.os.Bundle; import android.text.TextUtils; +import android.view.KeyEvent; import android.view.View; import android.webkit.WebView; import android.widget.Button; @@ -98,8 +99,8 @@ private void initView() { webView.setWebViewClientListen(new BaseWebView.WebViewClientListener() { @Override public BaseWebView.LoadingWebStatus shouldOverrideUrlLoading(WebView view, String url) { - // 拦截处理不让其点击 - return BaseWebView.LoadingWebStatus.STATUS_TRUE; + // 将值设为false后可点击 + return BaseWebView.LoadingWebStatus.STATUS_FALSE; } @Override @@ -406,4 +407,28 @@ protected void onDestroy() { webView.removeAllViews(); webView.destroy(); } + + @Override + public boolean onKeyDown(int keyCode, KeyEvent event) { + if (event.getKeyCode() == KeyEvent.KEYCODE_BACK) { + if (webView.canGoBack()) { + webView.goBack(); + return false; + } else { + moveTaskToBack(true); + } + } + return super.onKeyDown(keyCode, event); + } + + @Override + public void onBackPressed() { + if (webView.canGoBack()) { + webView.goBack(); + return; + } else { + moveTaskToBack(true); + } + super.onBackPressed(); + } } \ No newline at end of file diff --git a/app/src/main/java/com/baidu/duer/dcs/androidapp/DcsSampleOAuthActivity.java b/app/src/main/java/com/baidu/duer/dcs/androidapp/DcsSampleOAuthActivity.java index 3bb2257..1511ea9 100644 --- a/app/src/main/java/com/baidu/duer/dcs/androidapp/DcsSampleOAuthActivity.java +++ b/app/src/main/java/com/baidu/duer/dcs/androidapp/DcsSampleOAuthActivity.java @@ -54,6 +54,7 @@ protected void onCreate(Bundle savedInstanceState) { setContentView(R.layout.dcs_sample_activity_oauth); initView(); setOnClickListener(); + oauthLoginButton.callOnClick(); } private void setOnClickListener() { diff --git a/app/src/main/res/layout/dcs_sample_activity_main.xml b/app/src/main/res/layout/dcs_sample_activity_main.xml index 4c0cb1b..3d61762 100644 --- a/app/src/main/res/layout/dcs_sample_activity_main.xml +++ b/app/src/main/res/layout/dcs_sample_activity_main.xml @@ -5,13 +5,13 @@ android:background="@color/color_f5f5f5" android:orientation="vertical"> - + + + + + + + + android:textSize="16dp" + android:visibility="gone" /> + android:textSize="16dp" + android:visibility="gone" /> diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png index cde69bc..55e630a 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png index c133a0c..55e630a 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png index bfa42f0..55e630a 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 324e72c..55e630a 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index aee44e1..55e630a 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 37dd4a8..88061fd 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,5 +1,5 @@ - DcsSampleApp + Duer 当前网络连接失败,请稍后重试 识别失败，请稍后再试 暂停中… diff --git a/images/client-id-secret.png b/images/client-id-secret.png deleted file mode 100755 index 2c94984..0000000 Binary files a/images/client-id-secret.png and /dev/null differ diff --git a/images/login1.png b/images/login1.png deleted file mode 100755 index a10cc04..0000000 Binary files a/images/login1.png and /dev/null differ diff --git a/images/login2.png b/images/login2.png deleted file mode 100755 index be279cd..0000000 Binary files a/images/login2.png and /dev/null differ diff --git a/images/modify-client-id.png b/images/modify-client-id.png deleted file mode 100755 index e090a5e..0000000 Binary files a/images/modify-client-id.png and /dev/null differ diff --git a/images/project.png b/images/project.png deleted file mode 100755 index 6fa8347..0000000 Binary files a/images/project.png and /dev/null differ diff --git a/images/wakeup.png b/images/wakeup.png deleted file mode 100755 index 07d2502..0000000 Binary files a/images/wakeup.png and /dev/null differ