发布5.5.1版本；

WeiChat/src/main/AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.xzjmyk.pm.activity"
-    android:versionCode="55"
-    android:versionName="5.5.0">
+    android:versionCode="56"
+    android:versionName="5.5.1">
 
     <uses-sdk
         android:minSdkVersion="11"

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/WorksFragment.java

@@ -109,9 +109,9 @@ public class WorksFragment extends XutilsFragment implements View.OnClickListene
                 String b_enuu=CommonUtil.getSharedPreferences(getActivity(),"erp_uu");
                 String url ="";
                 if (StringUtils.isEmpty(b_enuu)){
-                   url = "http://www.ubtob.com/authen?b_username="+phone+"&b_password="+password;
+                   url = "http://uas.ubtob.com/authen?b_username="+phone+"&b_password="+password;
                 }else{
-                  url = "http://www.ubtob.com/authen?b_username="+phone+"&b_password="+password+"&b_enuu="+b_enuu;
+                  url = "http://uas.ubtob.com/authen?b_username="+phone+"&b_password="+password+"&b_enuu="+b_enuu;
                 }
                 Log.i(TAG, "onClick:" +url);
                 ViewUtil.webLinks(ct, url, "我的商务");

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

@@ -21,6 +21,7 @@ import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.account.DataDownloadActivity;
+import com.xzjmyk.pm.activity.ui.account.LoginActivity;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.WebViewCommActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.LoginEntity;
@@ -157,7 +158,7 @@ public class ViewUtil {
         new Thread(new Runnable() {
             @Override
             public void run() {
-                boolean isNetHas = true;
+                boolean isNetHas = CommonUtil.isNetWorkConnected(MyApplication.getInstance());
                 if (isNetHas) {
                     /** @注释：处理网络请求返回结果 */
                     String result = getDataFromServer(url, params, request);
@@ -177,10 +178,24 @@ public class ViewUtil {
                             handler.sendMessage(message);
                         }
                     } else {
-
+                        Bundle bundle = new Bundle();
+                        Message message = new Message();
+                        bundle.putString("result", "{\n" +
+                                "\"exception\":\"系统内部错误！\"\n" +
+                                "}");
+                        message.setData(bundle);
+                        message.what = Constants.APP_SOCKETIMEOUTEXCEPTION;
+                        handler.sendMessage(message);
                     }
                 } else {
-
+                    Bundle bundle = new Bundle();
+                    Message message = new Message();
+                    bundle.putString("result", "{\n" +
+                            "\"exception\":\"网络未连接！\"\n" +
+                            "}");
+                    message.setData(bundle);
+                    message.what = Constants.APP_SOCKETIMEOUTEXCEPTION;
+                    handler.sendMessage(message);
 
                 }
             }
@@ -239,16 +254,28 @@ public class ViewUtil {
         if (((BaseActivity) ViewUtil.ct).isFinishing()) {
             mdProcessDialog.show();
         }
-        String url = Constants.BASE_URL_LOGIN;
-        Map<String, String> params = new HashMap<String, String>();
-        params.put("user", user_phone);
-        params.put("password", user_password);
-        Message message = new Message();
-        Bundle bundle = new Bundle();
-        bundle.putString("phone", user_phone);
-        bundle.putString("password", user_password);
-        startNetThread(url, params, handler, Constants.SUCCESS_LOGIN, message,
-                bundle, "get");
+        if (!(ct instanceof LoginActivity)){
+            //取缓存
+            if (!StringUtils.isEmpty(CommonUtil.getSharedPreferences(ct,"loginJson"))){
+                showDialogCompany(CommonUtil.getSharedPreferences(ct,"loginJson"), user_phone, user_password);
+            }else{
+                ToastMessage(ct,"缓存没有公司信息，请重新登录！");
+            }
+          
+        }else{
+            //登录界面过来，不走缓存
+            String url = Constants.BASE_URL_LOGIN;
+            Map<String, String> params = new HashMap<String, String>();
+            params.put("user", user_phone);
+            params.put("password", user_password);
+            Message message = new Message();
+            Bundle bundle = new Bundle();
+            bundle.putString("phone", user_phone);
+            bundle.putString("password", user_password);
+            startNetThread(url, params, handler, Constants.SUCCESS_LOGIN, message,
+                    bundle, "get");
+        }
+      
     }
 
 /*    public static void LoginTaskERP(String user_phone, String user_password, Context ct) {
@@ -303,10 +330,15 @@ public class ViewUtil {
                     if (mdProcessDialog != null && mdProcessDialog.isShowing()) {
                         mdProcessDialog.dismiss();
                     }
-                    ToastMessage(MyApplication.getInstance(), "服务器拒绝访问！");
+                    ToastMessage(MyApplication.getInstance(), "网络超时响应！");
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
-                    ToastMessage(MyApplication.getInstance(), "服务器拒绝此账套登录！");
+                    if (new JsonValidator().validate(msg.getData().getString("result"))) {
+                        ToastMessage(MyApplication.getInstance(), 
+                                JSON.parseObject(msg.getData().getString("result")).getString("exception"));
+                    }else{
+                        ToastMessage(MyApplication.getInstance(), "系统内部错误！");
+                    }
                     break;
                 default:
                     break;
@@ -339,7 +371,7 @@ public class ViewUtil {
             CommonUtil.setSharedPreferences(ct, "erp_baseurl", erp_baseurl);
             CommonUtil.setSharedPreferences(ct, "erp_master", erp_master);
             CommonUtil.setSharedPreferences(ct, "erp_commpany", erp_company);
-            CommonUtil.setSharedPreferences(ct, "erp_uu", erp_uu);
+            CommonUtil.setSharedPreferences(ct, "erp_uu", String.valueOf(dataMap.get("uu")));
             CommonUtil.setSharedPreferences(ct, "erp_masterId", erp_masterId);
             CommonUtil.setSharedPreferences(ct, "erp_login", true);
         }
@@ -435,6 +467,8 @@ public class ViewUtil {
                                                 erp_masterId = String.valueOf(entity.getMasterId());
                                                 LoginERPTask(entity.getWebsite(),
                                                         entity.getMaster(), phone, password);
+                                                //清除账套列表缓存
+                                                CommonUtil.clearSharedPreferences(ct,"erp_masterlist");
                                             }
                                         }
                                     }
@@ -456,6 +490,10 @@ public class ViewUtil {
         String phone = msg.getData().getString("phone");
         String password = msg.getData().getString("password");
         Log.i("Login", "login sucess:" + json);
+        showDialogCompany(json, phone, password);
+    }
+
+    private static void showDialogCompany(String json, String phone, String password) {
         List<LoginEntity> logMsg = JSON.parseArray(json, LoginEntity.class);
         erpEntities = new ArrayList<LoginEntity>();
         if (logMsg != null && !logMsg.isEmpty()) {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/Constants.java

@@ -10,8 +10,7 @@ import android.net.NetworkInfo;
 public class Constants {
 
     public static final String BASE_URL_LOGIN = "http://manage.ubtob.com/public/account";
-    //public static final String basicURL = "http://www.ubtob.com/";
-    public static final String serviceURL = "http://www.ubtob.com/j_spring_security_check";
+    public static final String serviceURL = "http://uas.ubtob.com/j_spring_security_check";
 
     //组织架构 员工信息
     public static final String SQL_EMPLOYEES_CREATETABLE = "CREATE TABLE EMPLOYEES "

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

@@ -22,6 +22,7 @@ import android.widget.TextView;
 
 import com.afollestad.materialdialogs.GravityEnum;
 import com.afollestad.materialdialogs.MaterialDialog;
+import com.alibaba.fastjson.JSON;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.uuzuche.lib_zxing.activity.CaptureActivity;
@@ -52,7 +53,6 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-//import com.tencent.bugly.crashreport.CrashReport;
 
 public class MeFragment extends EasyFragment implements View.OnClickListener {
 
@@ -82,10 +82,10 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
     @ViewInject(R.id.app_scan_code_rl)
     private RelativeLayout rl_scan_code;
     @ViewInject(R.id.app_drafts_rl)
-    private RelativeLayout  app_drafts_rl;
+    private RelativeLayout app_drafts_rl;
 
     @ViewInject(R.id.app_friend_rl)
-    private RelativeLayout   app_friend_rl;
+    private RelativeLayout app_friend_rl;
 
     private Context ct;
     public MasterDialog mDialog;
@@ -95,9 +95,17 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
         public void handleMessage(Message msg) {
             switch (msg.what) {
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
-                    ToastUtil.showToast(getActivity(), "服务器繁忙！");
+                    if (new JsonValidator().validate(msg.getData().getString("result"))) {
+                        ToastUtil.showToast(getActivity(), "系统内部错误！");
+                    } else {
+                        ToastUtil.showToast(getActivity(),
+                                msg.getData().getString("result"));
+                    }
+
                     break;
                 case 1://获取中文账套
+                    //账套信息需要做缓存 master list 数据  存 key  erp_masterlist
+                    //公司信息已经做了缓存，存key  loginJson
                     String result = msg.getData().getString("result"); //解析账套信息
                     boolean isJsonStr = new JsonValidator().validate(result);
                     if (isJsonStr) {
@@ -105,6 +113,7 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
                         List<Master> mList = FlexJsonUtil.fromJsonArray(
                                 FlexJsonUtil.toJson(resultsMap.get("masters")),
                                 Master.class);
+
                         getChMaster(mList);
                     } else {
                         ViewUtil.ShowMessageFDialogAutoDismiss(ct, "获取账套信息失败!", 2000);
@@ -117,7 +126,11 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
                             FlexJsonUtil.toJson(resultsMap.get("masters")),
                             Master.class);
                     Log.i("erp_master", FlexJsonUtil.toJson(resultsMap.get("masters")));
-                    if (CommonUtil.isDialogShowing(mDialog)){
+                    //保存账套列表
+                    CommonUtil.setSharedPreferences(ct, "erp_masterlist", JSON.toJSONString(
+                            resultsMap.get("masters")
+                    ));
+                    if (CommonUtil.isDialogShowing(mDialog)) {
                         return;
                     }
                     mDialog = new MasterDialog(ct, "切换账套",
@@ -170,7 +183,7 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
     public void onResume() {
         if (!mReceiverTag) {     //在注册广播接受者的时候 判断是否已被注册,避免重复多次注册广播
             IntentFilter inflate = new IntentFilter();
-            mReceiverTag=true;
+            mReceiverTag = true;
             inflate.addAction(BasicInfoEditActivity.UPHEAD);
             getActivity().registerReceiver(receiverUpdataHead, inflate);
         }
@@ -255,42 +268,19 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         super.onCreateOptionsMenu(menu, inflater);
 //        inflater = getActivity().getMenuInflater();
-        inflater.inflate(R.menu.menu_me_scan,menu);
+        inflater.inflate(R.menu.menu_me_scan, menu);
     }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == R.id.me_scan){
+        if (item.getItemId() == R.id.me_scan) {
             Intent intent = new Intent();
             intent.setClass(getActivity(), CaptureActivity.class);
-            startActivityForResult(intent,REQUEST_CODE);
+            startActivityForResult(intent, REQUEST_CODE);
         }
         return super.onOptionsItemSelected(item);
     }
 
-    //    private void setApl() {
-//
-//        View view1=findViewById(R.id.info_rl);
-//        View view2=findViewById(R.id.my_data_rl);
-//        View view3=findViewById(R.id.my_friend_rl);
-//        View view4=findViewById(R.id.my_space_rl);
-//        View view5=findViewById(R.id.local_video_rl);
-//        View view6=findViewById(R.id.rl_company_change);
-//        View view7=findViewById(R.id.rl_master_change);
-//
-//        ViewAlphaUtil.setViewAlpha(view1);
-//        ViewAlphaUtil.setViewAlpha(view2);
-//        ViewAlphaUtil.setViewAlpha(view3);
-//        ViewAlphaUtil.setViewAlpha(view4);
-//        ViewAlphaUtil.setViewAlpha(view5);
-//        ViewAlphaUtil.setViewAlpha(view6);
-//        ViewAlphaUtil.setViewAlpha(view7);
-//        ViewAlphaUtil.setViewAlpha(findViewById(R.id.my_erp_rl));
-//        ViewAlphaUtil.setViewAlpha(findViewById(R.id.my_b2b_rl));
-//        ViewAlphaUtil.setViewAlpha(findViewById(R.id.setting_rl));
-//
-//
-//    }
 
     /**
      * @desc:账户设置菜单界面
@@ -308,7 +298,7 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
                 startActivity(new Intent(getActivity(), BaseInfoActivity.class));
                 break;
             case R.id.rl_master_change:
-                    changeMaster();
+                changeMaster();
                 break;
             case R.id.my_data_rl:// 我的资料
                 startActivityForResult(new Intent(getActivity(), BasicInfoEditActivity.class), 1);
@@ -335,7 +325,7 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
                         .customView(imageView, false)
                         .titleGravity(GravityEnum.CENTER)
                         .show();
-                final Bitmap bitmap = ((BitmapDrawable)imageView.getDrawable()).getBitmap();
+                final Bitmap bitmap = ((BitmapDrawable) imageView.getDrawable()).getBitmap();
                 imageView.setOnLongClickListener(new View.OnLongClickListener() {
                     @Override
                     public boolean onLongClick(View v) {
@@ -345,7 +335,7 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
                                 Intent intent = new Intent();
                                 intent.setClass(getActivity(), CommonWebviewActivity.class);
                                 intent.putExtra("scan_url", result);
-                                Log.d("image_url",result);
+                                Log.d("image_url", result);
                                 startActivity(intent);
                             }
 
@@ -359,10 +349,10 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
                 });
                 break;
             case R.id.app_drafts_rl:
-                ToastUtil.showToast(getActivity(),"新功能未上线！请期待！");
+                ToastUtil.showToast(getActivity(), "新功能未上线！请期待！");
                 break;
-            case  R.id.app_friend_rl:
-                
+            case R.id.app_friend_rl:
+
                 break;
         }
     }
@@ -375,7 +365,7 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
             mNickNameTv.setText(MyApplication.getInstance().mLoginUser.getNickName());
         }
 
-        if (requestCode == REQUEST_CODE && resultCode == Activity.RESULT_OK && data != null){
+        if (requestCode == REQUEST_CODE && resultCode == Activity.RESULT_OK && data != null) {
             data.setClass(getActivity(), CaptureResultActivity.class);
             startActivity(data);
         }
@@ -408,12 +398,30 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
 
     //切换账套
     public void changeMaster() {
-        String url = Constants.getAppBaseUrl(ct) + "mobile/getAllMasters.action";
-        Map<String, Object> params = new HashMap<>();
-        params.put("sessionId", CommonUtil.getSharedPreferences(ct, "sessionId"));
-        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
-        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
-        ViewUtil.httpSendRequest(ct, url, params, mhandler, headers, 2, null, null, "get");
+        if (StringUtils.isEmpty(CommonUtil.getSharedPreferences(ct, "erp_masterlist"))) {
+            String url = Constants.getAppBaseUrl(ct) + "mobile/getAllMasters.action";
+            Map<String, Object> params = new HashMap<>();
+            params.put("sessionId", CommonUtil.getSharedPreferences(ct, "sessionId"));
+            LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+            headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+            ViewUtil.httpSendRequest(ct, url, params, mhandler, headers, 2, null, null, "get");
+        } else {
+            String masterlist = CommonUtil.getSharedPreferences(ct, "erp_masterlist");
+            List<Master> mList = JSON.parseArray(masterlist, Master.class);
+            if (CommonUtil.isDialogShowing(mDialog)) {
+                return;
+            }
+            mDialog = new MasterDialog(ct, "切换账套",
+                    new MasterDialog.PickDialogListener() {
+                        @Override
+                        public void onListItemClick(int position, final Master master) {
+                            Login(master);
+                        }
+                    });
+            mDialog.show();
+            mDialog.initViewData(mList);
+        }
+
     }
 
     //切换登录
@@ -461,6 +469,7 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
     }
 
     private boolean mReceiverTag = false;   //广播接受者标识
+
     @Override
     public void onDestroy() {
         super.onDestroy();

WeiChat/src/main/res/layout/fragment_me.xml

@@ -349,7 +349,8 @@
         <RelativeLayout
             android:id="@+id/app_drafts_rl"
             
-            style="@style/IMTbleLine_UP_Me">
+            style="@style/IMTbleLine_UP_Me"
+            android:visibility="gone">
 
             <TextView
                 android:id="@+id/drafts_text"