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

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

Author: cxc0618

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

@@ -46,15 +46,14 @@ public static DrawerLayoutHelper getInstance() {
 
     /**
      * @param context
-     * @param projectInner 是不是显示标签数量
      * @param drawerLayout
      * @param filterModel
      * @param filterListener
      */
-    public void initData(Context context, boolean projectInner, DrawerLayout drawerLayout, FilterModel filterModel, FilterListener filterListener) {
+    public void initData(Context context, DrawerLayout drawerLayout, FilterModel filterModel, FilterListener filterListener) {
         this.mContext = context;
         this.mFilterModel = filterModel;
-        this.showLabelCount = !projectInner;
+        this.showLabelCount = false;
         font2 = mContext.getResources().getColor(R.color.font_2);
         green = mContext.getResources().getColor(R.color.green);
 
@@ -105,7 +104,6 @@ private void dismiss() {
     }
 
     private void iniLabels(FilterListener filterListener, EditText etSearch) {
-
         if (mFilterModel == null || mFilterModel.labelModels == null || mFilterModel.labelModels.size() == 0) {
             return;
         }

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

@@ -192,7 +192,7 @@ protected final void actionFilter() {
             }
         }
 
-        DrawerLayoutHelper.getInstance().initData(getContext(), isProjectInner(), drawerLayout, mFilterModel, new FilterListener() {
+        DrawerLayoutHelper.getInstance().initData(getContext(), drawerLayout, mFilterModel, new FilterListener() {
             @Override
             public void callback(FilterModel filterModel) {
                 mFilterModel = filterModel;

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

@@ -4,7 +4,6 @@
 import android.content.Intent;
 import android.graphics.PorterDuff;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -23,7 +22,6 @@
 import net.coding.program.common.BlankViewDisplay;
 import net.coding.program.common.Global;
 import net.coding.program.common.ListModify;
-import net.coding.program.common.network.LoadingFragment;
 import net.coding.program.common.network.RefreshBaseFragment;
 import net.coding.program.common.umeng.UmengEvent;
 import net.coding.program.common.util.BlankViewHelp;
@@ -182,9 +180,30 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
     String checkHostFilter() {
         String host = "";
         int userId = mMembers.user_id;
-        if (!TextUtils.isEmpty(mMeAction) && userId != 0) {
-            host += String.format("%s=%s&", mMeAction, userId);
+
+        //项目内 不是全部任务
+        if (mShowAdd && userId != 0) {
+            if (!TextUtils.isEmpty(mMeAction)) {
+                host += String.format("owner=%s&", userId);
+            }
+            //关注，创建可以返回数据
+            if (!TextUtils.isEmpty(mMeAction) && !mMeAction.equals("owner")) {
+                if (!TextUtils.isEmpty(mMeAction)) {
+                    host += String.format("%s=%s&", mMeAction, MyApp.sUserObject.id);
+                }
+            }
+        } else if (mShowAdd) {
+            //项目内 全部任务
+            if (!TextUtils.isEmpty(mMeAction) && !mMeAction.equals("owner")) {
+                host += String.format("%s=%s&", mMeAction, MyApp.sUserObject.id);
+            }
+        } else {
+            //项目外
+            if (!TextUtils.isEmpty(mMeAction) && userId != 0) {
+                host += String.format("%s=%s&", mMeAction, userId);
+            }
         }
+
         if (!TextUtils.isEmpty(mStatus) && !mStatus.equals("0")) {
             host += String.format("status=%s&", mStatus);
         }

app/src/main/res/layout/dialog_task_filter.xml

@@ -79,10 +79,9 @@
 
                     <com.flyco.roundview.RoundRelativeLayout
                         android:layout_width="match_parent"
-                        android:layout_height="35dp"
+                        android:layout_height="50dp"
                         android:layout_marginLeft="20dp"
-                        android:layout_marginRight="20dp"
-                        android:layout_marginTop="15dp">
+                        android:layout_marginRight="20dp">
 
                         <EditText
                             android:id="@+id/et_search"