Merge branch 'developer' of https://gitlab.com/Arisono/SkWeiChat-Baidu into feature

# Conflicts:
#	WeiChat/version.properties
#	app_modular/appbooking/src/main/java/com/modular/booking/activity/business/BBookingAddActivity.java

WeiChat/src/main/res/drawable/selector_me_menu_item_bg.xml

@@ -2,5 +2,6 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:drawable="@color/me_menu_item_press" android:state_pressed="true"/>
     <item android:drawable="@color/me_menu_item_press" android:state_selected="true"/>
+    <item android:drawable="@color/me_menu_item_normal" android:state_focused="false"/>
     <item android:drawable="@color/me_menu_item_normal"/>
 </selector>

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

@@ -2,6 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="@drawable/selector_me_menu_item_bg"
     android:paddingBottom="10dp">
 
     <View

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

@@ -2,9 +2,7 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    app:cardElevation="@dimen/paddingMin"
     android:layout_height="match_parent">
-
         <ListView
             android:id="@+id/mList"
             android:layout_width="match_parent"

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Fri Jul 27 10:15:20 CST 2018
-debugName=561
+#Fri Jul 27 16:23:54 CST 2018
+debugName=575
 versionName=637
-debugCode=561
+debugCode=575
 versionCode=178

app_core/common/src/main/java/com/common/system/SystemUtil.java

@@ -9,6 +9,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
+import android.graphics.drawable.BitmapDrawable;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.net.Uri;
@@ -338,59 +339,40 @@ public class SystemUtil {
             ToastUtil.showToast(mContext, R.string.phone_number_format_error);
             return;
         }
-
-        final PopupWindow window = new PopupWindow(mContext);
-        View view = LayoutInflater.from(mContext).inflate(R.layout.item_select_alert_pop, null);
-        window.setContentView(view);
-        window.setBackgroundDrawable(mContext.getResources().getDrawable(R.drawable.pop_round_bg));
-        DisplayUtil.backgroundAlpha(mContext, 0.4f);
-        window.setTouchable(true);
-        setPopupWindowHW((Activity) mContext, window);
-        window.setOutsideTouchable(false);
-        window.setFocusable(true);
-        TextView title_tv = (TextView) view.findViewById(R.id.title_tv);
-        TextView message_tv = (TextView) view.findViewById(R.id.message_tv);
-        TextView sure_tv = (TextView) view.findViewById(R.id.sure_tv);
-        title_tv.setText(mContext.getString(R.string.dialog_confim_phone));
-        message_tv.setText(mContext.getString(R.string.dialog_phone) + phone);
-        sure_tv.setText(R.string.dialog_phone_action);
-
-        window.setOnDismissListener(new PopupWindow.OnDismissListener() {
-            @Override
-            public void onDismiss() {
-                DisplayUtil.backgroundAlpha(mContext, 1f);
-            }
-        });
-        view.findViewById(R.id.goto_tv).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                window.dismiss();
-            }
-        });
-        sure_tv.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                mContext.requestPermission(Manifest.permission.CALL_PHONE, new Runnable() {
+        MaterialDialog dialog = new MaterialDialog.Builder(mContext).title(R.string.dialog_confim_phone).content(mContext.getString(R.string.dialog_phone) + phone)
+                .positiveText(R.string.dialog_phone_action).negativeText(R.string.common_cancel).autoDismiss(false).callback(new MaterialDialog.ButtonCallback() {
                     @Override
-                    public void run() {
-                        // 用intent启动拨打电话
-                        Intent intent = new Intent(Intent.ACTION_CALL, Uri.parse("tel:" + phone));
-                        if (ActivityCompat.checkSelfPermission(mContext, Manifest.permission.CALL_PHONE) != PackageManager.PERMISSION_GRANTED) {
-                            //预防万一
-                            return;
-                        }
-                        mContext.startActivity(intent);
+                    public void onPositive(MaterialDialog dialog) {
+                        mContext.requestPermission(Manifest.permission.CALL_PHONE, new Runnable() {
+                            @Override
+                            public void run() {
+                                // 用intent启动拨打电话
+                                Intent intent = new Intent(Intent.ACTION_CALL, Uri.parse("tel:" + phone));
+                                if (ActivityCompat.checkSelfPermission(mContext, Manifest.permission.CALL_PHONE) != PackageManager.PERMISSION_GRANTED) {
+                                    //预防万一
+                                    return;
+                                }
+                                mContext.startActivity(intent);
+                            }
+                        }, new Runnable() {
+                            @Override
+                            public void run() {
+                                ToastUtil.showToast(mContext, R.string.not_system_permission);
+                            }
+                        });
+                        dialog.dismiss();
                     }
-                }, new Runnable() {
+
                     @Override
-                    public void run() {
-                        ToastUtil.showToast(mContext, R.string.not_system_permission);
+                    public void onNegative(MaterialDialog dialog) {
+                        super.onNegative(dialog);
+                        dialog.dismiss();
                     }
-                });
-                window.dismiss();
-            }
-        });
-        window.showAtLocation(view, Gravity.CENTER, 0, 0);
+                }).build();
+
+        dialog.show();
+
+
     }
 
     @Deprecated
@@ -403,8 +385,8 @@ public class SystemUtil {
                 final PopupWindow window = new PopupWindow(mContext);
                 View view = LayoutInflater.from(mContext).inflate(R.layout.item_select_alert_pop, null);
                 window.setContentView(view);
-                window.setBackgroundDrawable(mContext.getResources().getDrawable(R.drawable.pop_round_bg));
-                DisplayUtil.backgroundAlpha(mContext, 0.4f);
+                window.setBackgroundDrawable(new BitmapDrawable());
+                DisplayUtil.backgroundAlpha(mContext, 0.5f);
                 window.setTouchable(true);
                 setPopupWindowHW((Activity) mContext, window);
                 window.setOutsideTouchable(false);
@@ -446,6 +428,8 @@ public class SystemUtil {
             }
         }
     }
+    
+    
 
     public static void setPopupWindowHW(Activity ct, PopupWindow window) {
         window.getContentView().measure(0, 0);

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

@@ -2,6 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="@color/white"
     android:paddingBottom="10dp">
 
     <View

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

@@ -12,7 +12,7 @@
         <ListView
             android:id="@+id/mList"
             style="@style/ListViewBasic"
-         
+         android:background="@color/white"
             android:layout_height="wrap_content"
             android:dividerHeight="0dp">
         </ListView>

app_modular/appcontact/src/main/java/com/uas/appcontact/ui/activity/CompanyContactsActivity.java

@@ -947,15 +947,15 @@ public class CompanyContactsActivity extends BaseActivity {
         popupWindow.setFocusable(true);
         // 设置允许在外点击消失
         popupWindow.setOutsideTouchable(false);
-        popupWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
-            @Override
-            public void onDismiss() {
-                DisplayUtil.backgroundAlpha(ct, 1f);
-                //显示
-                mRefreshLayout.getLayout().setVisibility(View.VISIBLE);
-            }
-        });
-        DisplayUtil.backgroundAlpha(this, 1f);
+//        popupWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
+//            @Override
+//            public void onDismiss() {
+//                DisplayUtil.backgroundAlpha(ct, 1f);
+//                //显示
+//                mRefreshLayout.getLayout().setVisibility(View.VISIBLE);
+//            }
+//        });
+//        DisplayUtil.backgroundAlpha(this, 1f);
         // 这个是为了点击“返回Back”也能使其消失，并且并不会影响你的背景
         popupWindow.setBackgroundDrawable(new BitmapDrawable());
         popupWindow.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT);
@@ -1252,13 +1252,13 @@ public class CompanyContactsActivity extends BaseActivity {
         @Override
         public View getView(final int position, View convertView, ViewGroup parent) {
             convertView = super.getView(position, convertView, parent);
-            ImageView phone_img = (ImageView) convertView.findViewById(R.id.phone_img);
-            ImageView header_img = (ImageView) convertView.findViewById(R.id.header_img);
+            ImageView phone_img =  convertView.findViewById(R.id.phone_img);
+            ImageView header_img =  convertView.findViewById(R.id.header_img);
             final Map<String, Object> mMap = (Map<String, Object>) getItem(position);
             phone_img.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    SystemUtil.phoneAction(mContext, mMap.get("item_phone").toString());
+                    SystemUtil.phoneAction(CompanyContactsActivity.this, mMap.get("item_phone").toString());
                     LogUtil.i("企业架构界面 拨打电话"+JSON.toJSONString(mMap));
                 }
             });