Commit 8a190f88 by 韩倩倩

v1.2 BUG #50695=>【图灵】语音输入“打开蓝牙”,一直停留在请稍后界面;BUG #50325=>【图灵】语音输入英文,回复it's显示异常(附图)

1 parent b578a4eb
...@@ -15,8 +15,8 @@ android { ...@@ -15,8 +15,8 @@ android {
applicationId "com.toscl.turingos" applicationId "com.toscl.turingos"
minSdkVersion 15 minSdkVersion 15
targetSdkVersion 22 targetSdkVersion 22
versionCode 11 versionCode 12
versionName "1.1" versionName "1.2"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
ndk { ndk {
......
...@@ -540,6 +540,9 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe ...@@ -540,6 +540,9 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
} }
Log.d(TAG, "end text"); Log.d(TAG, "end text");
String textValue = hasValue ? responseResult.getValues().getText() : ""; String textValue = hasValue ? responseResult.getValues().getText() : "";
if(textValue.contains("\u0092")){
textValue = textValue.replace("\u0092", "'");
}
String welcome = ""; String welcome = "";
try { try {
welcome = behavior.getIntent().getParameters().get("tasklist").getAsJsonArray().get(0).getAsJsonObject().get("text").getAsString(); welcome = behavior.getIntent().getParameters().get("tasklist").getAsJsonArray().get(0).getAsJsonObject().get("text").getAsString();
......
...@@ -117,6 +117,13 @@ public class SkillsSlotUtil { ...@@ -117,6 +117,13 @@ public class SkillsSlotUtil {
Collections.sort(list, new ApplicationInfo.DisplayNameComparator(pm)); //排序 Collections.sort(list, new ApplicationInfo.DisplayNameComparator(pm)); //排序
List<AppInfo> appInfos = new ArrayList<>();// 保存过滤查到的结果 List<AppInfo> appInfos = new ArrayList<>();// 保存过滤查到的结果
for (ApplicationInfo app : list) { for (ApplicationInfo app : list) {
if ("com.android.bluetooth".equals(getAppInfo(app, context).getPkgName()) && "蓝牙".equals(getAppInfo(app, context).getAppLabel())) {
appMap.put("蓝牙", "com.android.settings/com.android.settings.bluetooth.BluetoothSettings");
continue;
}
if("com.tencent.mobileqq".equals(getAppInfo(app, context).getPkgName())){
appMap.put("qq", "com.tencent.mobileqq");
}
Log.d(TAG, "getAppInfo: " + getAppInfo(app, context)); Log.d(TAG, "getAppInfo: " + getAppInfo(app, context));
appMap.put(getAppInfo(app, context).getAppLabel(), getAppInfo(app, context).getPkgName()); appMap.put(getAppInfo(app, context).getAppLabel(), getAppInfo(app, context).getPkgName());
appInfos.add(getAppInfo(app, context)); appInfos.add(getAppInfo(app, context));
...@@ -134,7 +141,6 @@ public class SkillsSlotUtil { ...@@ -134,7 +141,6 @@ public class SkillsSlotUtil {
appMap.put("最美天气", "com.icoolme.android.weather"); appMap.put("最美天气", "com.icoolme.android.weather");
appMap.put("抖音", "com.ss.android.ugc.aweme"); appMap.put("抖音", "com.ss.android.ugc.aweme");
appMap.put("抖音短视频", "com.ss.android.ugc.aweme"); appMap.put("抖音短视频", "com.ss.android.ugc.aweme");
appMap.put("qq", "com.tencent.mobileqq");
appMap.put("拨号", "com.sprd.simple.launcher/com.nb.dq.calllog.CallDialpadActivity"); appMap.put("拨号", "com.sprd.simple.launcher/com.nb.dq.calllog.CallDialpadActivity");
appMap.put("电话", "com.sprd.simple.launcher/com.nb.dq.calllog.CallDialpadActivity"); appMap.put("电话", "com.sprd.simple.launcher/com.nb.dq.calllog.CallDialpadActivity");
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!