coding · sicp618 · Dec 23, 2016 · Dec 13, 2016 · Dec 13, 2016 · Dec 13, 2016
diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ Android Studio 2.2.3，用gradle引用的许多第三方库，第一次加载会
 
 ##一些觉得有必要提一下的
 因为不想写一堆绑定函数，所以项目用了 [androidannotations](https://github.com/excilys/androidannotations)，如果以前没用过最好先看看。
-显示图片用的[universal-image-loader](https://github.com/nostra13/Android-Universal-Image-Loader)，网络库用的[android-async-http](https://github.com/loopj/android-async-http)，因为登录以后保存的cookie都在[android-async-http](https://github.com/loopj/android-async-http)，有些图片需要登录后的cookie才能取到（例如项目文档里面的图片），这种情况就会用先用[android-async-http](https://github.com/loopj/android-async-http)下载图片（AttachmentimagePagerFragment.java）。
+显示图片用的[universal-image-loader](https://github.com/nostra13/Android-Universal-Image-Loader)，网络库用的[android-async-http](https://github.com/loopj/android-async-http)，因为登录以后保存的cookie都在[android-async-http](https://github.com/loopj/android-async-http)，有些图片需要登录后的cookie才能取到（例如项目文件里面的图片），这种情况就会用先用[android-async-http](https://github.com/loopj/android-async-http)下载图片（AttachmentimagePagerFragment.java）。
 
 - Application用的是MyApp.java，用静态变量保存了用户信息，屏幕长宽等信息（理论上来说不是好的做法，但是这些基本都是只读的数据，而且并不大，所以就这么做了）。
 

diff --git a/app/build.gradle b/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')
+}
diff --git a/app/libs/checknetwork.aar b/app/libs/checknetwork.aar
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -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" />
@@ -214,6 +215,8 @@
             android:label="@string/app_name"
             android:launchMode="singleTask"
             android:screenOrientation="portrait"
+            android:configChanges="orientation|keyboardHidden"
+            android:windowSoftInputMode="adjustPan|stateAlwaysVisible|adjustUnspecified|stateHidden"
             android:theme="@style/ActionbarSpannerTheme1" />
         <activity
             android:name=".LoginActivity_"
@@ -226,6 +229,9 @@
             android:name=".project.detail.ProjectActivity_"
             android:icon="@drawable/ic_lancher"
             android:label="@string/title_activity_project"
+            android:theme="@style/ThemeProject"
+            android:configChanges="orientation|keyboardHidden"
+            android:windowSoftInputMode="adjustPan|stateAlwaysVisible|adjustUnspecified|stateHidden"
             android:screenOrientation="portrait" />
         <activity
             android:name=".EntranceActivity_"

diff --git a/app/src/main/java/net/coding/program/AllThirdKeys.java b/app/src/main/java/net/coding/program/AllThirdKeys.java
@@ -18,6 +18,5 @@ public class AllThirdKeys {
     public static final String geotable = "";
     public static final String ak = "";
     public static final String sk = "";
-
 }
 
diff --git a/app/src/main/java/net/coding/program/FootUpdate.java b/app/src/main/java/net/coding/program/FootUpdate.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);
     }

diff --git a/app/src/main/java/net/coding/program/ImagePagerFragment.java b/app/src/main/java/net/coding/program/ImagePagerFragment.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;
 

diff --git a/app/src/main/java/net/coding/program/LoginActivity.java b/app/src/main/java/net/coding/program/LoginActivity.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;
 

diff --git a/app/src/main/java/net/coding/program/MainActivity.java b/app/src/main/java/net/coding/program/MainActivity.java
@@ -10,7 +10,9 @@
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
+import android.support.v4.view.GravityCompat;
 import android.support.v4.view.ViewCompat;
+import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.Toolbar;
 import android.text.TextUtils;
@@ -29,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;
@@ -61,8 +66,9 @@
 import java.util.List;
 
 import de.greenrobot.event.EventBus;
+import network.coding.net.checknetwork.CheckNetworkIntentService;
 
-@EActivity(R.layout.activity_main)
+@EActivity(R.layout.activity_main_parent)
 public class MainActivity extends BaseActivity {
 
     public static final String TAG = "MainActivity";
@@ -123,6 +129,7 @@ protected void onCreate(Bundle savedInstanceState) {
         // qq push
         updateNotifyService();
         pushInXiaomi();
+        startNetworkCheckService();
 
         LoginBackground loginBackground = new LoginBackground(this);
         loginBackground.update();
@@ -148,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();
@@ -271,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) {
-
             }
         });
 
@@ -331,7 +348,7 @@ public void onNavigationDrawerItemSelected(int position) {
         }
 
         updateNotifyFromService();
-
+        isOpenDrawerLayout(false);
         switch (position) {
             case 0://防止重复加载数据
 //                fragment = new ProjectFragment_();
@@ -354,6 +371,7 @@ public void onNavigationDrawerItemSelected(int position) {
             case 1:
 //                bottomBar.getTabWithId(R.id.tabProject).setBadgeCount(20);
                 fragment = new TaskFragment_();
+                isOpenDrawerLayout(true);
                 break;
             case 2:
                 // 进入冒泡页面，单独处理
@@ -386,7 +404,14 @@ public void onNavigationDrawerItemSelected(int position) {
             }
 
             visibleTitle(toolbarMaopaoTitle);
-        } else if (position == 0) {
+        } else if (position == 0 || position == 1) {
+            if (position == 0) {
+                toolbarProjectTitle.setText("我的项目");
+            }
+            if (position == 1) {
+                toolbarProjectTitle.setText("我的任务");
+            }
+            toolbarProjectTitle.setTag(position);
             visibleTitle(toolbarProjectTitle);
         } else {
             toolbarTitle.setVisibility(View.VISIBLE);
@@ -432,7 +457,7 @@ protected void onRestoreInstanceState(Bundle savedInstanceState) {
 
     public void restoreActionBar() {
         mTitle = drawer_title[mSelectPos];
-        if (mSelectPos == 0) {
+        if (mSelectPos == 0 || mSelectPos == 1) {
             visibleTitle(toolbarProjectTitle);
         } else if (mSelectPos == 2) {
             visibleTitle(toolbarMaopaoTitle);
@@ -466,12 +491,28 @@ protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
     }
 
+    private void isOpenDrawerLayout(boolean isOpen) {
+        DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
+        if (drawer == null) return;
+        if (isOpen) {
+            drawer.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED);
+        } else {
+            drawer.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED);
+        }
+    }
+
     @Override
     public void onBackPressed() {
-        exitApp();
+        DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
+        if (drawer != null && drawer.isDrawerOpen(GravityCompat.END)) {
+            drawer.closeDrawer(GravityCompat.END);
+        } else {
+            exitApp();
+        }
     }
 
     private void exitApp() {
+
         if ((System.currentTimeMillis() - exitTime) > 2000) {
             showButtomToast("再按一次退出Coding");
             exitTime = System.currentTimeMillis();
@@ -481,7 +522,7 @@ private void exitApp() {
     }
 
     private View.OnClickListener clickProjectTitle = v -> {
-        EventBus.getDefault().post(new EventFilter());
+        EventBus.getDefault().post(new EventFilter(v.getTag()));
     };
 
     class MaopaoTypeAdapter extends BaseAdapter {
@@ -565,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();
+            }
         }
     }
 

diff --git a/app/src/main/java/net/coding/program/UpdateService.java b/app/src/main/java/net/coding/program/UpdateService.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)