Framework seem wokr.

xudajun · Jul 28, 2012 · 4c88ad1 · 4c88ad1
1 parent 220782d
commit 4c88ad1
Show file tree

Hide file tree

Showing 16 changed files with 320 additions and 17 deletions.
diff --git a/assets/droideye.js b/assets/droideye.js
@@ -0,0 +1,41 @@
+var supportedSize = new Array();
+var planeWidth = 0;
+var planeHeight = 0;
+var basicURL = "";
+
+var onPlayClick = function () {
+
+};
+
+var onQueryDone = function (ret) {
+    $("#debug_msg").html(ret);   
+    $("#btn_play").removeClass('ui-disabled');        
+}
+var onQueryError = function () {
+    $("#debug_msg").html("连接视频错误，请刷新重试！");   
+}
+
+$("#page_main").live("pageinit", function() {
+    basicURL = $(location).attr('href');
+
+    var screenHeight = $(window).height();
+    var screenWidth = $(window).width();
+    planeHeight = Math.round( screenHeight * 0.5);
+    planeWidth = Math.round( screenWidth * 0.80);
+
+    $("#video_plane").width(planeWidth);
+    $("#video_plane").height(planeHeight);
+
+    $("#btn_play").addClass('ui-disabled');        
+    $("#btn_play").click(onPlayClick);
+
+    $("#debug_msg").html(basicURL);
+    $.ajax({
+        url: "http://192.168.0.102:8080/cgi/query",
+        cache: false,
+        error: onQueryError,
+        success: onQueryDone
+    });
+});
+
+
diff --git a/assets/extern.css b/assets/extern.css
@@ -0,0 +1,21 @@
+div.live_image_box {
+    display: block;
+    background-color: black; 
+    text-align:center;
+    margin-left: auto;
+    margin-right: auto;
+}
+
+div.center {
+    text-align:center;
+    margin-left: auto;
+    margin-right: auto;
+}
+
+#bottom_div {
+    position: absolute; 
+    bottom:0;
+    right:0;
+    margin:auto 0; 
+}
+
diff --git a/assets/images/black.png b/assets/images/black.png
diff --git a/assets/index.html b/assets/index.html
@@ -1 +1,51 @@
-<h1>Hello World</h1>
+<!DOCTYPE html> 
+<html> 
+<head> 
+    <title>远程视讯监控王</title> 
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1"> 
+    <link rel="stylesheet" href="res/jquery.mobile-1.1.1.min.css" />
+    <link rel="stylesheet" href="extern.css">
+    <script src="res/jquery-1.7.1.min.js"></script>
+    <script src="res/jquery.mobile-1.1.1.min.js"></script>
+    <script src="droideye.js"></script>
+</head> 
+<body> 
+
+<!-- 
+/*********************************************************
+ * Main page 
+ *
+ *********************************************************/
+-->
+<div data-role="page" data-title="login" id="page_main" data-theme="c" >
+    <div data-role="header">
+        <h2>视频控制面板</h2>
+    </div>
+
+    <div data-role="content">
+        <ul data-role="listview" data-inset="true" >
+            <li>
+                <div class="live_image_box" id="video_plane">
+                    <img id="live_image" src="images/black.png">
+                </div>
+            </li> 
+            <li data-role="fieldcontain" class="center">
+                <div class="center">
+                    <span>选择视频分辨率:</span>
+                    <select name="resolution-choice" id="resolution-choice" data-native-menu="false">
+                    </select>
+                </div>
+                <a href="#" data-role="button" id="btn_play">播放视频</a>
+            </li>
+        </ul>
+        <!-- for debug -->
+        <div id="bottom_div">
+            <span id="debug_msg">正在连接视频</span>
+        </div>
+    </div><!-- /content -->  
+
+</div><!-- page -->
+
+</body>
+</html>
diff --git a/assets/res/images/ajax-loader.gif b/assets/res/images/ajax-loader.gif
diff --git a/assets/res/images/ajax-loader.png b/assets/res/images/ajax-loader.png
diff --git a/assets/res/images/icons-18-black.png b/assets/res/images/icons-18-black.png
diff --git a/assets/res/images/icons-18-white.png b/assets/res/images/icons-18-white.png
diff --git a/assets/res/images/icons-36-black.png b/assets/res/images/icons-36-black.png
diff --git a/assets/res/images/icons-36-white.png b/assets/res/images/icons-36-white.png
diff --git a/assets/res/jquery-1.7.1.min.js b/assets/res/jquery-1.7.1.min.js
diff --git a/assets/res/jquery.mobile-1.1.1.min.css b/assets/res/jquery.mobile-1.1.1.min.css
diff --git a/assets/res/jquery.mobile-1.1.1.min.js b/assets/res/jquery.mobile-1.1.1.min.js
diff --git a/assets/res/jquery.mobile.structure-1.1.1.min.css b/assets/res/jquery.mobile.structure-1.1.1.min.css
diff --git a/assets/res/jquery.mobile.theme-1.1.1.min.css b/assets/res/jquery.mobile.theme-1.1.1.min.css
diff --git a/src/teaonly/droideye/NanoHTTPD.java b/src/teaonly/droideye/NanoHTTPD.java
@@ -432,12 +432,12 @@ else if (!sbfound || size == 0x7FFFFFFFFFFFFFFFl)
 				// in data section, too, read it:
 				if ( method.equalsIgnoreCase( "POST" ))
 				{
-					String contentType = "";
-					String contentTypeHeader = header.getProperty("content-type");
-					StringTokenizer st = new StringTokenizer( contentTypeHeader , "; " );
-					if ( st.hasMoreTokens()) {
-						contentType = st.nextToken();
-					}
+                    String contentType = "";
+                    String contentTypeHeader = header.getProperty("content-type");
+                    StringTokenizer st = new StringTokenizer( contentTypeHeader , "; " );
+                    if ( st.hasMoreTokens()) {
+                        contentType = st.nextToken();
+                    }
 
 					if (contentType.equalsIgnoreCase("multipart/form-data"))
 					{
@@ -1106,12 +1106,15 @@ private Response serveAssets( String uri, Properties header) {
         if ( uri.endsWith("/") || uri.equalsIgnoreCase("") ) {
             uri = uri + "index.html";    
         }
+
+        Log.d("TEAONLY", ">>>> URI = " + uri);
 
-        AssetFileDescriptor assetFile = null;
+        InputStream assetFile = null;
         try {
-            assetFile = myAssets.openFd(uri);
+            assetFile = myAssets.open(uri);
         } catch ( IOException ex) {
             assetFile = null;
+            Log.d("TEAONLY", ">>>> Open Error:" + ex);
         }
         if ( res == null && assetFile == null) {
             res = new Response( HTTP_NOTFOUND, MIME_PLAINTEXT,
@@ -1129,7 +1132,7 @@ private Response serveAssets( String uri, Properties header) {
 					mime = MIME_DEFAULT_BINARY;
 
 				// Calculate etag
-				String etag = Integer.toHexString((uri + "" + assetFile.getLength()).hashCode());
+				String etag = Integer.toHexString((uri + "" + assetFile.available()).hashCode());
 
 				// Support (simple) skipping:
 				long startFrom = 0;
@@ -1153,7 +1156,7 @@ private Response serveAssets( String uri, Properties header) {
 				}
 
 				// Change return code and add Content-Range header when skipping is requested
-				long fileLen = assetFile.getLength();
+				long fileLen = assetFile.available();
 				if (range != null && startFrom >= 0)
 				{
 					if ( startFrom >= fileLen)
@@ -1170,20 +1173,17 @@ private Response serveAssets( String uri, Properties header) {
 						if ( newLen < 0 ) newLen = 0;
 
 						final long dataLen = newLen;
-						FileInputStream fis = new FileInputStream( assetFile.getFileDescriptor() ) {
-							public int available() throws IOException { return (int)dataLen; }
-                        };
-						fis.skip( startFrom );
+						assetFile.skip( startFrom );
 
-						res = new Response( HTTP_PARTIALCONTENT, mime, fis );
+						res = new Response( HTTP_PARTIALCONTENT, mime, assetFile );
 						res.addHeader( "Content-Length", "" + dataLen);
 						res.addHeader( "Content-Range", "bytes " + startFrom + "-" + endAt + "/" + fileLen);
 						res.addHeader( "ETag", etag);
 					}
 				}
 				else
 				{
-					res = new Response( HTTP_OK, mime, assetFile.createInputStream() );
+					res = new Response( HTTP_OK, mime, assetFile );
 					res.addHeader( "Content-Length", "" + fileLen);
 					res.addHeader( "ETag", etag);
 				}