Przeglądaj źródła

[WallPadCall]
1. App Ver. 갱신
- 2022.05.17.01
2. 최신 WallPadAPI 적용
- 통화이벤트 알림용 BR 추가
3. 로비호출 부재중 사진 저장 안되는 증상 개선
4. 통화앱 구동시, 통화앱 시작BR 전송 기능 추가
- 해당 BR을 수신한 모듈(WallPadMaiin, WallPadDevSevice(무인경비 드라이버)이 통화앱 구동상태를 바로 알수 있도록 한다.
- 통화앱 시작BR을 받으면 일정시간 모든 통화수신을 무시한다 (약 3초, 통화앱이 완전히 구동되기 전에 다른 호출이 수신되면 통화상태가 꼬인다.)
5. 로비통화후에도 로비부재중 사진이 남아있는 증상 개선

[WallPadAPI]
1. API Ver. 갱신
- 2022.05.17.01
2. 통화이벤트 알림용 BR 추가
- public static final String BR_NOTIFY_FRONTCALL_EVENT = "kr.co.icontrols.wallpad.BR_NOTIFY_FRONTCALL_EVENT"; // 현관 호출 수신 알림용 BR
- public static final String BR_NOTIFY_HOMEAUTOCALL_EVENT = "kr.co.icontrols.wallpad.BR_NOTIFY_HOMEAUTOCALL_EVENT"; // 무인경비 호출 수신 알림용 BR

Changwoo Nam 3 lat temu
rodzic
commit
c630ffd7b0

BIN
WallPadCall/libs/WallPadAPI.jar


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

@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="kr.co.icontrols.wallpadcall"
     android:versionCode="17"
-    android:versionName="2022.05.12.01">
+    android:versionName="2022.05.17.01">
 
     <!--android:sharedUserId="android.uid.system"-->
     <!--<uses-sdk-->

+ 2 - 2
WallPadCall/src/main/java/kr/co/icontrols/callengine/engine/CallController.java

@@ -2590,7 +2590,7 @@ public class CallController extends CallManager implements SIPEventListener {
                 }
 
                 strVisitorPicturePath = DBInfo.DIRECTORY_URI_VISITORPICTURE + makeVisitorPictureName(eCallType);
-                if (eCallType == CALLTYPE.FRONT) {
+                if (eCallType == CALLTYPE.FRONT || eCallType == CALLTYPE.LOBBY) {
                     if (bRemote_FrontCalled) {
                         if (!saveMoIPPicture(eCallType, strVisitorPicturePath)) return null;
                     }
@@ -2598,7 +2598,7 @@ public class CallController extends CallManager implements SIPEventListener {
                         if (!((MainActivity) mContext).saveFrontPicture()) return null;
                     }
                 }
-                else if (eCallType == CALLTYPE.LOBBY || eCallType == CALLTYPE.GUARD || eCallType == CALLTYPE.RESIDENCE) {
+                else if (eCallType == CALLTYPE.GUARD || eCallType == CALLTYPE.RESIDENCE) {
                     if (!saveMoIPPicture(eCallType, strVisitorPicturePath)) {
                         return null;
                     }

+ 1 - 0
WallPadCall/src/main/java/kr/co/icontrols/callengine/engine/MissedCallVisitorPicture.java

@@ -306,6 +306,7 @@ public class MissedCallVisitorPicture {
             String strName = "NONE";
             if (eCallType == CALLTYPE.PSTN) strName = eCallType.toString() + ":" + strRemoteSIPID;
             else if (eCallType == CALLTYPE.FRONT) strName = DEVICENAME.strType_Front + ":" + strRemoteSIPID;
+            else if (eCallType == CALLTYPE.LOBBY) strName = DEVICENAME.strType_Lobby + ":" + strRemoteSIPID;
             else strName = Global.makeCallHistoryName(strRemoteSIPID);
 
             for (int i = 0; i < strMissedCallPicURI.length; i++) {

+ 1 - 0
WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/MainActivity.java

@@ -332,6 +332,7 @@ public class MainActivity extends WpadActivity {
         try {
             Log.i(TAG, "=============== [START - MainActivity] ===============");
 
+            sendWallPadCallLiveBR_ACK();
             registerWallPadCallLiveBRReceiver();
 
             Global.setGlobalContext(this);

+ 9 - 11
WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/screen/InquiryVisitorPictureHistory.java

@@ -432,7 +432,7 @@ public class InquiryVisitorPictureHistory extends WpadScreen implements CallEven
 
     private String makeUnitName(String strName) {
         try {
-//            LOG("[makeUnitName] strName = " + strName);
+            LOG("[makeUnitName] strName = " + strName);
             String strResult = "NONE";
             if (strName.contains("PSTN")) {
                 String[] strParse_01 = strName.split(":");
@@ -691,8 +691,7 @@ public class InquiryVisitorPictureHistory extends WpadScreen implements CallEven
 
             for (int i = 0; i < LIST_CNT; i++) {
                 if (mLIST[i].IMG_UNIT != null) mLIST[i].IMG_UNIT.setVisibility(View.INVISIBLE);
-                if (mLIST[i].IMG_VISITORPICTURE != null)
-                    mLIST[i].IMG_VISITORPICTURE.setVisibility(View.INVISIBLE);
+                if (mLIST[i].IMG_VISITORPICTURE != null) mLIST[i].IMG_VISITORPICTURE.setVisibility(View.INVISIBLE);
                 if (mLIST[i].BTN_CHECK != null) mLIST[i].BTN_CHECK.setVisibility(View.INVISIBLE);
                 if (mLIST[i].TXT_INFO != null) mLIST[i].TXT_INFO.setVisibility(View.INVISIBLE);
                 if (mLIST[i].IMG_NEW != null) mLIST[i].IMG_NEW.setVisibility(View.INVISIBLE);
@@ -732,17 +731,17 @@ public class InquiryVisitorPictureHistory extends WpadScreen implements CallEven
                 if (i < nInfoCnt) {
                     mLIST_VALUE[i].ID = mVisitorPictureHistoryInfoTable.getVisitorPictureHistoryInfo(i).getID();
                     if (ConfigValues.bEasyModeUse) {
-                        mLIST_VALUE[i].INFO = makeUnitName(mVisitorPictureHistoryInfoTable.getVisitorPictureHistoryInfo(i).getName()) + "\n"
-                                + makeUnitTimestamp(mVisitorPictureHistoryInfoTable.getVisitorPictureHistoryInfo(i).getTimestamp());
-                    } else {
-                        mLIST_VALUE[i].INFO = makeUnitName(mVisitorPictureHistoryInfoTable.getVisitorPictureHistoryInfo(i).getName())
-                                + makeUnitTimestamp(mVisitorPictureHistoryInfoTable.getVisitorPictureHistoryInfo(i).getTimestamp());
+                        mLIST_VALUE[i].INFO = makeUnitName(mVisitorPictureHistoryInfoTable.getVisitorPictureHistoryInfo(i).getName()) + makeUnitTimestamp(mVisitorPictureHistoryInfoTable.getVisitorPictureHistoryInfo(i).getTimestamp());
+                    }
+                    else {
+                        mLIST_VALUE[i].INFO = makeUnitName(mVisitorPictureHistoryInfoTable.getVisitorPictureHistoryInfo(i).getName()) + makeUnitTimestamp(mVisitorPictureHistoryInfoTable.getVisitorPictureHistoryInfo(i).getTimestamp());
                     }
                     mLIST_VALUE[i].URI = mVisitorPictureHistoryInfoTable.getVisitorPictureHistoryInfo(i).getURI();
                     mLIST_VALUE[i].NEW = mVisitorPictureHistoryInfoTable.getVisitorPictureHistoryInfo(i).getChecked();
                     mLIST_VALUE[i].THIEF = mVisitorPictureHistoryInfoTable.getVisitorPictureHistoryInfo(i).getThief();
                     nStartIndex++;
-                } else {
+                }
+                else {
                     mLIST_VALUE[i].ID = "";
                     mLIST_VALUE[i].INFO = "";
                     mLIST_VALUE[i].URI = "";
@@ -755,8 +754,7 @@ public class InquiryVisitorPictureHistory extends WpadScreen implements CallEven
                 mLIST[i].TXT_INFO.setText(mLIST_VALUE[i].INFO);
                 mLIST[i].IMG_UNIT.setVisibility(View.VISIBLE);
                 mLIST[i].TXT_INFO.setVisibility(View.VISIBLE);
-                if (mLIST_VALUE[i].NEW.equals("FALSE"))
-                    mLIST[i].IMG_NEW.setVisibility(View.VISIBLE);
+                if (mLIST_VALUE[i].NEW.equals("FALSE")) mLIST[i].IMG_NEW.setVisibility(View.VISIBLE);
 //                if (mLIST_VALUE[i].THIEF.equals("TRUE"))
 //                    mLIST[i].IMG_THIEF.setVisibility(View.VISIBLE);
                 drawVisitorPicture(i, mLIST_VALUE[i].URI);

+ 1 - 0
WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/screen/TalkLobby.java

@@ -473,6 +473,7 @@ public class TalkLobby extends WpadScreen implements CallEventListener, MainEven
                     }
                     MainActivity.mCallController.set1stCallTimer(eCallType, MainActivity.mCallController.mCTT.RESIDENCEnLOBBY);
                     Global.change1stCallLogAction(CALLACTION.TALK);
+                    Global.add1stCallHistoryInfoFinal();
                 }
                 else if (eCallStatus == CALLSTATUS.END) {
                     bEnableVisitorPic = false;