Merge branch 'merge410' into merged

# Conflicts:
#	app/src/main/java/net/coding/program/project/detail/TaskListFragment.java

Author: thinaaron

app/build.gradle

@@ -16,7 +16,7 @@ android {
         renderscriptTargetApi 19
         multiDexEnabled true
         minSdkVersion 15
-        targetSdkVersion 22
+        targetSdkVersion 23
     }
 
     productFlavors {
@@ -55,7 +55,7 @@ dependencies {
     compile 'com.android.support:appcompat-v7:23.1.1'
     compile 'com.android.support:multidex:1.0.1'
     compile 'com.skyfishjy.ripplebackground:library:1.0.1'
-    compile 'com.loopj.android:android-async-http:1.4.6'
+    compile 'com.loopj.android:android-async-http:1.4.9'
     compile 'com.astuetz:pagerslidingtabstrip:1.0.1'
     compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
     compile 'se.emilsjolander:stickylistheaders:2.7.0'
@@ -86,16 +86,17 @@ dependencies {
     compile project(':social_sdk_library_project')
     compile 'com.bigkoo:convenientbanner:1.0.8'
     compile 'com.android.support:design:23.1.1'
-    compile project(':scrollanimationlibrary')
     compile files('libs/pinyin4j-2.5.0.jar')
     compile files('libs/jg_filter_sdk_1.1.jar')
     compile files('libs/wup-1.0.0.E-SNAPSHOT.jar')
-    compile files('libs/Xg_sdk_v2.42_20160111_1539.jar')
     compile files('libs/Xg_sdk_v2.45_20160510_1845.jar')
     compile project(':bottom-bar')
 
     compile 'com.alibaba:fastjson:1.1.44.android'
     compile 'com.flyco.roundview:FlycoRoundView_Lib:1.1.4@aar'
+    compile 'com.marshalchen.ultimaterecyclerview:library:0.7.0'
+
+    compile 'org.eclipse.jgit:org.eclipse.jgit:3.7.1.201504261725-r'
 }
 
 buildscript {
@@ -125,3 +126,11 @@ apt {
         androidManifestFile variant.outputs[0]?.processResources?.manifestFile
     }
 }
+repositories {
+    flatDir {
+        dirs 'libs' //this way we can find the .aar file in libs folder
+    }
+}
+dependencies {
+    compile(name:'checknetwork', ext:'aar')
+}

app/libs/checknetwork.aar

@@ -56,7 +56,8 @@
 
 
     <!-- 百度LBS检索 -->
-    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
+    <!--READ_PHONE_STATE 是必须的，感觉有点流氓-->
+    <!--<uses-permission android:name="android.permission.GET_ACCOUNTS" />-->
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />
     <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
     <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />

app/src/main/AndroidManifest.xml

@@ -18,6 +18,5 @@ public class AllThirdKeys {
     public static final String geotable = "";
     public static final String ak = "";
     public static final String sk = "";
-
 }
 

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

@@ -1,5 +1,6 @@
 package net.coding.program;
 
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 
@@ -36,6 +37,10 @@ public void init(Object listView, LayoutInflater inflater, final LoadMore loadMo
         init(listView, inflater, loadMore, "addFooterView");
     }
 
+    public void initToRecycler(Object listView, LayoutInflater inflater, final LoadMore loadMore) {
+        init(listView, inflater, loadMore, null);
+    }
+
     private void init(Object listView, LayoutInflater inflater, final LoadMore loadMore, String callMethod) {
         View v = inflater.inflate(R.layout.listview_foot, null, false);
 
@@ -52,16 +57,22 @@ private void init(Object listView, LayoutInflater inflater, final LoadMore loadM
 
         mLoading = v.findViewById(R.id.progressBar);
 
-        try {
-            Method method = listView.getClass().getMethod(callMethod, View.class);
-            method.invoke(listView, v);
-        } catch (Exception e) {
-            Global.errorLog(e);
+        if (!TextUtils.isEmpty(callMethod)) {
+            try {
+                Method method = listView.getClass().getMethod(callMethod, View.class);
+                method.invoke(listView, v);
+            } catch (Exception e) {
+                Global.errorLog(e);
+            }
         }
 
         mLayout.setVisibility(View.GONE);
     }
 
+    public View getView() {
+        return mLayout;
+    }
+
     public void showLoading() {
         show(true, true);
     }

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

@@ -35,7 +35,7 @@
 import org.androidannotations.annotations.EFragment;
 import org.androidannotations.annotations.FragmentArg;
 import org.androidannotations.annotations.ViewById;
-import org.apache.http.Header;
+import cz.msebera.android.httpclient.Header;
 import org.json.JSONException;
 import org.json.JSONObject;
 

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

@@ -51,7 +51,7 @@
 import org.androidannotations.annotations.FocusChange;
 import org.androidannotations.annotations.OnActivityResult;
 import org.androidannotations.annotations.ViewById;
-import org.apache.http.Header;
+import cz.msebera.android.httpclient.Header;
 import org.json.JSONException;
 import org.json.JSONObject;
 

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

@@ -31,14 +31,17 @@
 import com.tencent.android.tpush.XGPushManager;
 import com.tencent.android.tpush.service.XGPushService;
 
+import net.coding.program.common.Global;
 import net.coding.program.common.LoginBackground;
 import net.coding.program.common.Unread;
 import net.coding.program.common.UnreadNotify;
 import net.coding.program.common.htmltext.URLSpanNoUnderline;
+import net.coding.program.common.network.MyAsyncHttpClient;
 import net.coding.program.common.network.util.Login;
 import net.coding.program.common.ui.BaseActivity;
 import net.coding.program.common.ui.GlobalUnit;
 import net.coding.program.event.EventFilter;
+import net.coding.program.event.EventMessage;
 import net.coding.program.event.EventNotifyBottomBar;
 import net.coding.program.event.EventPosition;
 import net.coding.program.event.EventShowBottom;
@@ -63,6 +66,7 @@
 import java.util.List;
 
 import de.greenrobot.event.EventBus;
+import network.coding.net.checknetwork.CheckNetworkIntentService;
 
 @EActivity(R.layout.activity_main_parent)
 public class MainActivity extends BaseActivity {
@@ -125,6 +129,7 @@ protected void onCreate(Bundle savedInstanceState) {
         // qq push
         updateNotifyService();
         pushInXiaomi();
+        startNetworkCheckService();
 
         LoginBackground loginBackground = new LoginBackground(this);
         loginBackground.update();
@@ -150,6 +155,18 @@ protected void onCreate(Bundle savedInstanceState) {
         EventBus.getDefault().register(this);
     }
 
+    private void startNetworkCheckService() {
+        Intent intent = new Intent(this, CheckNetworkIntentService.class);
+        String extra = Global.getExtraString(this);
+        intent.putExtra("PARAM_APP", extra);
+
+        intent.putExtra("PARAM_GK", MyApp.sUserObject.global_key);
+        String sid = MyAsyncHttpClient.getCookie(this, Global.HOST);
+        intent.putExtra("PARAM_COOKIE", sid);
+
+        startService(intent);
+    }
+
     @Override
     protected void onStart() {
         super.onStart();
@@ -273,15 +290,13 @@ public void onItemSelected(AdapterView<?> parent, View view, int position, long
 
                 FragmentManager fm = getSupportFragmentManager();
                 FragmentTransaction ft = fm.beginTransaction();
-                Log.d("", ft == null ? "is null" : "is good");
+                Log.d(TAG, ft == null ? "is null" : "is good");
                 ft.replace(R.id.container, fragment, strings[position]);
                 ft.commit();
-
             }
 
             @Override
             public void onNothingSelected(AdapterView<?> parent) {
-
             }
         });
 
@@ -591,6 +606,11 @@ public void onEventMainThread(Object object) {
         } else if (object instanceof EventPosition) {
             EventPosition eventPosition = (EventPosition) object;
             toolbarProjectTitle.setText(eventPosition.title);
+        } else if (object instanceof EventMessage) {
+            EventMessage eventMessage = (EventMessage) object;
+            if (eventMessage.type == EventMessage.Type.loginOut) {
+                finish();
+            }
         }
     }
 

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

@@ -22,7 +22,7 @@
 import net.coding.program.common.network.MyAsyncHttpClient;
 import net.coding.program.setting.UpdateTipActivity;
 
-import org.apache.http.Header;
+import cz.msebera.android.httpclient.Header;
 import org.json.JSONObject;
 
 import java.io.File;
@@ -83,7 +83,6 @@ public int onStartCommand(Intent intent, int flags, int startId) {
     private void downloadApp() {
         try {
             if (enqueue == 0) {
-
                 DownloadManager.Request request = new DownloadManager.Request(Uri.parse(mUpdateInfo.url))
                         .setTitle("Coding")
                         .setDescription("下载Coding" + mUpdateInfo.versionName)

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

@@ -4,6 +4,7 @@
 import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageInfo;
 import android.content.res.AssetManager;
 import android.graphics.Bitmap;
 import android.graphics.Color;
@@ -44,7 +45,6 @@
 import net.coding.program.model.AccountInfo;
 import net.coding.program.model.GitFileObject;
 
-import org.apache.http.cookie.Cookie;
 import org.json.JSONObject;
 import org.xml.sax.XMLReader;
 
@@ -63,6 +63,7 @@
 import java.util.GregorianCalendar;
 import java.util.List;
 
+import cz.msebera.android.httpclient.cookie.Cookie;
 import pl.droidsonroids.gif.GifDrawable;
 
 /**
@@ -109,6 +110,37 @@ public static String dayFromTime(long time) {
         return DayFormatTime.format(time);
     }
 
+    private static final String LOG_PREFIX = "coding_";
+    private static final int LOG_PREFIX_LENGTH = LOG_PREFIX.length();
+    private static final int MAX_LOG_TAG_LENGTH = 23;
+
+    public static String makeLogTag(Class cls) {
+        return makeLogTag(cls.getSimpleName());
+    }
+
+    public static String makeLogTag(String str) {
+        if (str.length() > MAX_LOG_TAG_LENGTH - LOG_PREFIX_LENGTH) {
+            return LOG_PREFIX + str.substring(0, MAX_LOG_TAG_LENGTH - LOG_PREFIX_LENGTH - 1);
+        }
+
+        return LOG_PREFIX + str;
+    }
+
+
+    public static String getExtraString(Context context) {
+        String FEED_EXTRA = "";
+        if (FEED_EXTRA.isEmpty()) {
+            try {
+                PackageInfo pInfo = context.getPackageManager().getPackageInfo("net.coding.program", 0);
+                String appVersion = pInfo.versionName;
+                String phoneModel = Build.MODEL;
+                FEED_EXTRA = String.format("Coding_Android/%s (Android %s; %s)", appVersion, Build.VERSION.SDK_INT, phoneModel);
+            } catch (Exception e) {}
+        }
+
+        return FEED_EXTRA;
+    }
+
     public static long longFromDay(String day) throws ParseException {
         final String format = "yyyy-MM-dd";
         final SimpleDateFormat sd = new SimpleDateFormat(format);
@@ -166,6 +198,7 @@ public static boolean isImageUri(String s1) {
     }
 
     public static void syncCookie(Context context) {
+
         PersistentCookieStore cookieStore = new PersistentCookieStore(context);
         List<Cookie> cookies = cookieStore.getCookies();