X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fdvb_ci%2Fdvbci_mmi.cpp;h=297106602079818ef87cbe6f4cf5af87973f8035;hp=f9179d9bacc7be394c45b37779b8961b55d09c85;hb=27ac653dea3ebb218d915604a8fce4b0d34d9278;hpb=98a7f9e1e5f8ed89e6cc75c9347d85c9ecd4d470

diff --git a/lib/dvb_ci/dvbci_mmi.cpp b/lib/dvb_ci/dvbci_mmi.cpp
index f9179d9..2971066 100644
--- a/lib/dvb_ci/dvbci_mmi.cpp
+++ b/lib/dvb_ci/dvbci_mmi.cpp
@@ -1,6 +1,8 @@
 /* DVB CI MMI */
 
 #include <lib/dvb_ci/dvbci_mmi.h>
+#include <lib/dvb_ci/dvbci_ui.h>
+#include <lib/base/estring.h>
 
 /*
 PyObject *list = PyList_New(len);
@@ -17,12 +19,13 @@ return list;
 eDVBCIMMISession::eDVBCIMMISession(eDVBCISlot *tslot)
 {
 	slot = tslot;
-	slot->mmi_session = this;
+	slot->setMMIManager(this);
 }
 
 eDVBCIMMISession::~eDVBCIMMISession()
 {
-	slot->mmi_session = 0;
+	slot->setMMIManager(NULL);
+	eDVBCI_UI::getInstance()->mmiSessionDestroyed(slot->getSlotID());
 }
 
 int eDVBCIMMISession::receivedAPDU(const unsigned char *tag, const void *data, int len)
@@ -36,21 +39,75 @@ int eDVBCIMMISession::receivedAPDU(const unsigned char *tag, const void *data, i
 	{
 		switch (tag[2])
 		{
-			case 0x01:
+		case 0x00:		//Tmmi_close
+		{
+			unsigned char *d=(unsigned char*)data;
+			int timeout=0;
+			if (d[3] == 1)
+			{
+				if (len > 4)
+					timeout = d[4];
+				else
+				{
+					eDebug("mmi close tag incorrect.. no timeout given.. assume 5 seconds");
+					timeout = 5;
+				}
+			}
+			else if (timeout>1)
+				eDebug("mmi close tag incorrect.. byte 4 should be 0 or 1");
+			eDVBCI_UI::getInstance()->mmiScreenClose(slot->getSlotID(), timeout);
+			break;
+		}
+		case 0x01:
 			printf("MMI display control\n");
 			if (((unsigned char*)data)[0] != 1)
 				printf("kann ich nicht. aber das sag ich dem modul nicht.\n");
 			state=stateDisplayReply;
 			return 1;
-		case 0x09:
-		case 0x0c:
+		case 0x07:		//Tmenu_enq
 		{
 			unsigned char *d=(unsigned char*)data;
 			unsigned char *max=((unsigned char*)d) + len;
+			int textlen = len - 2;
+
+			printf("in enq\n");
+			
+			if ((d+2) > max)
+				break;
+				
+			int blind = *d++ & 1;
+			int alen = *d++;
+
+			printf("%d bytes text\n", textlen);
+			if ((d+textlen) > max)
+				break;
+			
+			char str[textlen + 1];
+			memcpy(str, ((char*)d), textlen);
+			str[textlen] = '\0';
+			
+			printf("enq-text: %s\n",str);
+			
+			eDVBCI_UI::getInstance()->mmiScreenEnq(slot->getSlotID(), blind, alen, (char*)convertDVBUTF8(str).c_str());
+
+			break;		
+		}
+		case 0x09:		//Tmenu_last
+		case 0x0c:		//Tlist_last
+		{
+			unsigned char *d=(unsigned char*)data;
+			unsigned char *max=((unsigned char*)d) + len;
+			int pos = 0;
 			printf("Tmenu_last\n");
 			if (d > max)
 				break;
 			int n=*d++;
+			
+			if(tag[2] == 0x09)	//menu
+				eDVBCI_UI::getInstance()->mmiScreenBegin(slot->getSlotID(), 0);
+			else								//list
+				eDVBCI_UI::getInstance()->mmiScreenBegin(slot->getSlotID(), 1);
+			
 			if (n == 0xFF)
 				n=0;
 			else
@@ -67,10 +124,18 @@ int eDVBCIMMISession::receivedAPDU(const unsigned char *tag, const void *data, i
 				printf("%d bytes text\n", textlen);
 				if ((d+textlen) > max)
 					break;
+					
+				char str[textlen + 1];
+				memcpy(str, ((char*)d), textlen);
+				str[textlen] = '\0';
+				
+				eDVBCI_UI::getInstance()->mmiScreenAddText(slot->getSlotID(), pos++, (char*)convertDVBUTF8(str).c_str());
+					
 				while (textlen--)
 					printf("%c", *d++);
 				printf("\n");
 			}
+			eDVBCI_UI::getInstance()->mmiScreenFinish(slot->getSlotID());
 			break;
 		}
 		default:
@@ -93,8 +158,9 @@ int eDVBCIMMISession::doAction()
 		unsigned char tag[]={0x9f, 0x88, 0x02};
 		unsigned char data[]={0x01, 0x01};
 		sendAPDU(tag, data, 2);
-		state=stateFakeOK;
-		return 1;
+		state=stateIdle;
+		//state=stateFakeOK;
+		//return 1;
 		break;
 	}
 	case stateFakeOK:
@@ -120,5 +186,45 @@ int eDVBCIMMISession::stopMMI()
 	unsigned char tag[]={0x9f, 0x88, 0x00};
 	unsigned char data[]={0x00};
 	sendAPDU(tag, data, 1);
+	
+	return 0;
+}
+
+int eDVBCIMMISession::answerText(int answer)
+{
+	printf("eDVBCIMMISession::answerText(%d)\n",answer);
+
+	unsigned char tag[]={0x9f, 0x88, 0x0B};
+	unsigned char data[]={0x00};
+	data[0] = answer & 0xff;
+	sendAPDU(tag, data, 1);
+	
+	return 0;
+}
+
+int eDVBCIMMISession::answerEnq(char *answer)
+{
+	unsigned int len = strlen(answer);
+	printf("eDVBCIMMISession::answerEnq(%d bytes)\n", len);
+
+	unsigned char data[len+1];
+	data[0] = 0x01; // answer ok
+	memcpy(data+1, answer, len);
+
+	unsigned char tag[]={0x9f, 0x88, 0x08};
+	sendAPDU(tag, data, len+1);
+
+	return 0;
+}
+
+int eDVBCIMMISession::cancelEnq()
+{
+	printf("eDVBCIMMISession::cancelEnq()\n");
+
+	unsigned char tag[]={0x9f, 0x88, 0x08};
+	unsigned char data[]={0x00}; // canceled
+	sendAPDU(tag, data, 1);
+	
+	return 0;
 }