FANGLH 8 years ago
parent
commit
8287edb6bf

+ 3 - 1
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;// 界面是否暂停
@@ -609,7 +610,8 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
     }
 
     private void hiQuickSearch() {
-        if (CommonUtil.isReleaseVersion() || 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() {

+ 12 - 3
WeiChat/src/main/java/com/xzjmyk/pm/activity/util/QSearchPpwindowUtils.java

@@ -21,6 +21,7 @@ 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;
@@ -55,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);
@@ -64,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();  //不进行快速搜索
+                popupWindow.dismiss();  //下次进入再说
+                isqSearch[0] = false;
+            }
+        });
+        contentView.findViewById(R.id.next_tv).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                PreferenceUtils.putInt(MainActivity.UU_STEP, 1);
+                popupWindow.dismiss();  //不再提示
                 isqSearch[0] = false;
             }
         });

+ 16 - 2
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">
@@ -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>