tangmj998
/
digital_man
3
0
Çatalla 0
Kod Konular 0 Değişiklik İstekleri 0 Sürümler 12 Wiki Aktivite
Kaynağa Gözat

Merge branch 'dev_h5stream' into dev_h5stream_transfer 

# Conflicts:
#	app/src/main/java/com/aispeech/nativedemo/asr/observer/DuiMessageObserver.java
dev_h5stream_transfer
李俊才 1 yıl önce
ebeveyn
da959afabb a92efb615d
işleme
2b9eaefd67
10 değiştirilmiş dosya ile 44 ekleme ve 27 silme
Görünümü Böl
Diff Seçenekleri
İstatistikleri Göster Yama Dosyasını İndir Diff Dosyasını İndir
  1. +1
    -1
      app/build.gradle
  2. +7
    -1
      app/src/main/java/com/aispeech/nativedemo/BaseMainActivity.java
  3. +11
    -6
      app/src/main/java/com/aispeech/nativedemo/asr/observer/DuiMessageObserver.java
  4. +1
    -1
      app/src/main/java/com/aispeech/nativedemo/config/BaseConfig.java
  5. +12
    -12
      app/src/main/java/com/aispeech/nativedemo/face/FaceChatGreetingQueueCloseNameMode.java
  6. +6
    -3
      app/src/main/java/com/aispeech/nativedemo/face/FaceManager.java
  7. +1
    -0
      app/src/main/java/com/aispeech/nativedemo/kuangs/ConUtil.java
  8. +1
    -1
      app/src/main/java/com/aispeech/nativedemo/mqtt/BaseMqttConfig.java
  9. +3
    -2
      app/src/main/java/com/aispeech/nativedemo/network/ws/DigiWebSocketServer.java
  10. +1
    -0
      app/src/main/java/com/aispeech/nativedemo/wyasr/WYIatManager.java

+ 1
- 1
app/build.gradle Dosyayı Görüntüle

@@ -9,7 +9,7 @@ apply from: 'p_module.gradle'

def VERSION_CODE = 3
def VERSION_NAME_LT = "LT.A.1.2.2.3_20231225_prod"
def VERSION_NAME = "A.2.6.0.3_20240302"
def VERSION_NAME = "A.2.6.0.4_20240305"
def flag = "_inner_test"

android {


+ 7
- 1
app/src/main/java/com/aispeech/nativedemo/BaseMainActivity.java Dosyayı Görüntüle

@@ -929,10 +929,16 @@ public class BaseMainActivity extends Activity implements DuiUpdateObserver.Upda

return "http://39.107.77.235:48087/index_config.html?devId=" + StatusUtils.getSerialNumber() + "&serverUrl=" + Config.CURRENT_URL;
}

public String getH5YanshijiUrl() {

return Config.PROD_H5_BASE_URL+":48090/index_config.html?devId=" + StatusUtils.getSerialNumber() + "&serverUrl=" + Config.CURRENT_URL;
}

public String getH5Url() {
if (isYanshiji) {
LogUtils.setDebugMode(true);
return getH5TestUrl();
return getH5YanshijiUrl();
}
//return "http://39.107.77.235:48090/index_config.html?devId=" + StatusUtils.getSerialNumber() + "&serverUrl=" + Config.CURRENT_URL;
String ip = Config.PROD_H5_BASE_URL;


+ 11
- 6
app/src/main/java/com/aispeech/nativedemo/asr/observer/DuiMessageObserver.java Dosyayı Görüntüle

@@ -225,6 +225,7 @@ public class DuiMessageObserver implements MessageObserver {
case "sys.dialog.state":
if (data.equals("avatar.silence")) {
mIsSleep = true;
stopVad();
if (DDSManager.getInstance().isOpen) {
DDSManager.getInstance().wakeUpDDSDialog();
}
@@ -358,11 +359,7 @@ public class DuiMessageObserver implements MessageObserver {
IatQueueThreadManager.getInstance().vadEnd(DuiMessageObserver.mTime, name);
}
}
MessageUtils.sendVadEnd(mTime);
DDSService.byteList = new LinkedList<>();
DDSService.multiple = 16;
DDSService.max_multiple = 0;
isInVad = false;
stopVad();
//pcmToMp3(DuiMessageObserver.mTime);
//VoicePrintManager.getInstance().createFeature(DDSService.byteList, DuiMessageObserver.mTime);
break;
@@ -370,6 +367,14 @@ public class DuiMessageObserver implements MessageObserver {
}
}

private void stopVad() {
MessageUtils.sendVadEnd(mTime);
DDSService.byteList = new LinkedList<>();
DDSService.multiple = 16;
DDSService.max_multiple = 0;
isInVad = false;
}

private String getWhisperAsrResult(String time, List<byte[]> byteList) {
long start = System.currentTimeMillis();
int sum = 0;
@@ -529,7 +534,7 @@ public class DuiMessageObserver implements MessageObserver {


public static boolean getCurrentSpeak(String name) {
Log.e("testface2", "close size 0 is speak false " + faceListInVad.size());
Log.e("testkd2", "FaceManager.needKSCheck " + FaceManager.needKSCheck);
if (!FaceManager.needKSCheck || !FaceManager.hasInitKs) {
return true;
}


+ 1
- 1
app/src/main/java/com/aispeech/nativedemo/config/BaseConfig.java Dosyayı Görüntüle

@@ -46,7 +46,7 @@ public class BaseConfig {
}
}
if (MainActivity.isYanshiji) {
return TEST_BASE_URL;
return PROD_BASE_URL;
}
return PROD_BASE_URL;
}


+ 12
- 12
app/src/main/java/com/aispeech/nativedemo/face/FaceChatGreetingQueueCloseNameMode.java Dosyayı Görüntüle

@@ -273,10 +273,10 @@ public class FaceChatGreetingQueueCloseNameMode implements ChatMode {
} else {
personInfo.level = 10;
}
Log.e("testupdate", "containsValue " + emp.id + " tag " + emp.typeId + " name " + emp.nickName + " person " + personInfo);
LogUtils.e("testupdate", "containsValue " + emp.id + " tag " + emp.typeId + " name " + emp.nickName + " person " + personInfo);

} else {
Log.e("testupdate", "update not contain " + emp.id + " tag " + emp.typeId + " name " + emp.nickName);
LogUtils.e("testupdate", "update not contain " + emp.id + " tag " + emp.typeId + " name " + emp.nickName);

}
}
@@ -578,7 +578,7 @@ public class FaceChatGreetingQueueCloseNameMode implements ChatMode {
if (mUndeterminedPersonsInScreen.size() > 0) {
//选择未确定脸大的人
mSelectPerson = selectUnknownMaxFacePerson(mUndeterminedPersonsInScreen, true);
Log.e("testtrack", " after selectUnknownMaxFacePerson " + mSelectPerson);
LogUtils.e("testtrack", " after selectUnknownMaxFacePerson " + mSelectPerson);
if (mSelectPerson != null) {
needSend = true;
}
@@ -590,7 +590,7 @@ public class FaceChatGreetingQueueCloseNameMode implements ChatMode {
if (personInfo == null) {
personInfo = selectMaxFacePerson(mUndeterminedPersonsInScreen, false, false, mSelectPerson.faceWidth);
}
Log.e("testtrack", " after selectKnownMaxTagAndFacePerson " + mSelectPerson);
LogUtils.e("testtrack", " after selectKnownMaxTagAndFacePerson " + mSelectPerson);
needSend = true;
}
}
@@ -604,7 +604,7 @@ public class FaceChatGreetingQueueCloseNameMode implements ChatMode {
FaceManager.bitmapDetectedClose(personInfo.bitmap, personInfo);
}
//FaceManager.bitmapDetectedClose(mSelectPerson.bitmap, mSelectPerson);
Log.e("testtwo", " needSend maxfaceMan " + personInfo + " name " + name);
LogUtils.e("testtwo", " needSend maxfaceMan " + personInfo + " name " + name);
sendMsgAndLog(maxFacePersonLevel, name);
}
return;
@@ -637,25 +637,25 @@ public class FaceChatGreetingQueueCloseNameMode implements ChatMode {
if (candidatesUnknown.size() > 0) {
if (mSelectPerson.isStranger()) {
mSelectPerson = selectUnknownMaxFacePerson(candidatesUnknown, false);
Log.e("testtwos", " after candidatesKnown.size() == 0 " + mSelectPerson);
LogUtils.e("testtwos", " after candidatesKnown.size() == 0 " + mSelectPerson);
greetingCandidate(mSelectPerson);
} else {
personInfo = selectMaxFacePerson(mPersonsInScreen, false, true, mSelectPerson.faceWidth);
if (personInfo == null && mSelectPerson != null) {
personInfo = selectMaxFacePerson(mUndeterminedPersonsInScreen, false, true, mSelectPerson.faceWidth);
}
Log.e("testtwos", " after else " + personInfo);
LogUtils.e("testtwos", " after else " + personInfo);
}
} else {
personInfo = selectMaxFacePerson(mPersonsInScreen, false, true, mSelectPerson.faceWidth);
if (personInfo == null && mSelectPerson != null) {
personInfo = selectMaxFacePerson(mUndeterminedPersonsInScreen, false, true, mSelectPerson.faceWidth);
}
Log.e("testtwos", " after else else " + personInfo);
LogUtils.e("testtwos", " after else else " + personInfo);
}
} else {
int maxTag = selectPersonMaxTag(candidatesKnown, false);
Log.e("testtwos", " maxTag " + maxTag + " before change candidate " + mSelectPerson);
LogUtils.e("testtwos", " maxTag " + maxTag + " before change candidate " + mSelectPerson);
mSelectPerson = filterHighLevelAndMaxFacePerson(candidatesKnown, maxTag, false);
if (mSelectPerson != null) {
personInfo = selectMaxFacePerson(mPersonsInScreen, false, true, mSelectPerson.faceWidth);
@@ -664,8 +664,8 @@ public class FaceChatGreetingQueueCloseNameMode implements ChatMode {
}
greetingCandidate(mSelectPerson);
}
Log.e("testtwos", " after filterHighLevelAndMaxFacePerson " + mSelectPerson);
Log.e("testtwos", " after filterHighLevelAndMaxFacePerson closeMan " + personInfo);
LogUtils.e("testtwos", " after filterHighLevelAndMaxFacePerson " + mSelectPerson);
LogUtils.e("testtwos", " after filterHighLevelAndMaxFacePerson closeMan " + personInfo);
}
int maxFacePersonLevel = MIN_LEVEL;
String name = null;
@@ -679,7 +679,7 @@ public class FaceChatGreetingQueueCloseNameMode implements ChatMode {

//FaceManager.bitmapDetectedClose(mSelectPerson.bitmap, mSelectPerson);
}
Log.e("testtwos", " maxfaceman " + personInfo + " closeName " + name);
LogUtils.e("testtwos", " maxfaceman " + personInfo + " closeName " + name);
sendMsgAndLog(maxFacePersonLevel, name);
}



+ 6
- 3
app/src/main/java/com/aispeech/nativedemo/face/FaceManager.java Dosyayı Görüntüle

@@ -171,7 +171,7 @@ public class FaceManager implements ChatMode {
if (result == FaceppApi.MG_RETCODE_OK) {
abilities = FaceppApi.getInstance().getAbilityList(ConUtil.readAssetsData(mContext, "megviifacepp_model")); //界面需要 可以不调
for (int i = 0; i < abilities.size(); i++) {
Log.e(TAG, "abilities name: " + abilities.get(i).name());
Log.e("access123", "abilities name: " + abilities.get(i).name());
}
}
}
@@ -190,6 +190,9 @@ public class FaceManager implements ChatMode {
faceConfig.minFaceSize = (int) (scale * minface);
faceConfig.minFaceSize = KS_MIN_FACE;
FaceDetectApi.getInstance().setFaceppConfig(faceConfig);
} else {
needKSCheck = false;
Logger.e("initFaceDetect fail " + faceDetect) ;
}
}

@@ -528,7 +531,7 @@ public class FaceManager implements ChatMode {
// File file = new File(Config.FilePath.PROGRAM_ROOT_PATH+"/" + "last.jpg");
// BitmapUtil.saveBitmap(file.getAbsolutePath(), textureBitmap);

Log.e("testC", "textureBitmap width " + textureBitmap.getWidth() + " height " + textureBitmap.getHeight());
//Log.e("testC", "textureBitmap width " + textureBitmap.getWidth() + " height " + textureBitmap.getHeight());
//Log.e("testC", "bitmap width " + bitmap.getWidth() + " height " + bitmap.getHeight());
// if (IdentityMode.MODE_CURRENT.equals(IdentityMode.MODE_CHAT)) {
// if (mUploadInterval == 0) {
@@ -541,7 +544,7 @@ public class FaceManager implements ChatMode {
// }
// }
long postDelay = detectFace(textureBitmap);
Log.e("testface", "---------------postDelay > 0------------- " + postDelay);
//Log.e("testface", "---------------postDelay > 0------------- " + postDelay);
errorCount = 0;
loopDetect(postDelay);
} catch (Exception e) {


+ 1
- 0
app/src/main/java/com/aispeech/nativedemo/kuangs/ConUtil.java Dosyayı Görüntüle

@@ -50,6 +50,7 @@ public class ConUtil {
is.close();
return buffer;
} catch (IOException e) {
Log.e("access123", " readAssetsData " + e.getMessage());
e.printStackTrace();
}
return null;


+ 1
- 1
app/src/main/java/com/aispeech/nativedemo/mqtt/BaseMqttConfig.java Dosyayı Görüntüle

@@ -33,7 +33,7 @@ public class BaseMqttConfig {
}
}
if (MainActivity.isYanshiji) {
return ENV_TEST;
return ENV_PROD;
}
return ENV_PROD;
}


+ 3
- 2
app/src/main/java/com/aispeech/nativedemo/network/ws/DigiWebSocketServer.java Dosyayı Görüntüle

@@ -259,6 +259,7 @@ public class DigiWebSocketServer extends WebSocketServer {
Log.e("testsocket", "post " + obj);
String bodyJson = obj.optString("body");
String header = obj.optString("header");
boolean needShutdown = obj.optBoolean("needShutdown", true);
HashMap<String, String> headerMap = new HashMap<>();
if (!StringUtils.isEmpty(header)) {
headerMap = jsonToMap(header);
@@ -275,7 +276,7 @@ public class DigiWebSocketServer extends WebSocketServer {
public void onSuccess(String success) {
long delay = 19*1000 - (System.currentTimeMillis() - start) + 500;
Log.e("testsocket", "success " + success + " delay " + delay);
if (MainActivity.instance != null) {
if (MainActivity.instance != null && needShutdown) {
MainActivity.instance.delayClose(delay);
}
}
@@ -284,7 +285,7 @@ public class DigiWebSocketServer extends WebSocketServer {
public void onFail(String error) {
long delay = 19*1000 - (System.currentTimeMillis() - start) + 500;
if (error.startsWith("unexpected end of stream on")) {
if (MainActivity.instance != null) {
if (MainActivity.instance != null && needShutdown) {
MainActivity.instance.delayClose(delay);
}
}


+ 1
- 0
app/src/main/java/com/aispeech/nativedemo/wyasr/WYIatManager.java Dosyayı Görüntüle

@@ -212,6 +212,7 @@ public class WYIatManager implements AsrManagerInterface {

@Override
public void onError(final ASRErrorCode error, String requestid) {
Log.e("testkd", "onError " + error.toString() + " code " + error.getCode() + " err " + error.name());
onAsrResult(ASR_ERROR);
}
}, mTime);


Yaz Önizleme
Yükleniyor…
İptal
Kaydet