rhodes 3.3.3.beta.1 → 3.3.3.beta.2

data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/SplashScreen.java

@@ -37,7 +37,7 @@ import com.rhomobile.rhodes.RhodesActivity;
 import com.rhomobile.rhodes.RhodesApplication;
 import com.rhomobile.rhodes.util.PerformOnUiThread;
 import com.rhomobile.rhodes.webview.GoogleWebView;
-import com.rhomobile.rhodes.webview.WebView;
+import com.rhomobile.rhodes.webview.IRhoWebView;
 
 import android.content.Context;
 import android.content.res.AssetManager;
@@ -57,7 +57,7 @@ public class SplashScreen implements MainView {
 	
 	private FrameLayout mView;
 	
-	private WebView mWebView;
+	private IRhoWebView mWebView;
 	
 	private native void nativeStart();
 	private native void nativeHide();
@@ -74,7 +74,7 @@ public class SplashScreen implements MainView {
 		mFirstNavigate = true;
 	}
 
-    private WebView createHtmlView(RhodesActivity context, AssetManager am) {
+    private IRhoWebView createHtmlView(RhodesActivity context, AssetManager am) {
 
         int type = 0;
         final String[][] urls = {{LOADING_ANDROID_PNG, LOADING_PNG}, {LOADING_PAGE}};
@@ -103,12 +103,12 @@ public class SplashScreen implements MainView {
         }
 
         // Now create WebView and load appropriate content there
-        WebView view = null;//new GoogleWebView(context);
+        IRhoWebView view = null;//new GoogleWebView(context);
         if (Capabilities.WEBKIT_BROWSER_ENABLED) {
             Logger.D(TAG, "Creating Motorola WebKIT view");
             try {
-                Class<? extends WebView> viewClass = (Class<? extends WebView>)Class.forName("com.rhomobile.rhodes.webview.EkiohWebView");
-                Constructor<? extends WebView> viewCtor = viewClass.getConstructor(Context.class, Runnable.class);
+                Class<? extends IRhoWebView> viewClass = (Class<? extends IRhoWebView>)Class.forName("com.rhomobile.rhodes.webview.EkiohWebView");
+                Constructor<? extends IRhoWebView> viewCtor = viewClass.getConstructor(Context.class, Runnable.class);
                 view = viewCtor.newInstance(context, RhodesApplication.AppState.AppStarted.addObserver("MotorolaStartEngineObserver", true));
             } catch (Throwable e) {
                 Logger.E(TAG, e);
@@ -151,7 +151,7 @@ public class SplashScreen implements MainView {
 	}
 	
 	@Override
-	public WebView getWebView(int index) {
+	public IRhoWebView getWebView(int index) {
 		return mWebView;
 	}
 	
@@ -195,8 +195,8 @@ public class SplashScreen implements MainView {
 	}
 
     @Override
-    public WebView detachWebView() {
-        WebView v = null;
+    public IRhoWebView detachWebView() {
+        IRhoWebView v = null;
         if (mWebView != null) {
             mView.removeView(mWebView.getView());
             v = mWebView;
@@ -244,4 +244,10 @@ public class SplashScreen implements MainView {
 	@Override
 	public void removeNavBar() {
 	}
+    @Override
+    public void executeJS(String js, int index) {
+    }
+    @Override
+    public void stopNavigate(int index) {
+    }
 }

data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/TabbedMainView.java

@@ -34,7 +34,7 @@ import com.rhomobile.rhodes.RhodesActivity;
 import com.rhomobile.rhodes.RhodesService;
 import com.rhomobile.rhodes.file.RhoFileApi;
 import com.rhomobile.rhodes.util.ContextFactory;
-import com.rhomobile.rhodes.webview.WebView;
+import com.rhomobile.rhodes.webview.IRhoWebView;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -613,7 +613,7 @@ public class TabbedMainView implements MainView {
 				RhodesService r = RhodesService.getInstance();
 				MainView mainView = r.getMainView();
                 action = mainView.currentLocation(-1);
-                WebView webView = mainView.detachWebView();
+                IRhoWebView webView = mainView.detachWebView();
                 view = new SimpleMainView(webView);
 			}
 			if (view == null) {
@@ -829,7 +829,7 @@ public class TabbedMainView implements MainView {
 						data.loaded = false;
 					}
 					if (i != tabIndex) {
-						WebView wv = getWebView(i);
+						IRhoWebView wv = getWebView(i);
 						wv.clear();
 					}
 				}
@@ -851,12 +851,12 @@ public class TabbedMainView implements MainView {
 	}
 	
     @Override
-    public WebView getWebView(int tab_index) {
+    public IRhoWebView getWebView(int tab_index) {
         return getTabMainView(tab_index).getWebView(-1);
     }
 	
 	@Override
-	public WebView detachWebView() {
+	public IRhoWebView detachWebView() {
 		return getTabMainView(activeTab()).detachWebView();
 	}
 	
@@ -913,4 +913,14 @@ public class TabbedMainView implements MainView {
 		return tabData.size();
 	}
 
+    @Override
+    public void executeJS(String js, int index) {
+        getTabMainView(index).executeJS(js, 0);
+    }
+
+    @Override
+    public void stopNavigate(int index) {
+        getTabMainView(index).stopNavigate(0);
+    }
+
 }

data/platform/android/Rhodes/src/com/rhomobile/rhodes/nativeview/RhoNativeViewManager.java

@@ -28,7 +28,7 @@ package com.rhomobile.rhodes.nativeview;
 
 import android.view.View;
 import com.rhomobile.rhodes.RhodesService;
-import com.rhomobile.rhodes.webview.WebView;
+import com.rhomobile.rhodes.webview.IRhoWebView;
 
 public class RhoNativeViewManager {
 
@@ -65,8 +65,8 @@ public class RhoNativeViewManager {
 		private long mViewHandle;
 	}
 	
-	public static WebView getWebViewObject(int tab_index) {
-		return RhodesService.getInstance().getMainView().getWebView(tab_index);
+	public static android.webkit.WebView getWebViewObject(int tab_index) {
+		return (android.webkit.WebView)RhodesService.getInstance().getMainView().getWebView(tab_index).getView();
 	}
 
 	public static RhoNativeView getNativeViewByteType(String typename) {

data/platform/android/Rhodes/src/com/rhomobile/rhodes/signature/ImageCapture.java

@@ -56,7 +56,7 @@ public class ImageCapture extends BaseActivity implements OnClickListener
 	private String callbackUrl;
 	private String imageFormat;
 	
-	private SimpleDateFormat timeStampFormat = new SimpleDateFormat("yyyyMMddHHmmssSS");
+	private static SimpleDateFormat timeStampFormat = new SimpleDateFormat("yyyyMMddHHmmssSS");
 
 	private SignatureView surfaceView;
 	private SurfaceHolder surfaceHolder;
@@ -70,7 +70,7 @@ public class ImageCapture extends BaseActivity implements OnClickListener
 		//Logger.D(TAG, "$$$$$$$$$$$$$$$$$$$$$$$$  onCreate");
 		requestWindowFeature(Window.FEATURE_NO_TITLE);
 		//getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
-		getWindow().setFormat(PixelFormat.TRANSLUCENT);
+		//getWindow().setFormat(PixelFormat.TRANSLUCENT);
 		setContentView(AndroidR.layout.signature);
 		
 		Bundle extras = getIntent().getExtras();
@@ -91,7 +91,9 @@ public class ImageCapture extends BaseActivity implements OnClickListener
 		int penColor = extras.getInt(com.rhomobile.rhodes.signature.Signature.INTENT_EXTRA_PREFIX + "penColor");
 		float penWidth = extras.getFloat(com.rhomobile.rhodes.signature.Signature.INTENT_EXTRA_PREFIX + "penWidth");
 		int bgColor = extras.getInt(com.rhomobile.rhodes.signature.Signature.INTENT_EXTRA_PREFIX + "bgColor");
-		surfaceView.setupView(penColor, penWidth, bgColor);
+		surfaceView.isTransparency = false;
+		surfaceView.setupView(penColor | 0xFF000000, penWidth, bgColor | 0xFF000000);
+		surfaceView.invalidate();
 	}
 
 	@Override
@@ -141,13 +143,12 @@ public class ImageCapture extends BaseActivity implements OnClickListener
 	}
 	
 
-	
-	private void takeSignature() {
+	public static void takeSignature(String callback, String imgFormat, Bitmap bitmap) {
 		try {
 			String file_ext = "jpg";
 			String file_type = "image/jpeg";
 			Bitmap.CompressFormat compress_format = Bitmap.CompressFormat.JPEG;
-			if (imageFormat.equals("png")) {
+			if (imgFormat.equals("png")) {
 				file_ext = "png";
 				file_type = "image/png";
 				compress_format = Bitmap.CompressFormat.PNG;
@@ -168,7 +169,7 @@ public class ImageCapture extends BaseActivity implements OnClickListener
 			String filePath = dir + "/" + filename + "." + file_ext;
 			OutputStream osOwn = new FileOutputStream(filePath);
 			
-			Bitmap bitmap = surfaceView.makeBitmap();
+			//Bitmap bitmap = surfaceView.makeBitmap();
 	
 			//bitmap.compress(compress_format, 100, osCommon);		
 			//osCommon.flush();
@@ -178,11 +179,16 @@ public class ImageCapture extends BaseActivity implements OnClickListener
 			osOwn.flush();
 			osOwn.close();
 			
-			Signature.doCallback(callbackUrl, filePath);
+			Signature.doCallback(callback, filePath);
 		} catch (Exception ex) {
 			Logger.E(TAG, ex.getMessage());
 		}
 	
+		
+	}
+	
+	private void takeSignature() {
+		takeSignature(callbackUrl, imageFormat, surfaceView.makeBitmap());
 	}
 
 

data/platform/android/Rhodes/src/com/rhomobile/rhodes/signature/Signature.java

@@ -27,25 +27,51 @@
 package com.rhomobile.rhodes.signature;
 
 import java.io.File;
+import java.util.Enumeration;
 import java.util.Map;
 import java.util.Vector;
 
 import android.content.Intent;
+import android.text.method.HideReturnsTransformationMethod;
+import android.view.View;
+import android.view.ViewGroup;
+import android.webkit.WebView;
+import android.widget.AbsoluteLayout;
 
 import com.rhomobile.rhodes.Logger;
 import com.rhomobile.rhodes.RhodesActivity;
 import com.rhomobile.rhodes.RhodesAppOptions;
 import com.rhomobile.rhodes.RhodesService;
+import com.rhomobile.rhodes.extmanager.IRhoExtension;
+import com.rhomobile.rhodes.util.ContextFactory;
 import com.rhomobile.rhodes.util.PerformOnUiThread;
+import com.rhomobile.rhodes.util.Utils;
 
-public class Signature {
+import com.rhomobile.rhodes.extmanager.IRhoExtData;
+import com.rhomobile.rhodes.extmanager.IRhoExtension;
+import com.rhomobile.rhodes.extmanager.IRhoExtManager;
+import com.rhomobile.rhodes.extmanager.RhoExtManagerSingleton;
 
-	private static final String TAG = "Signature";
+public class Signature implements IRhoExtension {
+
+	static final String TAG = "Signature";
 	
 	public static final String INTENT_EXTRA_PREFIX = RhodesService.INTENT_EXTRA_PREFIX + "signature.";
 	
-	private static void reportFail(String name, Exception e) {
-		Logger.E(TAG, "Call of \"" + name + "\" failed: " + e.getMessage());
+	private static final String SIGNATURE_EXT = "signature_ext";
+	
+	private static SignatureView ourInlineSignatureView = null;
+	
+	private static Signature ourInstance = null;
+	
+	public SignatureProperties mProperties = null;
+	
+	private static final boolean ENABLE_LOGGING = true;
+	
+	public static void reportMsg(String msg) {
+		if (ENABLE_LOGGING) {
+			Utils.platformLog("SignatureCapture", msg);
+		}
 	}
 	
 	private static void init() {
@@ -55,71 +81,56 @@ public class Signature {
 	}
 	
 	private static class Picture implements Runnable {
-		private String url;
 		private Class<?> klass;
-		private String imageFormat;
-		private int penColor;
-		private float penWidth;
-		private int bgColor;
 		
-		public Picture(String u, Class<?> c, String _imageFormat, int _penColor, float _penWidth, int _bgColor) {
-			url = u;
+		public Picture(Class<?> c) {
 			klass = c;
-			imageFormat = _imageFormat;
-			penColor = _penColor;
-			penWidth = _penWidth;
-			bgColor = _bgColor;
 		}
 		
 		public void run() {
 			init();
 			RhodesActivity ra = RhodesActivity.getInstance();
 			Intent intent = new Intent(ra, klass);
-			intent.putExtra(INTENT_EXTRA_PREFIX + "callback", url);
-			intent.putExtra(INTENT_EXTRA_PREFIX + "imageFormat", imageFormat);
-			intent.putExtra(INTENT_EXTRA_PREFIX + "penColor", penColor);
-			intent.putExtra(INTENT_EXTRA_PREFIX + "penWidth", penWidth);
-			intent.putExtra(INTENT_EXTRA_PREFIX + "bgColor", bgColor);
+			intent.putExtra(INTENT_EXTRA_PREFIX + "callback", getSharedInstance().mProperties.callbackUrl);
+			intent.putExtra(INTENT_EXTRA_PREFIX + "imageFormat", getSharedInstance().mProperties.imageFormat);
+			intent.putExtra(INTENT_EXTRA_PREFIX + "penColor", getSharedInstance().mProperties.penColor);
+			intent.putExtra(INTENT_EXTRA_PREFIX + "penWidth", getSharedInstance().mProperties.penWidth);
+			intent.putExtra(INTENT_EXTRA_PREFIX + "bgColor", getSharedInstance().mProperties.bgColor);
 			ra.startActivity(intent);
 		}
 	};
 	
-	public static void takeSignature(String url, Object params) {
-		try {
-			String imageFormat = "png";
-			int penColor = 0xFF66009A;
-			float penWidth = 2;
-			int bgColor = 0xFFFFFFFF;
-			
-			if (params instanceof Map<?,?>) {
-				Map<Object,Object> settings = (Map<Object,Object>)params;
-				
-				Object imgFrmtObj = settings.get("imageFormat");
-				if ((imgFrmtObj != null) && (imgFrmtObj instanceof String)) {
-					imageFormat = new String(((String)imgFrmtObj));
-				}
-				
-				Object penColorObj = settings.get("penColor");
-				if ((penColorObj != null) && (penColorObj instanceof String)) {
-					penColor = Integer.parseInt((String)penColorObj) | 0xFF000000;
-				}
-					
-				Object penWidthObj = settings.get("penWidth");
-				if ((penWidthObj != null) && (penWidthObj instanceof String)) {
-					penWidth = Float.parseFloat((String)penWidthObj);
-				}
+	private static void processParams(Object params) {
+		if (params == null) {
+			return;
+		}
+		if (params instanceof Map<?,?>) {
+			Map<Object,Object> settings = (Map<Object,Object>)params;
 
-				Object bgColorObj = settings.get("bgColor");
-				if ((bgColorObj != null) && (bgColorObj instanceof String)) {
-					bgColor = Integer.parseInt((String)bgColorObj) | 0xFF000000;
+			int prop_count = SignatureProperties.PROPERTIES_LIST.length;
+			int i;
+			for (i = 0; i < prop_count; i++) {
+				String prop_name = SignatureProperties.PROPERTIES_LIST[i];
+				Object valueObj = settings.get(prop_name);
+				if (valueObj != null) {
+					getSharedInstance().mProperties.setPropertyByName(prop_name, new String(((String)valueObj)));
 				}
 			}
-			
-			Runnable runnable = new Picture(url, ImageCapture.class, imageFormat, penColor, penWidth, bgColor);
-			PerformOnUiThread.exec(runnable, false);
+		}
+	}
+	
+	
+	public static void takeSignature(String url, Object params) {
+		try {
+			processParams(params);
+			getSharedInstance().mProperties.penColor = getSharedInstance().mProperties.penColor | 0xFF000000;
+			getSharedInstance().mProperties.bgColor = getSharedInstance().mProperties.bgColor | 0xFF000000;
+			getSharedInstance().mProperties.setPropertyByName(SignatureProperties.CALLBACK, url);
+			Runnable runnable = new Picture(ImageCapture.class);
+			PerformOnUiThread.exec(runnable);
 		}
 		catch (Exception e) {
-			reportFail("takeSignature", e);
+			Logger.E(TAG, e);
 		}
 	}
 
@@ -132,6 +143,162 @@ public class Signature {
 		callback(callbackUrl, fp, "", fp.length() == 0);
 	}
 
+	public static void inline_signature_visible(int visible, Object params) {
+		if (visible == 0) {
+			inline_signature_hide();
+			return;
+		}
+		
+		processParams(params);
+		
+		PerformOnUiThread.exec( new Runnable () {
+			public void run() {
+				reportMsg(" $$$ Start make of Signature View");
+				
+				ViewGroup wv = (WebView)RhodesService.getInstance().getMainView().getWebView(-1).getView();
+				if ((wv != null) && (ourInlineSignatureView != null)) {
+					wv.removeView(ourInlineSignatureView);
+					ourInlineSignatureView = null;
+				}
+				
+				ourInlineSignatureView = new SignatureView(ContextFactory.getUiContext(), null);
+				
+				{
+					if ((getSharedInstance().mProperties.bgColor & 0xFF000000) != 0xFF000000) {
+						//ourInlineSignatureView.setVisibility(View.INVISIBLE);
+						ourInlineSignatureView.isTransparency = true;
+					}
+					ourInlineSignatureView.setupView(	getSharedInstance().mProperties.penColor, 
+							getSharedInstance().mProperties.penWidth, 
+							getSharedInstance().mProperties.bgColor);
+					ourInlineSignatureView.setLayoutParams(
+							new AbsoluteLayout.LayoutParams(	getSharedInstance().mProperties.width, 
+																getSharedInstance().mProperties.height, 
+																getSharedInstance().mProperties.left, 
+																getSharedInstance().mProperties.top));
+					
+				}
+				
+				wv.addView(ourInlineSignatureView);
+				wv.bringChildToFront(ourInlineSignatureView);	
+				ourInlineSignatureView.requestFocus();
+				ourInlineSignatureView.bringToFront();
+				ourInlineSignatureView.invalidate();
+				
+				//wv.invalidate();
+				
+				reportMsg(" $$$ Finish make of Signature View");
+			}
+		});
+	}
+	
+	public static void inline_signature_capture(String callback_url) {
+		if (ourInlineSignatureView != null) {
+			ImageCapture.takeSignature(callback_url, getSharedInstance().mProperties.imageFormat, ourInlineSignatureView.makeBitmap());
+		}
+		inline_signature_hide();
+	}
+	
+	public static void inline_signature_clear() {
+		PerformOnUiThread.exec( new Runnable () {
+			public void run() {
+				if (ourInlineSignatureView != null) {
+					ourInlineSignatureView.doClear();
+					//RhodesService.getInstance().getMainView().getWebView(-1).getView().invalidate();
+					//ViewGroup wv = (WebView)RhodesService.getInstance().getMainView().getWebView(-1).getView();
+					//if (wv != null) {
+					//	wv.invalidate();
+					//}
+					
+				}
+			}
+		});
+	}
+	
+	public static void inline_signature_hide() {
+		PerformOnUiThread.exec( new Runnable () {
+			public void run() {
+				ViewGroup wv = (WebView)RhodesService.getInstance().getMainView().getWebView(-1).getView();
+				if ((wv != null) && (ourInlineSignatureView != null)) {
+					wv.removeView(ourInlineSignatureView);
+					ourInlineSignatureView = null;
+				}
+			}
+		});
+	}
+	
+	@Override
+	public void onBeforeNavigate(String url, IRhoExtData data) {
+		inline_signature_hide();
+	}
+	
+	public void onSetProperty(String name, String value, IRhoExtData data) {
+		if ((name == null) || (value == null)) {
+			return;
+		}
+		mProperties.setPropertyByName(name, value);
+		if ("Visibility".equalsIgnoreCase(name)) {
+			if ("Visible".equalsIgnoreCase(value)) {
+				// show
+				inline_signature_visible(1, null);
+			}
+			else {
+				// hide;
+				inline_signature_hide();
+			}
+		}
+		else if ("Clear".equalsIgnoreCase(name)) {
+			// clear
+			inline_signature_clear();
+		}
+	}
+	
+	public static Signature getSharedInstance() {
+		if (ourInstance == null) {
+			ourInstance = new Signature();
+			ourInstance.mProperties = new SignatureProperties();
+		}
+		return ourInstance;
+	}
+	
+	public static void registerSignatureCaptureExtension() {
+		RhoExtManagerSingleton.getRhoExtManagerInstance().registerExtension(SIGNATURE_EXT, getSharedInstance());
+	}
+	
 	public static native void callback(String callbackUrl, String filePath, String error, boolean cancelled);
 
+    @Override
+    public void onSetPropertiesData(String propId, String data, IRhoExtData ext) {
+        // Nothing
+    }
+
+    @Override
+    public void onNavigateComplete(String urlBeingNavigatedTo, IRhoExtData ext) {
+    }
+
+    @Override
+    public void onDocumentComplete(String urlOfDocument, IRhoExtData ext) {
+    }
+
+    @Override
+    public long onNavigateTimeout(String urlBeingNavigatedTo, IRhoExtData ext) {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
+    @Override
+    public long onSIPState(boolean bSIPState, IRhoExtData ext) {
+        return 0;
+    }
+
+    @Override
+    public long onNavigateError(String urlBeingNavigatedTo, IRhoExtData ext) {
+        return 0;
+    }
+
+    @Override
+    public void onAppActivate(boolean bActivate, IRhoExtData ext) {
+    }
 }
+
+