14:38

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

@@ -44,7 +44,6 @@ import com.core.app.AppConstant;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.SupportToolBarActivity;
-import com.core.base.view.AndroidBug5497Workaround;
 import com.core.broadcast.MsgBroadcast;
 import com.core.dao.DBManager;
 import com.core.model.EmployeesEntity;
@@ -137,7 +136,6 @@ public class ChatActivity extends SupportToolBarActivity
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.chat);
-        AndroidBug5497Workaround.assistActivity(this);
         mLoginUserId = MyApplication.getInstance().mLoginUser.getUserId();
         mLoginNickName = MyApplication.getInstance().mLoginUser.getNickName();
         if (savedInstanceState != null) {

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Mon May 21 14:29:54 CST 2018
-debugName=268
+#Mon May 21 10:45:33 CST 2018
+debugName=270
 versionName=630
-debugCode=268
+debugCode=270
 versionCode=170

app_core/common/src/main/java/com/core/base/SupportToolBarActivity.java

@@ -19,6 +19,7 @@ import android.widget.TextView;
 
 import com.common.LogUtil;
 import com.core.app.R;
+import com.core.base.view.AndroidBug5497Workaround;
 import com.core.utils.StatusBarUtil;
 import com.core.utils.ToastUtil;
 
@@ -263,4 +264,10 @@ public class SupportToolBarActivity extends BaseActivity {
     public Toolbar getCommonToolBar() {
         return commonToolBar;
     }
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+        AndroidBug5497Workaround.assistActivity(this);
+    }
 }

app_core/common/src/main/java/com/core/base/fragment/SupportToolBarFragment.java

@@ -17,6 +17,7 @@ import android.widget.FrameLayout;
 import android.widget.TextView;
 
 import com.core.app.R;
+import com.core.base.view.AndroidBug5497Workaround;
 import com.core.utils.StatusBarUtil;
 import com.core.utils.ToastUtil;
 
@@ -180,5 +181,9 @@ public abstract class SupportToolBarFragment extends Fragment {
 
     protected abstract void onCreateView(Bundle savedInstanceState, boolean createView);
 
-
+    @Override
+    public void onStart() {
+        super.onStart();
+        AndroidBug5497Workaround.assistActivity(ct);
+    }
 }

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

@@ -289,6 +289,7 @@ public class ViewUtil {
      */
     public static void LoginTask(final String user_phone, final String user_password, final Context ct) {
         ViewUtil.ct = ct;
+        LogUtil.d("AppInfo","password:"+user_password+" phone:"+user_phone);
         mdProcessDialog = new MaterialDialog.Builder(ct).title(
                 MyApplication.getInstance().getString(R.string.app_dialog_title))
                 .content(MyApplication.getInstance().getString(R.string.login_progress_erp))
@@ -773,6 +774,8 @@ public class ViewUtil {
     public static int selectId;
     public static void  showPopDialog(final Activity ct, List<ItemsSelectType1> itemsSelectType1s
     , final String phone, final String password){
+        erp_phone=phone;
+        erp_password=password;
         View view = null;
         if (DialogUtils.isDialogShowing(mdProcessDialog)){
             mdProcessDialog.dismiss();