RhodesApp.h in rhodes-3.3.3.beta.2

- old
+ new

@@ -50,20 +50,19 @@
 public:
     DEFINE_LOGCLASS;
 
 private:
 
-    CRhodesApp(const String& strRootPath, const String& strUserPath);
+    CRhodesApp(const String& strRootPath, const String& strUserPath, const String& strRuntimePath);
     boolean m_bExit, m_bRestartServer;
 
     String m_strListeningPorts;
 
     common::CAutoPtr<net::CHttpServer> m_httpServer;
     CSplashScreen m_oSplashScreen;
     CAppMenu m_oAppMenu;
     CRhoTimer m_oTimer;
-    CExtManager m_oExtManager;
 
     String m_strLoadingPagePath, m_strLoadingPngPath;
     String m_strStartUrl, m_strOptionsUrl, m_strRhobundleReloadUrl;//, m_strFirstStartUrl;
     static String m_strStartParameters;
     static boolean m_bSecurityTokenNotPassed;
@@ -84,15 +83,16 @@
     boolean m_bDeactivationMode;
     //int m_activateCounter;
 
     common::CAutoPtr<common::CThreadQueue> m_appCallbacksQueue;
     boolean m_bSendingLog;
+    CExtManager* m_pExtManager;
 
 public:
     ~CRhodesApp(void);
 
-    static CRhodesApp* Create(const String& strRootPath, const String& strUserPath);
+    static CRhodesApp* Create(const String& strRootPath, const String& strUserPath, const String& strRuntimePath);
     static void Destroy();
     static CRhodesApp* getInstance(){ return (CRhodesApp*)m_pInstance; }
     void startApp();
     void stopApp();
     void restartLocalServer(common::CThreadQueue& waitThread);
@@ -103,10 +103,11 @@
     
     boolean deactivationMode() const {return m_bDeactivationMode;}
 
     const String& getRhobundleReloadUrl();
     const String& getBaseUrl();
+    void  setBaseUrl(const String& strBaseUrl);
     const String& getStartUrl();
     const String& getOptionsUrl();
     const String& getCurrentUrl(int index = 0);
     boolean isOnStartPage();
 
@@ -123,10 +124,11 @@
     String getAppTitle();
     String getAppName();
     StringW getAppNameW();
 
     void callBarcodeCallback(String strCallbackUrl, const String& strBarcode, bool isError);
+    void callCallbackWithData(String strCallbackUrl, String strBody, const String& strCallbackData, bool bWaitForResponse);
     void callCameraCallback(String strCallbackUrl, const String& strImagePath, const String& strError, boolean bCancel );
     void callSignatureCallback(String strCallbackUrl, const String& strSignaturePath, const String& strError, boolean bCancel );
     void callDateTimeCallback(String strCallbackUrl, long lDateTime, const char* szData, int bCancel );
 	void callBluetoothCallback(String strCallbackUrl, const char* body);
     void callAppActiveCallback(boolean bActive);
@@ -136,12 +138,14 @@
     boolean callTimerCallback(const String& strUrl, const String& strData);
 
     CAppMenu& getAppMenu (void) { return m_oAppMenu; }
     CSplashScreen& getSplashScreen(){return m_oSplashScreen;}
     CRhoTimer&     getTimer(){ return m_oTimer; }
-    CExtManager&   getExtManager(){ return m_oExtManager; }
 
+    void setExtManager( CExtManager* pExtManager ){m_pExtManager = pExtManager; }
+    CExtManager&   getExtManager(){ return *m_pExtManager; }
+
     boolean sendLog(const String& strCallbackUrl);
 
     String addCallbackObject(ICallbackObject* pCallbackObject, String strName);
     unsigned long getCallbackObject(int nIndex);
 
@@ -190,9 +194,10 @@
 extern "C" {
 #endif //__cplusplus
 	
 void rho_rhodesapp_create(const char* szRootPath);
 void rho_rhodesapp_create_with_separate_user_path(const char* szRootPath, const char* szUserPath);    
+void rho_rhodesapp_create_with_separate_runtime(const char* szRootPath, const char* szRuntimePath);    
 void rho_rhodesapp_start();	
 void rho_rhodesapp_destroy();
 	
 const char* rho_rhodesapp_getstarturl();
 //const char* rho_rhodesapp_getfirststarturl();