|
|
@@ -902,7 +902,7 @@ public class USBCameraActivity2 extends BaseActivity {
|
|
|
//add KSJ
|
|
|
//if (senseTimeMtc.getmPreviewHeight() != 360) {
|
|
|
|
|
|
-
|
|
|
+/* 카메라 출력이 안되는 현상 수정 위해 주성 20240809
|
|
|
DeviceVersion();
|
|
|
|
|
|
setAiConfig_first();
|
|
|
@@ -922,6 +922,35 @@ public class USBCameraActivity2 extends BaseActivity {
|
|
|
m_aes = new AES();
|
|
|
|
|
|
kr.co.icontrols.ilp300_700.MainActivity.m_bFaceDetect = true;
|
|
|
+*/
|
|
|
+
|
|
|
+ new Handler().postDelayed(new Runnable()
|
|
|
+ {
|
|
|
+ @Override
|
|
|
+ public void run()
|
|
|
+ {
|
|
|
+ Log.d("KSJ_INIT", "onCreate");
|
|
|
+ //딜레이 후 시작할 코드 작성
|
|
|
+ DeviceVersion();
|
|
|
+
|
|
|
+ setAiConfig_first();
|
|
|
+ setAiConfig();
|
|
|
+
|
|
|
+ setDeviceAntiFlickerset(m_bAEMode);
|
|
|
+
|
|
|
+
|
|
|
+ setDeviceIRLedON();
|
|
|
+ m_bIRLEDState = false;
|
|
|
+
|
|
|
+ if(m_bSettingAI)
|
|
|
+ setTemplateUpdate(1);
|
|
|
+ else
|
|
|
+ setTemplateUpdate(0);
|
|
|
+ kr.co.icontrols.ilp300_700.MainActivity.m_bFaceDetect = true;
|
|
|
+
|
|
|
+ }
|
|
|
+ }, 1000);// 0초 정도 딜레이를 준 후 시작
|
|
|
+ m_aes = new AES();
|
|
|
|
|
|
|
|
|
// String[] strName = {"814_201_범101801", "814_201_범101802", "814_201_범101803대외", "814_201_범101804대외", "814_201_범101805아이폰",
|
|
|
@@ -962,7 +991,7 @@ public class USBCameraActivity2 extends BaseActivity {
|
|
|
});
|
|
|
*/
|
|
|
mMediaPlayer = MediaPlayer.create(this, R.raw.dooropen);
|
|
|
- mMediaPlayer1 = MediaPlayer.create(this, R.raw.lobby_look);
|
|
|
+ //mMediaPlayer1 = MediaPlayer.create(this, R.raw.lobby_look);
|
|
|
|
|
|
|
|
|
//MaterialDialog progressDialog = MaterialDialogUtils.showIndeterminateProgressDialog(this, "", false).show();
|
|
|
@@ -3511,6 +3540,8 @@ public class USBCameraActivity2 extends BaseActivity {
|
|
|
@Override
|
|
|
protected void initData() {
|
|
|
//setAiConfig_first();
|
|
|
+
|
|
|
+
|
|
|
mUSBMonitor = new USBMonitor(this, myDeviceConnectListener);
|
|
|
}
|
|
|
|
|
|
@@ -3833,7 +3864,7 @@ public class USBCameraActivity2 extends BaseActivity {
|
|
|
if (!m_bIRLEDState) {
|
|
|
setDeviceIRLedON();
|
|
|
m_bIRLEDState = true;
|
|
|
- mMediaPlayer1.start();
|
|
|
+ //mMediaPlayer1.start();
|
|
|
}
|
|
|
}
|
|
|
}
|