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

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

@@ -23,7 +23,7 @@
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="@dimen/item_height"
+        android:layout_height="wrap_content"
         android:padding="10dp">
 
         <CheckBox

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="65.0dip"
-    android:layout_height="70.0dip"
+    android:layout_height="wrap_content"
     android:background="@android:color/transparent">
 
     <RelativeLayout

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

@@ -23,7 +23,7 @@
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="@dimen/item_height"
+        android:layout_height="wrap_content"
         android:padding="10dp">
 
         <CheckBox

app_modular/appbooking/src/main/java/com/modular/booking/activity/business/BBookingDetailActivity.java

@@ -492,7 +492,6 @@ public class BBookingDetailActivity extends OABaseActivity implements View.OnCli
                     .putExtras(bundle));
             return;
         }
-        showLoading();
         if (button.getText().equals("确认")) {
             String content = model.getAb_bman() + "确认了您" + time + "的预约计划";
             //   sendMessage(model.getAb_bmanid(),model.getAb_bman(),model.getAb_recordid(),content);
@@ -527,6 +526,7 @@ public class BBookingDetailActivity extends OABaseActivity implements View.OnCli
                         @Override
                         public void select(boolean selectOk) {
                             if (selectOk) {
+                                showLoading();
                                 String action = "已取消";
                                 String map = "{\"ad_confirmstatus\":\"" + action + "\",\"ad_bmanid\":\"" + MyApplication.getInstance().getLoginUserId() + "\",\"ad_sharestatus\":\"" + "未共享" + "\"}";
                                 actionOrder(model.getAb_id(), map);

app_modular/appme/src/main/java/com/uas/appme/other/activity/BasicInfoActivity.java

@@ -66,6 +66,7 @@ import com.core.xmpp.dao.NewFriendDao;
 import com.core.xmpp.listener.NewFriendListener;
 import com.core.xmpp.model.AddAttentionResult;
 import com.core.xmpp.utils.CardcastUiUpdateUtil;
+import com.modular.apputils.utils.PopupWindowHelper;
 import com.uas.appcontact.db.ContactsDao;
 import com.uas.appcontact.db.TopContactsDao;
 import com.uas.appcontact.model.contacts.ContactsModel;
@@ -152,7 +153,7 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
         if (StringUtil.isEmpty(mLoginUserId))
             mLoginUserId = MyApplication.getInstance().mLoginUser.getUserId();
         setContentView(R.layout.activity_basic_info);
-       setTitle(R.string.user_info_title);
+        setTitle(R.string.user_info_title);
         mProgressDialog = ProgressDialogUtil.init(this, null, getString(R.string.please_wait));
         initView();
         if (userId.equals("0")) {            //当imid不存在时候
@@ -363,10 +364,10 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
             return;
         }
         if (isMyInfo) {
-           setTitle(R.string.my_data);
+            setTitle(R.string.my_data);
             showMenu = false;
         } else {
-          setTitle(R.string.user_info_title);
+            setTitle(R.string.user_info_title);
             // 在这里查询出本地好友的状态
             initFriendMoreAction();
         }
@@ -531,21 +532,21 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
         phone_img.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                String phone=StringUtil.getText(phone_tv);
+                String phone = StringUtil.getText(phone_tv);
                 if (!StringUtil.isEmpty(phone)) {
                     String check = "^[1][3,5,7,8][0-9]\\d{8}$";
                     Pattern regex = Pattern.compile(check);
                     Matcher matcher = regex.matcher(phone);
                     boolean isMatched = matcher.matches();
                     if (isMatched) {
-                        SystemUtil.phoneAction(BasicInfoActivity.this,phone);
+                        SystemUtil.phoneAction(BasicInfoActivity.this, phone);
                     } else {
                         ViewUtil.ShowMessageTitle(BasicInfoActivity.this, getString(R.string.error_phone));
                     }
-                    if (mFriend!=null){
+                    if (mFriend != null) {
                         mFriend.setPhone(phone);
                     }
-                    LogUtil.i("个人资料界面 拨打电话\n"+ JSON.toJSONString(mFriend));
+                    LogUtil.i("个人资料界面 拨打电话\n" + JSON.toJSONString(mFriend));
                     TopContactsDao.api().addGoodFriend(mFriend);
                 }
             }
@@ -828,41 +829,42 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
         if (friend.getStatus() == Friend.STATUS_UNKNOW) {
             return;
         }
-        AlertDialog.Builder builder = new AlertDialog.Builder(this).setTitle(R.string.prompt_title)
-                .setMessage(R.string.cancel_attention_prompt)
-                .setPositiveButton(getString(R.string.common_sure), new DialogInterface.OnClickListener() {
+        PopupWindowHelper.showAlart(this,
+                getString(com.uas.appworks.R.string.prompt_title), getString(R.string.cancel_attention_prompt)
+                , new PopupWindowHelper.OnSelectListener() {
                     @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        deleteFriend(friend, 0);
-                        //取消好友  更新通讯录数据库
-                        ContactsModel model = new ContactsModel();
-                        model.setImid(mUser.getUserId());
-                        model.setOwnerId(MyApplication.getInstance().mLoginUser.getUserId());
-                        model.setWhichsys(CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_master"));
-                        model.setType(2);
-                        if (StringUtil.isEmpty(model.getWhichsys())) {
-                            model.setWhichsys("");
+                    public void select(boolean selectOk) {
+                        if (selectOk) {
+                            deleteFriend(friend, 0);
+                            //取消好友  更新通讯录数据库
+                            ContactsModel model = new ContactsModel();
+                            model.setImid(mUser.getUserId());
+                            model.setOwnerId(MyApplication.getInstance().mLoginUser.getUserId());
+                            model.setWhichsys(CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_master"));
+                            model.setType(2);
+                            if (StringUtil.isEmpty(model.getWhichsys())) {
+                                model.setWhichsys("");
+                            }
+                            ContactsDao.getInstance().update(model);
                         }
-                        ContactsDao.getInstance().update(model);
-
                     }
-                }).setNegativeButton(getString(R.string.common_cancel), null);
-        builder.create().show();
+                });
     }
 
     private void showDeleteAllDialog(final Friend friend) {
         if (friend.getStatus() == Friend.STATUS_UNKNOW) {
             return;
         }
-        AlertDialog.Builder builder = new AlertDialog.Builder(this).setTitle(R.string.prompt_title)
-                .setMessage(R.string.delete_all_prompt)
-                .setPositiveButton(getString(R.string.common_sure), new DialogInterface.OnClickListener() {
+        PopupWindowHelper.showAlart(this,
+                getString(com.uas.appworks.R.string.prompt_title), getString(R.string.delete_all_prompt)
+                , new PopupWindowHelper.OnSelectListener() {
                     @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        deleteFriend(friend, 1);
+                    public void select(boolean selectOk) {
+                        if (selectOk) {
+                            deleteFriend(friend, 1);
+                        }
                     }
-                }).setNegativeButton(getString(R.string.common_cancel), null);
-        builder.create().show();
+                });
     }
 
     /**
@@ -937,21 +939,21 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
         } else {// 其他关系（错误的状态）
             return;
         }
-        AlertDialog.Builder builder = new AlertDialog.Builder(this).setTitle(R.string.prompt_title)
-                .setMessage(messageId)
-                .setPositiveButton(getString(R.string.common_sure), new DialogInterface.OnClickListener() {
+        PopupWindowHelper.showAlart(this,
+                getString(com.uas.appworks.R.string.prompt_title), getString(messageId)
+                , new PopupWindowHelper.OnSelectListener() {
                     @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        if (friend.getStatus() == Friend.STATUS_BLACKLIST) {// 已经在黑名单，那就是移出黑名单
-                            removeBlacklist(friend);
-                        } else if (friend.getStatus() == Friend.STATUS_ATTENTION
-                                || friend.getStatus() == Friend.STATUS_FRIEND) {
-                            addBlacklist(friend);
+                    public void select(boolean selectOk) {
+                        if (selectOk) {
+                            if (friend.getStatus() == Friend.STATUS_BLACKLIST) {// 已经在黑名单，那就是移出黑名单
+                                removeBlacklist(friend);
+                            } else if (friend.getStatus() == Friend.STATUS_ATTENTION
+                                    || friend.getStatus() == Friend.STATUS_FRIEND) {
+                                addBlacklist(friend);
+                            }
                         }
-
                     }
-                }).setNegativeButton(getString(R.string.common_cancel), null);
-        builder.create().show();
+                });
     }
 
     private void addBlacklist(final Friend friend) {
@@ -982,7 +984,7 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
                     do_next_tv.setText(R.string.remove_blacklist);
                     do_next_tv.setOnClickListener(new RemoveBlacklistListener());
 
-							/* 发送加入黑名单的通知 */
+                    /* 发送加入黑名单的通知 */
                     if (friend.getStatus() == Friend.STATUS_FRIEND) {// 之前是好友，需要发消息让那个人不能看我的商务圈
                         NewFriendMessage message = NewFriendMessage.createWillSendMessage(
                                 MyApplication.getInstance().mLoginUser, XmppMessage.TYPE_BLACK, null, friend);

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

@@ -2,12 +2,10 @@ package com.uas.appworks.OA.erp.activity.form;
 
 import android.app.Activity;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.support.v7.app.AlertDialog;
 import android.text.Editable;
 import android.text.InputType;
 import android.text.TextUtils;
@@ -1080,19 +1078,18 @@ public class TravelDataFormDetailActivity extends BaseActivity implements View.O
                     item_add.setOnClickListener(new View.OnClickListener() {
                         @Override
                         public void onClick(View v) {
-                            new AlertDialog
-                                    .Builder(mContext)
-                                    .setTitle("温馨提示")
-                                    .setMessage("\t\t确认删除该明细项?")
-                                    .setNegativeButton("取消", null)
-                                    .setPositiveButton("确认", new DialogInterface.OnClickListener() {
+                            PopupWindowHelper.showAlart(TravelDataFormDetailActivity.this,
+                                    getString(R.string.app_dialog_title), "\t\t确认删除该明细项??"
+                                    , new PopupWindowHelper.OnSelectListener() {
                                         @Override
-                                        public void onClick(DialogInterface dialog, int which) {
-                                            LogUtil.d(JSON.toJSONString(itemValue));
-                                            deleteGridItemData(itemValue.getGroupId(), itemValue.getDetailId());
-                                            notifyDataSetChanged();
+                                        public void select(boolean selectOk) {
+                                            if (selectOk) {
+                                                LogUtil.d(JSON.toJSONString(itemValue));
+                                                deleteGridItemData(itemValue.getGroupId(), itemValue.getDetailId());
+                                                notifyDataSetChanged();
+                                            }
                                         }
-                                    }).show();
+                                    });
                         }
                     });
                     break;

app_modular/appworks/src/main/java/com/uas/appworks/adapter/B2bBusinessListAdapter.java

@@ -6,7 +6,6 @@ import android.text.SpannableStringBuilder;
 
 import com.chad.library.adapter.base.BaseMultiItemQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.common.system.DisplayUtil;
 import com.core.app.Constants;
 import com.core.utils.SpanUtils;
 import com.uas.appworks.R;
@@ -64,7 +63,7 @@ public class B2bBusinessListAdapter extends BaseMultiItemQuickAdapter<B2BBusines
         mSpanUtils = new SpanUtils();
         SpannableStringBuilder stringBuilder = mSpanUtils.append(mContext.getString(R.string.str_remain))
                 .append(b2BBusinessListBean.getRemainTime() + "").setForegroundColor(Color.RED)
-                .setBold().setFontSize(DisplayUtil.sp2px(mContext, 20))
+                .setBold().setFontSize(24, true)
                 .append(mContext.getString(R.string.str_days)).create();
         if (stringBuilder != null) {
             holder.setText(R.id.list_public_inquiry_remaintime_tv, stringBuilder);
@@ -112,7 +111,7 @@ public class B2bBusinessListAdapter extends BaseMultiItemQuickAdapter<B2BBusines
         mSpanUtils = new SpanUtils();
         SpannableStringBuilder stringBuilder = mSpanUtils.append(mContext.getString(R.string.str_remain))
                 .append(b2BBusinessListBean.getRemainTime() + "").setForegroundColor(Color.RED)
-                .setBold().setFontSize(DisplayUtil.sp2px(mContext, 20))
+                .setBold().setFontSize(24, true)
                 .append(mContext.getString(R.string.str_days)).create();
         if (stringBuilder != null) {
             holder.setText(R.id.list_public_inquiry_remaintime_tv, stringBuilder);
@@ -158,7 +157,7 @@ public class B2bBusinessListAdapter extends BaseMultiItemQuickAdapter<B2BBusines
         mSpanUtils = new SpanUtils();
         SpannableStringBuilder stringBuilder = mSpanUtils.append(mContext.getString(R.string.str_remain))
                 .append(b2BBusinessListBean.getRemainTime() + "").setForegroundColor(Color.RED)
-                .setBold().setFontSize(DisplayUtil.sp2px(mContext, 20))
+                .setBold().setFontSize(24, true)
                 .append(mContext.getString(R.string.str_days)).create();
         if (stringBuilder != null) {
             holder.setText(R.id.list_customer_inquiry_remaintime_tv, stringBuilder);

app_modular/appworks/src/main/res/layout/layout_list_customer_inquiry.xml

@@ -146,11 +146,11 @@
                 </LinearLayout>
 
                 <View
-                    android:layout_width="200dp"
+                    android:layout_width="300dp"
                     android:layout_height="match_parent"
                     android:layout_marginBottom="6dp"
-                    android:layout_marginLeft="-100dp"
-                    android:layout_marginRight="-90dp"
+                    android:layout_marginLeft="-150dp"
+                    android:layout_marginRight="-140dp"
                     android:layout_marginTop="6dp"
                     android:background="@drawable/shape_dotted_line"
                     android:layerType="software" />
@@ -166,7 +166,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_centerInParent="true"
-                        android:textSize="16sp"
+                        android:textSize="16dp"
                         tools:text="剩余0天" />
 
                     <TextView

app_modular/appworks/src/main/res/layout/layout_list_public_inquiry.xml

@@ -163,11 +163,11 @@
                 </LinearLayout>
 
                 <View
-                    android:layout_width="200dp"
+                    android:layout_width="300dp"
                     android:layout_height="match_parent"
                     android:layout_marginBottom="6dp"
-                    android:layout_marginLeft="-100dp"
-                    android:layout_marginRight="-90dp"
+                    android:layout_marginLeft="-150dp"
+                    android:layout_marginRight="-140dp"
                     android:layout_marginTop="6dp"
                     android:background="@drawable/shape_dotted_line"
                     android:layerType="software" />
@@ -183,7 +183,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_centerInParent="true"
-                        android:textSize="16sp"
+                        android:textSize="16dp"
                         tools:text="剩余0天" />
 
                     <TextView