sp中的context用application代替.

app/build.gradle

@@ -21,8 +21,8 @@ android {
         applicationId "com.dayu.bigfish"
         minSdkVersion 16
         targetSdkVersion 23
-        versionCode 4
-        versionName "1.0.0"
+        versionCode 5
+        versionName "1.1.1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
         vectorDrawables.useSupportLibrary = true

app/src/main/java/com/dayu/bigfish/Constants.java

@@ -21,8 +21,8 @@ public class Constants {
 
     /***********************测试环境配置**********************************/
     public static final int DEBUGLEVEL = LogUtils.LEVEL_ALL;
-        public static final String BASE_URL = "http://47.94.101.239:3112";
-//    public static final String BASE_URL = "http://192.168.123.121:3112";
+    public static final String BASE_URL = "http://47.94.101.239:3112";
+    //    public static final String BASE_URL = "http://192.168.123.121:3112";
     public final static String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply";
     public final static String WEB_SOP = "http://47.94.101.239:9004/#/sop";
     public static final boolean UM_DEBUG = true;

app/src/main/java/com/dayu/bigfish/InitializeActivity.java

@@ -57,7 +57,7 @@ public class InitializeActivity extends AppCompatActivity {
 
     private void doJump() {
         Intent intent;
-        if (UserManager.getInstance().hasUserInfo(this)) {
+        if (UserManager.getInstance().hasUserInfo()) {
             intent = new Intent(InitializeActivity.this, MainActivity.class);
         } else {
             intent = new Intent(InitializeActivity.this, LoginActivity.class);

app/src/main/java/com/dayu/bigfish/api/Api.java

@@ -4,7 +4,6 @@ import android.text.TextUtils;
 import android.util.Log;
 
 import com.dayu.bigfish.Constants;
-import com.dayu.bigfish.MyApplication;
 import com.dayu.bigfish.base.BaseResponse;
 import com.dayu.bigfish.bean.UserInfo;
 import com.dayu.bigfish.utils.LogUtils;
@@ -141,7 +140,7 @@ public class Api {
         @Override
         public Response intercept(Chain chain) throws IOException {
             Request request = chain.request();
-            UserInfo userInfo = UserManager.getInstance().getUser(MyApplication.getContext());
+            UserInfo userInfo = UserManager.getInstance().getUser();
             if (userInfo != null) {
                 String token = userInfo.getToken();
                 if (!TextUtils.isEmpty(token) && !request.url().toString().contains(Constants.BASE_URL + Constants.LOGIN_URL)) {

app/src/main/java/com/dayu/bigfish/api/ServerException.java

@@ -100,13 +100,13 @@ public class ServerException extends Exception {
                 message = "未知错误GLOBAL0100";   //远程调用失败
                 break;
             case "GLOBAL0101":
-                message = "未知错误GLOBAL0101";   //短信验证失败
+                message = "验证码错误";   //短信验证失败
                 break;
             case "GLOBAL0102":
                 message = "未知错误GLOBAL0102";   // unknowable error type
                 break;
             case "GLOBAL0103":
-                message = "验证码失败";
+                message = "验证码错误";
                 break;
             case "GLOBAL0104":
                 message = "用户名和密码错误";

app/src/main/java/com/dayu/bigfish/base/BaseListPresenter.java

@@ -10,14 +10,12 @@ public abstract class BaseListPresenter<V> extends BasePresenter<V> {
     /**
      * 如果有下拉刷新，子类必须重写此方法.
      */
-    public void refresh() {
-    }
+    public abstract void refresh();
 
     /**
      * 如果有上拉加载，子类必须重写此方法.
      */
-    public void loadMore() {
-    }
+    public abstract void loadMore();
 
     /**
      * 获取recy数据源.

app/src/main/java/com/dayu/bigfish/base/BasePresenter.java

@@ -148,9 +148,9 @@ public abstract class BasePresenter<V> {
         mDialog = new CustomDialog(mActivity, R.style.CustomDialog, getString(R.string.login_state_no)
                 , (dialog, confirm) -> {
             if (confirm) {
-                UserManager.getInstance().clearUserInfo(mActivity);
+                UserManager.getInstance().clearUserInfo();
                 EMClient.getInstance().logout(true);
-                UserManager.getInstance().clearUserInfo(mActivity);
+                UserManager.getInstance().clearUserInfo();
                 Intent Intents = new Intent(mActivity, LoginActivity.class);
                 Intents.setFlags(
                         Intent.FLAG_ACTIVITY_CLEAR_TASK |

app/src/main/java/com/dayu/bigfish/bean/sqlbean/OrderInfo.java

 package com.dayu.bigfish.bean.sqlbean;
 
-import android.databinding.BaseObservable;
-import android.databinding.Bindable;
-
-import com.dayu.bigfish.BR;
-
 import org.greenrobot.greendao.annotation.Convert;
 import org.greenrobot.greendao.annotation.Entity;
 import org.greenrobot.greendao.annotation.Generated;
@@ -18,7 +13,7 @@ import java.util.List;
  */
 
 @Entity
-public class OrderInfo extends BaseObservable {
+public class OrderInfo  {
     @Id
     private long id;
     @Property(nameInDb = "engineerId")
@@ -75,67 +70,53 @@ public class OrderInfo extends BaseObservable {
         this.engineerId = engineerId;
     }
 
-    @Bindable
     public String getServerRecord() {
         return this.serverRecord;
     }
 
     public void setServerRecord(String serverRecord) {
         this.serverRecord = serverRecord;
-        notifyPropertyChanged(BR.serverRecord);
     }
-    @Bindable
     public String getDoorPrice() {
         return this.doorPrice;
     }
 
     public void setDoorPrice(String doorPrice) {
         this.doorPrice = doorPrice;
-        notifyPropertyChanged(BR.doorPrice);
     }
-    @Bindable
     public String getServerPrice() {
         return this.serverPrice;
     }
 
     public void setServerPrice(String serverPrice) {
         this.serverPrice = serverPrice;
-        notifyPropertyChanged(BR.serverPrice);
     }
-    @Bindable
     public String getMaterialCost() {
         return this.materialCost;
     }
 
     public void setMaterialCost(String materialCost) {
         this.materialCost = materialCost;
-        notifyPropertyChanged(BR.materialCost);
     }
-    @Bindable
     public String getOtherPrice() {
         return this.otherPrice;
     }
 
     public void setOtherPrice(String otherPrice) {
         this.otherPrice = otherPrice;
-        notifyPropertyChanged(BR.otherPrice);
     }
-    @Bindable
     public String getOtherInfo() {
         return this.otherInfo;
     }
 
     public void setOtherInfo(String otherInfo) {
         this.otherInfo = otherInfo;
-        notifyPropertyChanged(BR.otherInfo);
     }
-    @Bindable
     public List<String> getImgPath() {
         return this.imgPath;
     }
 
     public void setImgPath(List<String> imgPath) {
         this.imgPath = imgPath;
-        notifyPropertyChanged(BR.imgPath);
     }
 }

app/src/main/java/com/dayu/bigfish/presenter/Withdrawals/WithdrawalsPresenter.java

@@ -35,7 +35,7 @@ public class WithdrawalsPresenter extends WithdrawalsContract.Presenter {
 
     @Override
     public void onAttached() {
-        UserInfo userInfo = UserManager.getInstance().getUser(mActivity);
+        UserInfo userInfo = UserManager.getInstance().getUser();
         mUserId = Integer.parseInt(userInfo.getAccountId());
         mView.showDialog();
         querAlipay();

app/src/main/java/com/dayu/bigfish/presenter/accountbalance/AccountBalancePresenter.java

@@ -28,21 +28,19 @@ public class AccountBalancePresenter extends AccountBalanceContract.Presenter {
     public void onAttached() {
         String price = "￥" + mActivity.getIntent().getIntExtra(Constants.ACCOUNT_BALANCE, 0);
         totalPrice.set(price);
-        UserInfo userInfo = UserManager.getInstance().getUser(mActivity);
+        UserInfo userInfo = UserManager.getInstance().getUser();
         mAccoutId = Integer.parseInt(userInfo.getAccountId());
         refresh();
     }
 
     @Override
     public void refresh() {
-        super.refresh();
         mPage = 1;
         getAccountBalanceList(mPage, Constants.PAGESIZE, mAccoutId);
     }
 
     @Override
     public void loadMore() {
-        super.loadMore();
         getAccountBalanceList(mPage, Constants.PAGESIZE, mAccoutId);
     }
 

app/src/main/java/com/dayu/bigfish/presenter/feedback/FeedBackPresenter.java

@@ -29,8 +29,8 @@ public class FeedBackPresenter extends FeedBackContract.Presenter {
 
     @Override
     public void onAttached() {
-        mUserName = UserManager.getInstance().getUserName(mActivity);
-        mUserMobile = UserManager.getInstance().getUserPhone(mActivity);
+        mUserName = UserManager.getInstance().getUserName();
+        mUserMobile = UserManager.getInstance().getUserPhone();
     }
 
 

app/src/main/java/com/dayu/bigfish/presenter/homeorder/HomeOrderPresenter.java

@@ -22,7 +22,7 @@ public class HomeOrderPresenter extends HomeOrderContract.Presenter {
 
     @Override
     public void onAttached() {
-        UserInfo userInfo = UserManager.getInstance().getUser(mActivity);
+        UserInfo userInfo = UserManager.getInstance().getUser();
         mUserId = Integer.parseInt(userInfo.getAccountId());
         mSiteId = Integer.parseInt(userInfo.getSiteId());
     }

app/src/main/java/com/dayu/bigfish/presenter/login/LoginPresenter.java

@@ -79,10 +79,10 @@ public class LoginPresenter extends LoginContract.Presenter {
                     dumpAndSave(userInfo);
                 } else if (userInfo.getStatus() == 2) {
                     ToastUtils.showShortToast(R.string.engineer_identity_auditing);
-                    UserManager.getInstance().saveUser(mActivity, userInfo);
+                    UserManager.getInstance().saveUser(userInfo);
                 } else if (userInfo.getStatus() == 3) {
                     showLoginDialog();
-                    UserManager.getInstance().saveUser(mActivity, userInfo);
+                    UserManager.getInstance().saveUser(userInfo);
                 }
             }
         }));
@@ -119,7 +119,7 @@ public class LoginPresenter extends LoginContract.Presenter {
 
     @Override
     public void dumpAndSave(UserInfo info) {
-        UserManager.getInstance().saveUser(mActivity, info);
+        UserManager.getInstance().saveUser(info);
         startActvityAndFinish(MainActivity.class);
     }
 

app/src/main/java/com/dayu/bigfish/presenter/main/MainPresenter.java

@@ -46,7 +46,7 @@ public class MainPresenter extends MainContract.Presenter {
 
     @Override
     public void onAttached() {
-        mUser = UserManager.getInstance().getUser(mActivity);
+        mUser = UserManager.getInstance().getUser();
         mAccountId = Integer.parseInt(mUser.getAccountId());
         mSiteId = Integer.parseInt(mUser.getSiteId());
         request();
@@ -84,7 +84,7 @@ public class MainPresenter extends MainContract.Presenter {
 
     @Override
     public void commitVersionInfo(int accoutId, String imei, String platform, String versionCode) {
-        if (SPUtils.get(mActivity, Constants.OLD_PAKAGENUM, "").equals(mActivity.getPackageName())) {
+        if (SPUtils.get(Constants.OLD_PAKAGENUM, "").equals(mActivity.getPackageName())) {
             return;
         }
         JSONObject jsonObject = new JSONObject();
@@ -100,7 +100,7 @@ public class MainPresenter extends MainContract.Presenter {
         ApiFactory.commitVersionInfo(requestBody).subscribe(baseObserver(new Consumer<Boolean>() {
             @Override
             public void accept(Boolean aBoolean) throws Exception {
-                SPUtils.put(mActivity, Constants.OLD_PAKAGENUM, mActivity.getPackageName());
+                SPUtils.put(Constants.OLD_PAKAGENUM, mActivity.getPackageName());
             }
         }));
     }

app/src/main/java/com/dayu/bigfish/presenter/message/messagePresenter.java

@@ -40,21 +40,19 @@ public class messagePresenter extends messageContract.Presenter {
     @Override
     public void onAttached() {
         mCategory = ((MessageFragment) mView).getArguments().getInt("category", 1);
-        UserInfo userInfo = UserManager.getInstance().getUser(mActivity);
+        UserInfo userInfo = UserManager.getInstance().getUser();
         mHxId = userInfo.getHxAccount();
         refresh();
     }
 
     @Override
     public void refresh() {
-        super.refresh();
         mPage = 1;
         getHxMessage(mHxId, mCategory, mPage, Constants.PAGESIZE);
     }
 
     @Override
     public void loadMore() {
-        super.loadMore();
         getHxMessage(mHxId, mCategory, mPage, Constants.PAGESIZE);
     }
 

app/src/main/java/com/dayu/bigfish/presenter/myhead/MyHeadPresenter.java

@@ -27,7 +27,7 @@ public class MyHeadPresenter extends MyHeadContract.Presenter {
 
     @Override
     public void onAttached() {
-        mUserInfo = UserManager.getInstance().getUser(mActivity);
+        mUserInfo = UserManager.getInstance().getUser();
         mAccountId = Integer.parseInt(mUserInfo.getAccountId());
         headUrl.set(mUserInfo.getHeaderImg());
     }
@@ -57,7 +57,7 @@ public class MyHeadPresenter extends MyHeadContract.Presenter {
             public void accept(Boolean aBoolean) throws Exception {
                 headUrl.set(path);
                 mUserInfo.setHeaderImg(path);
-                UserManager.getInstance().saveUser(mActivity, mUserInfo);
+                UserManager.getInstance().saveUser(mUserInfo);
                 PictureFileUtils.deleteCacheDirFile(mActivity);
             }
         }));

app/src/main/java/com/dayu/bigfish/presenter/orderdoing/OrderDoingPresenter.java

@@ -39,7 +39,7 @@ public class OrderDoingPresenter extends orderDoingContract.Presenter {
 
     @Override
     public void onAttached() {
-        UserInfo userInfo = UserManager.getInstance().getUser(mActivity);
+        UserInfo userInfo = UserManager.getInstance().getUser();
         mUserId = Integer.parseInt(userInfo.getAccountId());
         mSiteId = Integer.parseInt(userInfo.getSiteId());
         mState = mView.getState();
@@ -47,7 +47,6 @@ public class OrderDoingPresenter extends orderDoingContract.Presenter {
 
     @Override
     public void refresh() {
-        super.refresh();
         if (mView instanceof OrderThreeTabFragment) {
             mView.showDialog();
             getErrorOrder();
@@ -59,7 +58,6 @@ public class OrderDoingPresenter extends orderDoingContract.Presenter {
 
     @Override
     public void loadMore() {
-        super.loadMore();
         getOrders(mState, mUserId, mSiteId, mPage, Constants.PAGESIZE);
     }
 

app/src/main/java/com/dayu/bigfish/presenter/personinfo/PersonInfoPresenter.java

@@ -24,7 +24,7 @@ public class PersonInfoPresenter extends PersonInfoContract.Presenter {
 
     @Override
     public void onAttached() {
-        UserInfo info = UserManager.getInstance().getUser(mActivity);
+        UserInfo info = UserManager.getInstance().getUser();
         mAccountId = Integer.parseInt(info.getAccountId());
         mView.showDialog();
         queryInfo(mAccountId);

app/src/main/java/com/dayu/bigfish/presenter/processorder/ProcessOrderContract.java

@@ -3,7 +3,6 @@ package com.dayu.bigfish.presenter.processorder;
 
 import com.dayu.bigfish.base.BasePresenter;
 import com.dayu.bigfish.base.BaseView;
-import com.dayu.bigfish.ui.ProcessOrderActivity;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -26,7 +25,7 @@ public interface ProcessOrderContract {
         void initPhotoView(ArrayList<String> list);
     }
 
-    abstract class Presenter extends BasePresenter<ProcessOrderActivity> {
+    abstract class Presenter extends BasePresenter<View> {
 
         public abstract void getOrderInfo(int orderId);
 

app/src/main/java/com/dayu/bigfish/presenter/processorder/ProcessOrderPresenter.java

@@ -59,7 +59,7 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter {
     public void onAttached() {
         mOrderId = mActivity.getIntent().getIntExtra(Constants.ORDER_ID, 0);
         mPosition = mActivity.getIntent().getIntExtra(Constants.ORDER_POSTION, 0);
-        UserInfo userInfo = UserManager.getInstance().getUser(mActivity);
+        UserInfo userInfo = UserManager.getInstance().getUser();
         mAccountId = Integer.parseInt(userInfo.getAccountId());
         mOrderInfoDao = GreenDaoManager.getInstance().getmDaoSession().getOrderInfoDao();
         mView.showDialog();
@@ -79,8 +79,7 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter {
             mOrderInfo.setId(mOrderId);
             mOrderInfo.setEngineerId(mAccountId);
         }
-        mView.mBind.setInfo(mOrderInfo);
-//        mOrderField.set(mOrderInfo);
+        mOrderField.set(mOrderInfo);
         if (mOrderInfo != null && TextUtils.isEmpty(mOrderInfo.getDoorPrice()) && TextUtils.isEmpty(mOrderInfo.getServerPrice())
                 && TextUtils.isEmpty(mOrderInfo.getMaterialCost()) && TextUtils.isEmpty(mOrderInfo.getOtherPrice())) {
             buttonState.set(false);
@@ -94,17 +93,11 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter {
     public void swtichButton() {
         buttonState.set(!buttonState.get());
         if (!buttonState.get()) {
-//            mOrderField.get().setDoorPrice("");
-//            mOrderField.get().setServerPrice("");
-//            mOrderField.get().setMaterialCost("");
-//            mOrderField.get().setOtherPrice("");
-//            mOrderField.get().setOtherInfo("");
-
-            mView.mBind.getInfo().setDoorPrice("");
-            mView.mBind.getInfo().setServerPrice("");
-            mView.mBind.getInfo().setMaterialCost("");
-            mView.mBind.getInfo().setOtherPrice("");
-            mView.mBind.getInfo().setOtherInfo("");
+            mOrderField.get().setDoorPrice("");
+            mOrderField.get().setServerPrice("");
+            mOrderField.get().setMaterialCost("");
+            mOrderField.get().setOtherPrice("");
+            mOrderField.get().setOtherInfo("");
         }
     }
 
@@ -113,8 +106,7 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter {
         ApiFactory.getOrderInfo(orderId).subscribe(baseObserver(new Consumer<OrderDetail>() {
             @Override
             public void accept(OrderDetail detail) throws Exception {
-                mView.mBind.setItem(detail);
-//                mDetail.set(detail);
+                mDetail.set(detail);
                 mAnyContacts = detail.getAnyContacts();
             }
         }));
@@ -190,8 +182,7 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter {
         ApiFactory.uploadPhoto(part).subscribe(baseObserver(new Consumer<List<String>>() {
             @Override
             public void accept(List<String> list) throws Exception {
-//                OrderInfo info = mOrderField.get();
-                OrderInfo info = mView.mBind.getInfo();
+                OrderInfo info = mOrderField.get();
                 commitOrder(list, mOrderId, info.getServerRecord(),
                         mAccountId, isPay, info.getDoorPrice(), info.getOtherInfo(),
                         info.getServerPrice(), info.getMaterialCost(), info.getOtherPrice());
@@ -204,11 +195,9 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter {
     @Override
     public void saveOrder() {
         if (mImages != null && mImages.size() > 0) {
-//            mOrderField.get().setImgPath(mImages);
-            mView.mBind.getInfo().setImgPath(mImages);
+            mOrderField.get().setImgPath(mImages);
         }
-        mOrderInfoDao.insertOrReplace(mView.mBind.getInfo());
-//        mOrderInfoDao.insertOrReplace(mOrderField.get());
+        mOrderInfoDao.insertOrReplace(mOrderField.get());
         mView.showToast(R.string.order_save_success);
         mActivity.finish();
     }
@@ -225,8 +214,7 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter {
             mView.showDialog();
             commitPhoto(mImages);
         } else {
-            OrderInfo info = mView.mBind.getInfo();
-//            OrderInfo info = mOrderField.get();
+            OrderInfo info = mOrderField.get();
             commitOrder(null, mOrderId, info.getServerRecord(),
                     mAccountId, isPay, info.getDoorPrice(), info.getOtherInfo(),
                     info.getServerPrice(), info.getMaterialCost(), info.getOtherPrice());

app/src/main/java/com/dayu/bigfish/presenter/receivingorder/ReceivingPresenter.java

@@ -39,7 +39,7 @@ public class ReceivingPresenter extends ReceivingContract.Presenter {
 
     @Override
     public void onAttached() {
-        UserInfo userInfo = UserManager.getInstance().getUser(mActivity);
+        UserInfo userInfo = UserManager.getInstance().getUser();
         mUserId = Integer.parseInt(userInfo.getAccountId());
         mSiteId = Integer.parseInt(userInfo.getSiteId());
         refresh();
@@ -92,7 +92,6 @@ public class ReceivingPresenter extends ReceivingContract.Presenter {
 
     @Override
     public void refresh() {
-        super.refresh();
         mPage = 1;
         getOrders(Constants.WATING_ORDER, mUserId, mSiteId, mPage, Constants.PAGESIZE);
     }

app/src/main/java/com/dayu/bigfish/presenter/setting/SettingPresenter.java

@@ -39,17 +39,17 @@ public class SettingPresenter extends SettingContract.Presenter {
 
     @Override
     public void onAttached() {
-        UserInfo userInfo = UserManager.getInstance().getUser(mActivity);
+        UserInfo userInfo = UserManager.getInstance().getUser();
         mHxAccount = userInfo.getHxAccount();
         mHxPwd = userInfo.getHxPwd();
-        boolean flag = (boolean) SPUtils.get(mActivity, Constants.MESSAGE_STATE, true);
+        boolean flag = (boolean) SPUtils.get(Constants.MESSAGE_STATE, true);
         buttonState.set(flag);
     }
 
     @Override
     public void switchButton() {
         buttonState.set(!buttonState.get());
-        SPUtils.put(mActivity, Constants.MESSAGE_STATE, buttonState.get());
+        SPUtils.put(Constants.MESSAGE_STATE, buttonState.get());
         if (buttonState.get()) {
             if (!(TextUtils.isEmpty(mHxAccount)) && !(TextUtils.isEmpty(mHxPwd))) {
                 EMClient.getInstance().login(mHxAccount, mHxPwd, new EMCallBack() {
@@ -90,7 +90,7 @@ public class SettingPresenter extends SettingContract.Presenter {
 
     @Override
     public void exite() {
-        UserManager.getInstance().clearUserInfo(mActivity);
+        UserManager.getInstance().clearUserInfo();
         EMClient.getInstance().logout(true);
         Intent Intents = new Intent(mActivity, LoginActivity.class);
         Intents.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);

app/src/main/java/com/dayu/bigfish/presenter/worksRecord/OrderRecordPresenter.java

@@ -34,7 +34,7 @@ public class OrderRecordPresenter extends OrderRecordContract.Presenter {
 
     @Override
     public void onAttached() {
-        UserInfo userInfo = UserManager.getInstance().getUser(mActivity);
+        UserInfo userInfo = UserManager.getInstance().getUser();
         mUserId = Integer.parseInt(userInfo.getAccountId());
         mSiteId = Integer.parseInt(userInfo.getSiteId());
         serchStr.addOnPropertyChangedCallback(new Observable.OnPropertyChangedCallback() {

app/src/main/java/com/dayu/bigfish/ui/SopWebViewActivity.java

@@ -54,7 +54,7 @@ public class SopWebViewActivity extends DataBindingActivity<ActivityWebviewBindi
     @Override
     public void initView() {
         mActivity = this;
-        UserInfo userInfo = UserManager.getInstance().getUser(mActivity);
+        UserInfo userInfo = UserManager.getInstance().getUser();
         mToken = userInfo.getToken();
         mOrderId = getIntent().getIntExtra(Constants.ORDER_ID, 0);
         mPositon = getIntent().getIntExtra(Constants.ORDER_POSTION, 0);

app/src/main/java/com/dayu/bigfish/ui/fragment/HomePersonFragment.java

@@ -52,7 +52,7 @@ public class HomePersonFragment extends BaseFragment<HomePersonPresenter, Fragme
 
     @Override
     public void initView() {
-        UserInfo userInfo = UserManager.getInstance().getUser(mActivity);
+        UserInfo userInfo = UserManager.getInstance().getUser();
         userId = Integer.parseInt(userInfo.getAccountId());
         siteId = Integer.parseInt(userInfo.getSiteId());
     }
@@ -60,7 +60,7 @@ public class HomePersonFragment extends BaseFragment<HomePersonPresenter, Fragme
     @Override
     public void onResume() {
         super.onResume();
-        UserInfo userInfo = UserManager.getInstance().getUser(mActivity);
+        UserInfo userInfo = UserManager.getInstance().getUser();
         mPresenter.mUrl.set(userInfo.getHeaderImg());
     }
 
@@ -96,8 +96,8 @@ public class HomePersonFragment extends BaseFragment<HomePersonPresenter, Fragme
         mBind.tvAge.setText(info.getAge() + mActivity.getString(R.string.age));
         mUserPhone = info.getMobile();
         mBind.tvPhone.setText(mUserPhone);
-        SPUtils.put(mActivity, "USER_PHONE", mUserPhone);
-        SPUtils.put(mActivity, "USER_NAME", mUserName);
+        SPUtils.put("USER_PHONE", mUserPhone);
+        SPUtils.put("USER_NAME", mUserName);
     }
 
     @Override
@@ -133,10 +133,10 @@ public class HomePersonFragment extends BaseFragment<HomePersonPresenter, Fragme
 
     @Override
     public void showAlipayDialog() {
-        boolean isShow = (boolean) SPUtils.get(mActivity, Constants.IS_SHOW_ALIPAY_DILAOG, true);
+        boolean isShow = (boolean) SPUtils.get(Constants.IS_SHOW_ALIPAY_DILAOG, true);
         if (isShow) {
             showAlertDialog();
-            SPUtils.put(mActivity, Constants.IS_SHOW_ALIPAY_DILAOG, false);
+            SPUtils.put(Constants.IS_SHOW_ALIPAY_DILAOG, false);
         }
     }
 

app/src/main/java/com/dayu/bigfish/utils/SPUtils.java

@@ -3,6 +3,8 @@ package com.dayu.bigfish.utils;
 import android.content.Context;
 import android.content.SharedPreferences;
 
+import com.dayu.bigfish.MyApplication;
+
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.Map;
@@ -19,16 +21,15 @@ public class SPUtils {
     /**
      * 保存数据的方法，我们需要拿到保存数据的具体类型，然后根据类型调用不同的保存方法
      *
-     * @param context
      * @param key
      * @param object  存储的数据类型
      */
-    public static void put(Context context, String key, Object object) {
+    public static void put(String key, Object object) {
 
-        SharedPreferences sp = context.getSharedPreferences(FILE_NAME,
+        SharedPreferences sp = MyApplication.getContext().getSharedPreferences(FILE_NAME,
                 Context.MODE_PRIVATE);
         SharedPreferences.Editor editor = sp.edit();
-         if (object instanceof String) {
+        if (object instanceof String) {
             editor.putString(key, (String) object);
         } else if (object instanceof Integer) {
             editor.putInt(key, (Integer) object);
@@ -48,11 +49,12 @@ public class SPUtils {
     /**
      * 得到保存数据的方法,我们根据默认值得到保存的数据的具体类型,然后调用相对于的方法获取值
      */
-    public static Object get(Context context,String key, Object defaultObject) {
-        return get(context, FILE_NAME, key, defaultObject);
+    public static Object get(String key, Object defaultObject) {
+        return get(FILE_NAME, key, defaultObject);
     }
-    public static Object get(Context context, String spName, String key, Object defaultObject) {
-        SharedPreferences sp = context.getSharedPreferences(spName,
+
+    public static Object get(String spName, String key, Object defaultObject) {
+        SharedPreferences sp = MyApplication.getContext().getSharedPreferences(spName,
                 Context.MODE_PRIVATE);
         if (defaultObject instanceof String) {
             return sp.getString(key, (String) defaultObject);
@@ -72,12 +74,12 @@ public class SPUtils {
     /**
      * 移除某个key值已经对应的值
      */
-    public static void remove(Context context, String key) {
-        remove(context, FILE_NAME, key);
+    public static void remove(String key) {
+        remove(FILE_NAME, key);
     }
 
-    public static void remove(Context context, String spName, String key) {
-        SharedPreferences sp = context.getSharedPreferences(spName,
+    public static void remove(String spName, String key) {
+        SharedPreferences sp = MyApplication.getContext().getSharedPreferences(spName,
                 Context.MODE_PRIVATE);
         SharedPreferences.Editor editor = sp.edit();
         editor.remove(key);
@@ -87,12 +89,12 @@ public class SPUtils {
     /**
      * 清除所有数据
      */
-    public static void clear(Context context) {
-        clear(context, FILE_NAME);
+    public static void clear() {
+        clear(FILE_NAME);
     }
 
-    public static void clear(Context context, String spName) {
-        SharedPreferences sp = context.getSharedPreferences(spName, Context.MODE_PRIVATE);
+    public static void clear(String spName) {
+        SharedPreferences sp = MyApplication.getContext().getSharedPreferences(spName, Context.MODE_PRIVATE);
         SharedPreferences.Editor editor = sp.edit();
         editor.clear();
         SharedPreferencesCompat.apply(editor);
@@ -101,24 +103,24 @@ public class SPUtils {
     /**
      * 查询某个key是否已经存在
      */
-    public static boolean contains(Context context, String key) {
-        return contains(context, FILE_NAME, key);
+    public static boolean contains(String key) {
+        return contains(FILE_NAME, key);
     }
 
-    public static boolean contains(Context context, String spName, String key) {
-        SharedPreferences sp = context.getSharedPreferences(spName, Context.MODE_PRIVATE);
+    public static boolean contains(String spName, String key) {
+        SharedPreferences sp = MyApplication.getContext().getSharedPreferences(spName, Context.MODE_PRIVATE);
         return sp.contains(key);
     }
 
     /**
      * 返回所有的键值对
      */
-    public static Map<String, ?> getAll(Context context) {
-        return getAll(context, FILE_NAME);
+    public static Map<String, ?> getAll() {
+        return getAll(FILE_NAME);
     }
 
-    public static Map<String, ?> getAll(Context context, String spName) {
-        SharedPreferences sp = context.getSharedPreferences(spName,
+    public static Map<String, ?> getAll(String spName) {
+        SharedPreferences sp = MyApplication.getContext().getSharedPreferences(spName,
                 Context.MODE_PRIVATE);
         return sp.getAll();
     }

app/src/main/java/com/dayu/bigfish/utils/managers/UserManager.java

 package com.dayu.bigfish.utils.managers;
 
-import android.content.Context;
 import android.text.TextUtils;
 
 import com.dayu.bigfish.bean.UserInfo;
@@ -27,37 +26,37 @@ public class UserManager {
     }
 
 
-    public void saveUser(Context context, UserInfo info) {
+    public void saveUser(UserInfo info) {
         if (info != null) {
-            SPUtils.put(context, "USER_INFO", new Gson().toJson(info));
+            SPUtils.put("USER_INFO", new Gson().toJson(info));
         }
     }
 
-    public UserInfo getUser(Context context) {
-        return new Gson().fromJson((String) SPUtils.get(context, "big_fish", "USER_INFO", ""), UserInfo.class);
+    public UserInfo getUser() {
+        return new Gson().fromJson((String) SPUtils.get("big_fish", "USER_INFO", ""), UserInfo.class);
     }
 
-    public String getUserName(Context context) {
-        return (String) SPUtils.get(context, "USER_NAME", "");
+    public String getUserName() {
+        return (String) SPUtils.get("USER_NAME", "");
     }
 
-    public String getUserPhone(Context context) {
-        return (String) SPUtils.get(context, "USER_PHONE", "");
+    public String getUserPhone() {
+        return (String) SPUtils.get("USER_PHONE", "");
     }
 
     /**
      * 清空 userInfo中数据
      * 一般用在退出登录
      */
-    public void clearUserInfo(Context context) {
-        SPUtils.remove(context, "USER_INFO");
+    public void clearUserInfo() {
+        SPUtils.remove("USER_INFO");
     }
 
     /**
      * 判断UserInfo中是否有数据
      */
-    public boolean hasUserInfo(Context context) {
-        UserInfo userInfo = getUser(context);
+    public boolean hasUserInfo() {
+        UserInfo userInfo = getUser();
         if (userInfo != null) {
             //有数据
             if ((!TextUtils.isEmpty(userInfo.getAccountId())) && !TextUtils.isEmpty(userInfo.getSiteId())

app/src/main/res/layout/activity_process_order.xml

@@ -11,12 +11,12 @@
             name="presenter"
             type="ProcessOrderPresenter" />
 
-        <variable
-            name="item"
-            type="com.dayu.bigfish.bean.OrderDetail" />
-        <variable
-            name="info"
-            type="com.dayu.bigfish.bean.sqlbean.OrderInfo"/>
+        <!--<variable-->
+            <!--name="item"-->
+            <!--type="com.dayu.bigfish.bean.OrderDetail" />-->
+        <!--<variable-->
+            <!--name="info"-->
+            <!--type="com.dayu.bigfish.bean.sqlbean.OrderInfo"/>-->
     </data>
 
     <RelativeLayout
@@ -50,7 +50,7 @@
             android:text="@string/sop_finish"
             android:textColor="@color/cl_white"
             android:textSize="13.3sp"
-            android:visibility="@{item.subStatus == 5?View.VISIBLE:View.GONE}" />
+            android:visibility="@{presenter.mDetail.subStatus == 5?View.VISIBLE:View.GONE}" />
 
         <ImageView
             style="@style/card_line"
@@ -99,7 +99,7 @@
                             android:layout_marginStart="22dp"
                             android:layout_toEndOf="@+id/text_one_text"
                             android:layout_toRightOf="@+id/text_one_text"
-                            android:text="@{item.categoryName??@string/now_no}"
+                            android:text="@{presenter.mDetail.categoryName??@string/now_no}"
                             android:textColor="@color/cl_selector_hui"
                             android:textSize="@dimen/sp_15" />
                     </RelativeLayout>
@@ -133,7 +133,7 @@
                             android:layout_centerVertical="true"
                             android:layout_marginLeft="@dimen/dp_21.3"
                             android:layout_toRightOf="@id/text_two_text"
-                            android:text="@{item.brandName??@string/now_no}"
+                            android:text="@{presenter.mDetail.brandName??@string/now_no}"
                             android:textColor="@color/cl_selector_hui"
                             android:textSize="@dimen/sp_15" />
                     </RelativeLayout>
@@ -168,7 +168,7 @@
                             android:layout_centerVertical="true"
                             android:layout_marginLeft="@dimen/dp_21.3"
                             android:layout_toRightOf="@id/text_six_text"
-                            android:text="@{item.providerName??@string/now_no}"
+                            android:text="@{presenter.mDetail.providerName??@string/now_no}"
                             android:textColor="@color/cl_selector_hui"
                             android:textSize="@dimen/sp_15" />
                     </RelativeLayout>
@@ -207,7 +207,7 @@
                             android:hint="@string/order_hint"
                             android:paddingLeft="@dimen/dp_13"
                             android:paddingTop="@dimen/dp_11"
-                            android:text="@={info.serverRecord}"
+                            android:text="@={presenter.mOrderField.serverRecord}"
                             android:textColor="@color/cl_home_title_text_color"
                             android:textColorHint="@color/cl_selector_hui"
                             android:textSize="@dimen/sp_13.3" />
@@ -314,7 +314,7 @@
                                 android:background="@null"
                                 android:hint="@string/input_up_door_money"
                                 android:inputType="number"
-                                android:text="@={info.doorPrice}"
+                                android:text="@={presenter.mOrderField.doorPrice}"
                                 android:textColor="@color/cl_home_title_text_color"
                                 android:textColorHint="@color/cl_selector_hui"
                                 android:textSize="@dimen/sp_13.3" />
@@ -359,7 +359,7 @@
                                 android:background="@null"
                                 android:hint="@string/input_up_money"
                                 android:inputType="number"
-                                android:text="@={info.serverPrice}"
+                                android:text="@={presenter.mOrderField.serverPrice}"
                                 android:textColor="@color/cl_home_title_text_color"
                                 android:textColorHint="@color/cl_selector_hui"
                                 android:textSize="@dimen/sp_13.3"
@@ -406,7 +406,7 @@
                                 android:background="@null"
                                 android:hint="@string/input_cailiao_money"
                                 android:inputType="number"
-                                android:text="@={info.materialCost}"
+                                android:text="@={presenter.mOrderField.materialCost}"
                                 android:textColor="@color/cl_home_title_text_color"
                                 android:textColorHint="@color/cl_selector_hui"
                                 android:textSize="@dimen/sp_13.3" />
@@ -451,7 +451,7 @@
                                 android:background="@null"
                                 android:hint="@string/input_other_money"
                                 android:inputType="number"
-                                android:text="@={info.otherPrice}"
+                                android:text="@={presenter.mOrderField.otherPrice}"
                                 android:textColor="@color/cl_home_title_text_color"
                                 android:textColorHint="@color/cl_selector_hui"
                                 android:textSize="@dimen/sp_13.3" />
@@ -485,7 +485,7 @@
                             android:gravity="top"
                             android:hint="@string/tv_order_other"
                             android:paddingTop="@dimen/dp_11"
-                            android:text="@={info.otherInfo}"
+                            android:text="@={presenter.mOrderField.otherInfo}"
                             android:textColor="@color/cl_home_title_text_color"
                             android:textColorHint="@color/cl_selector_hui"
                             android:textSize="@dimen/sp_13.3" />