Преглед на файлове

优化ipu-show在部分机型中,iScroll等依赖高度计算的组件不正常问题

guohh преди 6 години
родител
ревизия
ea7f8d1d80
променени са 23 файла, в които са добавени 137 реда и са изтрити 131 реда
  1. 41 37
      show-server/src/main/webapp/biz/js/index.js
  2. 2 2
      show-server/src/main/webapp/biz/js/more/opensource/iscroll.js
  3. 2 2
      show-server/src/main/webapp/biz/js/plugins/baidumap.js
  4. 2 2
      show-server/src/main/webapp/biz/js/plugins/basic.js
  5. 2 2
      show-server/src/main/webapp/biz/js/plugins/contacts.js
  6. 2 2
      show-server/src/main/webapp/biz/js/plugins/database.js
  7. 2 3
      show-server/src/main/webapp/biz/js/plugins/file/file.js
  8. 2 2
      show-server/src/main/webapp/biz/js/plugins/jPush.js
  9. 2 2
      show-server/src/main/webapp/biz/js/plugins/localstorage.js
  10. 2 2
      show-server/src/main/webapp/biz/js/plugins/mail.js
  11. 2 2
      show-server/src/main/webapp/biz/js/plugins/map.js
  12. 2 2
      show-server/src/main/webapp/biz/js/plugins/photo.js
  13. 1 1
      show-server/src/main/webapp/biz/js/plugins/share.js
  14. 1 1
      show-server/src/main/webapp/biz/js/plugins/storage.js
  15. 1 3
      show-server/src/main/webapp/biz/js/plugins/ui/ui-customAlertDialog.js
  16. 1 1
      show-server/src/main/webapp/biz/js/plugins/ui/ui-customDialog.js
  17. 1 1
      show-server/src/main/webapp/biz/js/plugins/ui/ui-customWindow.js
  18. 1 1
      show-server/src/main/webapp/biz/js/plugins/ui/ui-slidingMenu.js
  19. 1 1
      show-server/src/main/webapp/biz/js/plugins/ui/ui.js
  20. 58 55
      show-server/src/main/webapp/biz/js/plugins/uploaddownload.js
  21. 2 2
      show-server/src/main/webapp/biz/js/plugins/videocompress.js
  22. 2 2
      show-server/src/main/webapp/biz/js/plugins/yunbaPush.js
  23. 5 3
      show-server/src/main/webapp/template/common/Head.html

+ 41 - 37
show-server/src/main/webapp/biz/js/index.js

@ -2,43 +2,47 @@ require(["ipuUI", "jquery", "iScroll","mobile","wadeMobile"], function (ipuUI, $
2 2
	// 首页被其他iframe嵌入时,需要加入这一行代码,不是被其它页面嵌入,可注释
3 3
	// ipu.page.options.target = window;
4 4
	
5
	var navBar = ipuUI.navBar(".ipu-navbar", {
6
        animate: true
7
    });
8
    
9
    $("#plugin-index,#js-Plugin,#static-Plugin,#more-Plugin, .ipu-grid-nine").children().click(function(){
10
    	var action = $(this).data("action");
11
    	if(action == "ruUI"){
12
			return;
13
		}
14
    	if(action && action != ""){
15
    		Mobile.openPage(action);
16
    	}else{
17
    		Mobile.alert("This element doesn't bind the attribute of 'data-action'");
18
    	}
19
    });
20
    
21
    Mobile.setBackCallListener(function(e){
22
		alert(e);
23
	});
24
    
25
    $("#rnUI").click(function(){
26
    	WadeMobile.openRN("UI_GRIDVIEW");
27
    });
28
    
29
    new iScroll("scrollDemo"); // 第二页设置可以拖动
30
31
    $("#invokeException").click(function () {
32
        ipu.showPreloader();
33
        var param = new Wade.DataMap();
5
	// ipuUI.js扩展的jquery方法,用来防止部分手机webview中ready事件触发,不能获取元素尺寸,导致组件初始异常或失败的情况
6
	// 需要引入ipuUI才能使用sizeReady方法
7
	$.sizeReady(function(){ 
8
		var navBar = ipuUI.navBar(".ipu-navbar", {
9
	        animate: true
10
	    });
11
	    
12
	    $("#plugin-index,#js-Plugin,#static-Plugin,#more-Plugin, .ipu-grid-nine").children().click(function(){
13
	    	var action = $(this).data("action");
14
	    	if(action == "ruUI"){
15
				return;
16
			}
17
	    	if(action && action != ""){
18
	    		Mobile.openPage(action);
19
	    	}else{
20
	    		Mobile.alert("This element doesn't bind the attribute of 'data-action'");
21
	    	}
22
	    });
23
	    
24
	    Mobile.setBackCallListener(function(e){
25
			alert(e);
26
		});
27
	    
28
	    $("#rnUI").click(function(){
29
	    	WadeMobile.openRN("UI_GRIDVIEW");
30
	    });
31
	    
32
	    new iScroll("scrollDemo"); // 第二页设置可以拖动
34 33
35
        Common.callSvc("SceneBean.dataRequestScene", param, function (resultData) {
36
            ipu.hidePreloader();
37
            alert("成功返回\n参数是:" + JSON.stringify(resultData));
38
        }, null, function (x_info) {
39
            ipu.hidePreloader();
40
            alert("进入了插件错误调用返回,错误信息是:" + x_info);
41
        });
42
    });
34
	    $("#invokeException").click(function () {
35
	        ipu.showPreloader();
36
	        var param = new Wade.DataMap();
43 37
38
	        Common.callSvc("SceneBean.dataRequestScene", param, function (resultData) {
39
	            ipu.hidePreloader();
40
	            alert("成功返回\n参数是:" + JSON.stringify(resultData));
41
	        }, null, function (x_info) {
42
	            ipu.hidePreloader();
43
	            alert("进入了插件错误调用返回,错误信息是:" + x_info);
44
	        });
45
	    });
46
	});
47
	
44 48
});

+ 2 - 2
show-server/src/main/webapp/biz/js/more/opensource/iscroll.js

@ -1,5 +1,5 @@
1
require(["jquery", "iScroll"], function ($, iScroll) {
2
    $(function () {
1
require(["jquery", "iScroll", "ipuUI"], function ($, iScroll, ipuUI) {
2
    $.sizeReady(function () {
3 3
        new iScroll("scrollDemo"); // 设置滚动
4 4
    });
5 5
});

+ 2 - 2
show-server/src/main/webapp/biz/js/plugins/baidumap.js

@ -1,5 +1,5 @@
1
require(["wadeMobile","jcl","iScroll"],function(WadeMobile,$,iScroll){
2
	$(function(){
1
require(["wadeMobile","jcl","iScroll", "jquery", "ipuUI"],function(WadeMobile,$,iScroll, jquery, ipuUI){
2
	jquery.sizeReady(function(){
3 3
		var iscroll=new iScroll("scroll-container");
4 4
		//定位
5 5
		$("#baiduLocation").click(function(){

+ 2 - 2
show-server/src/main/webapp/biz/js/plugins/basic.js

@ -1,5 +1,5 @@
1
require([ "wadeMobile", "jquery", "iScroll"], function(WadeMobile, $, iScroll) {
2
	$(function(){
1
require([ "wadeMobile", "jquery", "iScroll", "ipuUI"], function(WadeMobile, $, iScroll, ipuUI) {
2
	$.sizeReady(function(){
3 3
		var iscroll = new iScroll("scrollContainer");
4 4
		
5 5
		var osTitle = '系统信息';

+ 2 - 2
show-server/src/main/webapp/biz/js/plugins/contacts.js

@ -1,5 +1,5 @@
1
require(["wadeMobile","jcl","iScroll", "jquery"], function(WadeMobile,$,iScroll, jquery) {
2
	$(function(){
1
require(["wadeMobile","jcl","iScroll", "jquery", "ipuUI"], function(WadeMobile,$,iScroll, jquery, ipuUI) {
2
	jquery.sizeReady(function(){
3 3
		var iscroll=new iScroll("scroll-container");
4 4
		
5 5
		$("#getContactDetail").click(function(){

+ 2 - 2
show-server/src/main/webapp/biz/js/plugins/database.js

@ -1,5 +1,5 @@
1
require(["mobile", "jcl","iScroll"], function(Mobile,$,iScroll) {
2
	$(function(){
1
require(["mobile", "jcl","iScroll", "jquery", "ipuUI"], function(Mobile,$,iScroll, jquery, ipuUI) {
2
	jquery.sizeReady(function(){
3 3
		// new iScroll("scroll-container");
4 4
		
5 5
		var dbName = "display", tableName = "student";

+ 2 - 3
show-server/src/main/webapp/biz/js/plugins/file/file.js

@ -1,7 +1,6 @@
1
require(["ipuUI","wadeMobile","Hammer","handlebars","mobile","jcl","iScroll"],function(ipuUI,WadeMobile,Hammer,Handlebars,Mobile,$,iScroll){
1
require(["ipuUI","wadeMobile","Hammer","handlebars","mobile","jcl","jquery"],function(ipuUI,WadeMobile,Hammer,Handlebars,Mobile,Wade,$){
2 2
	
3 3
	$(function(){
4
		new iScroll("scroll-container");
5 4
		var tab = new ipuUI.tab(".ipu-tab");
6 5
		
7 6
		// base path
@ -75,7 +74,7 @@ require(["ipuUI","wadeMobile","Hammer","handlebars","mobile","jcl","iScroll"],fu
75 74
			file.on("tap", function (ev) {
76 75
	 			var fileName = $(ev.target).parents("li").data("filename");
77 76
				var isSdcard = $(ev.target).parents("li").data("issdcard");
78
				var values = new $.DataMap();
77
				var values = new Wade.DataMap();
79 78
				values.put("isSdcard", isSdcard);
80 79
				values.put("fileName", fileName);
81 80
//				Mobile.openTemplate("FileDetail", values);

+ 2 - 2
show-server/src/main/webapp/biz/js/plugins/jPush.js

@ -1,5 +1,5 @@
1
require(["wadeMobile", "jquery","iScroll"], function(WadeMobile,$,iScroll) {
2
	$(function(){
1
require(["wadeMobile", "jquery","iScroll", "ipuUI"], function(WadeMobile,$,iScroll, ipuUI) {
2
	$.sizeReady(function(){
3 3
		$(".ipu-switch input").click(function(){
4 4
			if($(this).prop("checked")) {
5 5
				WadeMobile.registerForPushWithJpush();

+ 2 - 2
show-server/src/main/webapp/biz/js/plugins/localstorage.js

@ -1,6 +1,6 @@
1
require([ "wadeMobile", "mobile", "ipuUI", "jcl", "iScroll", "common", "jcl" ],
1
require([ "wadeMobile", "mobile", "ipuUI", "jquery", "iScroll", "common", "jcl" ],
2 2
		function(WadeMobile, Mobile, ipuUI, $, iScroll, Common, Wade) {
3
			$(function() {
3
			$.sizeReady(function() {
4 4
				var iscroll = new iScroll("scroll-container");
5 5

6 6
				// 设置数据

+ 2 - 2
show-server/src/main/webapp/biz/js/plugins/mail.js

@ -1,5 +1,5 @@
1
require([ "wadeMobile", "jcl", "iScroll" ], function(WadeMobile, $, iScroll) {
2
	$(function() {
1
require([ "wadeMobile", "jcl", "iScroll", "jquery", "ipuUI"], function(WadeMobile, $, iScroll, jquery, ipuUI) {
2
	jquery.sizeReady(function() {
3 3
		var iscroll = new iScroll("scroll-container");
4 4
		var picPath = "picture/my.png";
5 5

+ 2 - 2
show-server/src/main/webapp/biz/js/plugins/map.js

@ -1,5 +1,5 @@
1
require([ "wadeMobile", "jcl", "iScroll" ], function(WadeMobile, $, iScroll) {
2
	$(function(){
1
require([ "wadeMobile", "jcl", "iScroll", "jquery", "ipuUI" ], function(WadeMobile, $, iScroll, jquery) {
2
	jquery.sizeReady(function(){
3 3
		
4 4
		var iscroll = new iScroll("scroll-container");
5 5
		

+ 2 - 2
show-server/src/main/webapp/biz/js/plugins/photo.js

@ -1,5 +1,5 @@
1
require([ "wadeMobile", "jcl", "iScroll" ], function(WadeMobile, $, iScroll) {
2
	$(function() {
1
require([ "wadeMobile", "jcl", "iScroll", "jquery", "ipuUI"], function(WadeMobile, $, iScroll, jquery, ipuUI) {
2
	jquery.sizeReady(function() {
3 3
		var iscroll = new iScroll("scroll-container");
4 4
5 5
		// 调用手机的照相功能,返回相片的路径或相片的Base64编码

+ 1 - 1
show-server/src/main/webapp/biz/js/plugins/share.js

@ -1,4 +1,4 @@
1
require(["wadeMobile","jcl","iScroll"], function(WadeMobile,$,iScroll){
1
require(["wadeMobile","jcl"], function(WadeMobile,$){
2 2
	$(function(){
3 3
		var imgPathType = 0;
4 4
		var musicPathType = 1;

+ 1 - 1
show-server/src/main/webapp/biz/js/plugins/storage.js

@ -1,6 +1,6 @@
1 1
require([ "mobile", "ipuUI", "jquery", "iScroll" ], function(Mobile, ipuUI, $,
2 2
		iScroll) {
3
	$(function() {
3
	$.sizeReady(function() {
4 4
		var iscroll = new iScroll("scroll-container");
5 5
6 6
		// 数组存储的key值固定为以下5个

+ 1 - 3
show-server/src/main/webapp/biz/js/plugins/ui/ui-customAlertDialog.js

@ -1,7 +1,5 @@
1
require([ "wadeMobile", "mobile", "jcl", "iScroll" ], function(WadeMobile,
2
		Mobile, $, iScroll) {
1
require([ "wadeMobile", "mobile", "jcl"], function(WadeMobile, Mobile, $) {
3 2
	$(function() {
4
		new iScroll("mycontent");
5 3
		var param = $.DataMap();
6 4
		$("#progress_dialog").click(function() {
7 5
			param.put("title", "加载中");

+ 1 - 1
show-server/src/main/webapp/biz/js/plugins/ui/ui-customDialog.js

@ -1,4 +1,4 @@
1
require(["mobile","jcl","iScroll"], function(Mobile,$,iScroll) {
1
require(["mobile","jcl"], function(Mobile,$) {
2 2
	$(function(){
3 3
		$("#return").click(function() {
4 4
			Mobile.closeDialog($("#result").val());

+ 1 - 1
show-server/src/main/webapp/biz/js/plugins/ui/ui-customWindow.js

@ -1,4 +1,4 @@
1
require(["mobile","jcl","iScroll"], function(Mobile,$,iScroll) {
1
require(["mobile","jcl"], function(Mobile,$) {
2 2
	$(function(){
3 3
		var level = $("#level").val();
4 4
		var param = $.DataMap();

+ 1 - 1
show-server/src/main/webapp/biz/js/plugins/ui/ui-slidingMenu.js

@ -1,4 +1,4 @@
1
require([ "mobile", "iScroll", "jcl" ], function(Mobile, iScroll, $) {
1
require([ "mobile", "jquery"], function(Mobile, $) {
2 2
	$(function(){
3 3
		$("#return").click(function() {
4 4
			Mobile.closeSlidingMenu("侧滑菜单返回");

+ 1 - 1
show-server/src/main/webapp/biz/js/plugins/ui/ui.js

@ -1,4 +1,4 @@
1
require(["wadeMobile","mobile","jcl","iScroll"], function(WadeMobile,Mobile,$,iScroll) {
1
require(["wadeMobile","mobile","jcl"], function(WadeMobile,Mobile,$) {
2 2
	$(function(){
3 3
		$("#progressBar").click(function() {
4 4
			WadeMobile.loadingStart('加载中……', '进度条');

+ 58 - 55
show-server/src/main/webapp/biz/js/plugins/uploaddownload.js

@ -1,64 +1,67 @@
1
require(["wadeMobile", "jcl","iScroll"], function(WadeMobile,$,iScroll) {
2
	var iscroll = new iScroll("scroll-container");
3
	//服务器存储文件路径:webapp/ picture/my.png
4
	var picPath = "picture/my.png";
1
require(["wadeMobile", "jcl","iScroll", "jquery", "ipuUI"], function(WadeMobile,$,iScroll, jquery, ipuUI) {
2
	jquery.sizeReady(function(){
3
		var iscroll = new iScroll("scroll-container");
4
		//服务器存储文件路径:webapp/ picture/my.png
5
		var picPath = "picture/my.png";
5 6
6
	/**
7
	 * 上传 
8
	 */
9
	$("#upload").click(function() {
10
		//① 选择图片
11
		WadeMobile.getPicture(function(filePath){
12
			$("#uploadFilePath").html(filePath);
7
		/**
8
		 * 上传 
9
		 */
10
		$("#upload").click(function() {
11
			//① 选择图片
12
			WadeMobile.getPicture(function(filePath){
13
				$("#uploadFilePath").html(filePath);
13 14
14
			//②上传
15
			var uploadFile = $("#uploadFilePath").html();
16
			if(!uploadFile){
17
				alert("请先选择上传文件!");
18
				return;
19
			}
20
			/*单文件上传*/
21
			var params = $.DataMap();
22
			params.put("FILE_PATH",picPath);
23
			
24
			WadeMobile.loadingStart("正在上传...");
25
			WadeMobile.uploadWithServlet(uploadFile, "UploadDownloadBean.upload", params.toString(), function(result){
26
				WadeMobile.loadingStop();
15
				//②上传
16
				var uploadFile = $("#uploadFilePath").html();
17
				if(!uploadFile){
18
					alert("请先选择上传文件!");
19
					return;
20
				}
21
				/*单文件上传*/
22
				var params = $.DataMap();
23
				params.put("FILE_PATH",picPath);
27 24
				
28
				var data = new $.DataMap(result);
29
				$("#remoteFilePath").html(data.get("FILE_PATH"));
25
				WadeMobile.loadingStart("正在上传...");
26
				WadeMobile.uploadWithServlet(uploadFile, "UploadDownloadBean.upload", params.toString(), function(result){
27
					WadeMobile.loadingStop();
28
					
29
					var data = new $.DataMap(result);
30
					$("#remoteFilePath").html(data.get("FILE_PATH"));
31
				});
32
				/*多文件上传*/
33
				//有待补充
30 34
			});
31
			/*多文件上传*/
32
			//有待补充
33 35
		});
34
	});
35
	
36
	/**
37
	 * 下载
38
	 * 常用相对路径,如果只有android,可使用绝对路径
39
	 */
40
	$("#download").click(function() {
41
		var params = new $.DataMap();
42
		params.put("FILE_PATH", picPath); //下载文件的路径
43 36
		
44
		WadeMobile.loadingStart("正在下载...");
45
		WadeMobile.downloadWithServlet(picPath, "UploadDownloadBean.download", params.toString(), function(savePath){
46
			WadeMobile.loadingStop();
37
		/**
38
		 * 下载
39
		 * 常用相对路径,如果只有android,可使用绝对路径
40
		 */
41
		$("#download").click(function() {
42
			var params = new $.DataMap();
43
			params.put("FILE_PATH", picPath); //下载文件的路径
47 44
			
48
//			alert("下载成功:"+savePath);
49
			$("#downloadFilePath").html(savePath);
50
			
51
			var width = $("#downloadPicture").width();
52
			var height = $("#downloadPicture").height();
53
			$("#downloadPicture").removeClass("fa").removeClass("fa-image");
54
			$("#downloadPicture").html("<img class='img-limit' src='" + savePath + "'/>");
55
			
56
			setTimeout(function(){
57
				iscroll.refresh();
58
			}, 1000);
59
		}, function(error){
60
			WadeMobile.loadingStop();
61
			WadeMobile.alert("下载错误:"+error);
45
			WadeMobile.loadingStart("正在下载...");
46
			WadeMobile.downloadWithServlet(picPath, "UploadDownloadBean.download", params.toString(), function(savePath){
47
				WadeMobile.loadingStop();
48
				
49
//				alert("下载成功:"+savePath);
50
				$("#downloadFilePath").html(savePath);
51
				
52
				var width = $("#downloadPicture").width();
53
				var height = $("#downloadPicture").height();
54
				$("#downloadPicture").removeClass("fa").removeClass("fa-image");
55
				$("#downloadPicture").html("<img class='img-limit' src='" + savePath + "'/>");
56
				
57
				setTimeout(function(){
58
					iscroll.refresh();
59
				}, 1000);
60
			}, function(error){
61
				WadeMobile.loadingStop();
62
				WadeMobile.alert("下载错误:"+error);
63
			});
62 64
		});
63
	});
65
	})
66
	
64 67
});

+ 2 - 2
show-server/src/main/webapp/biz/js/plugins/videocompress.js

@ -1,5 +1,5 @@
1
require([ "wadeMobile", "jcl", "iScroll" ], function(WadeMobile, $, iScroll) {
2
	$(function() {
1
require([ "wadeMobile", "jquery", "iScroll", "ipuUI"], function(WadeMobile, $, iScroll, ipuUI) {
2
	$.sizeReady(function() {
3 3
		var iscroll = new iScroll("scroll-container");
4 4
5 5
		/**

+ 2 - 2
show-server/src/main/webapp/biz/js/plugins/yunbaPush.js

@ -1,5 +1,5 @@
1
require(["mobile","wadeMobile","common","handlebars","jcl","iScroll"],function(Mobile,WadeMobile,Common,Handlebars,$,iScroll){	
2
	$(function(){
1
require(["mobile","wadeMobile","common","handlebars","jquery","iScroll", "ipuUI"],function(Mobile,WadeMobile,Common,Handlebars,$,iScroll,ipuUI){	
2
	$.sizeReady(function(){
3 3
		var iscroll;
4 4
		
5 5
		// 注册

+ 5 - 3
show-server/src/main/webapp/template/common/Head.html

@ -13,9 +13,11 @@
13 13
<script>
14 14
/*自定义增加每个页面需要执行的公共逻辑*/
15 15
require(["mobile","jquery"],function(Mobile, $) {
16
	/*每个页面的back样式都需要执行回退*/
17
	$(".page-back").click(function(){
18
		Mobile.back();
16
	$(function(){
17
		/*每个页面的back样式都需要执行回退*/
18
		$(".page-back").click(function(){
19
			Mobile.back();
20
		});
19 21
	});
20 22
}); 
21 23
</script>