Changeset 4671

Timestamp:

Dec 4, 2013 2:46:42 AM (11 years ago)

Author:

nanang

Message:

Re #1708: Initial work on chat window.

Location:

pjproject/branches/projects/pjsua2/pjsip-apps/src/pygui

Files:

• account.py (modified) (3 diffs)
• application.py (modified) (9 diffs)
• call.py (modified) (1 diff)
• chat.py (added)
• chatgui.py (added)

pjproject/branches/projects/pjsua2/pjsip-apps/src/pygui/account.py

@@ -35 +35 @@
 import application
 import call
+import chat as ch
 
 # Account class
@@ -48 +49 @@
                 self.cfgChanged = False
                 self.buddyList = []
-                self.callList = []
-
+                self.chatList = []
+
+        def findBuddy(self, uri):
+                # TODO: proper URI comparison
+                for bud in self.buddyList:
+                        if bud.cfg.uri in uri or uri in bud.cfg.uri:
+                                return bud
+                return None
+                
+        def findChat(self, buddy, call_inst = None):
+                for chat in self.chatList:
+                        if chat.isBuddyParticipant(buddy):
+                                if call_inst and chat.isCallRegistered(call_inst):
+                                        return chat
+                                elif not call_inst and chat.isPrivate():
+                                        return chat
+                return None
+        
+        def newChat(self, buddy):
+                chat = ch.Chat(self, buddy)
+                self.chatList.append(chat)
+                return chat
+        
         def statusText(self):
                 status = '?'
@@ -75 +97 @@
                         status = '- not created -'
                 return status
-        
-        def makeCall(self):
-                mycall = call.Call(self.app, self, pj.PJSUA_INVALID_ID)
-                callPrm = pj.CallOpParam()
-                callPrm.opt.audioCount = 1
-                callPrm.opt.videoCount = 0
-                mycall.uri = "sip:test1@pjsip.org"
-                self.callList.append(mycall)
-                mycall.makeCall(mycall.uri, callPrm)
-        
+                
         def onRegState(self, prm):
                 self.app.updateAccount(self)
 
         def onIncomingCall(self, prm):
-                mycall = call.Call(self.app, self, prm.callId)
-                self.callList.append(mycall)
-                self.app.updateCall(self)
-                callPrm = pj.CallOpParam()
-                msg = "Incoming call for account '%s'" % self.cfg.idUri
-                if msgbox.askquestion(msg, 'Accept call?', default=msgbox.YES) == u'yes':
-                        callPrm.statusCode = 200
-                        mycall.answer(callPrm)
-                else:
-                        mycall.hangup(callPrm)
-
-
+                c = call.Call(self, call_id=prm.callId)
+                call_prm = pj.CallOpParam()
+                call_prm.statusCode = 180
+                c.answer(call_prm)
+                ci = c.getInfo()
+                msg = "Incoming call for account '%s'" % self.cfg.idUri
+                if msgbox.askquestion(msg, "Accept call from '%s'?" % (ci.remoteURI), default=msgbox.YES) == u'yes':
+                        call_prm.statusCode = 200
+                        c.answer(call_prm)
+                        
+                        # create chat instance
+                        bud = self.findBuddy(ci.remoteURI)
+                        if not bud: return
+                        chat = self.findChat(bud)
+                        if not chat: chat = self.newChat(bud, c)
+                        
+                        chat.registerCall(bud, c)
+                        chat.showWindow()
+                else:
+                        c.hangup(call_prm)
+                        
+        def onInstantMessage(self, prm):
+                bud = self.findBuddy(prm.fromUri)
+                if not bud: return
+                chat = self.findChat(bud)
+                if not chat: chat = self.newChat(bud)
+                        
+                chat.addMessage(bud.cfg.uri, prm.msgBody)
+                chat.showWindow()
+                
+        def onInstantMessageStatus(self, prm):
+                if prm.code/100 == 2: return
+                
+                bud = self.findBuddy(prm.toUri)
+                if not bud: return
+                chat = self.findChat(bud)
+                if not chat: return
+                
+                chat.addMessage(None, "Failed sending message to '%s': %s" % (bud.cfg.uri, prm.reason))
+                
+        def onTypingIndication(self, prm):
+                bud = self.findBuddy(prm.fromUri)
+                if not bud: return
+                chat = self.findChat(bud)
+                if not chat: return
+                
+                chat.setTypingIndication(bud.cfg.uri, prm.isTyping)
+
+                
 # Account frame, to list accounts
 class AccountListFrame(ttk.Frame):

pjproject/branches/projects/pjsua2/pjsip-apps/src/pygui/application.py

@@ -52 +52 @@
                 
                 # Logger
-                self.logger = log.Logger()
+                self.logger = None #log.Logger()
                 
                 # Accounts
@@ -136 +136 @@
                 # Start polling
                 self._onTimer()
-
-        def updateCall(self, acc):
-                iid = str(acc.randId)
-                for call in acc.callList:
-                        calliid = str(call.randId)
-                        uri, status = call.statusText()
-                        if self.tv.exists(calliid):
-                                self.tv.item(call.iid, text=uri, values=(status,))
-                        else:
-                                call.iid = self.tv.insert(iid, 0, calliid, open=True, text=uri, values=(status,))
 
         def updateAccount(self, acc):
@@ -226 +216 @@
                 self.accMenu = tk.Menu(top, tearoff=False)
                 # Labels, must match with _onAccContextMenu()
-                labels = ['Call', '-', 'Unregister', 'Reregister', 'Add buddy...', '-',
+                labels = ['Unregister', 'Reregister', 'Add buddy...', '-',
                           'Online', 'Invisible', 'Away', 'Busy', '-',
                           'Settings...', '-',
@@ -238 +228 @@
                 
                 # Create Buddy context menu
-                # Labels, must match with _onAccContextMenu()
+                # Labels, must match with _onBuddyContextMenu()
                 self.buddyMenu = tk.Menu(top, tearoff=False)
-                labels = ['Video call', 'Audio call', 'Send instant message', '-',
+                labels = ['Audio call', 'Send instant message', '-',
                           'Subscribe', 'Unsubscribe', '-',
                           'Settings...', '-',
@@ -257 +247 @@
                 else:
                         self.tv.bind('<3>', self._onTvRightClick)
+                self.tv.bind('<Double-Button-1>', self._onTvDoubleClick)
 
         def _getSelectedAccount(self):
@@ -303 +294 @@
                                 self.buddyMenu.post(event.x_root, event.y_root)
         
+        def _onTvDoubleClick(self, event):
+                iid = self.tv.identify_row(event.y)
+                if iid:
+                        self.tv.selection_set( (iid,) )
+                        acc = self._getSelectedAccount()
+                        if acc:
+                                self.cfgChanged = False
+                                dlg = accountsetting.Dialog(self.master, acc.cfg)
+                                if dlg.doModal():
+                                        self.updateAccount(acc)
+                                        acc.modify(acc.cfg)
+                        else:
+                                bud = self._getSelectedBuddy()
+                                acc = bud.account
+                                chat = acc.findChat(bud)
+                                if not chat:
+                                        chat = acc.newChat(bud)
+                                chat.showWindow()
+        
         def _onAccContextMenu(self, label):
                 acc = self._getSelectedAccount()
@@ -308 +318 @@
                         return
                 
-                if label=='Call':
-                        acc.makeCall()
-                elif label=='Unregister':
+                if label=='Unregister':
                         acc.setRegistration(False)
                 elif label=='Reregister':
@@ -362 +370 @@
                 acc = bud.account
                         
-                if label=='Video call':
-                        pass
-                elif label=='Audio call':
-                        pass
+                if label=='Audio call':
+                        chat = acc.findChat(bud)
+                        if not chat: chat = acc.newChat(bud)
+                        chat.showWindow()
+                        chat.startAudio()
                 elif label=='Send instant message':
-                        pass
+                        chat = acc.findChat(bud)
+                        if not chat: chat = acc.newChat(bud)
+                        chat.showWindow()
                 elif label=='Subscribe':
                         bud.subscribePresence(True)
@@ -476 +487 @@
                 
 if __name__ == '__main__':
+        print pj
         main()

pjproject/branches/projects/pjsua2/pjsip-apps/src/pygui/call.py

@@ -38 +38 @@
         High level Python Call object, derived from pjsua2's Call object.
         """
-        def __init__(self, app, acc, callId):
-                pj.Call.__init__(self, acc, callId)
-                self.app = app
+        def __init__(self, acc, peer_uri='', chat=None, call_id = pj.PJSUA_INVALID_ID):
+                pj.Call.__init__(self, acc, call_id)
                 self.acc = acc
-                self.uri = ''
-                self.randId = random.randint(1, 9999)
+                self.peerUri = peer_uri
+                self.chat = chat
+                self.connected = False
 
-        def statusText(self):
-                uri = ''
-                status = '?'
-                if self.isActive():
-                        ci = self.getInfo()
-                        status = ci.stateText
-                        uri = ci.remoteURI
-                else:
-                        status = '- not established -'
-                return uri, status
-        
         def onCallState(self, prm):
-                ci = self.getInfo()
-                if ci.state == pj.PJSIP_INV_STATE_DISCONNECTED:
-                        iid = str(self.randId)
-                        self.acc.callList.remove(self)
-                        self.app.tv.delete( (iid,) )
-                        del self
-                else:
-                        self.app.updateCall(self.acc)
-
+                ci = self.getInfo()
+                self.connected = ci.state == pj.PJSIP_INV_STATE_CONFIRMED                       
+                if self.chat:
+                        self.chat.updateCallState(self, ci)
+                        
+        def onInstantMessage(self, prm):
+                # chat instance should have been initalized
+                if not self.chat: return
+                        
+                self.chat.addMessage(self.peerUri, prm.msgBody)
+                self.chat.showWindow()
+                        
+        def onInstantMessageStatus(self, prm):
+                if prm.code/100 == 2: return
+                # chat instance should have been initalized
+                if not self.chat: return
+                
+                self.chat.addMessage(None, "Failed sending message to '%s' (%d): %s" % (self.peerUri, prm.code, prm.reason))
+                
+        def onTypingIndication(self, prm):
+                # chat instance should have been initalized
+                if not self.chat: return
+                
+                self.chat.setTypingIndication(self.peerUri, prm.isTyping)
+                        
 if __name__ == '__main__':
         application.main()