Browse Source

fix camera

dev
MTing 3 weeks ago
parent
commit
32850163fa
  1. 22
      app/src/main/java/com/ouxuan/oxface/OXFaceOnlineActivity.java
  2. 6
      financelibrary/src/main/java/com/baidu/idl/face/main/finance/manager/FaceSDKManager.java

22
app/src/main/java/com/ouxuan/oxface/OXFaceOnlineActivity.java

@ -232,6 +232,9 @@ public class OXFaceOnlineActivity extends BaseActivity implements View.OnClickLi
private static boolean isOrderSelectionActivityShowing = false; // 订单选择页面是否正在显示 private static boolean isOrderSelectionActivityShowing = false; // 订单选择页面是否正在显示
private static boolean isOrderVerificationResultActivityShowing = false; // 订单核销结果页面是否正在显示 private static boolean isOrderVerificationResultActivityShowing = false; // 订单核销结果页面是否正在显示
public static boolean isVerificationCodeActivityShowing = false; // 验证码页面是否正在显示 public static boolean isVerificationCodeActivityShowing = false; // 验证码页面是否正在显示
// 设备类型相关变量
private int deviceType = -1; // 设备类型5表示第6批6表示第7批7表示第8批等
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
@ -247,6 +250,10 @@ public class OXFaceOnlineActivity extends BaseActivity implements View.OnClickLi
// 初始化LoginDataManager // 初始化LoginDataManager
loginDataManager = com.ouxuan.oxface.data.LoginDataManager.getInstance(this); loginDataManager = com.ouxuan.oxface.data.LoginDataManager.getInstance(this);
// 获取设备类型
deviceType = DeviceSelectDataManager.getInstance(this).getDeviceType();
Log.d(TAG, "OXFaceOnlineActivity初始化设备类型: " + deviceType);
// 初始化网络请求管理器 // 初始化网络请求管理器
initNetworkManagers(); initNetworkManagers();
@ -1404,6 +1411,21 @@ public class OXFaceOnlineActivity extends BaseActivity implements View.OnClickLi
// 检测图片的坐标和显示的坐标不一样需要转换 // 检测图片的坐标和显示的坐标不一样需要转换
FaceOnDrawTexturViewUtil.mapFromOriginalRect(rectF, FaceOnDrawTexturViewUtil.mapFromOriginalRect(rectF,
mAutoCameraPreviewView, model.getBdFaceImageInstance()); mAutoCameraPreviewView, model.getBdFaceImageInstance());
// 根据设备类型进行人脸框坐标适配
if (deviceType == 6) {
// 第7批设备需要180度旋转适配
float screenWidth = mAutoCameraPreviewView.getPreviewWidth();
float screenHeight = mAutoCameraPreviewView.getPreviewHeight();
float tempLeft = rectF.left;
float tempTop = rectF.top;
rectF.left = screenWidth - rectF.right;
rectF.right = screenWidth - tempLeft;
rectF.top = screenHeight - rectF.bottom;
rectF.bottom = screenHeight - tempTop;
Log.d(TAG, "第7批设备人脸框坐标已进行180度旋转适配");
}
// 人脸框颜色 // 人脸框颜色
FaceOnDrawTexturViewUtil.drawFaceColor(paint, paintBg, liveStatus, model); FaceOnDrawTexturViewUtil.drawFaceColor(paint, paintBg, liveStatus, model);
// 绘制人脸框 // 绘制人脸框

6
financelibrary/src/main/java/com/baidu/idl/face/main/finance/manager/FaceSDKManager.java

@ -855,9 +855,11 @@ public class FaceSDKManager {
try { try {
if(deviceType == 6){ if(deviceType == 6){
Log.e("FaceSDKManager", "switchCamera--第7批"); Log.e("FaceSDKManager", "switchCamera--第7批");
SingleBaseConfig.getBaseConfig().setVideoDirection(180);
// SingleBaseConfig.getBaseConfig().setVideoDirection(90);
SingleBaseConfig.getBaseConfig().setRgbVideoDirection(90); SingleBaseConfig.getBaseConfig().setRgbVideoDirection(90);
SingleBaseConfig.getBaseConfig().setMirrorDetectRGB(0);
SingleBaseConfig.getBaseConfig().setDetectDirection(270);
SingleBaseConfig.getBaseConfig().setRgbDetectDirection(270);
// SingleBaseConfig.getBaseConfig().setMirrorDetectRGB(0);
}else if(deviceType == 5){ }else if(deviceType == 5){
Log.e("FaceSDKManager", "switchCamera--第6批"); Log.e("FaceSDKManager", "switchCamera--第6批");
SingleBaseConfig.getBaseConfig().setVideoDirection(90); SingleBaseConfig.getBaseConfig().setVideoDirection(90);

Loading…
Cancel
Save