Merge pull request #75 from AppCanOpenSource/develop

merge

Engine/assets/widget/wintestNormal/uexWindow.html

@@ -47,6 +47,7 @@ <h1 class="ut ub-f1 ulev0 ut-s tx-c" tabindex="0">Window功能</h1>
 			}
 
             uexWindow.setSlidingWindowEnabled(0);
+            uexWindow.setSwipeCloseEnable('{enable:0}')
         }
 		function winBack(){
 //			uexWindow.back();	//同一个页面使用<a>标签的href跳转，之后可以用back()返回

Engine/build.gradle

@@ -59,8 +59,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
+        sourceCompatibility JavaVersion.VERSION_1_6
+        targetCompatibility JavaVersion.VERSION_1_6
     }
 }
 

Engine/project.properties

@@ -8,5 +8,5 @@
 # project structure.
 
 # Project target.
-target=android-19
-proguard.config=proguard.pro
+target=android-21
+#proguard.config=proguard.pro

Engine/src/org/zywx/wbpalmstar/base/BConstant.java

@@ -25,6 +25,8 @@
 
 public class BConstant {
 
+    public static final String ENGINE_VERSION="3.2.1";
+
 	public static final String F_URL 					= "url";
 	public static final String F_WIDGET 				= "widget";
 	public static final String F_MULTIPLEWINDOW 		= "MultipleWindow";

Engine/src/org/zywx/wbpalmstar/base/vo/SetSwipeCloseEnableVO.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2015.  The AppCan Open Source Project.
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ */
+
+package org.zywx.wbpalmstar.base.vo;
+
+import java.io.Serializable;
+
+/**
+ * Created by ylt on 15/11/23.
+ */
+public class SetSwipeCloseEnableVO implements Serializable {
+    private int enable;
+
+    public int getEnable() {
+        return enable;
+    }
+
+    public void setEnable(int enable) {
+        this.enable = enable;
+    }
+}