Merge branch 'draft' of https://gitlab.com/Arisono/SkWeiChat-Baidu into uu_v2.0

WeiChat/src/main/java/com/xzjmyk/pm/activity/MyApplication.java

@@ -1,11 +1,13 @@
 package com.xzjmyk.pm.activity;
 
+import android.app.Activity;
 import android.app.Application;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
 import android.graphics.Bitmap.Config;
 import android.os.Build;
+import android.os.Bundle;
 import android.os.Environment;
 import android.os.Handler;
 import android.os.StrictMode;
@@ -49,6 +51,7 @@ import com.xzjmyk.pm.activity.util.SharedUtil;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.view.AuthImageDownloader;
 import com.xzjmyk.pm.activity.volley.FastVolley;
+import com.xzjmyk.pm.activity.xmpp.MyActivityManager;
 
 import org.apache.http.cookie.Cookie;
 
@@ -146,7 +149,24 @@ public class MyApplication extends Application {
         } catch (PackageManager.NameNotFoundException e) {
             e.printStackTrace();
         }
-
+        registerActivityLifecycleCallbacks(new ActivityLifecycleCallbacks() {
+            @Override
+            public void onActivityCreated(Activity activity, Bundle savedInstanceState) {}
+            @Override
+            public void onActivityStarted(Activity activity) {}
+            @Override
+            public void onActivityResumed(Activity activity) {
+                MyActivityManager.getInstance().setCurrentActivity(activity);
+            }
+            @Override
+            public void onActivityPaused(Activity activity) {}
+            @Override
+            public void onActivityStopped(Activity activity) {}
+            @Override
+            public void onActivitySaveInstanceState(Activity activity, Bundle outState) {}
+            @Override
+            public void onActivityDestroyed(Activity activity) {}
+        });
     }
 
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/MainActivity.java

@@ -154,6 +154,7 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
     private ContactFragment mBusinessCircleFragment;
     public static String BAIDU_PUSH = "BAIDUPUSH";
     public static String UU_STEP = "UUSTEP";
+    public static String Q_SEARCH = "Q_SEARCH";
     private boolean mXmppBind;
     private CoreService mCoreService;
     private boolean isPause = true;// 界面是否暂停
@@ -583,6 +584,7 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
         LogUtil.d("OnCreate end:" + DateFormatUtil.getDateTimeStr());
     }
 
+
     private Handler handler = new Handler();
     private Runnable runnable = new MyRunnable();
     private Boolean firstRed = true;
@@ -608,12 +610,12 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
     }
 
     private void hiQuickSearch() {
-        if (CommonUtil.isReleaseVersion()) return;
-        if (MainActivity.class == null) return;
+        int qs =  PreferenceUtils.getInt(MyApplication.getInstance(), MainActivity.Q_SEARCH);
+        if (CommonUtil.isReleaseVersion() || MainActivity.class == null || qs == 1) return;
         handler.postDelayed(new Runnable() {
             @Override
             public void run() {
-                QSearchPpwindowUtils.qSearchWindows(MainActivity.this);
+                 QSearchPpwindowUtils.qSearchWindows(MainActivity.this);
             }
         },4000);
     }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/account/RegisterSelectActivity.java

@@ -23,7 +23,7 @@ public class RegisterSelectActivity extends BaseActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_register_select);
         ViewUtils.inject(this);
-        getSupportActionBar().setTitle("用户注册");
+        getSupportActionBar().setTitle("新用户注册");
         person_btn.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -37,7 +37,7 @@ public class RegisterSelectActivity extends BaseActivity {
             public void onClick(View v) {
                 ViewUtil.webLinks(mContext,
                         "https://account.ubtob.com/sso/register",
-                        getString(R.string.login_register));
+                        "企业注册");
             }
         });
     }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/message/PersonalRegActivity.java

@@ -148,7 +148,10 @@ public class PersonalRegActivity extends BaseActivity implements View.OnClickLis
             ToastMessage(getString(R.string.input_name));
             return;
         }
-        
+
+        if(!CommonUtil.isNetWorkConnected(this)){
+            ToastMessage(getString(R.string.common_notlinknet));
+        }
         doRegiter();
 
     }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/model/QSCModel.java

@@ -0,0 +1,37 @@
+package com.xzjmyk.pm.activity.ui.erp.model;
+
+/**
+ * Created by FANGlh on 2017/8/7.
+ * function:
+ */
+
+public class QSCModel  {
+
+    String key1;
+    String key2;
+    String key3;
+
+    public String getKey1() {
+        return key1;
+    }
+
+    public void setKey1(String key1) {
+        this.key1 = key1;
+    }
+
+    public String getKey2() {
+        return key2;
+    }
+
+    public void setKey2(String key2) {
+        this.key2 = key2;
+    }
+
+    public String getKey3() {
+        return key3;
+    }
+
+    public void setKey3(String key3) {
+        this.key3 = key3;
+    }
+}

WeiChat/src/main/java/com/xzjmyk/pm/activity/util/QSComShowPpUtils.java

@@ -0,0 +1,179 @@
+package com.xzjmyk.pm.activity.util;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.util.DisplayMetrics;
+import android.util.Log;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.BaseAdapter;
+import android.widget.PopupWindow;
+import android.widget.TextView;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONException;
+import com.alibaba.fastjson.JSONObject;
+import com.xzjmyk.pm.activity.MyApplication;
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.ui.erp.activity.secretary.BookingDetailActivity;
+import com.xzjmyk.pm.activity.ui.erp.model.QSCModel;
+import com.xzjmyk.pm.activity.ui.erp.model.book.BookingModel;
+import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
+import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
+import com.xzjmyk.pm.activity.view.MyListView;
+import com.xzjmyk.pm.activity.xmpp.MyActivityManager;
+
+import java.util.ArrayList;
+
+/**
+ * Created by FANGlh on 2017/8/7.
+ * function:
+ */
+
+public class QSComShowPpUtils {
+    public QSComShowPpUtils() {
+    }
+    public static void qSComShowPp(final int code, ArrayList<QSCModel> qscModelsList, final String realList){
+        View contentView = LayoutInflater.from(MyActivityManager.getCurrentActivity()).inflate(R.layout.com_show_menu, null);
+        DisplayMetrics dm =MyActivityManager.getCurrentActivity().getResources().getDisplayMetrics();
+        int w_screen = dm.widthPixels;
+        int h_screen = dm.heightPixels;
+        w_screen = DisplayUtil.dip2px(MyActivityManager.getCurrentActivity(), 350);
+        h_screen = DisplayUtil.dip2px(MyActivityManager.getCurrentActivity(), 400);
+        final PopupWindow popupWindow = new PopupWindow(contentView, w_screen, h_screen, true);
+        popupWindow.setTouchable(true);
+        popupWindow.setOutsideTouchable(false);
+        // 如果不设置PopupWindow的背景，无论是点击外部区域还是Back键都无法dismiss弹框
+        popupWindow.setBackgroundDrawable( MyActivityManager.getCurrentActivity().getResources().getDrawable(R.drawable.pop_round_bg));
+        // 设置好参数之后再show
+        popupWindow.showAtLocation(contentView, Gravity.CENTER, 0, 0);
+        QSearchPpwindowUtils.setbg(MyActivityManager.getCurrentActivity(),popupWindow,0.4f);
+        TextView title_tv = (TextView) contentView.findViewById(R.id.title);
+        initTitle(code,title_tv);
+
+        MyListView mlist = (MyListView) contentView.findViewById(R.id.qs_common_mlist);
+
+        mlist.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+//                enterItemJudge(code,position,realList,view);
+                popupWindow.dismiss();
+            }
+        });
+        LogUtil.prinlnLongMsg("qscModelsList1",JSON.toJSONString(qscModelsList));
+        Log.d("CurrentActivity()",MyActivityManager.getCurrentActivity()+"null");
+
+        ComShowAdapter mAdapter = new ComShowAdapter(MyApplication.getInstance());
+        mAdapter.setModels(qscModelsList);
+        mlist.setAdapter(mAdapter);
+    }
+
+    private static void initTitle(int code, TextView title_tv) {
+        String title = "";
+        switch (code){
+            case 0x01:
+                title = "我的预约";
+                break;
+
+            default:
+        }
+        title_tv.setText(title+"");
+    }
+
+    private static void enterItemJudge(int code, int position, String realList, View view) {
+        switch (code){
+            case 0x01:
+                try {
+                    JSONArray array = JSON.parseArray(realList);
+                    JSONObject object = array.getJSONObject(position);
+                    BookingModel model = new BookingModel();
+                    model.setAb_address(object.getString("ab_address"));
+                    model.setAb_bman(object.getString("ab_bman"));
+                    model.setAb_bmanid(object.getString("ab_bmanid"));
+                    model.setAb_confirmstatus(object.getString("ab_confirmstatus"));
+                    model.setAb_content(object.getString("ab_content"));
+                    model.setAb_endtime(object.getString("ab_endtime"));
+                    model.setAb_id(object.getString("ab_id"));
+                    model.setAb_latitude(object.getString("ab_latitude"));
+                    model.setAb_longitude(object.getString("ab_longitude"));
+                    model.setAb_recorddate(object.getString("ab_recorddate"));
+                    model.setAb_recordid(object.getString("ab_recordid"));
+                    model.setAb_recordman(object.getString("ab_recordman"));
+                    model.setAb_sharestatus(object.getString("ab_sharestatus"));
+                    model.setAb_starttime(object.getString("ab_starttime"));
+                    model.setAb_type(object.getString("ab_type"));
+                    Bundle bundle = new Bundle();
+                    bundle.putParcelable("model", model);
+                    bundle.putBoolean("isShared", true);
+                    MyActivityManager.getCurrentActivity().startActivity(
+                            new Intent(MyActivityManager.getCurrentActivity(), BookingDetailActivity.class)
+                            .putExtras(bundle)
+                    );
+                }catch (JSONException e){
+                    e.printStackTrace();
+                }catch (Exception e) {
+                    e.printStackTrace();
+                }
+                break;
+            case 0x02:
+                break;
+                default:
+        }
+    }
+
+    private static class ComShowAdapter extends BaseAdapter{
+        private ArrayList<QSCModel> models;
+        private Context mContext;
+        public ComShowAdapter(Context mContext){
+            this.mContext = mContext;
+        }
+        public ArrayList<QSCModel> getModels() {
+            return models;
+        }
+        public void setModels(ArrayList<QSCModel> models) {
+            this.models = models;
+            LogUtil.prinlnLongMsg("qscModelsList2",JSON.toJSONString(models)+"null?");
+        }
+        @Override
+        public int getCount() {
+            return ListUtils.isEmpty(getModels()) ? 0 : getModels().size();
+        }
+        @Override
+        public Object getItem(int position) {
+            return models.get(position);
+        }
+        @Override
+        public long getItemId(int position) {
+            return position;
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            QsViewHolder viewHolder = null;
+            if (convertView == null){
+                viewHolder = new QsViewHolder();
+                convertView = View.inflate(mContext,R.layout.com_show_ppitem,null);
+                viewHolder.key1 = (TextView) convertView.findViewById(R.id.key1Tv);
+                viewHolder.key2 = (TextView) convertView.findViewById(R.id.key2Tv);
+                viewHolder.key3 = (TextView) convertView.findViewById(R.id.key3Tv);
+                convertView.setTag(viewHolder);
+            }else {
+                viewHolder = (QsViewHolder) convertView.getTag();
+            }
+
+            viewHolder.key1.setText(getModels().get(position).getKey1()+"");
+            viewHolder.key2.setText(getModels().get(position).getKey2()+"");
+            viewHolder.key3.setText(getModels().get(position).getKey3()+"");
+            return convertView;
+        }
+        class QsViewHolder {
+            TextView key1;
+            TextView key2;
+            TextView key3;
+        }
+    }
+}

WeiChat/src/main/java/com/xzjmyk/pm/activity/util/QSearchPpwindowUtils.java

@@ -13,21 +13,32 @@ import android.widget.PopupWindow;
 import android.widget.Toast;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.iflytek.cloud.RecognizerResult;
 import com.iflytek.cloud.SpeechError;
 import com.iflytek.cloud.ui.RecognizerDialogListener;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.audio.voicerecognition.JsonParser;
+import com.xzjmyk.pm.activity.ui.MainActivity;
+import com.xzjmyk.pm.activity.ui.erp.model.QSCModel;
+import com.xzjmyk.pm.activity.ui.erp.model.book.BookingModel;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.erp.util.JsonValidator;
+import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.oa.RecognizerDialogUtil;
+import com.xzjmyk.pm.activity.xmpp.MyActivityManager;
 
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * Created by FANGlh on 2017/8/4.
@@ -35,7 +46,6 @@ import java.util.Map;
  */
 
 public class QSearchPpwindowUtils{
-
     public QSearchPpwindowUtils() {
     }
 
@@ -46,7 +56,7 @@ public class QSearchPpwindowUtils{
         int w_screen = dm.widthPixels;
         int h_screen = dm.heightPixels;
         w_screen = DisplayUtil.dip2px(activity, 250);
-        h_screen = DisplayUtil.dip2px(activity, 100);
+        h_screen = DisplayUtil.dip2px(activity, 150);
         final PopupWindow  popupWindow = new PopupWindow(contentView, w_screen, h_screen, true);
         popupWindow.setTouchable(true);
         popupWindow.setOutsideTouchable(false);
@@ -55,10 +65,18 @@ public class QSearchPpwindowUtils{
         // 设置好参数之后再show
         popupWindow.showAtLocation(contentView, Gravity.CENTER, 0, 0);
         setbg(activity,popupWindow,0.4f);
-        contentView.findViewById(R.id.no_tv).setOnClickListener(new View.OnClickListener() {
+        contentView.findViewById(R.id.next_tv).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                popupWindow.dismiss();  //下次进入再说
+                isqSearch[0] = false;
+            }
+        });
+        contentView.findViewById(R.id.next_tv).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                popupWindow.dismiss();  //不进行快速搜索
+                PreferenceUtils.putInt(MainActivity.UU_STEP, 1);
+                popupWindow.dismiss();  //不再提示
                 isqSearch[0] = false;
             }
         });
@@ -75,31 +93,34 @@ public class QSearchPpwindowUtils{
                             }
                         }
                         @Override
-                        public void onError(SpeechError speechError) {}
+                        public void onError(SpeechError speechError) {
+                        }
                     });
+//                    handlerQSearch(activity,"预约你");
                     popupWindow.dismiss();
                 }
             }
         },6000);
     }
 
-    private static void handlerQSearch(Activity activity,String text) {
-        Toast.makeText(activity,text,Toast.LENGTH_LONG).show();
+    private static void handlerQSearch(Activity activity, String text) {
         Log.i("handlerQSearch",text+"");
+        String url=null;
+        Map<String,Object> params = new HashMap<>();
 
         if (text.contains("预约")){
-            String url =   "common/attach/change.action";
-            Map<String,Object> params = new HashMap<>();
-            params.put("table","FeePlease");
-            params.put("update","fb_attach='"+""+"'");
-            params.put("condition","fp_id = ");
-            params.put("type","删除附件");
-
-            CommonHttp(activity,url,params);
+            url =   Constants.IM_BASE_URL + "user/appBookingList";
+            params.put("token", MyApplication.getInstance().mAccessToken);
+            params.put("userid", MyApplication.getInstance().mLoginUser.getUserId());
+            params.put("telephone",MyApplication.getInstance().mLoginUser.getTelephone());
+            params.put("yearmonth", DateFormatUtil.getStrDate4Date(new Date(System.currentTimeMillis()), "yyyyMM"));
+        }else {
+            Toast.makeText(MyActivityManager.getCurrentActivity(),"导航"+text+"功能未实现",Toast.LENGTH_LONG).show();
         }
+        CommonHttp(activity,url,params);
+
     }
-    private static void CommonHttp(Activity activity, String url, Map<String, Object> params) {
-        String comurl = com.xzjmyk.pm.activity.ui.erp.util.Constants.getAppBaseUrl(activity) + url;
+    private static void CommonHttp(Activity activity, String comurl, Map<String, Object> params) {
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(activity, "sessionId"));
         ViewUtil.httpSendRequest(activity, comurl, params, cHandler, headers, 0x01, null, null, "get");
@@ -115,6 +136,8 @@ public class QSearchPpwindowUtils{
                 case 0x01:
                     if (!StringUtils.isEmpty(result)){
                         Log.i("0x01result", result);
+//                        QSearchDatasUtils.handleBookDatas(result);
+                        handleBookDatas(0x01,result);
                     }
                     break;
                 case 0x02:
@@ -139,10 +162,68 @@ public class QSearchPpwindowUtils{
             }
         }
     };
+
+    private static void handleBookDatas(int handleCode, String result) {
+        try {
+            final ArrayList<BookingModel> BookingModelList = new ArrayList<>();
+            final ArrayList<QSCModel>  qscModelsList = new ArrayList<>();
+            if (JSON.parseObject(result).getString("resultMsg") != null) {
+                return;
+            }
+            JSONArray jsonArray = JSON.parseArray(JSON.parseObject(result).getString("bookinglist"));
+            if (jsonArray != null) {
+                Set<Integer> tags = new HashSet<>();
+                for (int i = 0; i < jsonArray.size(); i++) {
+                    JSONObject object = jsonArray.getJSONObject(i);
+                    BookingModel model = new BookingModel();
+                    QSCModel qscModel = new QSCModel();
+                    model.setAb_address(object.getString("ab_address"));
+                    model.setAb_bman(object.getString("ab_bman"));
+                    model.setAb_bmanid(object.getString("ab_bmanid"));
+                    model.setAb_confirmstatus(object.getString("ab_confirmstatus"));
+                    model.setAb_content(object.getString("ab_content"));
+                    model.setAb_endtime(object.getString("ab_endtime"));
+                    model.setAb_id(object.getString("ab_id"));
+                    model.setAb_latitude(object.getString("ab_latitude"));
+                    model.setAb_longitude(object.getString("ab_longitude"));
+                    model.setAb_recorddate(object.getString("ab_recorddate"));
+                    model.setAb_recordid(object.getString("ab_recordid"));
+                    model.setAb_recordman(object.getString("ab_recordman"));
+                    model.setAb_sharestatus(object.getString("ab_sharestatus"));
+                    model.setAb_starttime(object.getString("ab_starttime"));
+                    model.setAb_type(object.getString("ab_type"));
+                    tags.add(Integer.valueOf(model.getAb_starttime().substring(8, 10)));
+
+                    qscModel.setKey1(object.getString("ab_recordman"));
+                    qscModel.setKey2(object.getString("ab_starttime"));
+                    qscModel.setKey3(object.getString("ab_content"));
+//                    if (model.getAb_starttime().contains(DateFormatUtil.getStrDate4Date(new Date(System.currentTimeMillis()), "yyyy-MM-dd"))) {
+                        BookingModelList.add(model);
+                        qscModelsList.add(qscModel);
+//                    }
+
+                    if (i == jsonArray.size() - 1){
+                        LogUtil.prinlnLongMsg("qscModelsList",JSON.toJSONString(qscModelsList));
+                        LogUtil.prinlnLongMsg("BookingModelList",JSON.toJSONString(BookingModelList));
+                        QSComShowPpUtils.qSComShowPp(0x01,qscModelsList,BookingModelList.toString());
+
+                    }
+
+                }
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+    }
+
+
+
     public static void ToastMessage(String message) {
         ViewUtil.ToastMessage(MyApplication.getInstance(), message);
     }
-    private  static void setbg(final Activity activity , PopupWindow popupWindow, float alpha) {
+    public  static void setbg(final Activity activity , PopupWindow popupWindow, float alpha) {
         setBackgroundAlpha(activity, alpha);
         if (popupWindow == null) return;
         popupWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {

WeiChat/src/main/java/com/xzjmyk/pm/activity/xmpp/MyActivityManager.java

@@ -0,0 +1,36 @@
+package com.xzjmyk.pm.activity.xmpp;
+
+import android.app.Activity;
+
+import java.lang.ref.WeakReference;
+
+/**
+ * Created by FANGlh on 2017/8/7.
+ * function:
+ */
+
+public class MyActivityManager {
+    private static MyActivityManager sInstance = new MyActivityManager();
+    private static WeakReference<Activity> sCurrentActivityWeakRef;
+
+
+    private MyActivityManager() {
+
+    }
+
+    public static MyActivityManager getInstance() {
+        return sInstance;
+    }
+
+    public static Activity getCurrentActivity() {
+        Activity currentActivity = null;
+        if (sCurrentActivityWeakRef != null) {
+            currentActivity = sCurrentActivityWeakRef.get();
+        }
+        return currentActivity;
+    }
+
+    public void setCurrentActivity(Activity activity) {
+        sCurrentActivityWeakRef = new WeakReference<Activity>(activity);
+    }
+}

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

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="350dp"
+    android:layout_height="400dp"
+    android:background="@color/bg_main"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/title"
+        android:padding="10dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="tltle"
+        android:background="@color/bg_main"
+        android:visibility="visible"
+        android:gravity="center_horizontal"
+        />
+    <com.xzjmyk.pm.activity.ui.erp.view.CustomerScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:fillViewport="true"
+        android:scrollbars="none">
+       <com.xzjmyk.pm.activity.view.MyListView
+           android:id="@+id/qs_common_mlist"
+           android:layout_width="match_parent"
+           android:layout_height="wrap_content"
+           android:visibility="visible"
+           android:background="#ebe9e9">
+
+       </com.xzjmyk.pm.activity.view.MyListView>
+    </com.xzjmyk.pm.activity.ui.erp.view.CustomerScrollView>
+</LinearLayout>

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

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/selector_me_menu_item_bg">
+    <ImageView
+        android:visibility="gone"
+        android:id="@+id/photo_img"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:contentDescription="@string/app_name"
+        android:layout_marginLeft="10dp"
+        android:layout_marginTop="12dp"
+        android:src="@drawable/common_header_boy" />
+    <de.hdodenhof.circleimageview.CircleImageView
+        android:visibility="gone"
+        android:id="@+id/photo_me"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:contentDescription="@string/app_name"
+        android:layout_marginLeft="10dp"
+        android:layout_marginTop="12dp"
+        android:src="@drawable/common_header_boy"/>
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/selector_me_menu_item_bg">
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+            <TextView
+                android:id="@+id/key1Tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="10dp"
+                android:textSize="15sp"
+                android:text="采购单-2013212"
+                android:maxLength="12"
+                android:singleLine="true"
+                android:ellipsize="end"
+                android:textColor="@color/light_gray"/>
+
+            <TextView
+                android:id="@+id/key2Tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="10dp"
+                android:layout_alignParentRight="true"
+                android:text="2016-10-09 09:11"
+                android:textColor="@color/light_gray"/>
+        </RelativeLayout>
+
+        <TextView
+            android:id="@+id/key3Tv"
+            android:layout_marginLeft="10dp"
+            android:layout_marginBottom="10dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="状态"
+            android:textColor="@color/light_gray"
+            android:autoText="false"
+            />
+    </LinearLayout>
+</LinearLayout>

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="250dp"
-    android:layout_height="100dp"
+    android:layout_height="150dp"
     android:orientation="vertical"
     android:layout_gravity="center"
     android:background="@drawable/pop_round_bg">
@@ -20,7 +20,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center"
-        android:text="即将进行语音快速搜索,请在语音框出来后说“预约” "
+        android:text="语音导航即将开始,请在语音框出来后说“预约” "
         android:textColor="@color/black"
         android:textSize="15sp"/>
     <View
@@ -28,7 +28,7 @@
         android:layout_height="0.3dp"
         android:background="@color/button_invalid"/>
     <TextView
-        android:id="@+id/no_tv"
+        android:id="@+id/next_tv"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="2"
@@ -37,5 +37,19 @@
         android:text="下次进入再说"
         android:minHeight="45dp"
         android:textSize="15sp"/>
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0.3dp"
+        android:background="@color/button_invalid"/>
+    <TextView
+        android:id="@+id/no_tv"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="2"
+        android:gravity="center"
+        android:textColor="@color/red"
+        android:text="不再提示"
+        android:minHeight="45dp"
+        android:textSize="15sp"/>
 
 </LinearLayout>