Accept Pull Request #792 : (ashuo:merged -> coding:merge410)

Pull Request: 项目内外筛选
Created By: @阿朔
Accepted By: @陈超
URL: https://coding.net/u/coding/p/Coding-Android/git/pull/792

Author: cxc0618

app/src/main/AndroidManifest.xml

@@ -228,6 +228,7 @@
             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" />

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

@@ -333,7 +333,7 @@ public void onNavigationDrawerItemSelected(int position) {
         }
 
         updateNotifyFromService();
-
+        isOpenDrawerLayout(false);
         switch (position) {
             case 0://防止重复加载数据
 //                fragment = new ProjectFragment_();
@@ -356,6 +356,7 @@ public void onNavigationDrawerItemSelected(int position) {
             case 1:
 //                bottomBar.getTabWithId(R.id.tabProject).setBadgeCount(20);
                 fragment = new TaskFragment_();
+                isOpenDrawerLayout(true);
                 break;
             case 2:
                 // 进入冒泡页面，单独处理
@@ -475,6 +476,16 @@ 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() {
         DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);

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

@@ -113,6 +113,10 @@ private void iniLabels(FilterListener filterListener, EditText etSearch) {
                 continue;
             }
             labelModels.add(item.name);
+            //兼容新接口
+            if (item.all == 0) {
+                item.all = item.count;
+            }
 
             TextView labelItem = (TextView) layoutInflater.inflate(R.layout.dialog_task_filter_label_item, null);
             String str = String.format("%s (%d/%d)", item.name, item.processing, item.all);

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

@@ -9,5 +9,6 @@ public class TaskLabelModel {
     public String project_id;
     public String name;
     public int all;
+    public int count;
     public int processing;
 }

app/src/main/java/net/coding/program/model/TaskLabelModel.java

@@ -4,8 +4,8 @@
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentTransaction;
-import android.support.v4.view.GravityCompat;
-import android.support.v4.widget.DrawerLayout;
+import android.support.v7.app.ActionBar;
+import android.support.v7.widget.Toolbar;
 import android.widget.Toast;
 
 import net.coding.program.FileUrlActivity;
@@ -19,6 +19,7 @@
 import net.coding.program.project.detail.merge.ProjectPullFragment_;
 import net.coding.program.project.detail.readme.ReadmeFragment_;
 
+import org.androidannotations.annotations.AfterViews;
 import org.androidannotations.annotations.EActivity;
 import org.androidannotations.annotations.Extra;
 import org.androidannotations.annotations.OnActivityResult;
@@ -95,21 +96,27 @@ public class ProjectActivity extends BackActivity implements NetworkCallback {
     ));
     private NetworkImpl networkImpl;
 
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
+    @AfterViews
+    protected void initProjectActivity() {
+        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+        setActionBarTitle("");
+        ActionBar supportActionBar = getSupportActionBar();
+        if (supportActionBar != null) {
+            supportActionBar.setDisplayHomeAsUpEnabled(true);
+        }
 
         if (mJumpParam != null) {
             urlProject = String.format(FileUrlActivity.HOST_PROJECT, mJumpParam.mUser, mJumpParam.mProject);
-            setActionBarTitle(mJumpParam.mProject);
+            //setActionBarTitle(mJumpParam.mProject);
 
             networkImpl = new NetworkImpl(this, this);
             networkImpl.initSetting();
 
             getNetwork(urlProject, urlProject);
 
         } else if (mProjectObject != null) {
-            setActionBarTitle(mProjectObject.name);
+            //setActionBarTitle(mProjectObject.name);
             initData();
 
         } else {
@@ -216,7 +223,7 @@ public ProjectJumpParam(String mUser, String mProject) {
         }
 
         public ProjectJumpParam(String path) {
-            String[] regexs = new String[] {
+            String[] regexs = new String[]{
                     "^/u/(.*?)/p/(.*?)(?:/git)?$",
                     "^/user/(.*)/project/(.*)$",
                     "^/t/(.*?)/p/(.*?)(?:/git)?$",
@@ -254,15 +261,4 @@ public enum JumpType {
             typeHome
         }
     }
-
-    @Override
-    public void onBackPressed() {
-        DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
-        if (drawer != null && drawer.isDrawerOpen(GravityCompat.END)) {
-            drawer.closeDrawer(GravityCompat.END);
-        } else {
-            super.onBackPressed();
-        }
-    }
-
 }

app/src/main/java/net/coding/program/project/detail/ProjectActivity.java

@@ -21,7 +21,6 @@
 import net.coding.program.common.ListModify;
 import net.coding.program.common.PinyinComparator;
 import net.coding.program.common.SaveFragmentPagerAdapter;
-import net.coding.program.common.util.ViewUtils;
 import net.coding.program.message.JSONUtils;
 import net.coding.program.model.AccountInfo;
 import net.coding.program.model.ProjectObject;
@@ -102,9 +101,8 @@ protected final void initProjectTaskFragment() {
     @Override
     protected void initFilterViews() {
         super.initFilterViews();
-        toolBarTitle = (TextView) ViewUtils.findActionBarTitle(getActivity().getWindow().getDecorView());
+        toolBarTitle = (TextView) getActivity().findViewById(R.id.toolbarProjectTitle);
         if (toolBarTitle != null) {
-            toolBarTitle.setBackgroundResource(R.drawable.maopao_spinner);
             toolBarTitle.setOnClickListener(v -> {
                 meActionFilter();
             });

app/src/main/java/net/coding/program/project/detail/ProjectTaskFragment.java

@@ -31,13 +31,16 @@ public class TaskFilterFragment extends LoadingFragment {
 
     //final String urlTaskLabels = Global.HOST_API + "/v2/tasks/search_filters";
 
-    //数量项目外https://coding.net/api/tasks/count
+    //项目外
     protected final String urlTaskCountAll = Global.HOST_API + "/tasks/count";
     protected final String urlTaskLabel = Global.HOST_API + "/projects/tasks/labels?role=";
-
+    //项目外特定项目
     protected final String urlProjectTaskCount = Global.HOST_API + "/project/%s/tasks/counts";
     protected final String urlProjectTaskLabels = Global.HOST_API + "/project/%s/tasks/labels?role=";
 
+    //项目内 全部成员
+    protected final String urlALL_P_WatcherCount = Global.HOST_API + "project/{projectId}/task/count";
+    protected final String urlALL_P_CreatorCount = Global.HOST_API + "/project/%s/task/count";
 
     //任务筛选
     protected TextView toolBarTitle;

app/src/main/java/net/coding/program/project/detail/TaskFilterFragment.java

@@ -135,7 +135,7 @@ protected void bindUI(UserObject mUserObject) {
         } else {
             findViewById(R.id.hsl_main).setVisibility(View.VISIBLE);
             LinearLayout llTags = (LinearLayout) findViewById(R.id.ll_tags);
-
+            llTags.removeAllViews();
             String[] split = mUserObject.tags_str.split(",");
             for (String tag : split) {
                 if (TextUtils.isEmpty(tag)) {