Skip to content

Commit 834f634

Browse files
committed
升级 asynchttpclient
1 parent d9ccbaa commit 834f634

27 files changed

+41
-35
lines changed

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ dependencies {
5555
compile 'com.android.support:appcompat-v7:23.1.1'
5656
compile 'com.android.support:multidex:1.0.1'
5757
compile 'com.skyfishjy.ripplebackground:library:1.0.1'
58-
compile 'com.loopj.android:android-async-http:1.4.6'
58+
compile 'com.loopj.android:android-async-http:1.4.9'
5959
compile 'com.astuetz:pagerslidingtabstrip:1.0.1'
6060
compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
6161
compile 'se.emilsjolander:stickylistheaders:2.7.0'

app/libs/checknetwork.aar

-6.65 KB
Binary file not shown.

app/src/main/java/net/coding/program/ImagePagerFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
import org.androidannotations.annotations.EFragment;
3636
import org.androidannotations.annotations.FragmentArg;
3737
import org.androidannotations.annotations.ViewById;
38-
import org.apache.http.Header;
38+
import cz.msebera.android.httpclient.Header;
3939
import org.json.JSONException;
4040
import org.json.JSONObject;
4141

app/src/main/java/net/coding/program/LoginActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
import org.androidannotations.annotations.FocusChange;
5252
import org.androidannotations.annotations.OnActivityResult;
5353
import org.androidannotations.annotations.ViewById;
54-
import org.apache.http.Header;
54+
import cz.msebera.android.httpclient.Header;
5555
import org.json.JSONException;
5656
import org.json.JSONObject;
5757

app/src/main/java/net/coding/program/MainActivity.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,11 +156,11 @@ protected void onCreate(Bundle savedInstanceState) {
156156
private void startNetworkCheckService() {
157157
Intent intent = new Intent(this, CheckNetworkIntentService.class);
158158
String extra = Global.getExtraString(this);
159-
intent.putExtra(CheckNetworkIntentService.PARAM_APP, extra);
159+
intent.putExtra("PARAM_APP", extra);
160160

161-
intent.putExtra(CheckNetworkIntentService.PARAM_GK, MyApp.sUserObject.global_key);
161+
intent.putExtra("PARAM_GK", MyApp.sUserObject.global_key);
162162
String sid = MyAsyncHttpClient.getCookie(this, Global.HOST);
163-
intent.putExtra(CheckNetworkIntentService.PARAM_COOKIE, sid);
163+
intent.putExtra("PARAM_COOKIE", sid);
164164

165165
startService(intent);
166166
}

app/src/main/java/net/coding/program/UpdateService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import net.coding.program.common.network.MyAsyncHttpClient;
2323
import net.coding.program.setting.UpdateTipActivity;
2424

25-
import org.apache.http.Header;
25+
import cz.msebera.android.httpclient.Header;
2626
import org.json.JSONObject;
2727

2828
import java.io.File;

app/src/main/java/net/coding/program/common/Global.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
import net.coding.program.model.AccountInfo;
4646
import net.coding.program.model.GitFileObject;
4747

48-
import org.apache.http.cookie.Cookie;
4948
import org.json.JSONObject;
5049
import org.xml.sax.XMLReader;
5150

@@ -64,6 +63,7 @@
6463
import java.util.GregorianCalendar;
6564
import java.util.List;
6665

66+
import cz.msebera.android.httpclient.cookie.Cookie;
6767
import pl.droidsonroids.gif.GifDrawable;
6868

6969
/**
@@ -131,10 +131,10 @@ public static String getExtraString(Context context) {
131131
String FEED_EXTRA = "";
132132
if (FEED_EXTRA.isEmpty()) {
133133
try {
134-
PackageInfo pInfo = context.getPackageManager().getPackageInfo("net.coding.mart", 0);
134+
PackageInfo pInfo = context.getPackageManager().getPackageInfo("net.coding.program", 0);
135135
String appVersion = pInfo.versionName;
136136
String phoneModel = Build.MODEL;
137-
FEED_EXTRA = String.format("CodingMart_Android/%s (Android %s; %s)", appVersion, Build.VERSION.SDK_INT, phoneModel);
137+
FEED_EXTRA = String.format("Coding_Android/%s (Android %s; %s)", appVersion, Build.VERSION.SDK_INT, phoneModel);
138138
} catch (Exception e) {}
139139
}
140140

@@ -198,6 +198,7 @@ public static boolean isImageUri(String s1) {
198198
}
199199

200200
public static void syncCookie(Context context) {
201+
201202
PersistentCookieStore cookieStore = new PersistentCookieStore(context);
202203
List<Cookie> cookies = cookieStore.getCookies();
203204

app/src/main/java/net/coding/program/common/LoginBackground.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import net.coding.program.common.network.MyAsyncHttpClient;
1212
import net.coding.program.model.AccountInfo;
1313

14-
import org.apache.http.Header;
14+
import cz.msebera.android.httpclient.Header;
1515
import org.json.JSONArray;
1616
import org.json.JSONObject;
1717

app/src/main/java/net/coding/program/common/UnreadNotify.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import net.coding.program.common.network.MyAsyncHttpClient;
1212
import net.coding.program.event.EventNotifyBottomBar;
1313

14-
import org.apache.http.Header;
14+
import cz.msebera.android.httpclient.Header;
1515
import org.json.JSONObject;
1616

1717
import java.lang.ref.WeakReference;

app/src/main/java/net/coding/program/common/base/MyJsonResponse.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@
88
import net.coding.program.common.network.NetworkImpl;
99
import net.coding.program.common.util.SingleToast;
1010

11-
import org.apache.http.Header;
1211
import org.json.JSONObject;
1312

13+
import cz.msebera.android.httpclient.Header;
14+
1415
/**
1516
* Created by chenchao on 15/10/11.
1617
*/

0 commit comments

Comments
 (0)