|
|
@@ -1,24 +1,5 @@
|
|
|
package com.xzjmyk.pm.activity.ui.erp.activity;
|
|
|
|
|
|
-import java.util.Date;
|
|
|
-import java.util.HashMap;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
-
|
|
|
-import org.apache.http.util.EncodingUtils;
|
|
|
-
|
|
|
-import com.handmark.pulltorefresh.library.PullToRefreshWebView;
|
|
|
-import com.xzjmyk.pm.activity.ui.erp.model.LoginEntity;
|
|
|
-import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
|
|
|
-import com.xzjmyk.pm.activity.R;
|
|
|
-import com.xzjmyk.pm.activity.ui.MainActivity;
|
|
|
-import com.xzjmyk.pm.activity.ui.base.BaseActivity;
|
|
|
-import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
|
|
|
-import com.xzjmyk.pm.activity.ui.erp.util.Blowfish;
|
|
|
-import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
|
|
|
-import com.xzjmyk.pm.activity.ui.erp.util.Constants;
|
|
|
-import com.xzjmyk.pm.activity.ui.erp.util.FlexJsonUtil;
|
|
|
-
|
|
|
import android.annotation.SuppressLint;
|
|
|
import android.content.Intent;
|
|
|
import android.os.Bundle;
|
|
|
@@ -32,6 +13,26 @@ import android.webkit.WebViewClient;
|
|
|
import android.widget.ProgressBar;
|
|
|
import android.widget.TextView;
|
|
|
|
|
|
+import com.alibaba.fastjson.JSON;
|
|
|
+import com.handmark.pulltorefresh.library.PullToRefreshWebView;
|
|
|
+import com.xzjmyk.pm.activity.R;
|
|
|
+import com.xzjmyk.pm.activity.ui.MainActivity;
|
|
|
+import com.xzjmyk.pm.activity.ui.base.BaseActivity;
|
|
|
+import com.xzjmyk.pm.activity.ui.erp.model.LoginEntity;
|
|
|
+import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
|
|
|
+import com.xzjmyk.pm.activity.ui.erp.util.Blowfish;
|
|
|
+import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
|
|
|
+import com.xzjmyk.pm.activity.ui.erp.util.Constants;
|
|
|
+import com.xzjmyk.pm.activity.ui.erp.util.FlexJsonUtil;
|
|
|
+import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
|
|
|
+
|
|
|
+import org.apache.http.util.EncodingUtils;
|
|
|
+
|
|
|
+import java.util.Date;
|
|
|
+import java.util.HashMap;
|
|
|
+import java.util.List;
|
|
|
+import java.util.Map;
|
|
|
+
|
|
|
/**
|
|
|
* @注释:链接网址
|
|
|
*/
|
|
|
@@ -227,7 +228,8 @@ public class WebViewLoadActivity extends BaseActivity {
|
|
|
private void updateCompany(String uu, String master) {
|
|
|
String json = CommonUtil.getSharedPreferences(this, "loginJson");
|
|
|
System.out.println("login json=" + json);
|
|
|
- List<LoginEntity> logMsg = FlexJsonUtil.fromJsonArray(json, LoginEntity.class);
|
|
|
+ List<LoginEntity> logMsg = JSON.parseArray(json, LoginEntity.class);
|
|
|
+ // FlexJsonUtil.fromJsonArray(json, LoginEntity.class);
|
|
|
for (int i = 0; i < logMsg.size(); i++) {
|
|
|
LoginEntity entity = logMsg.get(i);
|
|
|
if ((String.valueOf(entity.getEnuu())).equals(uu)) {
|
|
|
@@ -257,7 +259,8 @@ public class WebViewLoadActivity extends BaseActivity {
|
|
|
private void updateCompanyByMasterId(String masterId, String master) {
|
|
|
String json = CommonUtil.getSharedPreferences(this, "loginJson");
|
|
|
System.out.println("login json=" + json);
|
|
|
- List<LoginEntity> logMsg = FlexJsonUtil.fromJsonArray(json, LoginEntity.class);
|
|
|
+ List<LoginEntity> logMsg = JSON.parseArray(json, LoginEntity.class);
|
|
|
+
|
|
|
for (int i = 0; i < logMsg.size(); i++) {
|
|
|
LoginEntity entity = logMsg.get(i);
|
|
|
if ((String.valueOf(entity.getMasterId())).equals(masterId)) {
|