lt分支内存和图片上传问题

app/src/main/java/com/aispeech/nativedemo/MainActivity.java

@@ -592,15 +592,20 @@ public class MainActivity extends Activity implements DuiUpdateObserver.UpdateCa
         public void run() {
             try {
                 Log.e(TAG, "-----------------detect face----------------");
-                textureBitmap = mTextureView.getBitmap();
+                if (textureBitmap == null) {
+                    textureBitmap = Bitmap.createBitmap(getBaseContext().getResources().getDisplayMetrics(),
+                            mTextureView.getWidth(), mTextureView.getHeight(), Bitmap.Config.ARGB_8888);
+                }
+
+                Bitmap bitmap = mTextureView.getBitmap(textureBitmap);
 
                 //删除过期人员
                 FaceChatMode.deleteExpirePerson();
-                List<MultiAtt> results = FaceChatMode.detectMultiAtt(textureBitmap);
+                List<MultiAtt> results = FaceChatMode.detectMultiAtt(bitmap);
                 if (results != null && results.size() > 0) {
                     //过滤相同人物
-                    FaceChatMode.filterPersonForFeatExtract(results, textureBitmap);
-                    boolean isContinue = FaceChatMode.featExtract(results, textureBitmap);
+                    FaceChatMode.filterPersonForFeatExtract(results, bitmap);
+                    boolean isContinue = FaceChatMode.featExtract(results, bitmap);
                     if(isContinue){
 //                        if(isInitComplete){
 //                            DDSManager.getInstance().wakeUpDDSDialog();

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

@@ -87,7 +87,12 @@ public class FaceChatMode {
                     if(mUndeterminedPersons.containsKey(person.trackId)){
                         PersonInfo origin = mUndeterminedPersons.get(person.trackId);
                         origin.updateTime = System.currentTimeMillis();
-                        if(person.result.hd_fa > 0 && person.result.fa_quality > origin.result.fa_quality){
+                        if (origin.dfeatures == null) {
+                            origin.dfeatures = person.dfeatures;
+                            origin.result = person.result;
+                            origin.faceWidth = person.faceWidth;
+                            origin.bitmap = person.bitmap;
+                        } else {
                             origin.result = person.result;
                             origin.faceWidth = person.faceWidth;
                             origin.bitmap = person.bitmap;
@@ -101,7 +106,8 @@ public class FaceChatMode {
                     if(mPersons.containsKey(person.id)){
                         PersonInfo origin = mPersons.get(person.id);
                         origin.updateTime = System.currentTimeMillis();
-                        if(person.result.hd_fa > 0 && person.result.fa_quality > origin.result.fa_quality){
+                        //if(person.result.hd_fa > 0 && person.result.fa_quality > origin.result.fa_quality)
+                        {
                             origin.result = person.result;
                             origin.faceWidth = person.faceWidth;
                             origin.bitmap = person.bitmap;
@@ -271,7 +277,8 @@ public class FaceChatMode {
                 PersonInfo value = entry.getValue();
                 if (att.track_id == value.trackId) {
                     value.updateTime = System.currentTimeMillis();
-                    if(att.hd_fa > 0 && att.fa_quality > value.result.fa_quality){
+                    //if(att.hd_fa > 0 && att.fa_quality > value.result.fa_quality)
+                    {
                         value.faceWidth = att.fa_w;
                         value.result = att;
                         value.bitmap = textureBitmap;
@@ -316,7 +323,8 @@ public class FaceChatMode {
                 PersonInfo stranger = mUndeterminedPersons.get(att.track_id);
                 if(stranger.id.equals("-2")){
                     stranger.updateTime = System.currentTimeMillis();
-                    if(att.hd_fa > 0 && att.fa_quality > stranger.result.fa_quality){
+                    //if(att.hd_fa > 0 && att.fa_quality > stranger.result.fa_quality)
+                    {
                         stranger.faceWidth = att.fa_w;
                         stranger.result = att;
                         stranger.bitmap = textureBitmap;
@@ -340,7 +348,8 @@ public class FaceChatMode {
                 } else{
                     PersonInfo message = mUndeterminedPersons.get(att.track_id);
                         message.updateTime = System.currentTimeMillis();
-                    if(att.hd_fa > 0 && att.fa_quality > message.result.fa_quality){
+                    //if(att.hd_fa > 0 && att.fa_quality > message.result.fa_quality)
+                    {
                         message.faceWidth = att.fa_w;
                         message.result = att;
                         message.bitmap = textureBitmap;