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

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

@@ -561,6 +561,12 @@ public class MeFragment extends SupportToolBarFragment implements View.OnClickLi
             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");
+                    if (!StringUtil.isEmpty(masterCN)){
+                        if (masterCN.equals(mList.get(i).getMa_function())){
+                            selectId=i;
+                        }
+                    }
                ItemsSelectType1 itemsSelectType1=new ItemsSelectType1();
                itemsSelectType1.setName(mList.get(i).getMa_function());
                itemsSelectType1.setEn_name(mList.get(i).getMa_user());
@@ -677,6 +683,8 @@ public class MeFragment extends SupportToolBarFragment implements View.OnClickLi
             LayoutInflater layoutInflater = (LayoutInflater) ct.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
             view = layoutInflater.inflate(com.core.app.R.layout.pop_dialog_list, null);
             ListView plist = view.findViewById(com.core.app.R.id.mList);
+            TextView tv_title=view.findViewById(R.id.tv_title);
+            tv_title.setText("账套选择");
             List<ItemsSelectType1> datas =itemsSelectType1s;
             adapter = new ItemPopListAdapter(ct, datas);
             adapter.setSelectId(selectId);

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

@@ -44,6 +44,7 @@ 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;
@@ -136,6 +137,7 @@ 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 16:53:56 CST 2018
-debugName=298
+#Mon May 21 17:37:04 CST 2018
+debugName=301
 versionName=630
-debugCode=298
+debugCode=301
 versionCode=170

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

@@ -19,7 +19,6 @@ 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;
 
@@ -268,6 +267,5 @@ public class SupportToolBarActivity extends BaseActivity {
     @Override
     protected void onStart() {
         super.onStart();
-        AndroidBug5497Workaround.assistActivity(this);
     }
 }

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

@@ -17,7 +17,6 @@ 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;
 
@@ -184,6 +183,6 @@ public abstract class SupportToolBarFragment extends Fragment {
     @Override
     public void onStart() {
         super.onStart();
-        AndroidBug5497Workaround.assistActivity(ct);
+       // AndroidBug5497Workaround.assistActivity(ct);
     }
 }

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

@@ -742,14 +742,20 @@ public class ViewUtil {
                 model.setName(loginEntities.get(j).getName());
                 items[j] = loginEntities.get(j).getName();
                 itemsSelectType1s.add(model);
+                String companyName=CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_commpany");
+                if (!StringUtil.isEmpty(companyName)){
+                    if (companyName.equals(loginEntities.get(j).getName())){
+                        selectId=j;
+                    }
+                }
             }
             if (!DialogUtils.isDialogShowing(loginERPDialog)) {
-                if (loginERPDialog != null) {
-                    select = loginERPDialog.getSelectedIndex();
-                }
-                if (select > items.length) {
-                    select = 0;
-                }
+//                if (loginERPDialog != null) {
+//                    select = loginERPDialog.getSelectedIndex();
+//                }
+//                if (select > items.length) {
+//                    select = 0;
+//                }
                 popupWindow=null;
                 showPopDialog((Activity) ct,itemsSelectType1s,phone,password);
 //                loginERPDialog = new MaterialDialog.Builder(ct)

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

@@ -13,6 +13,7 @@
             android:gravity="center"
             android:orientation="horizontal">
                 <TextView
+                    android:id="@+id/tv_title"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_margin="@dimen/dp_10"