Ver código fonte

[2024.10.10]
1. 메이드인랩에서 받은 최신 소스로 갱신
2. 버전업
- 2024.01.09.01 -> 2024.10.08.01
3. 해당버전은 현재 해운대 아이파크 2024.10.10일 부로 사용하고 있음
4. 파일 생성 시, 업데이트 할 수 있는 이름으로 변경(BSP 에 기재되어 있는 앱 이름으로 변경)

jglee 1 ano atrás
pai
commit
467e433867

+ 2 - 2
app/build.gradle

@@ -64,7 +64,7 @@ android {
         targetSdkVersion versionTarget
         versionCode 2
         //versionName "2021.12.24.99"
-        versionName "2024.01.09.01"
+        versionName "2024.10.08.01"
 //        versionName "2021.10.22.01"
         multiDexEnabled true
 
@@ -98,7 +98,7 @@ android {
 
     applicationVariants.all { variant ->
         variant.outputs.all { output ->
-            outputFileName = new File("../", "ILP300FR_6410.apk");
+            outputFileName = new File("../", "ILP_300FR_6410.apk");
         }
     }
 

+ 1 - 1
app/src/main/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="kr.co.icontrols.ilp300_700"
     android:versionCode="1"
-    android:versionName="2024.01.09.01">
+    android:versionName="2024.10.08.01">
 
     <application
         android:name="com.sensetime.demo.SenseTimeApp"

+ 11 - 0
app/src/main/java/cm/sip/hns/SIPStun.java

@@ -4653,6 +4653,17 @@ public class SIPStun extends Service {
                     Intent.putExtra(Declare.CALLTRIGGER.REMOTEINFO, clientIP);
                     mContext.sendBroadcast(Intent);
 
+                    //mCallController.onCeresCallEvent(Intent);
+                    break;
+                case 104: // from I_AM_TALKING
+                    //int i = mCMIF.CERES_MakeCall(clientIP, 1);        // 1 : audio, 2: video, 3: audio+video
+                    //Log.v("yjyoon", "mCMIF.CERES_MakeCall " + i);
+                    clientIP = (String)msg.obj;
+                    message = "null";
+                    Intent.setAction(Declare.PrivateBR.REDIRECT_CALL);
+                    Intent.putExtra(Declare.CALLTRIGGER.REMOTEINFO, clientIP);
+                    mContext.sendBroadcast(Intent);
+
                     //mCallController.onCeresCallEvent(Intent);
                     break;
             }

+ 34 - 3
app/src/main/java/kr/co/icontrols/ilp300_700/USBCameraActivity2.java

@@ -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();
                                     }
                                 }
                             }

+ 12 - 1
app/src/main/java/kr/co/icontrols/ilp300_700/call/MyTCPServer.java

@@ -139,7 +139,7 @@ public class MyTCPServer {
                     while (! client.isClosed()) {
                         Log.d(TAG, "TCPServerThread(): 2 " + clientIP);
                         String data = "";
-                        char[] str = new char[10];
+                        char[] str = new char[100];
                         int len = 0;
                         if ((len = mInputBuffer.read(str)) > 0) {
                             for(int i = 0; i < len; i++)
@@ -192,6 +192,17 @@ public class MyTCPServer {
 
 
                             }
+                            else if (data.contains("CALL_REDIRECT_")) {
+                                Log.d(TAG,"[mySocket] CALL_REDIRECT_TO_() data " + data);
+                                mOutputBuffer.write("ACK", 0, "ACK".length());
+                                mOutputBuffer.flush();
+                                String[] strReIPSplit = data.split("_");
+
+                                Message msg = mHandler.obtainMessage(104, strReIPSplit[3].trim());
+                                mHandler.sendMessage(msg);
+
+
+                            }
 
 
                         }

+ 1 - 0
app/src/main/java/kr/co/icontrols/ilp300_700/global/Declare.java

@@ -11,6 +11,7 @@ public class Declare {
         public static String APPLIVESIGNAL = "APPLIVESIGNAL";
         public static String UPDATE_MAINSCREEN = "UPDATE_MAINSCREEN";
         public static String CERES_CALL = "CERES_CALL";
+        public static String REDIRECT_CALL = "REDIRECT_CALL";
         public static String UPDATE_KEYDATA= "UPDATE_KEYDATA";
         public static String UPDATE_SENSOR= "UPDATE_SENSOR";
         public static String UPDATE_KEYDATA_TALK= "UPDATE_KEYDATA_TALK";

+ 17 - 0
app/src/main/java/kr/co/icontrols/ilp300_700/screen/TalkGuard.java

@@ -121,6 +121,7 @@ public class TalkGuard extends WpadScreen implements CallEventListener, TTSEvent
             Initialize();
 
             super.addBrActionFilter(Declare.PrivateBR.UPDATE_KEYDATA_TALK);
+            super.addBrActionFilter(Declare.PrivateBR.REDIRECT_CALL);
             Image_Background = new WpadImageView(context, 0, Declare.DeviceInfo.getScreenSizeFullW(ConfigValue.DEVICE_MODELTYPE), Declare.DeviceInfo.getScreenSizeFullH(ConfigValue.DEVICE_MODELTYPE), BGImages[ConfigValue.DEVICE_MODELTYPE], 0, ID.SCREENS.TALKGUARD.ELEMENTS.IMAGES.BACKGROUND);
             ViewRegistration(layout, Image_Background, getPosition(ID.SCREENS.TALKGUARD.ELEMENTS.IMAGES.BACKGROUND).X, getPosition(ID.SCREENS.TALKGUARD.ELEMENTS.IMAGES.BACKGROUND).Y);
 
@@ -299,6 +300,22 @@ public class TalkGuard extends WpadScreen implements CallEventListener, TTSEvent
                 }
                 UpdateScreen();
             }
+            else if(intent.getAction().equals(Declare.PrivateBR.REDIRECT_CALL))
+            {
+                String strRedirectIP = intent.getStringExtra(Declare.CALLTRIGGER.REMOTEINFO);
+
+                String[] aDeviceName = Global.makeDeviceName(strRedirectIP);
+                LOG("[onKeyDown] strRedirectIP [" + strRedirectIP + "] strGuard_Dong [" + aDeviceName[1] + "], strGuard_ID [" + aDeviceName[2] + "]");
+                RemoteIDInfo.strDong = aDeviceName[1];
+                RemoteIDInfo.strHo = aDeviceName[2];
+                RemoteIDInfo.strIP = EthernetCtrl.makeIPAddress(Declare.DeviceType.GUARD, RemoteIDInfo.strDong, RemoteIDInfo.strHo);
+                if (!send_check_sip_activation_request(EthernetCtrl.makeIPAddress(Declare.DeviceType.GUARD, RemoteIDInfo.strDong, RemoteIDInfo.strHo))) {
+                    MainActivity.mSound.PlayMent_lobby(R.raw.trylater);
+                    return;
+                }
+                MainActivity.mCallController.mCallInfo.setCallStatus(CALLTYPE.GUARD, CALLSTATUS.TRYING_CALL);
+                LOG("[onBrReceive] Intent : " + strRedirectIP);
+            }
         } catch (Exception e) {
             Log.e(TAG, "[Exception] onBrReceive(...) : " + e);
             e.printStackTrace();