Merge branch 'master' of http://10.1.235.20:3000/ipu/android-share

* 'master' of http://10.1.235.20:3000/ipu/android-share:
  添加图片加水印的插件
  修改包名错误
  dataRequestAsync插件，dataRequest的异步版本，新建线程做网络请求

ipu-plugin-basic/build.gradle

@@ -0,0 +1,24 @@
apply plugin: 'java'
group = 'com.ai.ipu.mobile'
version = '3.0-SNAPSHOT'
tasks.withType(JavaCompile) {
	options.encoding = 'UTF-8'
}
repositories {
    maven { url "http://114.215.100.48:9090/nexus/content/groups/public/" }
}
dependencies {
	compileOnly group: 'junit', name: 'junit', version:'4.12'
	compileOnly group: 'android', name: 'android', version:'22'
	compileOnly group: 'com.ai.wade', name: 'wade-mobile-data', version:'1.0'
    compileOnly "android:android-lite-http:1.0"
	compileOnly "com.ai.ipu:ipu-basic:${IPU_VERSION}"
	compileOnly "com.ai.ipu.mobile:ipu-mobile-basic:${IPU_VERSION}"
	compileOnly "com.ai.ipu.mobile:ipu-mobile-framework:${IPU_VERSION}"
    compileOnly "com.ai.ipu.mobile:ipu-plugin-extend:${IPU_VERSION}"
    compileOnly "com.ai.ipu.mobile:ipu-mobile-ui:${IPU_VERSION}"
}

ipu-plugin-basic/gradle.properties

@@ -0,0 +1,18 @@
## Project-wide Gradle settings.
#
# For more details on how to configure your build environment visit
# http://www.gradle.org/docs/current/userguide/build_environment.html
#
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
# Default value: -Xmx1024m -XX:MaxPermSize=256m
# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
#
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
#
android_support_v4=1.0
IPU_VERSION=3.0-SNAPSHOT

ipu-plugin-basic/pom.xml

@@ -68,5 +68,14 @@
			<artifactId>ipu-plugin-extend</artifactId>
			<version>${ipu}</version>
		</dependency>
		<dependency>
			<groupId>com.ai.wade</groupId>
			<artifactId>wade-mobile-data</artifactId>
		</dependency>
		<dependency>
			<groupId>com.ai.ipu.mobile</groupId>
			<artifactId>ipu-mobile-basic</artifactId>
			<version>${ipu}</version>
		</dependency>
	</dependencies>
</project>

ipu-plugin-basic/src/main/java/com/ai/ipu/mobile/plugin/MobileCamera.java

@@ -1,6 +1,10 @@
package com.ai.ipu.mobile.plugin;
import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -12,6 +16,8 @@ import android.content.Intent;
import android.database.Cursor;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Canvas;
import android.graphics.Rect;
import android.net.Uri;
import android.os.Bundle;
import android.provider.MediaStore;
@@ -23,6 +29,7 @@ import com.ai.ipu.mobile.frame.plugin.Plugin;
import com.ai.ipu.mobile.ui.HintUtil;
import com.ai.ipu.mobile.ui.image.MobileGraphics;
import com.ai.ipu.mobile.util.DirectionUtil;
import com.ai.ipu.mobile.util.IpuMobileLog;
import com.ai.ipu.mobile.util.IpuMobileUtility;
import com.ailk.common.data.IData;
import com.ailk.common.data.impl.DataMap;
@@ -288,4 +295,87 @@ public class MobileCamera extends Plugin {
		//cursor.close(); //关闭会报错
		return path;
	}
	
	public void addWaterMarkForImage(JSONArray param) throws Exception {
	    String path = param.getString(0);
	    String waterPath = param.getString(1);
	    double left = param.getDouble(2);
	    double top = param.getDouble(3);
	    double right = param.getDouble(4);
	    double bottom = param.getDouble(5);
	    
	    String resultPath = addWaterMark(path, waterPath, left, top, right, bottom);
	    
	    callback(resultPath);
	}
	
	/**
    * @param path 原图片路径
    * @param waterPath 水印图片路径
    * @param left 水印图片左边位置，值为占整个图片的宽的比例
    * @param top 水印图片上边位置，值为占整个图片的高的比例
    * @param right 水印图片右边位置，值为占整个图片的宽的比例
    * @param bottom 水印图片下边位置，值为占整个图片的高的比例
    * @return 加了水印的图片路径
    */
   private String addWaterMark(String path, String waterPath, double left, double top, double right, double bottom) {
       Bitmap bitmap1 = BitmapFactory.decodeFile(path);
       Bitmap bitmap2 = BitmapFactory.decodeFile(waterPath);
       bitmap1 = bitmap1.copy(bitmap1.getConfig(), true);
       Canvas canvas = new Canvas(bitmap1);
       Rect rect = buildRect(bitmap1, left, top, right, bottom);
       canvas.drawBitmap(bitmap2, null, rect, null);
       String fileName = format.format(new Date()) + "-mark.png";
       File f = new File(DirectionUtil.getInstance(context).getImageDirection(true), fileName);
       if (!f.getParentFile().exists()) {
           f.getParentFile().mkdirs();
       }
       String res = f.getAbsolutePath();
       BufferedOutputStream bos = null;
       try {
           FileOutputStream outputStream = new FileOutputStream(f);
           bos = new BufferedOutputStream(outputStream);
           bitmap1.compress(Bitmap.CompressFormat.PNG, 100, bos);
       } catch (FileNotFoundException e) {
           e.printStackTrace();
           res = null;
       } finally {
           if (bos != null) {
               try {
                   bos.close();
               } catch (IOException e) {
                   e.printStackTrace();
               }
           }
       }
       return res;
   }
   private Rect buildRect(Bitmap bitmap, double left, double top, double right, double bottom) {
       left = fixIn1(left);
       right = fixIn1(right);
       top = fixIn1(top);
       bottom = fixIn1(bottom);
       int w = bitmap.getWidth();
       int h = bitmap.getHeight();
       int l = (int) (w * left);
       int t = (int) (h * top);
       int r = (int) (w * right);
       int b = (int) (h * bottom);
       if (l >= r || t >= b) {
           IpuMobileLog.w(TAG, "buildRect: invalid params");
           return new Rect(0, 0, w/4, h/4);
       }
       Rect rect = new Rect(l, t, r, b);
       return rect;
   }
   private double fixIn1(double v) {
       if (v > 1) v = 1;
       if (v < 0) v = 0;
       return v;
   }
}

ipu-plugin-basic/src/main/java/com/ai/ipu/mobile/plugin/MobileNetWork.java

@@ -28,6 +28,7 @@ import com.ai.ipu.mobile.common.bluetooth.util.BluetoothTool;
import com.ai.ipu.mobile.common.sms.listener.OnSmsReceiveListener;
import com.ai.ipu.mobile.common.sms.util.SmsTool;
import com.ai.ipu.mobile.frame.IIpuMobile;
import com.ai.ipu.mobile.frame.activity.IpuMobileActivity;
import com.ai.ipu.mobile.frame.config.MobileConfig;
import com.ai.ipu.mobile.frame.config.ServerDataConfig;
import com.ai.ipu.mobile.frame.plugin.Plugin;
@@ -175,6 +176,27 @@ public class MobileNetWork extends Plugin {
		callback(result);
	}
	
	public void dataRequestAsync(final JSONArray param) throws Exception {
	    final String dataAction = param.getString(0);
        final String data = param.getString(1);
        final String headers = param.optString(5);
        
        new Thread(new Runnable() {
            
            @Override
            public void run() {
                String result = null;
                try {
                    result = isNull(headers) ? dataRequest(dataAction, isNull(data) ? null : new DataMap(data)) :
                        dataRequest(dataAction, isNull(data) ? null : new DataMap(data),new DataMap(headers));
                } catch (Exception e) {
                    exceptionInThread(e, "dataRequest", param);
                }
               callback(result);
            }
        }).start();
	}
	
	public void dataRequestWithHost(JSONArray param) throws Exception {
	    String requestUrl = param.getString(0);// http://ip:port/servername/mobiledata
        String dataAction = param.getString(1);

ipu-plugin-basic/src/main/java/com/ai/ipu/mobile/plugin/MobileUI.java

@@ -65,7 +65,7 @@ import com.ailk.common.data.IDataset;
import com.ailk.common.data.impl.DataMap;
public class MobileUI extends Plugin {
	private SimpleProgressDialog progressDialog = null;
	private static SimpleProgressDialog progressDialog = null;
	private final int REQUEST_CODE_CUSTOM_DIALOG = 100;
	private final int REQUEST_CODE_CUSTOM_WINDOW = 200;
	private final int REQUEST_CODE_SLIDING_MENU = 300;

ipu-scan-lib/AndroidManifest.xml

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
    package="com.ipu.scan"
    package="com.ai.ipu.scan"
    android:versionCode="1"
    android:versionName="1.0" >

ipu-scan-lib/res/layout/activity_scan_multiple.xml

@@ -52,7 +52,7 @@
		            android:src="@drawable/scan_flashlight_off" />
	        </RelativeLayout>
		
		        <com.ipu.scan.view.ViewfinderView
		        <com.ai.ipu.scan.view.ViewfinderView
			        android:id="@+id/viewfinder_view"
			        android:layout_width="wrap_content"
			        android:layout_height="wrap_content"

ipu-scan-lib/res/layout/scan_zxing_capture.xml

@@ -30,7 +30,7 @@
            android:layout_alignParentTop="true"
            android:src="@drawable/scan_flashlight_off" />
        <com.ipu.scan.view.ViewfinderView
        <com.ai.ipu.scan.view.ViewfinderView
	        android:id="@+id/viewfinder_view"
	        android:layout_width="wrap_content"
	        android:layout_height="wrap_content"/>