修复沉浸栏模式下底部输入框 被系统盘隐藏的bug！！！

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/ClientActivity.java

@@ -1112,7 +1112,7 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                 DisplayUtil.backgroundAlpha(ClientActivity.this, 1f);
             }
         });
-        DisplayUtil.backgroundAlpha(this, 1f);
+        DisplayUtil.backgroundAlpha(this, 0.5f);
         // 这个是为了点击“返回Back”也能使其消失，并且并不会影响你的背景
         popupWindow.setBackgroundDrawable(new BitmapDrawable());
         popupWindow.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/MeFragment.java

@@ -52,6 +52,7 @@ import com.core.base.fragment.SupportToolBarFragment;
 import com.core.broadcast.MsgBroadcast;
 import com.core.net.http.ViewUtil;
 import com.core.net.utils.NetUtils;
+import com.core.utils.DialogUtils;
 import com.core.utils.FlexJsonUtil;
 import com.core.utils.helper.AvatarHelper;
 import com.me.network.app.http.HttpClient;
@@ -465,7 +466,10 @@ public class MeFragment extends SupportToolBarFragment implements View.OnClickLi
                     showToact(R.string.networks_out);
                     return;
                 }
-             ViewUtil.LoginTask(MyApplication.getInstance().mLoginUser.getTelephone()
+                if (DialogUtils.isDialogShowing(popupWindow)){
+                    popupWindow.dismiss();
+                }
+               ViewUtil.LoginTask(MyApplication.getInstance().mLoginUser.getTelephone()
                         , CommonUtil.getSharedPreferences(ct, "user_password"), ct);
                 break;
             case R.id.editInfoIv://个人资料
@@ -473,6 +477,9 @@ public class MeFragment extends SupportToolBarFragment implements View.OnClickLi
                 break;
             case R.id.rl_master_change:
                 if (!platform) {
+                    if (DialogUtils.isDialogShowing(ViewUtil.popupWindow)){
+                        ViewUtil.popupWindow.dismiss();
+                    }
                     changeMaster();
                 }
                 break;
@@ -548,6 +555,11 @@ public class MeFragment extends SupportToolBarFragment implements View.OnClickLi
 
     //切换账套
     public void changeMaster() {
+//        if (ViewUtil.mdProcessDialog!=null&&!ViewUtil.mdProcessDialog.isShowing()){
+//            ViewUtil.mdProcessDialog.setContent("加载数据中...");
+//            ViewUtil.mdProcessDialog.getBuilder().autoDismiss(false);
+//            ViewUtil.mdProcessDialog.show();
+//        }
         if (StringUtil.isEmpty(CommonUtil.getSharedPreferences(ct, "erp_masterlist"))) {
             String url = com.core.utils.CommonUtil.getAppBaseUrl(ct) + "mobile/getAllMasters.action";
             Map<String, Object> params = new HashMap<>();
@@ -558,7 +570,7 @@ public class MeFragment extends SupportToolBarFragment implements View.OnClickLi
         } else {
             String masterlist = CommonUtil.getSharedPreferences(ct, "erp_masterlist");
             List<Master> mList = JSON.parseArray(masterlist, Master.class);
-            List<ItemsSelectType1> selectType1s=new ArrayList<>();
+            List<ItemsSelectType1>   selectType1s=new ArrayList<>();
             if (!ListUtils.isEmpty(mList)) {
                 for (int i = 0; i < mList.size(); i++) {
                     String masterCN=CommonUtil.getSharedPreferences(MyApplication.getInstance(),"Master_ch");
@@ -567,10 +579,10 @@ public class MeFragment extends SupportToolBarFragment implements View.OnClickLi
                             selectId=i;
                         }
                     }
-               ItemsSelectType1 itemsSelectType1=new ItemsSelectType1();
-               itemsSelectType1.setName(mList.get(i).getMa_function());
-               itemsSelectType1.setEn_name(mList.get(i).getMa_user());
-               selectType1s.add(itemsSelectType1);
+                    ItemsSelectType1 itemsSelectType1=new ItemsSelectType1();
+                    itemsSelectType1.setName(mList.get(i).getMa_function());
+                    itemsSelectType1.setEn_name(mList.get(i).getMa_user());
+                    selectType1s.add(itemsSelectType1);
                 }
             }
             showPopDialog(ct,selectType1s);
@@ -586,7 +598,7 @@ public class MeFragment extends SupportToolBarFragment implements View.OnClickLi
 //                    });
 //            mDialog.show();
 //            mDialog.initViewData(mList);
-        }
+        };
 
     }
 
@@ -720,6 +732,10 @@ public class MeFragment extends SupportToolBarFragment implements View.OnClickLi
         popupWindow.setBackgroundDrawable(new BitmapDrawable());
         popupWindow.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT);
         popupWindow.showAtLocation(ct.getWindow().getDecorView(), Gravity.CENTER, 0, 0);
+
+//        if (ViewUtil.mdProcessDialog!=null&&ViewUtil.mdProcessDialog.isShowing()){
+//            ViewUtil.mdProcessDialog.dismiss();
+//        }
     }
 
 

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Tue May 22 10:37:47 CST 2018
-debugName=303
+#Tue May 22 16:16:38 CST 2018
+debugName=320
 versionName=630
-debugCode=303
+debugCode=320
 versionCode=170

app_core/common/src/main/java/com/core/net/http/ViewUtil.java

@@ -1223,9 +1223,6 @@ public class ViewUtil {
                         .url("mobile/login.action")
                         .addParam("token", loginToken)
                         .addParam("enuu", enuu)
-//                        .addParam("username", username)
-//                        .addParam("password", password)
-//                        .addParam("master", "UAS_DEV")
                         .method(Method.POST)
                         .build(), new HttpCallback() {
                     @Override
@@ -1238,7 +1235,8 @@ public class ViewUtil {
 
                     @Override
                     public void onFail(int flag, String failStr) throws Exception {
-                        Log.e("erp登录失败", failStr);
+                        Log.e("erp登录失败", "登录失败:"+failStr);
+                        ToastMessage(MyApplication.getInstance(),"登录失败:"+failStr);
                         mdProcessDialog.setContent("登录失败");
                         new Handler().postDelayed(new Runnable() {
                             @Override

app_core/common/src/main/res/drawable/shape_border_withe.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
     <stroke
-        android:color="#ffffff">
+        android:color="@color/gray">
     </stroke>
     <solid
         android:color="#fefefe">

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

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"

app_core/network/src/main/java/com/me/network/app/http/HttpRequest.java

@@ -75,7 +75,7 @@ public class HttpRequest {
             }
         }
 
-        mHttpClient = new HttpClient.Builder(requestHost).build();
+        mHttpClient = new HttpClient.Builder(requestHost).isDebug(true).build();
 
         mHttpClient.Api().send(new HttpClient.Builder()
                 .url(httpParams.getUrl())

app_modular/appbooking/src/main/java/com/modular/booking/activity/services/BServicesActivity.java

@@ -624,7 +624,7 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
                 DisplayUtil.backgroundAlpha(activity, 1f);
             }
         });
-        DisplayUtil.backgroundAlpha(this, 1f);
+        DisplayUtil.backgroundAlpha(this, 0.5f);
         popupWindow.setBackgroundDrawable(new BitmapDrawable());
         popupWindow.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT);
         // 显示的位置为:屏幕的宽度的一半-PopupWindow的高度的一半

app_modular/apputils/src/main/res/drawable/shape_border_withe.xml

@@ -7,7 +7,7 @@
         android:bottomLeftRadius="10dp">
     </corners>
     <stroke
-        android:color="#ffffff">
+        android:color="@color/gray">
     </stroke>
     <solid
         android:color="#fefefe">