*[android] merge feature-playground

android/playground/app/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "com.alibaba.weex"
         minSdkVersion 15
         targetSdkVersion 23
-        versionCode 1
-        versionName "0.5.2.2"
+        versionCode 5
+        versionName "0.5.2.5"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         ndk{
             abiFilters "x86"

android/playground/app/src/main/assets/component/text-demo.js

@@ -44,7 +44,7 @@
 /* 0 */
 /***/ function(module, exports, __webpack_require__) {
 
-	;__weex_define__("@weex-component/610122a9602101680271cd31b3d07010", [], function(__weex_require__, __weex_exports__, __weex_module__){
+	;__weex_define__("@weex-component/621c9dd25370a65530622e88f51a4c08", [], function(__weex_require__, __weex_exports__, __weex_module__){
 
 	;
 	  __webpack_require__(1);
@@ -384,7 +384,7 @@
 	    {
 	      "type": "wxc-panel",
 	      "attr": {
-	        "title": "text-lineheight",
+	        "title": "line-height",
 	        "type": "primary"
 	      },
 	      "children": [
@@ -433,7 +433,7 @@
 	  }
 	})
 	})
-	;__weex_bootstrap__("@weex-component/610122a9602101680271cd31b3d07010", {
+	;__weex_bootstrap__("@weex-component/621c9dd25370a65530622e88f51a4c08", {
 	  "transformerVersion": "0.3.1"
 	},undefined)
 

android/playground/app/src/main/java/com/alibaba/weex/WXPageActivity.java

@@ -41,6 +41,8 @@
 
 import java.io.File;
 import java.io.UnsupportedEncodingException;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.HashMap;
 
 
@@ -250,13 +252,13 @@ public void onError(WXHttpTask task) {
    * hot refresh
    */
   private void startHotRefresh() {
-    String host = mUri.getHost();
-    String port = mUri.getQueryParameter("wsport");
-    if (port == null || port.length() == 0) {
-      port = "8082";
+    try {
+      String host = new URL(mUri.toString()).getHost();
+      String wsUrl = "ws://" + host + ":8082";
+      mWXHandler.obtainMessage(Constants.HOT_REFRESH_CONNECT, 0, 0, wsUrl).sendToTarget();
+    } catch (MalformedURLException e) {
+      e.printStackTrace();
     }
-    String wsUrl = "ws://" + host + ":" + port;
-    mWXHandler.obtainMessage(Constants.HOT_REFRESH_CONNECT, 0, 0, wsUrl).sendToTarget();
   }
 
   private void addOnListener() {
@@ -377,17 +379,13 @@ public boolean onOptionsItemSelected(MenuItem item) {
       finish();
       return true;
     } else if (id == R.id.action_refresh) {
-
-      if(mUri.isHierarchical() && mUri.getQueryParameterNames()!=null && mUri.getQueryParameterNames().contains(Constants.WEEX_TPL_KEY)){
-        String url=mUri.getQueryParameter(Constants.WEEX_TPL_KEY);
+      String scheme=mUri.getScheme();
+      if (mUri.isHierarchical() && (TextUtils.equals(scheme,"http") || TextUtils.equals(scheme,"https"))) {
+        String weexTpl = mUri.getQueryParameter(Constants.WEEX_TPL_KEY);
+        String url = TextUtils.isEmpty(weexTpl) ? mUri.toString() : weexTpl;
         loadWXfromService(url);
         return true;
       }
-
-      if (TextUtils.equals(mUri.getScheme(), "http") || TextUtils.equals(mUri.getScheme(), "https")) {
-        loadWXfromService(mUri.toString());
-        return true;
-      }
     }
     return super.onOptionsItemSelected(item);
   }