Merge branch 'master' of http://114.215.100.48:3000/ipu/android-share.git

.gitignore

@@ -1,3 +1,6 @@
/.DS_Store
wade-mobile-push-yunba
general-web-server/web/WEB-INF/classes
*.iml
.idea/
out/

ipu-count-test/src/com/ai/ipu/count/test/TestActivity.java

@@ -1,26 +1,27 @@
package com.ai.ipu.count.test;
import java.io.IOException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import android.app.Activity;
import android.content.pm.PackageManager;
import android.os.Bundle;
import android.os.SystemClock;
import android.util.Log;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.Button;
import android.widget.LinearLayout;
import android.widget.LinearLayout.LayoutParams;
import com.ai.ipu.basic.reflect.IpuReflect;
import com.ai.ipu.basic.reflect.ReflectUtil;
import com.ai.ipu.count.IpuCount;
import com.ai.ipu.count.info.IpuCountReport;
import com.ai.ipu.count.proxy.IpuCountHolder;
import com.ai.ipu.count.test.count.ICountBean;
import com.ai.ipu.count.test.count.impl.TestCountBean;
import com.ai.ipu.count.test.count.impl.TestCountOtherBean;
import com.ai.ipu.count.util.IpuCountConstant;
import com.ai.ipu.count.util.IpuUDPHelper;
import com.ai.ipu.count.util.IpuUDPUtil;
import java.io.IOException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
public class TestActivity extends Activity {
	private static final String TAG = TestActivity.class.getName();
@@ -66,7 +67,7 @@ public class TestActivity extends Activity {
				// TODO Auto-generated method stub
				try {
					Object obj = IpuCountHolder.getCountInstance(TestCountBean.class);
					Object result = IpuReflect.invokeMethod(obj, "sayHello", "");
					Object result = ReflectUtil.invokeMethod(obj, "sayHello", "");
					Log.d(TAG, "返回结果:" + result);
				} catch (Exception e) {
					// TODO Auto-generated catch block
@@ -158,13 +159,12 @@ public class TestActivity extends Activity {
			@Override
			public void onClick(View paramView) {
				// TODO Auto-generated method stub
				new Thread(new Runnable() {
					@Override
					public void run() {
						IpuUDPHelper.sendReport(getApplicationContext(), "Hello UDP");
					}
				}).start();
			}
                try {
                    IpuCount.send("Hello UDP");
                } catch (PackageManager.NameNotFoundException e) {
                    e.printStackTrace();
                }
            }
		});
		layout.addView(button);
		
@@ -174,14 +174,42 @@ public class TestActivity extends Activity {
		button.setOnClickListener(new View.OnClickListener() {
			@Override
			public void onClick(View v) {
				try {
					IpuUDPUtil.FileUtil.getInstance().clear(IpuCountConstant.LOG_FILE_NAME);
				} catch (IOException e) {
					e.printStackTrace();
				}
//				try {
//					IpuUDPUtil.FileUtil.getInstance().clear(IpuCountConstant.LOG_FILE_NAME);
//				} catch (IOException e) {
//					e.printStackTrace();
//				}
			}
		});
		layout.addView(button);
        button = new Button(this);
        button.setText("8-发送设备日志");
        button.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                try {
                    IpuCount.sendDevice("设备日志");
                } catch (PackageManager.NameNotFoundException e) {
                    e.printStackTrace();
                }
            }
        });
        layout.addView(button);
        button = new Button(this);
        button.setText("9-发送插件日志");
        button.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                try {
                    IpuCount.sendPlugin(SystemClock.currentThreadTimeMillis(),"Plugin Action");
                } catch (PackageManager.NameNotFoundException e) {
                    e.printStackTrace();
                }
            }
        });
        layout.addView(button);
		
		setContentView(layout);
	}

ipu-count-test/src/com/ai/ipu/count/test/TestApplication.java

@@ -2,7 +2,7 @@ package com.ai.ipu.count.test;
import android.app.Application;
import com.ai.ipu.count.IpuReport;
import com.ai.ipu.count.IpuCount;
public class TestApplication extends Application {
	@Override
@@ -10,6 +10,6 @@ public class TestApplication extends Application {
		super.onCreate();
		//移到IpuReport的initiate方法中
//		IpuCrashHandler.getInstance().init(getApplicationContext());
		IpuReport.initiate(getApplicationContext(),"127.0.0.1",6001);
        IpuCount.init(this,"127.0.0.1",6001);
	}
}