Merge branch 'master' of

http://114.215.100.48:3000/ipu/android-share.git

Conflicts:
	display-server/.gitignore

display-client/.classpath

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
	<classpathentry kind="src" path="gen"/>
	<classpathentry kind="src" path="src"/>
	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
	<classpathentry kind="output" path="bin/classes"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
	<classpathentry kind="src" path="src"/>
	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
	<classpathentry kind="src" path="gen"/>
	<classpathentry kind="output" path="bin/classes"/>
</classpath>

display-client/assets/mobile-config.xml

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<configs>
    <!-- 请求主机名或请求地址。包括服务器的ip地址和端口 -->
	<config name="request_host" value="http://10.173.148.168:8080"/>
	<config name="request_host" value="http://114.215.100.48:8080"/>
	<!-- 必须。10.0.2.2为Android模拟器的保留ip地址。访问到本机电脑时使用 -->
	<!-- <config name="request_host" value="http://10.0.2.2:8080"/> -->
	<!-- 必须。容器应用名或请求根路径 -->

display-server/.gitignore

@@ -1,3 +1,5 @@
/.settings
/display.war
/bin/
/.settings
/display.war

display-server/web/res/js/mobile/browser-toolkit.js

@@ -305,8 +305,8 @@ define(["module","jcl","clientTool"],function(module,Wade,clientTool) {
	 		post:function(action,params,callback,error,settings){
	 			browserTool.ajax.request("mobiledata",action,params,callback,error,Wade.extend({type:"POST",encoding:"UTF-8"},settings));
	 		},
	 		html:function(action,params,callback,error,settings){
	 			browserTool.ajax.request("mobile",action,params,callback,error,Wade.extend({type:"POST",encoding:"UTF-8"},settings),true);
	 		html:function(action,params,callback,error,settings,isContext){
	 			browserTool.ajax.request("mobile",action,params,callback,error,Wade.extend({type:"POST",encoding:"UTF-8"},settings),isContext);
	 		}
	    };
	})();

display-server/web/res/js/mobile/mobile-browser.js

@@ -53,7 +53,7 @@ define(["browserTool","jcl"],function(browserTool,Wade) {
		};
		/*将模板转换成html源码*/
		this.getTemplate = function(action, param, callback, err) {
			browserTool.ajax.html(action, param, callback, err);
			browserTool.ajax.html(action, param, callback, err, null, true);
		};
		/*将Page转换成html源码*/
		this.getPage = function(action, param, callback, err) {

general-web-server/web/html/myindex.html

@@ -42,6 +42,27 @@
		
		
		<br /><br />
		<button style="width:200px;height:100px;" id="setMemoryCache">设置缓存</button>
		<script type="text/javascript">
			var btn = document.getElementById("setMemoryCache");
			btn.onclick = function(){
				WadeMobile.setMemoryCache("Key001","我是缓存中的测试值-Value001");
			}
		</script>
		
		<br /><br />
		<button style="width:200px;height:100px;" id="getMemoryCache">获取缓存</button>
		<script type="text/javascript">
			var btn = document.getElementById("getMemoryCache");
			btn.onclick = function(){
				WadeMobile.getMemoryCache(function(value){
					alert(value);
				},"Key001","没有取到值我，我是默认值");
			}
		</script>
		
		
		<br /><br />
		<button style="width: 200px;height: 100px;" id="sendAjaxPost">发送Post请求</button>
		<script type="text/javascript">
			var btn = document.getElementById("sendAjaxPost");

general-web-server/web/res/js/wade-mobile.js

@@ -1,7 +1,7 @@
/**
 * 与客户端交互的基础API
 */
window.Mobile = window.WadeMobile = (function(Wade,Base64) {
window.Mobile = window.WadeMobile = (function() {
	//终端类型,a为android,i为ios
	var deviceType = (function(){
		var sUserAgent = navigator.userAgent.toLowerCase();

ipu-count-test/assets/count-config.xml

@@ -1,26 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<config>
    
        <delegate name="firstDele" class="com.ai.ipu.count.test.TestBeanImpl">
            <aspect class="com.ai.ipu.count.test.TestLogImpl"/>
            <method>sayHello</method>
        </delegate>
<config>    
    <count class="com.ai.ipu.count.test.TestLogImpl">
        <monitor class="com.ai.ipu.count.test.TestBeanImpl">
            
        </monitor>
        
        <delegate name="secondDele" class="com.ai.ipu.count.test.TestBeanImpl2">
            <aspect class="com.ai.ipu.count.test.TestLogImpl"/>
            <method>sayBey</method>
        <monitor class="com.ai.ipu.count.test.TestBeanImpl2">
            <method>sayHello</method>
        </delegate>
  
            <method>sayHey</method>
        </monitor>
    </count>
    
    <!-- <aspect class="com.ai.ipu.count.test.TestLogImpl">
        <delegate class="com.ai.ipu.count.test.TestBeanImpl">
            <method>sayHello</method>
        </delegate>
    <count class="com.ai.ipu.count.test.TestLogImpl222222">
        <monitor class="com.ai.ipu.count.test.TestBeanImpl222">
            <method>sayHello22222</method>
        </monitor>
        
        <delegate class="com.ai.ipu.count.test.TestBeanImpl2">
            <method>sayHello</method>
            <method>sayHey</method>
        </delegate>
    </aspect> -->
        <monitor class="com.ai.ipu.count.test.TestBeanImpl222222">
            <method>sayHello222222</method>
            <method>sayHey222222</method>
        </monitor>
    </count>
    
</config>

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

@@ -85,11 +85,7 @@ public class TestActivity extends Activity {
				new Thread(new Runnable() {
					@Override
					public void run() {
						try {
							IpuUDPHelper.send("Hello UDP");
						} catch (IOException e) {
							e.printStackTrace();
						}
						IpuUDPHelper.sendReport(getApplicationContext(), "Hello UDP");
					}
				}).start();
			}
@@ -103,7 +99,7 @@ public class TestActivity extends Activity {
			@Override
			public void onClick(View v) {
				try {
					IpuUDPUtil.FileUtil.getInstance(getApplicationContext()).clear(IpuConstant.LOG_FILE_NAME);
					IpuUDPUtil.FileUtil.getInstance().clear(IpuConstant.LOG_FILE_NAME);
				} catch (IOException e) {
					e.printStackTrace();
				}

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

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