版本5.8.8

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/net/ViewUtil.java

@@ -711,7 +711,7 @@ public class ViewUtil {
      */
     private static void showDialogCompany(String json, String phone, String password) {
         List<LoginEntity> logMsg = JSON.parseArray(json, LoginEntity.class);
-        erpEntities = new ArrayList<LoginEntity>();
+        erpEntities = new ArrayList<>();
         LoginEntity logB2b = null;
         if (logMsg != null && !logMsg.isEmpty()) {
             for (int i = 0; i < logMsg.size(); i++) {
@@ -756,7 +756,7 @@ public class ViewUtil {
                         CommonUtil.setSharedPreferences(MyApplication.getInstance().getApplicationContext(), "spaceId", String.valueOf(sModel.get(0).getId()));
                         CommonUtil.setSharedPreferences(MyApplication.getInstance().getApplicationContext(), "companyName", String.valueOf(sModel.get(0).getName()));
                         CommonUtil.setSharedPreferences(MyApplication.getInstance().getApplicationContext(), "companyEnUu", String.valueOf(sModel.get(0).getEnuu()));
-                        LoginB2BTask(phone, password, sModel.get(0).getId());//登录B2B
+                        LoginB2BTask(phone, password, sModel.get(0).getIn\d());//登录B2B
                     }
                 }else{
                     if (ct!=null) {

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

@@ -103,7 +103,7 @@ public class SettingActivity extends ActionBackActivity implements View.OnClickL
 
     @ViewInject(R.id.tv_help_new)
     private TextView tv_help_new;
-  
+
 
     @ViewInject(R.id.language_us_rl)
     private RelativeLayout language_us_rl;
@@ -374,7 +374,7 @@ public class SettingActivity extends ActionBackActivity implements View.OnClickL
             break;
             case R.id.about_us_rl:// 关于我们
                 startActivity(new Intent(mContext, AboutActivity.class));
-              
+
                 break;
             case R.id.share_rl:
                 share();

app_third/libbdupdatesdk/src/main/res/values/bdp_update_strings.xml

@@ -1,7 +1,6 @@
 <resources>
 
     <string name="bdp_update_request_net_error">网络错误，请重试</string>
-    
     <string name="bdp_update_title_download">发现新版本</string>
     <string name="bdp_update_title_install">发现新版本安装包</string>
     <string name="bdp_update_title_as">提示</string>