|
@ -477,6 +477,8 @@ public class OXFaceOnlineActivity extends BaseActivity implements View.OnClickLi |
|
|
LogManager.logError(TAG, "清空画布时发生异常", e); |
|
|
LogManager.logError(TAG, "清空画布时发生异常", e); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
}else{ |
|
|
|
|
|
android.util.Log.d("OXFace", "isNeedCamera: false"); |
|
|
} |
|
|
} |
|
|
} catch (Exception e) { |
|
|
} catch (Exception e) { |
|
|
LogManager.logError(TAG, "摄像头数据处理异常", e); |
|
|
LogManager.logError(TAG, "摄像头数据处理异常", e); |
|
@ -789,6 +791,10 @@ public class OXFaceOnlineActivity extends BaseActivity implements View.OnClickLi |
|
|
private void handleVerificationCodeClick() { |
|
|
private void handleVerificationCodeClick() { |
|
|
LogManager.logInfo(TAG, "用户点击验证码开门"); |
|
|
LogManager.logInfo(TAG, "用户点击验证码开门"); |
|
|
|
|
|
|
|
|
|
|
|
// 暂停摄像头预览 |
|
|
|
|
|
isNeedCamera = false; |
|
|
|
|
|
LogManager.logInfo(TAG, "暂停摄像头预览 - isNeedCamera设置为false"); |
|
|
|
|
|
|
|
|
// 启动验证码Activity |
|
|
// 启动验证码Activity |
|
|
Intent intent = new Intent(this, VerificationCodeActivity.class); |
|
|
Intent intent = new Intent(this, VerificationCodeActivity.class); |
|
|
startActivityForResult(intent, 1001); |
|
|
startActivityForResult(intent, 1001); |
|
@ -1308,13 +1314,22 @@ public class OXFaceOnlineActivity extends BaseActivity implements View.OnClickLi |
|
|
protected void onActivityResult(int requestCode, int resultCode, Intent data) { |
|
|
protected void onActivityResult(int requestCode, int resultCode, Intent data) { |
|
|
super.onActivityResult(requestCode, resultCode, data); |
|
|
super.onActivityResult(requestCode, resultCode, data); |
|
|
|
|
|
|
|
|
if (requestCode == 1001) { |
|
|
|
|
|
|
|
|
if (requestCode == 1001) { // 验证码验证获取输入结果 |
|
|
|
|
|
// 恢复摄像头预览 |
|
|
|
|
|
isNeedCamera = true; |
|
|
|
|
|
LogManager.logInfo(TAG, "恢复摄像头预览 - isNeedCamera设置为true"); |
|
|
|
|
|
|
|
|
if (resultCode == RESULT_OK && data != null) { |
|
|
if (resultCode == RESULT_OK && data != null) { |
|
|
String verificationCode = data.getStringExtra("verification_code"); |
|
|
String verificationCode = data.getStringExtra("verification_code"); |
|
|
if (verificationCode != null && verificationCode.length() == 12) { |
|
|
if (verificationCode != null && verificationCode.length() == 12) { |
|
|
LogManager.logInfo(TAG, "收到验证码: " + verificationCode); |
|
|
LogManager.logInfo(TAG, "收到验证码: " + verificationCode); |
|
|
|
|
|
|
|
|
|
|
|
android.util.Log.d("MainActivity", "收到验证码"+verificationCode); |
|
|
|
|
|
|
|
|
handleVerificationCodeSubmit(verificationCode); |
|
|
handleVerificationCodeSubmit(verificationCode); |
|
|
} |
|
|
} |
|
|
|
|
|
} else if (resultCode == RESULT_CANCELED) { |
|
|
|
|
|
LogManager.logInfo(TAG, "用户点击关闭验证码弹窗"); |
|
|
} else { |
|
|
} else { |
|
|
LogManager.logInfo(TAG, "用户取消验证码输入"); |
|
|
LogManager.logInfo(TAG, "用户取消验证码输入"); |
|
|
} |
|
|
} |
|
|