net

wong8369 · Aug 9, 2012 · cd9d1d0 · cd9d1d0
1 parent 47303ed
commit cd9d1d0
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 12 deletions.
diff --git a/build.xml b/build.xml
@@ -73,11 +73,11 @@
          To customize existing targets, there are two options:
          - Customize only one target:
              - copy/paste the target into this file, *before* the
-               <import> task.
+               <import> taskAvatar.
              - customize it to your needs.
          - Customize the whole content of build.xml
              - copy/paste the content of the rules files (minus the top node)
-               into this file, replacing the <import> task.
+               into this file, replacing the <import> taskAvatar.
              - customize to your needs.
 
          ***********************

diff --git a/project.properties b/project.properties
@@ -11,5 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-15
+target=android-14
 
diff --git a/src/org/qii/weiciyuan/support/http/HttpUtility.java b/src/org/qii/weiciyuan/support/http/HttpUtility.java
@@ -15,6 +15,7 @@
 import ch.boye.httpclientandroidlib.conn.ConnectTimeoutException;
 import ch.boye.httpclientandroidlib.impl.client.BasicCookieStore;
 import ch.boye.httpclientandroidlib.impl.client.DefaultHttpClient;
+import ch.boye.httpclientandroidlib.impl.conn.PoolingClientConnectionManager;
 import ch.boye.httpclientandroidlib.message.BasicNameValuePair;
 import ch.boye.httpclientandroidlib.params.BasicHttpParams;
 import ch.boye.httpclientandroidlib.params.CoreProtocolPNames;
@@ -34,7 +35,10 @@
 import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 public class HttpUtility {
 
@@ -48,7 +52,8 @@ private HttpUtility() {
         HttpParams params = new BasicHttpParams();
         params.setParameter(CoreProtocolPNames.PROTOCOL_VERSION, HttpVersion.HTTP_1_1);
 
-        httpClient = new DefaultHttpClient(params);
+        //default 2 connections
+        httpClient = new DefaultHttpClient(new PoolingClientConnectionManager());
         HttpConnectionParams.setConnectionTimeout(httpClient.getParams(), 4000);
         HttpConnectionParams.setSoTimeout(httpClient.getParams(), 4000);
 

diff --git a/weiciyuan.iml b/weiciyuan.iml
@@ -21,23 +21,55 @@
         <option name="PACK_TEST_CODE" value="false" />
         <option name="RUN_PROGUARD" value="false" />
         <option name="PROGUARD_CFG_PATH" value="/proguard-project.txt" />
-        <resOverlayFolders>
-          <path>/res-overlay</path>
-        </resOverlayFolders>
-        <includeSystemProguardFile>true</includeSystemProguardFile>
+        <resOverlayFolders />
+        <includeSystemProguardFile>false</includeSystemProguardFile>
         <additionalNativeLibs />
       </configuration>
     </facet>
   </component>
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" />
     </content>
-    <orderEntry type="jdk" jdkName="Android 4.0.3 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android 4.0 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="libs" level="project" />
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/libs/android-support-v4.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="file://D:/android-sdk-windows/extras/android/compatibility/v4/src/eclair" />
+          <root url="file://D:/android-sdk-windows/extras/android/compatibility/v4/src/froyo" />
+          <root url="file://D:/android-sdk-windows/extras/android/compatibility/v4/src/gingerbread" />
+          <root url="file://D:/android-sdk-windows/extras/android/compatibility/v4/src/honeycomb" />
+          <root url="file://D:/android-sdk-windows/extras/android/compatibility/v4/src/honeycomb_mr2" />
+          <root url="file://D:/android-sdk-windows/extras/android/compatibility/v4/src/ics" />
+          <root url="file://D:/android-sdk-windows/extras/android/compatibility/v4/src/java" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/libs/gson-2.2.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/libs/httpclientandroidlib-1.1.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
   </component>
 </module>