1 修改语音解析结果逻辑

YangShuai
1 parent ed3b99c2
Showing 9 changed files with 123 additions and 79 deletions
gradle/wrapper/gradle-wrapper.jar
gradle/wrapper/gradle-wrapper.properties
smartAssistant/src/main/java/com/ys/yslibrary/bean/Answer.java
smartAssistant/src/main/java/com/ys/yslibrary/bean/ChatMessageHandler.java
smartAssistant/src/main/java/com/ys/yslibrary/bean/MsgConstant.java
smartAssistant/src/main/java/com/ys/yslibrary/bean/UnknownHandler.java
smartAssistant/src/main/java/com/ys/yslibrary/bean/WeatherHandler.java
smartAssistant/src/main/java/com/ys/yslibrary/ui/AssistantActivity.java
smartAssistant/src/main/res/layout/activity_xiaojia_assistant.xml
+#Mon Apr 12 13:40:02 CST 2021
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
@@ -4,9 +4,20 @@ package com.ys.yslibrary.bean;
  * 技能处理返回结果，包含展示内容，合成内容和回调
  */
 public class Answer {
+    public static final int TYPE_WEATHER = 1001;
+    public static final int TYPE_UNKNOWN = 1002;
     private String mAnswer;
     private String mTTSContent;
     private Runnable mAnswerCallback;
+    private int answerType;
+
+    public int getAnswerType() {
+        return answerType;
+    }
+
+    public void setAnswerType(int answerType) {
+        this.answerType = answerType;
+    }
     public Answer(String answer, String ttsContent, Runnable answerCallback) {
         mAnswer = answer;
@@ -31,7 +42,9 @@ public class Answer {
         return mAnswer;
     }
-    public String getTTSContent() { return mTTSContent; }
+    public String getTTSContent() {
+        return mTTSContent;
+    }
     public Runnable getAnswerCallback() {
         return mAnswerCallback;
 package com.ys.yslibrary.bean;
 import android.text.TextUtils;
+import android.util.Log;
 import com.ys.yslibrary.bean.player.PlayerHandler;
@@ -30,6 +31,9 @@ public class ChatMessageHandler {
     static {
 //        handlerMap.put("telephone", TelephoneHandler.class);
         handlerMap.put("weather", WeatherHandler.class);
+        handlerMap.put(MsgConstant.TYPE_UNKNOWN, UnknownHandler.class);
+        //历史上的今天
+        handlerMap.put("LEIQIAO.historyToday", UnknownHandler.class);
 //        handlerMap.put("cookbook", CookBookHandler.class);
 //        handlerMap.put("stock", StockHandler.class);
 //        handlerMap.put("mapU", MapHandler.class);
@@ -62,15 +66,19 @@ public class ChatMessageHandler {
     private SemanticResult mSemanticResult;
     private IntentHandler mHandler;
+    public void reset(){
+        mSemanticResult=null;
+    }
-    public String getFormatMessage(RawMessage message) {
+    public Answer getFormatMessage(RawMessage message) {
         this.mMessage = message;
         if (mMessage.fromType == RawMessage.FromType.USER) {
             //用户消息
             if (mMessage.msgType == RawMessage.MsgType.TEXT) {
-                return new String(mMessage.msgData);
+//                return new String(mMessage.msgData);
+                return new Answer(new String(mMessage.msgData));
             } else {
-                return "";
+                return null;
             }
         } else {
             initHandler();
@@ -89,9 +97,9 @@ public class ChatMessageHandler {
                 if (!TextUtils.isEmpty(answer.getTTSContent())) {
                     latestTTSAnswer = answer;
                 }
-                return answer.getAnswer();
+                return answer;
             } else {
-                return "错误";
+                return null;
             }
         }
     }
@@ -108,7 +116,7 @@ public class ChatMessageHandler {
             //根据语义结果的service查找对应的IntentHandler，并实例化
             Class handlerClass = handlerMap.get(mSemanticResult.service);
             if (handlerClass == null) {
-                handlerClass = PlayerHandler.class;
+                handlerClass = UnknownHandler.class;
             }
             try {
                 Constructor constructor = handlerClass.getConstructor();
@@ -134,7 +142,7 @@ public class ChatMessageHandler {
             semanticResult = new JSONObject(new String(mMessage.msgData));
             mSemanticResult.rc = semanticResult.optInt("rc");
             if (mSemanticResult.rc == 4) {
-//                mSemanticResult.service = Constant.SERVICE_UNKNOWN;
+                mSemanticResult.service = MsgConstant.TYPE_UNKNOWN;
             } else if (mSemanticResult.rc == 1) {
                 mSemanticResult.service = semanticResult.optString("service");
                 mSemanticResult.answer = "语义错误";
@@ -177,7 +185,7 @@ public class ChatMessageHandler {
             }
         } catch (JSONException e) {
             mSemanticResult.rc = 4;
-//            mSemanticResult.service = Constant.SERVICE_UNKNOWN;
+            mSemanticResult.service = MsgConstant.TYPE_UNKNOWN;
         }
     }
 }
+package com.ys.yslibrary.bean;
+
+public class MsgConstant {
+    public static final String TYPE_UNKNOWN="unknown";
+}
+package com.ys.yslibrary.bean;
+
+import org.json.JSONArray;
+import org.json.JSONObject;
+
+public class UnknownHandler extends IntentHandler {
+    @Override
+    public Answer getFormatContent(SemanticResult result) {
+        Answer answer = new Answer(result.answer);
+        answer.setAnswerType(Answer.TYPE_UNKNOWN);
+        return answer;
+    }
+}
@@ -14,25 +14,30 @@ public class WeatherHandler extends IntentHandler {
     @Override
     public Answer getFormatContent(SemanticResult result) {
+        Answer answer = null;
         if (notified) {
-            return new Answer(result.answer);
+            answer = new Answer(result.answer);
+            answer.setAnswerType(Answer.TYPE_WEATHER);
+            return answer;
         } else {
-            StringBuilder answer = new StringBuilder(result.answer);
+            StringBuilder builder = new StringBuilder(result.answer);
             JSONArray slots = result.semantic.optJSONArray("slots");
             for (int index = 0; index < slots.length(); index++) {
                 JSONObject item = slots.optJSONObject(index);
-                if (item.optString("name").contains("location")) {
+                if (item != null && item.optString("name") != null && item.optString("name").contains("location")) {
                     // 问法意图中不包含具体的城市名，提示可使用定位让城市信息更准确
                     if (item.optString("value").contains("CURRENT_CITY")) {
-                        answer.append(NEWLINE);
-                        answer.append(NEWLINE);
-                        answer.append("<a href=\"use_loc\">使用定位让天气信息更准确</a>");
+                        builder.append(NEWLINE);
+                        builder.append(NEWLINE);
+                        builder.append("<a href=\"use_loc\">使用定位让天气信息更准确</a>");
                         notified = true;
                         break;
                     }
                 }
             }
-            return new Answer(answer.toString(), result.answer);
+            answer = new Answer(result.answer, result.answer);
+            answer.setAnswerType(Answer.TYPE_WEATHER);
+            return answer;
         }
     }
 package com.ys.yslibrary.ui;
-import android.app.Dialog;
-import android.os.Handler;
-import android.os.Message;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
@@ -12,11 +9,9 @@ import android.view.animation.AnimationUtils;
 import android.view.animation.LayoutAnimationController;
 import android.widget.HorizontalScrollView;
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 import com.ys.yslibrary.aiui.AIUIWrapper;
+import com.ys.yslibrary.bean.Answer;
 import com.ys.yslibrary.bean.AssistantContentBean;
 import com.ys.yslibrary.bean.ChatMessageHandler;
 import com.ys.yslibrary.callback.OnVoiceIdentifyResultListener;
@@ -27,20 +22,12 @@ import com.ys.yslibrary.ui.adapter.AssistantAdapter;
 import com.ys.yslibrary.ui.custom.AssistantViewAdapter;
 import com.ys.yslibrary.viewmodel.VoiceViewModel;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ConcurrentHashMap;
 public class AssistantActivity extends BaseActivity {
     private VoiceViewModel mVoiceViewModel;
     private ActivityXiaojiaAssistantBinding binding;
     private ChatMessageHandler messageHandler;
-    private AssistantAdapter assistantAdapter;
-    private List<AssistantContentBean> list;
+    private AssistantViewAdapter viewAdapter;
     @Override
     protected int getBindingLayoutId() {
@@ -55,19 +42,17 @@ public class AssistantActivity extends BaseActivity {
     @Override
     protected void init() {
         this.binding = (ActivityXiaojiaAssistantBinding) getBaseBinding();
-        this.list = new ArrayList<>();
-        assistantAdapter = new AssistantAdapter(this, list);
 //        binding.rv.setLayoutManager(new LinearLayoutManager(this));
 //        binding.rv.setAdapter(assistantAdapter);
         getWindow().setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
         messageHandler = new ChatMessageHandler();
-//        AIUIWrapper.getInstance().startRecordAudio();
+        AIUIWrapper.getInstance().startRecordAudio();
         AssistantContentBean assistantContentBean = new AssistantContentBean(AssistantContentBean.TYPE_WEATHER);
-        assistantContentBean.setWeather("天气好");
-        AssistantViewAdapter viewAdapter = new AssistantViewAdapter(this, assistantContentBean);
+        viewAdapter = new AssistantViewAdapter(this, assistantContentBean);
+        binding.assistantView.setVisibility(View.GONE);
         binding.assistantView.setLayoutAnimation(AnimationUtils.loadLayoutAnimation(this, R.anim.layout_animation_fall_down));
         binding.assistantView.setAdapter(viewAdapter);
         binding.assistantView.setOnClickBlankBgListener(new View.OnClickListener() {
@@ -76,15 +61,15 @@ public class AssistantActivity extends BaseActivity {
                 finish();
             }
         });
-        new Handler().postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                AssistantContentBean assistantContentBean = new AssistantContentBean(AssistantContentBean.TYPE_DIALOGUE);
-                assistantContentBean.setDialogue("修奥对话");
-                viewAdapter.setChangeData(assistantContentBean);
-                viewAdapter.notifyAllChange();
-            }
-        }, 3000);
+//        new Handler().postDelayed(new Runnable() {
+//            @Override
+//            public void run() {
+//                AssistantContentBean assistantContentBean = new AssistantContentBean(AssistantContentBean.TYPE_DIALOGUE);
+//                assistantContentBean.setDialogue("修奥对话");
+//                viewAdapter.setChangeData(assistantContentBean);
+//                viewAdapter.notifyAllChange();
+//            }
+//        }, 3000);
 //                list.add(assistantContentBean);
 ////                assistantAdapter.notifyItemInserted(0);
@@ -98,40 +83,47 @@ public class AssistantActivity extends BaseActivity {
 //                binding.rv.scheduleLayoutAnimation();
 //            }
 //        }, 3000);
-//        AIUIWrapper.getInstance().setVoiceIdentifyResultListener(new OnVoiceIdentifyResultListener() {
-//            @Override
-//            public void onResult(boolean isIATResult, RawMessage rawMessage) {
-//                if (rawMessage != null) {
-//                    if (rawMessage.isFromUser()) {
-//                        binding.rv.setVisibility(View.INVISIBLE);
-//                        binding.tvMsg.setText(isIATResult ? rawMessage.cacheContent : String.valueOf(rawMessage.msgData));
-//                        if (!isIATResult) {
-//                            Log.e("TAG", "onResult: " + new String(rawMessage.msgData));
-//                        }
-//                        //滑动到最后一位
-//                        binding.hscroll.fullScroll(HorizontalScrollView.FOCUS_RIGHT);
-//                    } else {
-//                        binding.rv.setVisibility(View.VISIBLE);
-//                        //非用户说的
-//                        String result = messageHandler.getFormatMessage(rawMessage);
-//                        list.clear();
-//                        Animation animation = AnimationUtils.loadAnimation(AssistantActivity.this, R.anim.anim_bottom);
-//                        //得到一个LayoutAnimationController对象；
-//                        LayoutAnimationController lac = new LayoutAnimationController(animation);
-//                        binding.rv.setLayoutAnimation(lac);
-//
-//                        AssistantContentBean assistantContentBean = new AssistantContentBean(AssistantContentBean.TYPE_WEATHER);
-//                        assistantContentBean.setWeather(result);
-//                        list.add(assistantContentBean);
-//                        assistantAdapter.notifyDataSetChanged();
-//                        binding.rv.scheduleLayoutAnimation();
-//                    }
-//
-//                } else {
-//                    binding.tvMsg.setText("什么也没说");
-//                }
-//            }
-//        });
+        binding.assistantView.setVisibility(View.INVISIBLE);
+        AIUIWrapper.getInstance().setVoiceIdentifyResultListener(new OnVoiceIdentifyResultListener() {
+            @Override
+            public void onResult(boolean isIATResult, RawMessage rawMessage) {
+                if (rawMessage != null) {
+                    if (rawMessage.isFromUser()) {
+
+                        binding.tvMsg.setText(isIATResult ? rawMessage.cacheContent : String.valueOf(rawMessage.msgData));
+                        if (!isIATResult) {
+                            Log.e("TAG", "onResult: " + new String(rawMessage.msgData));
+                        }
+                        //滑动到最后一位
+                        binding.hscroll.fullScroll(HorizontalScrollView.FOCUS_RIGHT);
+                    } else {
+                        binding.assistantView.setVisibility(View.VISIBLE);
+                        //非用户说的
+                        Answer result = messageHandler.getFormatMessage(rawMessage);
+                        AssistantContentBean assistantContentBean = new AssistantContentBean(AssistantContentBean.TYPE_WEATHER);
+                        assistantContentBean.setWeather(result.getAnswer());
+                        viewAdapter.setChangeData(assistantContentBean);
+                        viewAdapter.notifyAllChange();
+                    }
+
+                } else {
+                    binding.tvMsg.setText("什么也没说");
+                }
+            }
+        });
+
+        binding.tvMsg.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                reSpeak();
+            }
+        });
+    }
+
+    private void reSpeak() {
+        messageHandler.reset();
+        AIUIWrapper.getInstance().startRecordAudio();
+        binding.tvMsg.setText("倾听中...");
     }
     @Override
@@ -11,6 +11,7 @@
         android:layout_height="match_parent"
         android:background="@android:color/transparent">
+
         <com.ys.yslibrary.ui.custom.AssistantView
             android:id="@+id/assistant_view"
             android:layout_width="match_parent"
@@ -18,6 +19,7 @@
             app:layout_constraintBottom_toTopOf="@id/iv_icon"
             app:layout_constraintTop_toTopOf="parent" />
+
         <ImageView
             android:id="@+id/iv_icon"
             android:layout_width="20dp"