Skip to content

Commit 2a7d141

Browse files
committed
Merge branch 'merge410' into merged
# Conflicts: # app/src/main/java/net/coding/program/project/detail/TaskListFragment.java
2 parents 5cda54b + 93e36b2 commit 2a7d141

File tree

203 files changed

+1580
-1934
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

203 files changed

+1580
-1934
lines changed

app/build.gradle

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ android {
1616
renderscriptTargetApi 19
1717
multiDexEnabled true
1818
minSdkVersion 15
19-
targetSdkVersion 22
19+
targetSdkVersion 23
2020
}
2121

2222
productFlavors {
@@ -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'
@@ -86,16 +86,17 @@ dependencies {
8686
compile project(':social_sdk_library_project')
8787
compile 'com.bigkoo:convenientbanner:1.0.8'
8888
compile 'com.android.support:design:23.1.1'
89-
compile project(':scrollanimationlibrary')
9089
compile files('libs/pinyin4j-2.5.0.jar')
9190
compile files('libs/jg_filter_sdk_1.1.jar')
9291
compile files('libs/wup-1.0.0.E-SNAPSHOT.jar')
93-
compile files('libs/Xg_sdk_v2.42_20160111_1539.jar')
9492
compile files('libs/Xg_sdk_v2.45_20160510_1845.jar')
9593
compile project(':bottom-bar')
9694

9795
compile 'com.alibaba:fastjson:1.1.44.android'
9896
compile 'com.flyco.roundview:FlycoRoundView_Lib:1.1.4@aar'
97+
compile 'com.marshalchen.ultimaterecyclerview:library:0.7.0'
98+
99+
compile 'org.eclipse.jgit:org.eclipse.jgit:3.7.1.201504261725-r'
99100
}
100101

101102
buildscript {
@@ -125,3 +126,11 @@ apt {
125126
androidManifestFile variant.outputs[0]?.processResources?.manifestFile
126127
}
127128
}
129+
repositories {
130+
flatDir {
131+
dirs 'libs' //this way we can find the .aar file in libs folder
132+
}
133+
}
134+
dependencies {
135+
compile(name:'checknetwork', ext:'aar')
136+
}

app/libs/checknetwork.aar

10.7 KB
Binary file not shown.

app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@
5656

5757

5858
<!-- 百度LBS检索 -->
59-
<uses-permission android:name="android.permission.GET_ACCOUNTS" />
59+
<!--READ_PHONE_STATE 是必须的,感觉有点流氓-->
60+
<!--<uses-permission android:name="android.permission.GET_ACCOUNTS" />-->
6061
<uses-permission android:name="android.permission.USE_CREDENTIALS" />
6162
<uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
6263
<uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,5 @@ public class AllThirdKeys {
1818
public static final String geotable = "";
1919
public static final String ak = "";
2020
public static final String sk = "";
21-
2221
}
2322

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

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package net.coding.program;
22

3+
import android.text.TextUtils;
34
import android.view.LayoutInflater;
45
import android.view.View;
56

@@ -36,6 +37,10 @@ public void init(Object listView, LayoutInflater inflater, final LoadMore loadMo
3637
init(listView, inflater, loadMore, "addFooterView");
3738
}
3839

40+
public void initToRecycler(Object listView, LayoutInflater inflater, final LoadMore loadMore) {
41+
init(listView, inflater, loadMore, null);
42+
}
43+
3944
private void init(Object listView, LayoutInflater inflater, final LoadMore loadMore, String callMethod) {
4045
View v = inflater.inflate(R.layout.listview_foot, null, false);
4146

@@ -52,16 +57,22 @@ private void init(Object listView, LayoutInflater inflater, final LoadMore loadM
5257

5358
mLoading = v.findViewById(R.id.progressBar);
5459

55-
try {
56-
Method method = listView.getClass().getMethod(callMethod, View.class);
57-
method.invoke(listView, v);
58-
} catch (Exception e) {
59-
Global.errorLog(e);
60+
if (!TextUtils.isEmpty(callMethod)) {
61+
try {
62+
Method method = listView.getClass().getMethod(callMethod, View.class);
63+
method.invoke(listView, v);
64+
} catch (Exception e) {
65+
Global.errorLog(e);
66+
}
6067
}
6168

6269
mLayout.setVisibility(View.GONE);
6370
}
6471

72+
public View getView() {
73+
return mLayout;
74+
}
75+
6576
public void showLoading() {
6677
show(true, true);
6778
}

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: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,17 @@
3131
import com.tencent.android.tpush.XGPushManager;
3232
import com.tencent.android.tpush.service.XGPushService;
3333

34+
import net.coding.program.common.Global;
3435
import net.coding.program.common.LoginBackground;
3536
import net.coding.program.common.Unread;
3637
import net.coding.program.common.UnreadNotify;
3738
import net.coding.program.common.htmltext.URLSpanNoUnderline;
39+
import net.coding.program.common.network.MyAsyncHttpClient;
3840
import net.coding.program.common.network.util.Login;
3941
import net.coding.program.common.ui.BaseActivity;
4042
import net.coding.program.common.ui.GlobalUnit;
4143
import net.coding.program.event.EventFilter;
44+
import net.coding.program.event.EventMessage;
4245
import net.coding.program.event.EventNotifyBottomBar;
4346
import net.coding.program.event.EventPosition;
4447
import net.coding.program.event.EventShowBottom;
@@ -63,6 +66,7 @@
6366
import java.util.List;
6467

6568
import de.greenrobot.event.EventBus;
69+
import network.coding.net.checknetwork.CheckNetworkIntentService;
6670

6771
@EActivity(R.layout.activity_main_parent)
6872
public class MainActivity extends BaseActivity {
@@ -125,6 +129,7 @@ protected void onCreate(Bundle savedInstanceState) {
125129
// qq push
126130
updateNotifyService();
127131
pushInXiaomi();
132+
startNetworkCheckService();
128133

129134
LoginBackground loginBackground = new LoginBackground(this);
130135
loginBackground.update();
@@ -150,6 +155,18 @@ protected void onCreate(Bundle savedInstanceState) {
150155
EventBus.getDefault().register(this);
151156
}
152157

158+
private void startNetworkCheckService() {
159+
Intent intent = new Intent(this, CheckNetworkIntentService.class);
160+
String extra = Global.getExtraString(this);
161+
intent.putExtra("PARAM_APP", extra);
162+
163+
intent.putExtra("PARAM_GK", MyApp.sUserObject.global_key);
164+
String sid = MyAsyncHttpClient.getCookie(this, Global.HOST);
165+
intent.putExtra("PARAM_COOKIE", sid);
166+
167+
startService(intent);
168+
}
169+
153170
@Override
154171
protected void onStart() {
155172
super.onStart();
@@ -273,15 +290,13 @@ public void onItemSelected(AdapterView<?> parent, View view, int position, long
273290

274291
FragmentManager fm = getSupportFragmentManager();
275292
FragmentTransaction ft = fm.beginTransaction();
276-
Log.d("", ft == null ? "is null" : "is good");
293+
Log.d(TAG, ft == null ? "is null" : "is good");
277294
ft.replace(R.id.container, fragment, strings[position]);
278295
ft.commit();
279-
280296
}
281297

282298
@Override
283299
public void onNothingSelected(AdapterView<?> parent) {
284-
285300
}
286301
});
287302

@@ -591,6 +606,11 @@ public void onEventMainThread(Object object) {
591606
} else if (object instanceof EventPosition) {
592607
EventPosition eventPosition = (EventPosition) object;
593608
toolbarProjectTitle.setText(eventPosition.title);
609+
} else if (object instanceof EventMessage) {
610+
EventMessage eventMessage = (EventMessage) object;
611+
if (eventMessage.type == EventMessage.Type.loginOut) {
612+
finish();
613+
}
594614
}
595615
}
596616

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

Lines changed: 1 addition & 2 deletions
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;
@@ -83,7 +83,6 @@ public int onStartCommand(Intent intent, int flags, int startId) {
8383
private void downloadApp() {
8484
try {
8585
if (enqueue == 0) {
86-
8786
DownloadManager.Request request = new DownloadManager.Request(Uri.parse(mUpdateInfo.url))
8887
.setTitle("Coding")
8988
.setDescription("下载Coding" + mUpdateInfo.versionName)

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

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import android.content.ClipboardManager;
55
import android.content.Context;
66
import android.content.Intent;
7+
import android.content.pm.PackageInfo;
78
import android.content.res.AssetManager;
89
import android.graphics.Bitmap;
910
import android.graphics.Color;
@@ -44,7 +45,6 @@
4445
import net.coding.program.model.AccountInfo;
4546
import net.coding.program.model.GitFileObject;
4647

47-
import org.apache.http.cookie.Cookie;
4848
import org.json.JSONObject;
4949
import org.xml.sax.XMLReader;
5050

@@ -63,6 +63,7 @@
6363
import java.util.GregorianCalendar;
6464
import java.util.List;
6565

66+
import cz.msebera.android.httpclient.cookie.Cookie;
6667
import pl.droidsonroids.gif.GifDrawable;
6768

6869
/**
@@ -109,6 +110,37 @@ public static String dayFromTime(long time) {
109110
return DayFormatTime.format(time);
110111
}
111112

113+
private static final String LOG_PREFIX = "coding_";
114+
private static final int LOG_PREFIX_LENGTH = LOG_PREFIX.length();
115+
private static final int MAX_LOG_TAG_LENGTH = 23;
116+
117+
public static String makeLogTag(Class cls) {
118+
return makeLogTag(cls.getSimpleName());
119+
}
120+
121+
public static String makeLogTag(String str) {
122+
if (str.length() > MAX_LOG_TAG_LENGTH - LOG_PREFIX_LENGTH) {
123+
return LOG_PREFIX + str.substring(0, MAX_LOG_TAG_LENGTH - LOG_PREFIX_LENGTH - 1);
124+
}
125+
126+
return LOG_PREFIX + str;
127+
}
128+
129+
130+
public static String getExtraString(Context context) {
131+
String FEED_EXTRA = "";
132+
if (FEED_EXTRA.isEmpty()) {
133+
try {
134+
PackageInfo pInfo = context.getPackageManager().getPackageInfo("net.coding.program", 0);
135+
String appVersion = pInfo.versionName;
136+
String phoneModel = Build.MODEL;
137+
FEED_EXTRA = String.format("Coding_Android/%s (Android %s; %s)", appVersion, Build.VERSION.SDK_INT, phoneModel);
138+
} catch (Exception e) {}
139+
}
140+
141+
return FEED_EXTRA;
142+
}
143+
112144
public static long longFromDay(String day) throws ParseException {
113145
final String format = "yyyy-MM-dd";
114146
final SimpleDateFormat sd = new SimpleDateFormat(format);
@@ -166,6 +198,7 @@ public static boolean isImageUri(String s1) {
166198
}
167199

168200
public static void syncCookie(Context context) {
201+
169202
PersistentCookieStore cookieStore = new PersistentCookieStore(context);
170203
List<Cookie> cookies = cookieStore.getCookies();
171204

0 commit comments

Comments
 (0)