提交类型 新功能修改

提交内容  修改待办工作界面

WeiChat/src/main/AndroidManifest.xml

@@ -917,7 +917,8 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
-        <activity android:name=".ui.platform.task.TaskB2BActivity">
+        <activity android:name=".ui.platform.task.TaskB2BActivity"
+            android:theme="@style/MainBaseTheme">
             <intent-filter>
                 <action android:name="com.modular.task.TaskB2BActivity" />
                 <category android:name="android.intent.category.DEFAULT" />

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/task/TaskActivity.java

@@ -38,6 +38,7 @@ import com.core.net.http.ViewUtil;
 import com.core.utils.CommonUtil;
 import com.core.utils.FlexJsonUtil;
 import com.core.utils.IntentUtils;
+import com.core.utils.ToastUtil;
 import com.core.widget.EmptyLayout;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
@@ -71,7 +72,6 @@ public class TaskActivity extends SupportToolBarActivity implements OnClickListe
     private EmptyLayout mEmptyLayout;
     private Context context;
     private PullToRefreshListView listview_main;
-    //    private SchedultAdapter adapter;
     private NewSchedultAdapter adapter;
     private List<AllProcess> allList = new ArrayList<AllProcess>();
     private List<AllProcess> waitList = new ArrayList<>();
@@ -84,6 +84,7 @@ public class TaskActivity extends SupportToolBarActivity implements OnClickListe
 
     private int tab_type = 1;
     private MenuVoiceSearchView voiceSearchView;
+    private DivideRadioGroup tabGroup;
 
     private int mCurrentPage = 1;
     private int mPosition = -1;
@@ -177,9 +178,9 @@ public class TaskActivity extends SupportToolBarActivity implements OnClickListe
             if (!ListUtils.isEmpty(waitList)) waitList.clear();
             if (!ListUtils.isEmpty(doneList)) doneList.clear();
             if (!ListUtils.isEmpty(isendList)) isendList.clear();
-            showToast(getString(R.string.common_refresh_finish));
+            ToastUtil.showToast(this, R.string.common_refresh_finish, tabGroup);
         } else {
-            showToast(getString(R.string.common_up_finish));
+            ToastUtil.showToast(this, R.string.common_up_finish, tabGroup);
         }
         listview_main.onRefreshComplete();
         if (ListUtils.isEmpty(allList)) return;
@@ -271,7 +272,7 @@ public class TaskActivity extends SupportToolBarActivity implements OnClickListe
         if (CommonUtil.isNetWorkConnected(ct)) {
             sendResquestForServerAll(2, mCurrentPage);  // update TODO :出息进来请求所有任务数据
         } else {
-             showToast( R.string.networks_out);
+            ToastUtil.showToast(this, R.string.networks_out, tabGroup);
         }
         initSearchEvent();
         /**注释：监听 */
@@ -281,32 +282,23 @@ public class TaskActivity extends SupportToolBarActivity implements OnClickListe
                                     final int position, long id) {
                 mPosition = (int) parent.getItemIdAtPosition(position);
                 NewSchedultAdapter.Store store = (NewSchedultAdapter.Store) view.getTag();
-                store.iv_website.setOnClickListener(new OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        handler.postDelayed(new Runnable() {
-                            @Override
-                            public void run() {
-                                loadWebView(position);
-                            }
-                        }, 500);
-                    }
-                });
                 Intent intent = new Intent(context, DetailTaskActivity.class);
                 intent.putExtra("description", store.tv_task_description);
                 intent.putExtra("duration", store.tv_task_duration);
-                intent.putExtra("status", store.tv_task_status.getText().toString());
-                intent.putExtra("taskid", store.pTextView3.getText().toString());//编号
-                intent.putExtra("taskname", store.pTextView4.getText().toString());//名称
-                intent.putExtra("taskemcode", store.pTextView1.getText().toString());//发起人
-                intent.putExtra("tasktime", store.pTextView2.getText().toString());//发起时间
+                intent.putExtra("status", store.tv_task_status);
+
+                intent.putExtra("taskid", store.pTextView3);//编号
+                intent.putExtra("taskname", store.pTextView4);//名称
+                intent.putExtra("taskemcode", store.pTextView1);//发起人
+                intent.putExtra("tasktime", store.pTextView2);//发起时间
+
                 intent.putExtra("performer", store.tv_task_performer);//处理人
                 intent.putExtra("emcode", store.tv_ra_resourcecode);//处理人编号
                 intent.putExtra("taskcode", store.taskCode);//处理人编号
                 intent.putExtra("ra_taskid", store.task_id);//取回复内容id
                 intent.putExtra("attachs", store.attachs);
                 intent.putExtra("endtime", store.tv_task_duration);
-                Log.i("tasktime1,endtime", store.pTextView2.getText().toString() + "," + store.tv_task_duration);
+                Log.i("tasktime1,endtime", store.pTextView2+ "," + store.tv_task_duration);
                 startActivityForResult(intent, 0x20);
             }
 
@@ -441,7 +433,7 @@ public class TaskActivity extends SupportToolBarActivity implements OnClickListe
         voiceSearchView = findViewById(R.id.mVoiceSearchView);
         findViewById(R.id.backImg).setOnClickListener(this);
         findViewById(R.id.addImg).setOnClickListener(this);
-        DivideRadioGroup tabGroup = findViewById(R.id.tabGroup);
+        tabGroup = findViewById(R.id.tabGroup);
         final View todoLine = findViewById(R.id.todoLine);
         final View doneDealLine = findViewById(R.id.doneDealLine);
         final View byMeLine = findViewById(R.id.byMeLine);
@@ -488,7 +480,7 @@ public class TaskActivity extends SupportToolBarActivity implements OnClickListe
             case R.id.addImg:
                 startActivityForResult(new Intent(context, TaskAddErpActivity.class), 0x17);
                 break;
-            case R.id.back:
+            case R.id.backImg:
                 onBackPressed();
                 break;
         }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/task/TaskB2BActivity.java

@@ -7,7 +7,6 @@ import android.graphics.drawable.BitmapDrawable;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.support.v7.app.ActionBar;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.util.Log;
@@ -18,7 +17,6 @@ import android.view.View;
 import android.view.WindowManager;
 import android.widget.AdapterView;
 import android.widget.Button;
-import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.PopupWindow;
 import android.widget.TextView;
@@ -35,7 +33,7 @@ import com.core.api.wxapi.ApiConfig;
 import com.core.api.wxapi.ApiUtils;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
-import com.core.base.BaseActivity;
+import com.core.base.SupportToolBarActivity;
 import com.core.model.Friend;
 import com.core.net.http.ViewUtil;
 import com.core.widget.EmptyLayout;
@@ -44,12 +42,13 @@ import com.core.xmpp.dao.FriendDao;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.lidroid.xutils.ViewUtils;
-import com.lidroid.xutils.view.annotation.ViewInject;
 import com.modular.appmessages.adapter.NewSchedultAdapter;
+import com.modular.appmessages.model.AllProcess;
+import com.uas.appworks.CRM.erp.activity.TaskAddErpActivity;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.activity.WebViewLoadActivity;
-import com.modular.appmessages.model.AllProcess;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
+import com.xzjmyk.pm.activity.view.DivideRadioGroup;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -64,7 +63,7 @@ import java.util.regex.Pattern;
 
 import static com.xzjmyk.pm.activity.util.oa.CommonUtil.getEmcode;
 
-public class TaskB2BActivity extends BaseActivity implements View.OnClickListener {
+public class TaskB2BActivity extends SupportToolBarActivity implements View.OnClickListener {
 
 
     private EmptyLayout mEmptyLayout;
@@ -79,15 +78,7 @@ public class TaskB2BActivity extends BaseActivity implements View.OnClickListene
     private List<AllProcess> real_List = new ArrayList<>();
     private String login_Name = CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_emname");
     private int tab_type = 1;
-    @ViewInject(R.id.isend_tv)
-    private TextView isend_tv;
-    @ViewInject(R.id.wait_tv)
-    private TextView wait_tv;
-    @ViewInject(R.id.done_tv)
-    private TextView done_tv;
-    @ViewInject(R.id.back)
-    private ImageView iv_back;
-    @ViewInject(R.id.voiceSearchView)
+    private DivideRadioGroup tabGroup;
     private VoiceSearchView voiceSearchView;
     private int mCurrentPage = 1;
     private int mPosition = -1;
@@ -301,11 +292,18 @@ public class TaskB2BActivity extends BaseActivity implements View.OnClickListene
         if (!ListUtils.isEmpty(doneList))
             Collections.sort(doneList, comparator);
     }
+    @Override
+    public int getToolBarId() {
+        return com.modular.appmessages.R.id.cycleCountToolBar;
+    }
 
+    @Override
+    public int getLayoutRes() {
+        return com.modular.appmessages.R.layout.acativity_task_list;
+    }
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.task_listview);
         context = TaskB2BActivity.this;
         ViewUtils.inject(this);
         getSupportActionBar().setTitle("待办工作");
@@ -331,25 +329,14 @@ public class TaskB2BActivity extends BaseActivity implements View.OnClickListene
                                     final int position, long id) {
                 mPosition = (int) parent.getItemIdAtPosition(position);
                 NewSchedultAdapter.Store store = (NewSchedultAdapter.Store) view.getTag();
-                store.iv_website.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        handler.postDelayed(new Runnable() {
-                            @Override
-                            public void run() {
-                                loadWebView(position);
-                            }
-                        }, 500);
-                    }
-                });
                 Intent intent = new Intent(context, TaskDetailB2BActivity.class);
                 intent.putExtra("description", store.tv_task_description);
                 intent.putExtra("duration", store.tv_task_duration);
-                intent.putExtra("status", store.tv_task_status.getText().toString());
-                intent.putExtra("taskid", store.pTextView3.getText().toString());//编号
-                intent.putExtra("taskname", store.pTextView4.getText().toString());//名称
-                intent.putExtra("taskemcode", store.pTextView1.getText().toString());//发起人
-                intent.putExtra("tasktime", store.pTextView2.getText().toString());//发起时间
+                intent.putExtra("status", store.tv_task_status);
+                intent.putExtra("taskid", store.pTextView3);//编号
+                intent.putExtra("taskname", store.pTextView4);//名称
+                intent.putExtra("taskemcode", store.pTextView1);//发起人
+                intent.putExtra("tasktime", store.pTextView2);//发起时间
                 intent.putExtra("performer", store.tv_task_performer);//处理人
                 intent.putExtra("emcode", store.tv_ra_resourcecode);//处理人编号
                 intent.putExtra("taskcode", store.taskCode);//处理人编号
@@ -489,19 +476,46 @@ public class TaskB2BActivity extends BaseActivity implements View.OnClickListene
     }
 
     private void initHeaderView() {
-        View view = LayoutInflater.from(ct).inflate(R.layout.task_header, null);
-        ActionBar bar = this.getSupportActionBar();
-        bar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
-        wait_tv = (TextView) view.findViewById(R.id.wait_tv);
-        done_tv = (TextView) view.findViewById(R.id.done_tv);
-        isend_tv = (TextView) view.findViewById(R.id.isend_tv);
-        iv_back = (ImageView) view.findViewById(R.id.back);
-        bar.setCustomView(view);
-        isend_tv.setOnClickListener(this);
-        done_tv.setOnClickListener(this);
-        wait_tv.setOnClickListener(this);
-        wait_tv.setSelected(true);
-        iv_back.setOnClickListener(this);
+        voiceSearchView = findViewById(com.modular.appmessages.R.id.mVoiceSearchView);
+        findViewById(com.modular.appmessages.R.id.backImg).setOnClickListener(this);
+        findViewById(com.modular.appmessages.R.id.addImg).setOnClickListener(this);
+        tabGroup = findViewById(com.modular.appmessages.R.id.tabGroup);
+        final View todoLine = findViewById(com.modular.appmessages.R.id.todoLine);
+        final View doneDealLine = findViewById(com.modular.appmessages.R.id.doneDealLine);
+        final View byMeLine = findViewById(com.modular.appmessages.R.id.byMeLine);
+        tabGroup.setOnCheckedChangeListener(new DivideRadioGroup.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(DivideRadioGroup group, int checkedId) {
+                todoLine.setVisibility(View.GONE);
+                doneDealLine.setVisibility(View.GONE);
+                byMeLine.setVisibility(View.GONE);
+                if (checkedId == com.modular.appmessages.R.id.todoRb) {
+                    todoLine.setVisibility(View.VISIBLE);
+                    tab_type = 1;
+                    adapter = new NewSchedultAdapter(ct, waitList);
+                    real_List = waitList;
+                } else if (checkedId == com.modular.appmessages.R.id.doneDealRb) {
+                    doneDealLine.setVisibility(View.VISIBLE);
+                    tab_type = 2;
+                    adapter = new NewSchedultAdapter(ct, doneList);
+                    real_List = doneList;
+                } else if (checkedId == com.modular.appmessages.R.id.byMeRb) {
+                    byMeLine.setVisibility(View.VISIBLE);
+                    tab_type = 3;
+                    adapter = new NewSchedultAdapter(ct, isendList);
+                    adapter.setiSend("iSend");
+                    real_List = isendList;
+                }
+                if (adapter == null) return;
+                listview_main.setAdapter(adapter);
+                if (adapter.getCount() != 0) {
+                    sendHomeBroadcast(adapter.getCount());
+                } else {
+                    mEmptyLayout.showEmpty();
+                }
+                listview_main.onRefreshComplete();
+            }
+        });
         voiceSearchView.setOnClickListener(this);
         tab_type = 1;
     }
@@ -740,40 +754,13 @@ public class TaskB2BActivity extends BaseActivity implements View.OnClickListene
     @Override
     public void onClick(View v) {
         switch (v.getId()) {
-            case R.id.wait_tv:
-                tab_type = 1;
-                wait_tv.setSelected(true);
-                done_tv.setSelected(false);
-                isend_tv.setSelected(false);
-                doShowListData();
-                break;
-            case R.id.done_tv:
-                tab_type = 2;
-                wait_tv.setSelected(false);
-                done_tv.setSelected(true);
-                isend_tv.setSelected(false);
-                doShowListData();
+            case R.id.addImg:
+                startActivityForResult(new Intent(context, TaskAddErpActivity.class), 0x17);
                 break;
-            case R.id.isend_tv:
-                tab_type = 3;
-                wait_tv.setSelected(false);
-                done_tv.setSelected(false);
-                isend_tv.setSelected(true);
-                doShowListData();
-                break;
-
-            case R.id.back:
+            case  R.id.backImg:
                 onBackPressed();
                 break;
         }
-        if (adapter == null) return;
-        listview_main.setAdapter(adapter);
-        if (adapter.getCount() != 0) {
-            sendHomeBroadcast(adapter.getCount());
-        } else {
-            mEmptyLayout.showEmpty();
-        }
-        listview_main.onRefreshComplete();
     }
 
     private void sendServiceForISend(int mCurrentPage) {

app_core/common/src/main/java/com/core/base/SupportToolBarActivity.java

@@ -73,7 +73,7 @@ public class SupportToolBarActivity extends BaseActivity {
         }
     }
 
-    public  void initCommonToolbar() {
+    public void initCommonToolbar() {
         LogUtil.i("gong", "initCommonToolbar");
         if (commonToolBar != null) {
             LogUtil.i("gong", "commonToolBar != null");
@@ -237,6 +237,8 @@ public class SupportToolBarActivity extends BaseActivity {
 
 
     public void showToast(CharSequence message) {
+        LogUtil.i("gong", "showToast=" + message);
+        LogUtil.i("gong", "contentFl=" + (contentFl != null));
         if (contentFl != null && !TextUtils.isEmpty(message)) {
             ToastUtil.showToast(this, message, contentFl);
         } else {

app_modular/appmessages/src/main/java/com/modular/appmessages/activity/ApprovalActivity.java

@@ -12,6 +12,7 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.WindowManager;
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
 import android.widget.ImageView;
@@ -186,6 +187,9 @@ public class ApprovalActivity extends SupportToolBarActivity implements IApprova
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        getWindow().setSoftInputMode
+                (WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN |
+                        WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN);
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_approval);
         ViewUtils.inject(this);
@@ -323,7 +327,7 @@ public class ApprovalActivity extends SupportToolBarActivity implements IApprova
 
     @Override
     public void nodeDealMan(String nodeDealMan) {
-        LogUtil.i("gong","nodeDealMan="+nodeDealMan);
+        LogUtil.i("gong", "nodeDealMan=" + nodeDealMan);
         if (StringUtil.isEmpty(nodeDealMan)) {
             findViewById(R.id.changedealmanTV).setVisibility(View.GONE);
             findViewById(R.id.disagreeTV).setVisibility(View.GONE);

app_modular/appmessages/src/main/java/com/modular/appmessages/adapter/NewSchedultAdapter.java

@@ -8,8 +8,6 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
-import android.widget.CheckBox;
-import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.common.data.ObjectUtils;
@@ -47,24 +45,31 @@ public class NewSchedultAdapter extends BaseAdapter {
     public void setSearch_content(String search_content) {
         this.search_content = search_content;
     }
+
     public List<AllProcess> getReal_List() {
         return real_List;
     }
+
     public void setReal_List(List<AllProcess> real_List) {
         this.real_List = real_List;
     }
+
     private Context context;
+
     public NewSchedultAdapter() {
     }
+
     public NewSchedultAdapter(Context context, List<AllProcess> fArrayList) {
         this.context = context;
         this.fList = fArrayList;
     }
+
     public NewSchedultAdapter(Context context, List<AllProcess> fArrayList, List<AllProcess> flistNew) {
         this.context = context;
         this.fList = fArrayList;
         this.flistNew = flistNew;
     }
+
     @Override
     public int getCount() {
         if (fList == null || fList.isEmpty()) {
@@ -72,14 +77,17 @@ public class NewSchedultAdapter extends BaseAdapter {
         }
         return fList.size();
     }
+
     @Override
     public Object getItem(int position) {
         return fList.get(position);
     }
+
     @Override
     public long getItemId(int position) {
         return position;
     }
+
     @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
     @Override
     public View getView(int position, View view, ViewGroup parent) {
@@ -88,65 +96,60 @@ public class NewSchedultAdapter extends BaseAdapter {
         if (view == null) {
             store = new Store();
             view = LayoutInflater.from(context).inflate(
-                    R.layout.item_erptask, parent, false);
-            store.pTextView1 = (TextView) view.findViewById(R.id.TextView03);
-            store.pTextView2 = (TextView) view.findViewById(R.id.TextView04);
-            store.pTextView3 = (TextView) view.findViewById(R.id.TextView01);
-            store.iv_website = (ImageView) view.findViewById(R.id.iv_website);
-            store.pTextView4 = (TextView) view.findViewById(R.id.TextView02);
-            store.tv_task_status = (TextView) view.findViewById(R.id.tv_task_status);
-            store.tv_title = (TextView) view.findViewById(R.id.tv_title);
-            store.tv_date = (TextView) view.findViewById(R.id.tv_date);
-            store.tv_status = (TextView) view.findViewById(R.id.tv_status);
+                    R.layout.item_approval_list, parent, false);
+            store.tv_title = view.findViewById(R.id.titleTv);
+            view.findViewById(R.id.headImage).setVisibility(View.GONE);
+            store.tv_date = view.findViewById(R.id.statusTv);
+            store.tv_status = view.findViewById(R.id.subTitle);
             view.setTag(store);
         } else {
             store = (Store) view.getTag();
         }
+        try {
+            bindView(store, fields_object);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return view;
+    }
 
-        view.setBackground(context.getResources().getDrawable(R.drawable.selector_me_menu_item_bg));
+    private void bindView(Store store, AllProcess fields_object) throws Exception {
         if (fields_object.getTypecode().equals("pagingrelease")) {// 知会
             String pTextView3Str = "发起人：<font color='#990000'>"
                     + fields_object.getRecorder() + "</font>";
             CharSequence pTextView3HTML = Html.fromHtml(pTextView3Str);
-            store.pTextView3.setText(pTextView3HTML);
-            store.pTextView4.setText("" + fields_object.getId());
+            store.pTextView3 = pTextView3HTML;
+            store.pTextView4 = "" + fields_object.getId();
             String pTextView1Str = "<font color='#6666CC'>"
                     + fields_object.getTaskname().replaceAll("</br>", "")
                     + "</font>";
             CharSequence pTextView1HTML = Html.fromHtml(pTextView1Str);
-            store.pTextView1.setText(pTextView1HTML);
-            store.pTextView2.setVisibility(View.GONE);
-            store.iv_website.setVisibility(View.GONE);
-            // store.arrow.setVisibility(View.GONE);
+            store.pTextView1 = pTextView1HTML;
         } else if (fields_object.getTypecode().contains("task")) {// 待办任务
-//            if (StringUtil.isEmpty(fields_object.getLink())){
-            store.iv_website.setVisibility(View.GONE);
-//            }else{
-//                store.iv_website.setVisibility(View.VISIBLE);
-//            }
 
-            store.pTextView1.setText(fields_object.getRecorder());
+
+            store.pTextView1 = fields_object.getRecorder();
             if (!ObjectUtils.isEquals(null, fields_object.getDatetime())) {
-                store.pTextView2.setText(new SimpleDateFormat("yyyy-MM-dd HH:mm")
-                        .format(fields_object.getDatetime()));
+                store.pTextView2 = new SimpleDateFormat("yyyy-MM-dd HH:mm")
+                        .format(fields_object.getDatetime());
             }
             store.tv_task_duration = fields_object.getEndTime();
             store.tv_ra_resourcecode = fields_object.getRa_resourcecode();
             store.taskCode = fields_object.getTaskcode();
-            store.pTextView4.setText(fields_object.getTaskname());
-            store.pTextView3.setText(fields_object.getTaskid());
-            store.tv_task_status.setText(fields_object.getMainname());
+            store.pTextView4 = fields_object.getTaskname();
+            store.pTextView3 = fields_object.getTaskid();
+            store.tv_task_status = fields_object.getMainname();
             store.tv_task_description = fields_object.getDescribe() == null ? "未填写" : fields_object.getDescribe();
             store.tv_task_performer = fields_object.getDealpersoncode() == null ? "未填写" : fields_object.getDealpersoncode();
             store.attachs = fields_object.getAttachs();
             store.task_id = fields_object.getRa_taskid();
             String recoder_name = "";
-            if (!StringUtil.isEmpty(iSend) && "iSend".equals(iSend)){
+            if (!StringUtil.isEmpty(iSend) && "iSend".equals(iSend)) {
                 recoder_name = "";
-            }else {
-                recoder_name = fields_object.getRecorder()+ MyApplication.getInstance().getString(R.string.task_sended);
+            } else {
+                recoder_name = fields_object.getRecorder() + MyApplication.getInstance().getString(R.string.task_sended);
             }
-            store.tv_title.setText( recoder_name  + fields_object.getTaskname());
+            store.tv_title.setText(recoder_name + fields_object.getTaskname());
             store.tv_status.setText(fields_object.getMainname());
 
             if (!ObjectUtils.isEquals(null, fields_object.getDatetime())) {
@@ -154,42 +157,37 @@ public class NewSchedultAdapter extends BaseAdapter {
                         .format(fields_object.getDatetime()));
             }
         } else {// 待办审批流
-            store.pTextView3.setText("" + fields_object.getCodevalue());//编号
-            store.pTextView4.setText("" + fields_object.getMainname());//名称
-            store.pTextView1.setText(fields_object.getRecorder());//发起人
-            store.tv_task_status.setText(fields_object.getStatus());//状态
+            store.pTextView3 = "" + fields_object.getCodevalue();//编号
+            store.pTextView4 = "" + fields_object.getMainname();//名称
+            store.pTextView1 = fields_object.getRecorder();//发起人
+            store.tv_task_status = fields_object.getStatus();//状态
             if (fields_object.getDatetime() != null) {
-                store.pTextView2.setText(""
+                store.pTextView2 = ""
                         + new SimpleDateFormat("yyyy-MM-dd HH:mm")
-                        .format(fields_object.getDatetime()));
+                        .format(fields_object.getDatetime());
             }
-            store.iv_website.setVisibility(View.GONE);
         }
-        return view;
     }
 
     public class Store {
         public String task_id;//取回复内容id
         public String attachs;//
         public String tv_ra_resourcecode;//
-        public ImageView iv_website;//网址
-        public TextView tv_task_status;//状态
         public String taskCode;
-        public TextView nTextView;
-        public TextView pTextView;
-        public TextView pTextView1;// 发起人
-        public TextView pTextView2;// 发起时间
-        public TextView pTextView3;//编号
-        public TextView pTextView4;//名称
         public String tv_task_performer;//执行人
         public String tv_task_description;//描述
         public String tv_task_duration;//持续时间
-        public TextView urlTextView;
-        public CheckBox bCheckBox;
-        public ImageView arrow;
+
         public TextView tv_title;
         public TextView tv_date;
         public TextView tv_status;
+
+        public CharSequence pTextView1;// 发起人
+        public CharSequence pTextView2;// 发起时间
+        public CharSequence pTextView3;//编号
+        public CharSequence pTextView4;//名称
+        public CharSequence tv_task_status;//状态
+
     }
 
 }

app_modular/apputils/src/main/res/drawable/text_bule_hint_bg.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-<item android:drawable="@color/approval_select_tab" android:state_checked="true"/>
-<item android:drawable="@color/approval_tab"/>
+    <item android:drawable="@color/approval_select_tab" android:state_checked="true" />
+    <item android:drawable="@color/approval_tab" />
 </selector>

app_modular/apputils/src/main/res/layout/acativity_task_list.xml

@@ -14,6 +14,7 @@
         android:id="@+id/tabGroup"
         android:layout_width="match_parent"
         android:layout_height="40dp"
+        android:background="@color/white"
         android:orientation="horizontal">
 
         <FrameLayout
@@ -38,7 +39,8 @@
                 android:checked="true"
                 android:gravity="center"
                 android:text="@string/task_wait_todo"
-                android:textColor="@drawable/text_bule_hint_bg" />
+                style="@style/IMTabButton"
+                />
 
         </FrameLayout>
 
@@ -63,9 +65,9 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:button="@null"
+                style="@style/IMTabButton"
                 android:gravity="center"
-                android:text="@string/task_done_deal"
-                android:textColor="@drawable/text_bule_hint_bg" />
+                android:text="@string/task_done_deal" />
         </FrameLayout>
 
 
@@ -92,7 +94,7 @@
                 android:button="@null"
                 android:gravity="center"
                 android:text="@string/task_request_me"
-                android:textColor="@drawable/text_bule_hint_bg" />
+                style="@style/IMTabButton" />
         </FrameLayout>
 
     </com.xzjmyk.pm.activity.view.DivideRadioGroup>
@@ -102,8 +104,8 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_below="@+id/tv_dispaly_top"
-        android:divider="@color/gray_light"
-        android:dividerPadding="1px"
+        android:background="#f2f2f2"
+        android:dividerPadding="0px"
         android:fadingEdge="none"
         android:listSelector="#00000000"
         android:scrollbars="none"

app_modular/apputils/src/main/res/layout/item_approval_list.xml

@@ -6,11 +6,11 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="60dp"
-        android:layout_margin="@dimen/padding"
-        android:paddingLeft="@dimen/padding"
-        android:paddingRight="@dimen/padding"
-        android:paddingTop="@dimen/paddingMin"
-        android:paddingBottom="@dimen/paddingMin"
+        android:layout_marginTop="@dimen/paddingMin"
+        android:layout_marginBottom="@dimen/paddingMin"
+        android:layout_marginLeft="@dimen/padding"
+        android:layout_marginRight="@dimen/padding"
+        android:padding="@dimen/padding"
         android:background="@drawable/radian_white_utils_bg">
 
         <de.hdodenhof.circleimageview.CircleImageView
@@ -26,19 +26,19 @@
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
             android:layout_alignTop="@id/headImage"
-            android:text="请假申请-AL3630467"
             android:textColor="#FF333333"
             android:textSize="10sp" />
 
         <TextView
             android:id="@+id/titleTv"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_alignTop="@id/headImage"
+            android:layout_toLeftOf="@id/statusTv"
+            android:layout_marginRight="@dimen/paddingMin"
             android:layout_toRightOf="@id/headImage"
             android:ellipsize="end"
             android:lines="1"
-            android:text="请假申请-AL3630467"
             android:textColor="#FF333333"
             android:textSize="15sp" />
 
@@ -49,7 +49,6 @@
             android:layout_below="@id/titleTv"
             android:layout_toRightOf="@id/headImage"
             android:layout_marginTop="4dp"
-            android:text="请假申请-AL3630467"
             android:textColor="#FF333333"
             android:textSize="12sp" />
     </RelativeLayout>