v1.0.0定版

app/src/main/java/com/aispeech/nativedemo/asr/observer/DuiMessageObserver.java

@@ -78,18 +78,18 @@ public class DuiMessageObserver implements MessageObserver {
                     String readText = nlg;
 //                    if(FaceManager.getInstance(DuiApplication.getContext()).hasPerson()) {
                         if (JSONUtils.isJson(display)) {
-//                            readText = MessageUtils.sendSkill(display);
+                            readText = MessageUtils.sendSkill(display);
                             try {
                                 jsonObject.put("nlg", "");
                                 jsonObject.put("display", "");
 
-//                                if (!TextUtils.isEmpty(readText)) {
-//                                    JSONObject jo = new JSONObject();
-//                                    jo.put("type", "djTtsNlpText");
-//                                    jo.put("data", readText);
-//                                    Logger.e("思必驰NLP结果发给叠境tts:" + readText);
-//                                    WebSocketManager.getInstance(MainActivity.instance).sendMsg(jo.toString());
-//                                }
+                                if (!TextUtils.isEmpty(readText)) {
+                                    JSONObject jo = new JSONObject();
+                                    jo.put("type", "djTtsNlpText");
+                                    jo.put("data", readText);
+                                    Logger.e("思必驰NLP结果发给叠境tts:" + readText);
+                                    WebSocketManager.getInstance(MainActivity.instance).sendMsg(jo.toString());
+                                }
                             } catch (JSONException e) {
                                 e.printStackTrace();
                             }
@@ -98,11 +98,11 @@ public class DuiMessageObserver implements MessageObserver {
                                 jsonObject.put("nlg", "");
                                 jsonObject.put("display", "");
 
-//                                JSONObject jo = new JSONObject();
-//                                jo.put("type", "djTtsNlpText");
-//                                jo.put("data", readText);
-//                                Logger.e("思必驰NLP结果发给叠境tts:" + readText);
-//                                WebSocketManager.getInstance(MainActivity.instance).sendMsg(jo.toString());
+                                JSONObject jo = new JSONObject();
+                                jo.put("type", "djTtsNlpText");
+                                jo.put("data", readText);
+                                Logger.e("思必驰NLP结果发给叠境tts:" + readText);
+                                WebSocketManager.getInstance(MainActivity.instance).sendMsg(jo.toString());
 
                             } catch (JSONException e) {
                                 e.printStackTrace();
@@ -157,7 +157,7 @@ public class DuiMessageObserver implements MessageObserver {
         Log.d(Tag, "message : " + message + " data : " + data);
         switch (message) {
             case "context.output.text":
-//                MessageUtils.sendChatMessage(data);
+                MessageUtils.sendChatMessage(data);
                 break;
             case "context.input.text":
                 //判断有人的时候才发送给大模型

app/src/main/java/com/aispeech/nativedemo/face/FaceManager.java

@@ -476,7 +476,7 @@ public class FaceManager {
         }
     }
 
-    private static final int PERSON_EXPIRE_TIME = 2000; //人物过期时间
+    private static final int PERSON_EXPIRE_TIME = 5000; //人物过期时间
     private static final int UNKNOWN_PERSON_EXPIRE_TIME = 1500;
     private static final int FACE_DIFF = 70;
     private static final int CANDIDATE_STAY_TIME = 3000;
@@ -775,20 +775,20 @@ public class FaceManager {
 
     public boolean hasPerson(){
         MessageUtils.sendMessage("识别人数量:" + mPersons.size() + " 未识别人数量:" + mUndeterminedPersons.size());
-//        if(mPersons.size() > 0 || mUndeterminedPersons.size() > 0){
-//            return true;
-//        }
-        if(mPersons.size() > 0){
+        if(mPersons.size() > 0 || mUndeterminedPersons.size() > 0){
             return true;
-        } else if(mUndeterminedPersons.size() > 0){
-            Iterator <Map.Entry< Integer, PersonInfo >> iterator = mUndeterminedPersons.entrySet().iterator();
-            while (iterator.hasNext()) {
-                Map.Entry< Integer, PersonInfo > entry = iterator.next();
-                if(entry.getValue().result.fa_quality > 0.6f){
-                    return true;
-                }
-            }
         }
+//        if(mPersons.size() > 0){
+//            return true;
+//        } else if(mUndeterminedPersons.size() > 0){
+//            Iterator <Map.Entry< Integer, PersonInfo >> iterator = mUndeterminedPersons.entrySet().iterator();
+//            while (iterator.hasNext()) {
+//                Map.Entry< Integer, PersonInfo > entry = iterator.next();
+//                if(entry.getValue().result.fa_quality > 0.6f){
+//                    return true;
+//                }
+//            }
+//        }
         return false;
     }
 

app/src/main/java/com/aispeech/nativedemo/network/ws/MessageUtils.java

@@ -188,7 +188,7 @@ public class MessageUtils {
                 person.put("type", "asr");
                 person.put("data", txt);
                 sendMessage(person.toString());
-                ShapeManager.getInstance().nlpFromNewDevGpt(txt);
+//                ShapeManager.getInstance().nlpFromNewDevGpt(txt);
             }
         } catch (JSONException e) {
             e.printStackTrace();