5-25

AJLoveChina · May 25, 2016 · da63b3c · da63b3c
1 parent fd4b643
commit da63b3c
Show file tree

Hide file tree

Showing 10 changed files with 149 additions and 67 deletions.
diff --git a/.gitignore b/.gitignore
@@ -40,4 +40,7 @@ java_demo/Pengfu/WebRoot/ueditor
 java_demo/Nigeerhuo Maven Webapp/src/main/webapp/static/
 java_demo/Nigeerhuo Maven Webapp/src/com/baidu/ueditor
 *.txt
-*.gif
+*.gif
+*.rmvb
+*.mp4
+*.xml
diff --git a/java_demo/Graduation Maven Webapp/src/main/java/com/meajax/model/AjaxRequest.java b/java_demo/Graduation Maven Webapp/src/main/java/com/meajax/model/AjaxRequest.java
@@ -73,10 +73,6 @@ public static String getResponse(Config config) {
 		Map<String, String> params = config.getMap();
 
 
-
-		//HttpRequestBase request = null;
-
-
 		HttpResponse back = null;
 
 		StringBuffer result = new StringBuffer();

diff --git a/java_demo/Graduation Maven Webapp/src/main/webapp/index.jsp b/java_demo/Graduation Maven Webapp/src/main/webapp/index.jsp
@@ -44,6 +44,7 @@
 		dataType : "json",
 		success : function (json) {
 			console.log(json);
+			dealJson(json);
 			map.enableScrollWheelZoom();
 			var resourcePoints = [];
 			for (var i = 0; i < json.data.lines.length; i++) {
@@ -134,6 +135,29 @@
 		map.addControl(top_left_navigation);     
 		map.addControl(top_right_navigation);    
 	}
+	
+	function dealJson(json) {
+		var damagePoints = {};
+		for (var i = 0; i < json.data.lines.length; i++) {
+			var name = json.data.lines[i].points[1].name;
+			
+			var get = damagePoints[name];
+			if (get) {
+				damagePoints[name] += parseInt(json.data.lines[i].info, 10);
+			} else {
+				damagePoints[name] = parseInt(json.data.lines[i].info, 10);
+			}
+		}
+		
+		for (var i = 0; i < json.data.lines.length; i++) {
+			var name = json.data.lines[i].points[1].name;
+			
+			if (damagePoints[name]) {
+				json.data.lines[i].points[1].name = name.replace(/\(\s?\d+\s?\)/, "( " + damagePoints[name] + " )");
+			}
+		}
+		
+	}
 </script>  
 
 

diff --git a/nigeerhuo/.idea/workspace.xml b/nigeerhuo/.idea/workspace.xml
diff --git a/nigeerhuo/video/local.html b/nigeerhuo/video/local.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<html>
+<head lang="en">
+    <meta charset="UTF-8">
+    <title></title>
+    <style>
+        *{
+            margin: 0;
+            padding: 0;
+        }
+        html,body{
+            position: relative;
+            height: 100%;
+        }
+        .logo{
+            position: fixed;
+            z-index: 99;
+            top: 100px;left: 100px;
+            color: white;
+        }
+    </style>
+</head>
+<body>
+
+<div class="logo">
+    二货TV
+</div>
+
+
+<embed
+        width="100%"
+        height="100%"
+        src="追逐繁星的孩子.mp4"></embed>
+
+</body>
+</html>
diff --git a/readme.md b/readme.md
@@ -1,3 +1,10 @@
+<h2>
+2016-05-25
+</h2>
+<article>
+5-25
+</article>
+
 <h2>
 2016-05-22
 </h2>

diff --git a/untitled/.idea/.name b/untitled/.idea/.name
diff --git a/untitled/.idea/untitled.iml b/untitled/.idea/untitled.iml
diff --git a/untitled/demo.css b/untitled/demo.css
@@ -0,0 +1,8 @@
+p{
+    color: lightblue;
+}
+
+
+p span{
+    color: lightcoral;
+}
diff --git a/untitled/demo.html b/untitled/demo.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html>
+    <head>
+
+        <title>demo</title>
+
+        <meta charset="utf-8" />
+
+        <link rel="stylesheet" type="text/css" href="demo.css">
+
+
+        <script>
+            alert("tishi");
+
+
+        </script>
+
+    </head>
+
+    <body>
+        <img src="http://tmxgb.hfut.edu.cn/hfut_tumu/img/aj/img-roll/roll-1.jpg"/>
+
+        <p style="font-size: 20px;color: red;">zhe shi duanluo</p>
+
+        <p>123</p>
+
+        <a href="http://baidu.com">链接</a>
+
+        <p>duan luo
+            <span>duan luo2</span>
+        </p>
+
+
+    </body>
+</html>
-Original file line number
+Diff line change
@@ Expand Up / @@ -40,4 +40,7 @@ java_demo/Pengfu/WebRoot/ueditor @@
     java_demo/Nigeerhuo Maven Webapp/src/main/webapp/static/
     java_demo/Nigeerhuo Maven Webapp/src/com/baidu/ueditor
     *.txt
-    *.gif
+    *.gif
+    *.rmvb
+    *.mp4
+    *.xml