提交类型 处理bug

提交内容   处理首页显示图标错乱的问题

WeiChat/src/main/res/layout/item_approval_enclosure.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              style="@style/approvalStyle">
-
-    <TextView
-        android:id="@+id/nameTv"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center|left"
-        android:layout_marginLeft="20dp"
-        android:layout_marginRight="20dp"
-        android:textColor="@color/titleBlue"/>
-
-
-
-</LinearLayout>

app_core/common/src/main/java/com/core/utils/CommonUtil.java

@@ -30,6 +30,7 @@ import android.util.Base64;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.View;
+import android.view.WindowManager;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 import android.widget.ImageView;
@@ -52,6 +53,7 @@ import com.core.dao.DBManager;
 import com.core.dao.SignAutoLogDao;
 import com.core.interfac.OnVoiceCompleteListener;
 import com.core.model.EmployeesEntity;
+import com.core.net.http.http.OAHttpHelper;
 import com.core.xmpp.model.SignAutoLogEntity;
 import com.core.xmpp.utils.audio.voicerecognition.JsonParser;
 import com.iflytek.cloud.RecognizerResult;
@@ -887,7 +889,26 @@ public class CommonUtil {
         }
 
     }
+    /**
+     * 关闭软键盘
+     *
+     * @param mContext  上下文
+     */
+    public static void closeKeybord( final Activity mContext) {
+        if (mContext != null) {
+            if(mContext.getWindow().getAttributes().softInputMode == WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE){
+                OAHttpHelper.getInstance().postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+                        InputMethodManager imm = (InputMethodManager) mContext
+                                .getSystemService(Context.INPUT_METHOD_SERVICE);
+                        imm.hideSoftInputFromWindow(mContext.getWindow().getDecorView().getWindowToken(), 0);
+                    }
+                }, 100);
+            }
+        }
 
+    }
     public static boolean isBiteman() {
         String baseUrl = getSharedPreferences(MyApplication.getInstance(), "erp_base");
         return !StringUtil.isEmpty(baseUrl) && baseUrl.contains("http://202.104.151.184:8099/ERP/");

app_core/common/src/main/res/layout/item_approval_enclosure.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              style="@style/approvalStyle">
-
-    <TextView
-        android:id="@+id/nameTv"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center|left"
-        android:layout_marginLeft="20dp"
-        android:layout_marginRight="20dp"
-        android:textColor="@color/titleBlue"/>
-
-
-
-</LinearLayout>

app_modular/appme/src/main/res/menu/bsetting_more.xml

@@ -6,7 +6,7 @@
     <item
         android:id="@+id/booking_set_list"
         android:title="@string/more"
-        android:icon="@drawable/xlist"
+        android:icon="@drawable/ic_oa_list"
         app:showAsAction="ifRoom" />
 
 </menu>

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

@@ -117,6 +117,7 @@ public class ApprovalAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
             case Approval.SETUPTASK:
                 return new BaseRVViewHodler(parent);
             case Approval.ENCLOSURE://单行列表
+                return new EnclosureViewHolder(parent);
             case Approval.TAG:
                 return new TagViewHolder(parent);
             case Approval.POINTS:
@@ -137,6 +138,8 @@ public class ApprovalAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
                 bindTitleView((TitleViewHolder) holder, position);
             } else if (holder instanceof BaseRVViewHodler) {
                 bindBaseRVView((BaseRVViewHodler) holder, position);
+            } else if (holder instanceof EnclosureViewHolder) {
+                bindEnclosureView((EnclosureViewHolder) holder, position);
             } else if (holder instanceof TagViewHolder) {
                 bindTAGView((TagViewHolder) holder, position);
             } else if (holder instanceof PointsViewHolder) {
@@ -302,6 +305,23 @@ public class ApprovalAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
 
     }
 
+    private void bindEnclosureView(EnclosureViewHolder holder, final int position) {
+        String name = approvals.get(position).getCaption();
+        holder.enclosureTv.setText(TextUtils.isEmpty(name) ? "" : name);
+        holder.enclosureTv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                gotoReadEnclosure(approvals.get(position));
+            }
+        });
+
+        if ((position + 1) < ListUtils.getSize(approvals) && approvals.get(position).getType() != approvals.get(position + 1).getType()) {
+            holder.endView.setVisibility(View.VISIBLE);
+        } else {
+            holder.endView.setVisibility(View.GONE);
+        }
+    }
+
     private void bindTAGView(TagViewHolder holder, final int position) {
         holder.valuesRG.setVisibility(View.GONE);
         String name = approvals.get(position).getCaption();
@@ -499,7 +519,7 @@ public class ApprovalAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
             if (isWeb(approval.getValues())) {
                 setViewShowAble(true, holder.valueWeb);
                 setViewShowAble(false, holder.valueEt, holder.valueTv);
-                LogUtil.i("isWeb"+approval.getValues());
+                LogUtil.i("isWeb" + approval.getValues());
                 holder.valueWeb.loadDataWithBaseURL(null, approval.getValues(), "text/html", "utf-8", null);
             } else {
                 setViewShowAble(true, holder.valueTv);
@@ -623,6 +643,21 @@ public class ApprovalAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
         }
     }
 
+    private class EnclosureViewHolder extends RecyclerView.ViewHolder {
+        TextView enclosureTv;
+        View endView;
+
+        public EnclosureViewHolder(ViewGroup parent) {
+            this(LayoutInflater.from(ct).inflate(R.layout.item_approval_enclosure, parent, false));
+        }
+
+        public EnclosureViewHolder(View itemView) {
+            super(itemView);
+            enclosureTv = itemView.findViewById(R.id.nameTv);
+            endView = itemView.findViewById(R.id.endView);
+        }
+    }
+
     private class TagViewHolder extends RecyclerView.ViewHolder {
         TextView nameTv;
         View padding, line;

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

@@ -1,185 +0,0 @@
-package com.modular.appmessages.adapter;
-
-import android.content.Context;
-import android.text.Html;
-import android.text.TextUtils;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.common.data.ListUtils;
-import com.common.data.StringUtil;
-import com.core.app.MyApplication;
-import com.core.model.Friend;
-import com.core.model.XmppMessage;
-import com.core.utils.TimeUtils;
-import com.core.utils.helper.AvatarHelper;
-import com.core.utils.sortlist.BaseSortModel;
-import com.core.xmpp.utils.HtmlUtils;
-import com.modular.appmessages.R;
-
-import java.util.List;
-
-/**
- * Created by Bitliker on 2017/3/1.
- */
-
-public class MessageAdapter extends BaseAdapter {
-
-    private List<BaseSortModel<Friend>> mFriendList;
-    private Context mContext;
-
-    public MessageAdapter(List<BaseSortModel<Friend>> mFriendList, Context mContext) {
-        this.mFriendList = mFriendList;
-        this.mContext = mContext;
-    }
-
-    public List<BaseSortModel<Friend>> getmFriendList() {
-        return mFriendList;
-    }
-
-    public void setmFriendList(List<BaseSortModel<Friend>> mFriendList) {
-        this.mFriendList = mFriendList;
-    }
-
-    @Override
-    public int getCount() {
-        return ListUtils.isEmpty(mFriendList) ? 0 : mFriendList.size();
-    }
-
-    @Override
-    public Object getItem(int position) {
-        return mFriendList.get(position).getBean();
-    }
-
-    @Override
-    public long getItemId(int position) {
-        return position;
-    }
-
-    @Override
-    public View getView(int position, View convertView, ViewGroup parent) {
-        Friend friend = (Friend) getItem(position);
-        ViewHolder holder = null;
-        if (convertView == null) {
-            convertView = LayoutInflater.from(mContext).inflate(R.layout.item_message_header, null);
-            holder = new ViewHolder();
-            holder.avatar_img = (ImageView) convertView.findViewById(R.id.headerImg);
-            holder.num_tv = (TextView) convertView.findViewById(R.id.headerNumTv);
-            holder.nick_name_tv = (TextView) convertView.findViewById(R.id.titleTv);
-            holder.content_tv = (TextView) convertView.findViewById(R.id.headerSubTv);
-            holder.time_tv = (TextView) convertView.findViewById(R.id.timeTv);
-            convertView.setTag(holder);
-        } else {
-            holder = (ViewHolder) convertView.getTag();
-        }
-        bindView(holder, friend);
-        return convertView;
-    }
-
-    private void bindView(ViewHolder holder, Friend friend) {
-        holder.avatar_img.setBackgroundResource(R.color.transparent);
-        //设置头像
-        if (friend.getType() == XmppMessage.TYPE_ERP) {
-            doShowMsgPhotos(holder, friend);
-            holder.time_tv.setText(TimeUtils.getFriendlyTimeDesc(MyApplication.getInstance(), friend.getTimeSend()));
-        } else if (friend.getType() == XmppMessage.TYPE_UUHELPER) {
-            holder.time_tv.setText(TimeUtils.getFriendlyTimeDesc(MyApplication.getInstance(), friend.getTimeSend()));
-            holder.avatar_img.setImageResource( R.drawable.icon_uuhelper);
-        } else {
-            if (friend.getRoomFlag() == 0) {// 这是单个人
-                AvatarHelper.getInstance().display(friend.getUserId(), holder.avatar_img, false, false);//每次刷新都会去删除此人缓存
-            } else {
-                if (TextUtils.isEmpty(friend.getRoomCreateUserId())) {
-                    holder.avatar_img.setImageResource(R.drawable.qunliao);
-                } else {
-                    AvatarHelper.getInstance().displayAvatarPng(friend.getRoomCreateUserId(), holder.avatar_img, true);// 目前在备注名放房间的创建者Id
-                }
-            }
-            holder.time_tv.setText(TimeUtils.getFriendlyTimeDesc(MyApplication.getInstance(), friend.getTimeSend()));
-        }
-
-        //设置名字和时间
-        holder.nick_name_tv.setText(friend.getRemarkName() != null ? friend.getRemarkName() : friend.getNickName());
-        //设置内容数据显示
-        CharSequence content = "";
-        if (friend.getType() == XmppMessage.TYPE_TEXT) {
-            String s = StringUtil.replaceSpecialChar(friend.getContent());
-            content = HtmlUtils.transform200SpanString(s.replaceAll("\n", "\r\n"), true);
-        } else {
-            content = friend.getContent();
-        }
-        if (!TextUtils.isEmpty(content)) {
-            holder.content_tv.setText(Html.fromHtml(content.toString()));
-        } else {
-            holder.content_tv.setText("");
-        }
-        //设置红点显示数量
-        if (friend.getUnReadNum() > 0) {
-            String numStr = friend.getUnReadNum() >= 99 ? "99+" : friend.getUnReadNum() + "";
-            holder.num_tv.setText(numStr);
-            holder.num_tv.setVisibility(View.VISIBLE);
-        } else {
-            holder.num_tv.setVisibility(View.GONE);
-        }
-
-    }
-
-    private void doShowMsgPhotos(ViewHolder holder, Friend friend) {
-        String msg_type = friend.getDescription();
-        if (!TextUtils.isEmpty(msg_type)) {
-            int imageurl = 0;
-            switch (msg_type) {
-                case "note": // 通知公告
-                    imageurl = R.drawable.home_image_03_u;
-                    break;
-                case "common": // 普通知会
-                    imageurl = R.drawable.putongzhihui;
-                    break;
-                case "b2b": // b2b提醒
-                    imageurl = R.drawable.b2btixing;
-                    break;
-                case "crm":  // CRM提醒
-                    imageurl = R.drawable.crmtixing;
-                    break;
-                case "kpi": // 考勤提醒
-                    imageurl = R.drawable.kaoqintixing;
-                    break;
-                case "meeting": // 会议提醒
-                    imageurl = R.drawable.huiyitixing;
-                    break;
-                case "process": // 审批知会
-                    imageurl = R.drawable.shenpizhihui;
-                    break;
-                case "job": // 稽核提醒
-                    imageurl = R.drawable.jihetixing;
-                    break;
-                case "system": // 知会消息
-                    imageurl = R.drawable.zhihuixiaoxi;
-                    break;
-                case "task": // 任务提醒
-                    imageurl = R.drawable.home_image_02_u;
-                    break;
-                default:
-                    imageurl = R.drawable.gongzuotixing;
-            }
-            holder.avatar_img.setImageResource(imageurl);
-        }
-    }
-
-    class ViewHolder {
-        //头像
-        ImageView avatar_img;
-        //数目
-        TextView num_tv;
-        //名字
-        TextView nick_name_tv;
-        //内容
-        TextView content_tv;
-        //时间
-        TextView time_tv;
-    }
-}

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

@@ -1,6 +1,7 @@
 package com.modular.appmessages.adapter;
 
 import android.content.Context;
+import android.graphics.Bitmap;
 import android.support.v7.widget.RecyclerView;
 import android.text.Html;
 import android.text.TextUtils;
@@ -10,6 +11,7 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.common.LogUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
 import com.core.app.MyApplication;
@@ -23,6 +25,10 @@ import com.core.xmpp.utils.HtmlUtils;
 import com.modular.appmessages.R;
 import com.modular.appmessages.model.MessageHeader;
 import com.modular.appmessages.model.MessageNew;
+import com.nostra13.universalimageloader.core.DisplayImageOptions;
+import com.nostra13.universalimageloader.core.ImageLoader;
+import com.nostra13.universalimageloader.core.assist.FailReason;
+import com.nostra13.universalimageloader.core.assist.ImageLoadingListener;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -113,24 +119,25 @@ public class MessageNewAdapter extends RecyclerView.Adapter<MessageNewAdapter.Vi
     @Override
     public void onBindViewHolder(ViewHolder viewHolder, int i) {
         MessageNew model = models.get(i);
-        viewHolder.itemView.setTag(R.id.tag_key,i);
-        viewHolder.itemView.setTag(R.id.tag_key2,model);
+        viewHolder.itemView.setTag(R.id.tag_key, i);
+        viewHolder.itemView.setTag(R.id.tag_key2, model);
         if (model != null && model.getT() != null) {
             if (model.getT() instanceof MessageHeader) {
-                bindHeader((MessageHeader) model.getT(), viewHolder);
+                bindHeader((MessageHeader) model.getT(), viewHolder,i);
             } else if (model.getT() instanceof BaseSortModel) {
                 BaseSortModel baseSortModel = (BaseSortModel) model.getT();
                 if (baseSortModel.getBean() instanceof Friend) {
-                    bindView(viewHolder, (Friend) baseSortModel.getBean());
+                    bindView(viewHolder, (Friend) baseSortModel.getBean(), i);
                 }
             }
         }
     }
 
 
-    private void bindHeader(MessageHeader model, ViewHolder hodler) {
+    private void bindHeader(MessageHeader model, ViewHolder hodler,int position) {
         hodler.itemView.setOnLongClickListener(null);
         hodler.itemView.setOnClickListener(mOnClickListener);
+        hodler.headerImg.setTag(position);
         if (model != null) {
             hodler.headerImg.setImageResource(model.getIcon());
             if (model.getRedNum() > 0) {
@@ -183,7 +190,7 @@ public class MessageNewAdapter extends RecyclerView.Adapter<MessageNewAdapter.Vi
         }
     };
 
-    private void bindView(ViewHolder holder, Friend friend) {
+    private void bindView(final ViewHolder holder, Friend friend, final int position) {
         holder.itemView.setOnLongClickListener(mOnLongClickListener);
         holder.itemView.setOnClickListener(mOnClickListener);
         holder.headerImg.setBackgroundResource(R.color.transparent);
@@ -196,7 +203,41 @@ public class MessageNewAdapter extends RecyclerView.Adapter<MessageNewAdapter.Vi
             holder.headerImg.setImageResource(R.drawable.icon_uuhelper);
         } else {
             if (friend.getRoomFlag() == 0) {// 这是单个人
-                AvatarHelper.getInstance().display(friend.getUserId(), holder.headerImg, false, false);//每次刷新都会去删除此人缓存
+                String url = AvatarHelper.getInstance().getAvatarUrl(friend.getUserId(), false);
+                holder.headerImg.setTag(position);
+                ImageLoader.getInstance().displayImage(url, holder.headerImg, mNormalImageOptions, new ImageLoadingListener() {
+                    @Override
+                    public void onLoadingStarted(String s, View view) {
+                        LogUtil.i("gong","onLoadingStarted");
+                    }
+
+                    @Override
+                    public void onLoadingFailed(String s, View view, FailReason failReason) {
+                        LogUtil.i("gong","onLoadingFailed");
+                        if (holder.headerImg.getTag() != null && holder.headerImg.getTag() instanceof Integer) {
+                            int item = (int) holder.headerImg.getTag();
+                            if (item == position) {
+                                holder.headerImg.setImageResource(R.drawable.avatar_round);
+                            }
+                        }
+                    }
+
+                    @Override
+                    public void onLoadingComplete(String s, View view, Bitmap bitmap) {
+                        LogUtil.i("gong","onLoadingComplete");
+                        if (holder.headerImg.getTag() != null && holder.headerImg.getTag() instanceof Integer) {
+                            int item = (int) holder.headerImg.getTag();
+                            if (item == position) {
+                                holder.headerImg.setImageBitmap(bitmap);
+                            }
+                        }
+                    }
+
+                    @Override
+                    public void onLoadingCancelled(String s, View view) {
+                        LogUtil.i("gong","onLoadingCancelled");
+                    }
+                });
             } else {
                 if (TextUtils.isEmpty(friend.getRoomCreateUserId())) {
                     holder.headerImg.setImageResource(R.drawable.qunliao);
@@ -232,7 +273,12 @@ public class MessageNewAdapter extends RecyclerView.Adapter<MessageNewAdapter.Vi
         }
 
     }
-
+    DisplayImageOptions   mNormalImageOptions = new DisplayImageOptions.Builder()
+            .bitmapConfig(Bitmap.Config.RGB_565)
+                .cacheInMemory(true)
+                .cacheOnDisc(true)
+                .resetViewBeforeLoading(false)
+                .build();
     private void doShowMsgPhotos(ViewHolder holder, Friend friend) {
         String msg_type = friend.getDescription();
         if (!TextUtils.isEmpty(msg_type)) {

app_modular/appmessages/src/main/res/layout/item_approval_enclosure.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:background="@color/white">
+
+    <TextView
+        android:layout_marginTop="2dp"
+        android:layout_marginBottom="2dp"
+        android:id="@+id/nameTv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="20dp"
+        android:background="@drawable/bg_enclosure"
+        android:paddingLeft="@dimen/padding"
+        android:paddingRight="@dimen/padding"
+        android:text="附件"
+        android:textColor="@color/text_main"
+        android:textSize="12sp" />
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="10dp"
+        android:visibility="gone"
+        android:id="@+id/endView"
+        />
+</LinearLayout>

app_modular/appmessages/src/main/res/layout/item_message_header.xml

@@ -23,7 +23,7 @@
             android:background="@color/transparent"
             android:contentDescription="@string/app_name"
             android:padding="1dp"
-            android:src="@drawable/icon_message_huisuo" />
+            android:src="@drawable/avatar_round" />
 
         <TextView
             android:id="@+id/headerNumTv"

app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/adapter/HListViewOneAdapter.java

@@ -85,7 +85,7 @@ public class HListViewOneAdapter extends BaseAdapter {
                     if (index!=0){
                         holder.tv_item[i].setText("●");
                         holder.tv_item[i].setTextSize(TypedValue.COMPLEX_UNIT_DIP, 23);
-                        holder.tv_item[i].setTextColor(Color.parseColor(items.get(i)));
+                        holder.tv_item[i].setTextColor(getColor(items.get(i)));
 //                        holder.tv_item[i].setMinWidth(CommonUtil.dip2px(ct, 50));
 //                        holder.tv_item[i].setMinHeight(CommonUtil.dip2px(ct, 50));
                     }else{
@@ -99,6 +99,13 @@ public class HListViewOneAdapter extends BaseAdapter {
         return view;
     }
 
+    private int getColor(String color){
+        try{
+            return Color.parseColor(color);
+        }catch (Exception e){
+            return 0xe9e9e9;
+        }
+    }
   public  class ViewHolder {
       public TextView[] tv_item;
       public  LinearLayout ll_root;

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/form/DataFormDetailActivity.java

@@ -1510,6 +1510,11 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
 
     }
 
+    @Override
+    protected void onDestroy() {
+        CommonUtil.closeKeybord(this);
+        super.onDestroy();
+    }
 
     private void paseSelectDbFind(JSONObject object) throws Exception {
         List<Data> tempLists = mAdapter.getmListData().get(0).getDatas();

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/form/FormListSelectActivity.java

@@ -170,17 +170,18 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
 
     private void initIDs() {
         mlistview = findViewById(R.id.lv_sale_list);
-        voiceSearchView =findViewById(R.id.voiceSearchView);
+        voiceSearchView = findViewById(R.id.voiceSearchView);
         ivDeleteText = findViewById(R.id.iv_DeleteText);
     }
 
     private static final String TAG = "FormListSelectActivity";
+
     private void initView() {
         Intent intent = getIntent();
         caller = intent.getStringExtra("caller");
         from = intent.getStringExtra("from");
-        statusKey  =intent.getStringExtra("statusKey");
-        LogUtil.d(TAG,"statusKey:"+statusKey);
+        statusKey = intent.getStringExtra("statusKey");
+        LogUtil.d(TAG, "statusKey:" + statusKey);
         if (!StringUtil.isEmpty(intent.getStringExtra("title"))) {
             setTitle(intent.getStringExtra("title"));
         }
@@ -191,11 +192,11 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
         key = user + master + caller;
         calendar = Calendar.getInstance();
         sBroadcast = new StateBroadcast();
-        
+
         IntentFilter intentFilter = new IntentFilter();
         intentFilter.addAction("com.erp.sale.dataupdate");
         registerReceiver(sBroadcast, intentFilter);
-        
+
         mlistview.setFilterTouchEvents(false);
         mlistview.setMode(PullToRefreshBase.Mode.BOTH);
         mlistview.setOnRefreshListener(new PullToRefreshBase.OnRefreshListener2<ListView>() {
@@ -280,7 +281,6 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
             }
         });
 
-     
 
         voiceSearchView.addTextChangedListener(new TextWatcher() {
             @Override
@@ -310,8 +310,7 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
             }
         });
 
-        
-        
+
         mlistview.setOnItemClickListener(new AdapterView.OnItemClickListener() {
 
             @Override
@@ -341,8 +340,8 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
 //                } else {
 //                    statusKey = "ct_status";
 //                }
-                if (StringUtil.isEmpty(statusKey)){
-                    statusKey="ct_status";
+                if (StringUtil.isEmpty(statusKey)) {
+                    statusKey = "ct_status";
                 }
                 if (StringUtil.isEmpty(pfField)) {
                     pfField = keyField;
@@ -395,7 +394,7 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
                         startActivity(new Intent(mContext,
                                 DataFormDetailActivity.class)
                                 .putExtra("caller", caller)
-                                .putExtra("title",getToolBarTitle().toString())
+                                .putExtra("title", getToolBarTitle().toString())
                                 .putExtra("status", status)
                                 .putExtra("id", keyId));
                     }
@@ -491,6 +490,7 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
 
     @Override
     protected void onDestroy() {
+        CommonUtil.closeKeybord(this);
         super.onDestroy();
         unregisterReceiver(sBroadcast);
     }