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

WeiChat/build.gradle

@@ -13,7 +13,7 @@ android {
     }
     signingConfigs {
         config {
-            storeFile file('C:/Users/Arison/Desktop/applicationsignname[20150409]')
+            storeFile file('D:/config/applicationsignname[20150409]')
             storePassword '13237658359'
             keyAlias 'jie-20150409'
             keyPassword '13237658359'

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/MissionActivity.java

@@ -206,9 +206,9 @@ public class MissionActivity extends BaseActivity implements View.OnClickListene
 //                        }
 //                    }).show();
 //                } else {
-                    adapter.getModels().remove(position);
-                    adapter.notifyItemRemoved(position);
-                    adapter.notifyItemRangeChanged(position, adapter.getModels().size());
+                adapter.getModels().remove(position);
+                adapter.notifyItemRemoved(position);
+                adapter.notifyItemRangeChanged(position, adapter.getModels().size());
 //                }
                 break;
             case R.id.item_reckontime_tv://预计到达时间
@@ -250,8 +250,7 @@ public class MissionActivity extends BaseActivity implements View.OnClickListene
                 if (StringUtils.isEmpty(distance)) return;
                 if (ListUtils.isEmpty(adapter.getModels()) || adapter.getModels().size() <= position)
                     return;
-                if (StringUtils.isEmpty(adapter.getModels().get(position).getCompanyName()))
-                    adapter.getModels().get(position).setCompanyName(info.name);
+                adapter.getModels().get(position).setCompanyName(info.name);
                 adapter.getModels().get(position).setCompanyAddr(info.address);
                 adapter.getModels().get(position).setLatLng(info.location);
                 adapter.getModels().get(position).setDistance(BaiduMapUtil.getInstence().distance(adapter.getModels().get(position).getLatLng()
@@ -259,7 +258,7 @@ public class MissionActivity extends BaseActivity implements View.OnClickListene
                                 MyApplication.getInstance().getBdLocationHelper().getLongitude())));
                 adapter.notifyItemChanged(position);
             }
-        } else if (0x22 == requestCode) {//外勤测试
+        } else if (0x22 == requestCode) {//外勤设置
             boolean isAuto = data.getBooleanExtra("isAuto", true);
             if (!isAuto) {
                 if (flag == 1) {

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

@@ -134,6 +134,7 @@ public class Subscription2Activity extends BaseActivity {
     }
 
     private void initView() {
+        ViewUtil.LoginERPTask(this, handler, 0x12);
         LinearLayoutManager layoutManager = new LinearLayoutManager(ct);
         recycler.setLayoutManager(layoutManager);
         viewDivider = new RecycleViewDivider(this, LinearLayout.HORIZONTAL, 1, getResources().getColor(R.color.gray_light));