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

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

@@ -0,0 +1,94 @@
+package com.rhomobile.rhodes.signature;
+
+import com.rhomobile.rhodes.Logger;
+
+class SignatureProperties {
+	
+	public int penColor;
+	public float penWidth;
+	public int bgColor;
+	
+	public int left;
+	public int top;
+	public int width;
+	public int height;
+	
+	String imageFormat;
+	
+	String callbackUrl;
+	
+	public static final String PEN_COLOR = "penColor";
+	public static final String PEN_WIDTH = "penWidth";
+	public static final String BG_COLOR = "bgColor";
+	public static final String IMAGE_FORMAT = "imageFormat";
+	public static final String LEFT = "left";
+	public static final String TOP = "top";
+	public static final String WIDTH = "width";
+	public static final String HEIGHT = "height";
+	public static final String CALLBACK = "callback";
+	
+	public static final String[] PROPERTIES_LIST = {	PEN_COLOR,
+														PEN_WIDTH,
+														BG_COLOR,
+														IMAGE_FORMAT,
+														LEFT,
+														TOP,
+														WIDTH,
+														HEIGHT,
+														CALLBACK};
+	
+	public SignatureProperties() {
+		penColor = 0xFF66009A;
+		penWidth = 2;
+		bgColor = 0xFFFFFFFF;
+		
+		left = 0;
+		top = 0;
+		width = 200;
+		height = 200;
+		
+		imageFormat = "png";
+		
+		callbackUrl = "";
+	}
+	
+	void setPropertyByName(String name, String value) {
+		if ((name == null) || (value == null)) {
+			return;
+		}
+		try {
+			if (PEN_COLOR.equalsIgnoreCase(name)) {
+				penColor = (int)Long.parseLong(value);
+			}
+			else if (PEN_WIDTH.equalsIgnoreCase(name)) {
+				penWidth = Float.parseFloat(value);
+			}
+			else if (BG_COLOR.equalsIgnoreCase(name)) {
+				bgColor = (int)Long.parseLong(value);
+			}
+			else if (LEFT.equalsIgnoreCase(name)) {
+				left = Integer.parseInt(value);
+			}
+			else if (TOP.equalsIgnoreCase(name)) {
+				top = Integer.parseInt(value);
+			}
+			else if (WIDTH.equalsIgnoreCase(name)) {
+				width = Integer.parseInt(value);
+			}
+			else if (HEIGHT.equalsIgnoreCase(name)) {
+				height = Integer.parseInt(value);
+			}
+			else if (IMAGE_FORMAT.equalsIgnoreCase(name)) {
+				imageFormat = new String(value);
+			}
+			else if (CALLBACK.equalsIgnoreCase(name)) {
+				callbackUrl = new String(value);
+			}
+		}
+		catch (Exception e) {
+		    Logger.E(Signature.TAG, "SignatureProperties Exception during set param["+name+"] to value["+value+"]");
+			Logger.E(Signature.TAG, e);
+		}
+	}	
+	
+}

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

@@ -32,7 +32,9 @@ import java.util.Vector;
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
+import android.graphics.Color;
 import android.graphics.Paint;
+import android.graphics.PixelFormat;
 import android.graphics.Rect;
 import android.graphics.PointF;
 import android.os.Bundle;
@@ -43,7 +45,9 @@ import android.view.MotionEvent;
 import java.io.Serializable;
 import java.io.IOException;
 
+
 import com.rhomobile.rhodes.Logger;
+import com.rhomobile.rhodes.util.PerformOnUiThread;
 
 class SignatureView extends SurfaceView implements SurfaceHolder.Callback {
 
@@ -51,7 +55,7 @@ class SignatureView extends SurfaceView implements SurfaceHolder.Callback {
 	public float penWidth;
 	public int bgColor;
 	
-	
+	public boolean isTransparency;
 	
 	private class PointSequence {
 		public Vector<PointF> mPoints = new Vector<PointF>();
@@ -114,14 +118,14 @@ class SignatureView extends SurfaceView implements SurfaceHolder.Callback {
     
     private Paint mPaint;
     
-   
+  
     public void doClear() {
     	// clear paths
     	mSequences.clear();
-    	doFullRedraw();
+    	doFullRedraw(mCanvas, mBitmap, true, true);
+    	invalidate();
     }
-	
-     
+	     
 	public void onRestoreInstanceState(Bundle savedInstanceState) {
 		SignatureViewState s = (SignatureViewState)savedInstanceState.getSerializable(mStateID);
 		mSequences = s.mSequences;
@@ -135,19 +139,39 @@ class SignatureView extends SurfaceView implements SurfaceHolder.Callback {
 		outState.putSerializable(mStateID, s);
 	}
 	
-	private void doFullRedraw() {
-		if (mCanvas == null) {
+	private void doFullRedraw(Canvas canvas, Bitmap bitmap, boolean useAlpha, boolean redrawOnScreen) {
+		if (canvas == null) {
 			return;
 		}
 		
         Paint paint = new Paint();
         paint.setAntiAlias(false);
-        paint.setARGB(	255, 
-        				(bgColor & 0xFF0000) >> 16, 
-        				(bgColor & 0xFF00) >> 8,
-        				(bgColor & 0xFF));
-   	 
-        mCanvas.drawRect(0, 0, mCanvas.getWidth(), mCanvas.getHeight(), paint);
+        
+        int a = (bgColor & 0xFF000000) >> 24;
+	        	
+	    if (isTransparency) {    	
+		    if (useAlpha) {
+		    	bitmap.eraseColor(bgColor);
+		    }
+		    else {
+		        a = 255;
+		    	bitmap.eraseColor(bgColor | 0xFF000000);
+			    //canvas.drawRect(0, 0, canvas.getWidth(), canvas.getHeight(), paint);
+		    }
+	    }
+	    else {
+		    paint.setARGB(	a, 
+					(bgColor & 0xFF0000) >> 16, 
+					(bgColor & 0xFF00) >> 8,
+					(bgColor & 0xFF));
+	 
+		    canvas.drawRect(0, 0, canvas.getWidth(), canvas.getHeight(), paint);
+	    }
+	    
+    	//bitmap.eraseColor(Color.argb(	a,
+		//								(bgColor & 0xFF0000) >> 16, 
+		//								(bgColor & 0xFF00) >> 8,
+		//								(bgColor & 0xFF)));
         
         // draw path
         int s;
@@ -159,7 +183,7 @@ class SignatureView extends SurfaceView implements SurfaceHolder.Callback {
 	        		PointF prev = ps.mPoints.elementAt(p-1);
 	        		PointF cur = ps.mPoints.elementAt(p);
 	        		if ((prev != null) && (cur != null)) {
-	        			mCanvas.drawLine(prev.x, prev.y, cur.x, cur.y, mPaint);
+	        			canvas.drawLine(prev.x, prev.y, cur.x, cur.y, mPaint);
 	        		}
 	        	}
         	}
@@ -176,50 +200,89 @@ class SignatureView extends SurfaceView implements SurfaceHolder.Callback {
         }
         
         // update screen
-	     Canvas c = null;
-	     try {
-	         c = getHolder().lockCanvas(null);
-	         synchronized (getHolder()) {
-	             c.drawBitmap(mBitmap, 0, 0, null);
-	         }
-	     } finally {
-	         if (c != null) {
-	        	 getHolder().unlockCanvasAndPost(c);
-	         }
-	     }    	 
+        if (redrawOnScreen && (!isTransparency)) {
+        	Canvas c = null;
+		     try {
+		         c = getHolder().lockCanvas(null);
+		         synchronized (getHolder()) {
+		             c.drawBitmap(bitmap, 0, 0, null);
+		         }
+		     } finally {
+		         if (c != null) {
+		        	 getHolder().unlockCanvasAndPost(c);
+		         }
+		     }
+        }
+        else {
+        	if (redrawOnScreen && isTransparency) {
+        		invalidate();
+        	}
+        }
 	}
     
 	private void doDrawSegment(float x1, float y1, float x2, float y2) {
 	     Canvas c = null;
 	     Rect rect = new Rect((int)(x1-1),(int)(y1-1),(int)(x1+1),(int)(y1+1));
 	     rect.union((int)(x2-1),(int)(y2-1),(int)(x2+1),(int)(y2+1));
+	     ///*
 	     try {
+	      
 	         c = getHolder().lockCanvas(rect);
 	         synchronized (getHolder()) {
-	             mCanvas.drawLine(x1,y1,x2,y2,mPaint);
-	             c.drawBitmap(mBitmap, rect, rect, null);
+	        	 if ((mCanvas != null) && (mBitmap != null)) {
+		        	 mCanvas.drawLine(x1,y1,x2,y2,mPaint);
+		             //c.drawLine(x1,y1,x2,y2,mPaint);
+		             //mCanvas.drawLine(x1,y1,x2,y2,mPaint);
+		        	 if (!isTransparency) {
+		        		 c.drawBitmap(mBitmap, rect, rect, null);
+		        	 }
+	        	 }
 	         }
 	     } finally {
 	         if (c != null) {
 	        	 getHolder().unlockCanvasAndPost(c);
 	         }
-	     }    	 
-		
+	     }
+	     //*/    	 
+		invalidate(rect);
 	}
     
-	
 	public void setupView(int _penColor, float _penWidth, int _bgColor) {
 		penColor = _penColor;
 		penWidth = _penWidth;
 		bgColor = _bgColor;
         mPaint = new Paint();
         mPaint.setAntiAlias(true);
-        mPaint.setColor(0xFF000000 | penColor);
+        mPaint.setColor(Color.argb(	(penColor & 0xFF000000) >> 24,
+					        		(penColor & 0xFF0000) >> 16,
+					        		(penColor & 0xFF00) >> 8,
+					        		penColor & 0xFF));
         mPaint.setStyle(Paint.Style.STROKE);
         mPaint.setStrokeJoin(Paint.Join.ROUND);
         mPaint.setStrokeCap(Paint.Cap.ROUND);
         mPaint.setStrokeWidth(penWidth);
-        doFullRedraw();
+        
+        Signature.reportMsg("$$$   setupView()");
+        Signature.reportMsg("$$$        penColor = "+String.valueOf(penColor));
+        Signature.reportMsg("$$$        bgColor = "+String.valueOf(bgColor));
+        
+    	setDrawingCacheEnabled(false);
+        if (isTransparency) {
+        	setZOrderOnTop(true);
+        	getHolder().setFormat(PixelFormat.TRANSLUCENT);
+        	setBackgroundColor(0);
+        }
+        doFullRedraw(mCanvas, mBitmap, true, true);    
+        
+        if (isTransparency) {
+	        PerformOnUiThread.exec(new Runnable() {
+	        	public void run() {
+	        		//invalidate();//
+	        		//setVisibility(VISIBLE);
+	        		doDrawSegment(-10,-10,-11,-11);
+	        	}
+	        },10);
+        }
 	}
     
     public SignatureView(Context context, AttributeSet attrs) {
@@ -232,6 +295,7 @@ class SignatureView extends SurfaceView implements SurfaceHolder.Callback {
 
         setVisibility(VISIBLE);
         
+        isTransparency = false;
 
         mPaint = new Paint();
         mPaint.setAntiAlias(true);
@@ -243,18 +307,25 @@ class SignatureView extends SurfaceView implements SurfaceHolder.Callback {
 
         bgColor = 0xFFFFFFFF;
         
+        //setBackgroundColor(0);
+        //setZOrderOnTop(true);
+        //getHolder().setFormat(PixelFormat.TRANSLUCENT);
+        
         setFocusable(true); // make sure we get key events
         
         requestFocus();
         bringToFront();
-        
-        
     }
 	
     public Bitmap makeBitmap() {
-    	return mBitmap;
+        Bitmap b = Bitmap.createBitmap(getWidth(), getHeight(), Bitmap.Config.ARGB_8888);
+        b.eraseColor(bgColor | 0xFF000000);
+        Canvas c = new Canvas(b);
+        doFullRedraw(c, b, false, false);
+        return b;
     }
     
+    
     public boolean onTouchEvent(MotionEvent event) {
     	 float x = event.getX();
     	 float y = event.getY();
@@ -280,14 +351,28 @@ class SignatureView extends SurfaceView implements SurfaceHolder.Callback {
     	 return true;
      }
      
+    ///*
+    protected void onDraw (Canvas canvas) {
+    	if (isTransparency) {
+	    	if (mBitmap != null) {
+	    		canvas.drawBitmap(mBitmap, 0, 0, null);
+	    	}
+    	}
+    	else {
+    		super.onDraw(canvas);
+    	}
+    }
+    //*/
     
     /* Callback invoked when the surface dimensions change. */
     public void surfaceChanged(SurfaceHolder holder, int format, int width,
             int height) {
  		Logger.D(TAG, "SurfaceChanged()");
-        mBitmap = Bitmap.createBitmap(getWidth(), getHeight(), Bitmap.Config.RGB_565);
+        mBitmap = Bitmap.createBitmap(getWidth(), getHeight(), Bitmap.Config.ARGB_8888);
+        mBitmap.eraseColor(bgColor);
         mCanvas = new Canvas(mBitmap);
-        doFullRedraw();
+        doFullRedraw(mCanvas, mBitmap, true, true);
+        invalidate();
     }
     
     

data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/GoogleWebView.java

@@ -5,13 +5,12 @@ import java.lang.reflect.Constructor;
 import com.rhomobile.rhodes.RhodesActivity;
 
 import android.app.Activity;
-import android.content.Context;
 import android.os.Build;
 import android.view.View;
 import android.webkit.WebChromeClient;
 import android.webkit.WebViewClient;
 
-public class GoogleWebView implements WebView {
+public class GoogleWebView implements IRhoWebView {
 
     private static WebChromeClient mChromeClient;
     private static WebViewClient mWebViewClient;
@@ -126,4 +125,9 @@ public class GoogleWebView implements WebView {
     public void loadDataWithBaseURL(String baseUrl, String data, String mimeType, String encoding, String historyUrl) {
         mWebView.loadDataWithBaseURL(baseUrl, data, mimeType, encoding, historyUrl);
     }
+
+    @Override
+    public void stopLoad() {
+        mWebView.stopLoading();
+    }
 }

data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/{WebView.java → IRhoWebView.java}

@@ -2,7 +2,7 @@ package com.rhomobile.rhodes.webview;
 
 import android.view.View;
 
-public interface WebView {
+public interface IRhoWebView {
     View getView();
     boolean canGoBack();
     void goBack();
@@ -13,4 +13,5 @@ public interface WebView {
     void loadUrl(String url);
     void loadData(String data, String mime, String encoding);
     void loadDataWithBaseURL(String baseUrl, String data, String mimeType, String encoding, String historyUrl);
+    void stopLoad();
 }

data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/RhoWebViewClient.java

@@ -30,6 +30,7 @@ import com.rhomobile.rhodes.Logger;
 import com.rhomobile.rhodes.RhoConf;
 import com.rhomobile.rhodes.RhodesActivity;
 import com.rhomobile.rhodes.RhodesService;
+import com.rhomobile.rhodes.extmanager.RhoExtManagerSingleton;
 
 import android.graphics.Bitmap;
 import android.net.http.SslError;
@@ -50,6 +51,9 @@ public class RhoWebViewClient extends WebViewClient
     
     @Override
     public void onPageStarted(WebView view, String url, Bitmap favicon) {
+        
+        RhoExtManagerSingleton.getRhoExtManagerInstance().onBeforeNavigate(url);
+        
         if (RhodesActivity.ENABLE_LOADING_INDICATION)
             RhodesActivity.safeGetInstance().getWindow().setFeatureInt(Window.FEATURE_PROGRESS, 0);
         else

data/platform/android/build/RhodesSRC_build.files

@@ -71,6 +71,7 @@ platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/Phonebook.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/signature/ImageCapture.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/signature/Signature.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/signature/SignatureView.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/signature/SignatureProperties.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/socket/RhoSockAddr.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/socket/RhoSocket.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/socket/RhoSocketImpl.java
@@ -95,8 +96,14 @@ platform/android/Rhodes/src/com/rhomobile/rhodes/webview/RhoWebSettings.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/webview/RhoWebSettingsNew.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/webview/RhoWebSettingsOld.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/webview/RhoWebViewClient.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/webview/WebView.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/webview/IRhoWebView.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/webview/GoogleWebView.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/IRhoExtData.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/IRhoExtension.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/IRhoExtManager.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/RhoExtDataImpl.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/RhoExtManagerImpl.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/RhoExtManagerSingleton.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality01.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality02.java