Skip to content

android / dayu

Go to a project
Commit 37b507ce by 罗翻
Options

sp中的context用application代替.

parent 2baca7b6
Inline Side-by-side
Showing with 107 additions and 148 deletions
app/build.gradle
...@@ -21,8 +21,8 @@ android { ...@@ -21,8 +21,8 @@ android {
applicationId "com.dayu.bigfish" applicationId "com.dayu.bigfish"
minSdkVersion 16 minSdkVersion 16
targetSdkVersion 23 targetSdkVersion 23
versionCode 4 versionCode 5
versionName "1.0.0" versionName "1.1.1"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
multiDexEnabled true multiDexEnabled true
vectorDrawables.useSupportLibrary = true vectorDrawables.useSupportLibrary = true
......
app/src/main/java/com/dayu/bigfish/Constants.java
...@@ -22,7 +22,7 @@ public class Constants { ...@@ -22,7 +22,7 @@ public class Constants {
/***********************测试环境配置**********************************/ /***********************测试环境配置**********************************/
public static final int DEBUGLEVEL = LogUtils.LEVEL_ALL; 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://47.94.101.239:3112";
// public static final String BASE_URL = "http://192.168.123.121: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 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 final static String WEB_SOP = "http://47.94.101.239:9004/#/sop";
public static final boolean UM_DEBUG = true; 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 { ...@@ -57,7 +57,7 @@ public class InitializeActivity extends AppCompatActivity {
private void doJump() { private void doJump() {
Intent intent; Intent intent;
if (UserManager.getInstance().hasUserInfo(this)) { if (UserManager.getInstance().hasUserInfo()) {
intent = new Intent(InitializeActivity.this, MainActivity.class); intent = new Intent(InitializeActivity.this, MainActivity.class);
} else { } else {
intent = new Intent(InitializeActivity.this, LoginActivity.class); 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; ...@@ -4,7 +4,6 @@ import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import com.dayu.bigfish.Constants; import com.dayu.bigfish.Constants;
import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.base.BaseResponse; import com.dayu.bigfish.base.BaseResponse;
import com.dayu.bigfish.bean.UserInfo; import com.dayu.bigfish.bean.UserInfo;
import com.dayu.bigfish.utils.LogUtils; import com.dayu.bigfish.utils.LogUtils;
...@@ -141,7 +140,7 @@ public class Api { ...@@ -141,7 +140,7 @@ public class Api {
@Override @Override
public Response intercept(Chain chain) throws IOException { public Response intercept(Chain chain) throws IOException {
Request request = chain.request(); Request request = chain.request();
UserInfo userInfo = UserManager.getInstance().getUser(MyApplication.getContext()); UserInfo userInfo = UserManager.getInstance().getUser();
if (userInfo != null) { if (userInfo != null) {
String token = userInfo.getToken(); String token = userInfo.getToken();
if (!TextUtils.isEmpty(token) && !request.url().toString().contains(Constants.BASE_URL + Constants.LOGIN_URL)) { 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 { ...@@ -100,13 +100,13 @@ public class ServerException extends Exception {
message = "未知错误GLOBAL0100"; //远程调用失败 message = "未知错误GLOBAL0100"; //远程调用失败
break; break;
case "GLOBAL0101": case "GLOBAL0101":
message = "未知错误GLOBAL0101"; //短信验证失败 message = "验证码错误"; //短信验证失败
break; break;
case "GLOBAL0102": case "GLOBAL0102":
message = "未知错误GLOBAL0102"; // unknowable error type message = "未知错误GLOBAL0102"; // unknowable error type
break; break;
case "GLOBAL0103": case "GLOBAL0103":
message = "验证码失败"; message = "验证码错误";
break; break;
case "GLOBAL0104": case "GLOBAL0104":
message = "用户名和密码错误"; message = "用户名和密码错误";
......
app/src/main/java/com/dayu/bigfish/base/BaseListPresenter.java
...@@ -10,14 +10,12 @@ public abstract class BaseListPresenter<V> extends BasePresenter<V> { ...@@ -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数据源. * 获取recy数据源.
......
app/src/main/java/com/dayu/bigfish/base/BasePresenter.java
...@@ -148,9 +148,9 @@ public abstract class BasePresenter<V> { ...@@ -148,9 +148,9 @@ public abstract class BasePresenter<V> {
mDialog = new CustomDialog(mActivity, R.style.CustomDialog, getString(R.string.login_state_no) mDialog = new CustomDialog(mActivity, R.style.CustomDialog, getString(R.string.login_state_no)
, (dialog, confirm) -> { , (dialog, confirm) -> {
if (confirm) { if (confirm) {
UserManager.getInstance().clearUserInfo(mActivity); UserManager.getInstance().clearUserInfo();
EMClient.getInstance().logout(true); EMClient.getInstance().logout(true);
UserManager.getInstance().clearUserInfo(mActivity); UserManager.getInstance().clearUserInfo();
Intent Intents = new Intent(mActivity, LoginActivity.class); Intent Intents = new Intent(mActivity, LoginActivity.class);
Intents.setFlags( Intents.setFlags(
Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK |
......
app/src/main/java/com/dayu/bigfish/bean/sqlbean/OrderInfo.java
package com.dayu.bigfish.bean.sqlbean; 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.Convert;
import org.greenrobot.greendao.annotation.Entity; import org.greenrobot.greendao.annotation.Entity;
import org.greenrobot.greendao.annotation.Generated; import org.greenrobot.greendao.annotation.Generated;
...@@ -18,7 +13,7 @@ import java.util.List; ...@@ -18,7 +13,7 @@ import java.util.List;
*/ */
@Entity @Entity
public class OrderInfo extends BaseObservable { public class OrderInfo {
@Id @Id
private long id; private long id;
@Property(nameInDb = "engineerId") @Property(nameInDb = "engineerId")
...@@ -75,67 +70,53 @@ public class OrderInfo extends BaseObservable { ...@@ -75,67 +70,53 @@ public class OrderInfo extends BaseObservable {
this.engineerId = engineerId; this.engineerId = engineerId;
} }
@Bindable
public String getServerRecord() { public String getServerRecord() {
return this.serverRecord; return this.serverRecord;
} }
public void setServerRecord(String serverRecord) { public void setServerRecord(String serverRecord) {
this.serverRecord = serverRecord; this.serverRecord = serverRecord;
notifyPropertyChanged(BR.serverRecord);
} }
@Bindable
public String getDoorPrice() { public String getDoorPrice() {
return this.doorPrice; return this.doorPrice;
} }
public void setDoorPrice(String doorPrice) { public void setDoorPrice(String doorPrice) {
this.doorPrice = doorPrice; this.doorPrice = doorPrice;
notifyPropertyChanged(BR.doorPrice);
} }
@Bindable
public String getServerPrice() { public String getServerPrice() {
return this.serverPrice; return this.serverPrice;
} }
public void setServerPrice(String serverPrice) { public void setServerPrice(String serverPrice) {
this.serverPrice = serverPrice; this.serverPrice = serverPrice;
notifyPropertyChanged(BR.serverPrice);
} }
@Bindable
public String getMaterialCost() { public String getMaterialCost() {
return this.materialCost; return this.materialCost;
} }
public void setMaterialCost(String materialCost) { public void setMaterialCost(String materialCost) {
this.materialCost = materialCost; this.materialCost = materialCost;
notifyPropertyChanged(BR.materialCost);
} }
@Bindable
public String getOtherPrice() { public String getOtherPrice() {
return this.otherPrice; return this.otherPrice;
} }
public void setOtherPrice(String otherPrice) { public void setOtherPrice(String otherPrice) {
this.otherPrice = otherPrice; this.otherPrice = otherPrice;
notifyPropertyChanged(BR.otherPrice);
} }
@Bindable
public String getOtherInfo() { public String getOtherInfo() {
return this.otherInfo; return this.otherInfo;
} }
public void setOtherInfo(String otherInfo) { public void setOtherInfo(String otherInfo) {
this.otherInfo = otherInfo; this.otherInfo = otherInfo;
notifyPropertyChanged(BR.otherInfo);
} }
@Bindable
public List<String> getImgPath() { public List<String> getImgPath() {
return this.imgPath; return this.imgPath;
} }
public void setImgPath(List<String> imgPath) { public void setImgPath(List<String> imgPath) {
this.imgPath = 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 { ...@@ -35,7 +35,7 @@ public class WithdrawalsPresenter extends WithdrawalsContract.Presenter {
@Override @Override
public void onAttached() { public void onAttached() {
UserInfo userInfo = UserManager.getInstance().getUser(mActivity); UserInfo userInfo = UserManager.getInstance().getUser();
mUserId = Integer.parseInt(userInfo.getAccountId()); mUserId = Integer.parseInt(userInfo.getAccountId());
mView.showDialog(); mView.showDialog();
querAlipay(); querAlipay();
......
app/src/main/java/com/dayu/bigfish/presenter/accountbalance/AccountBalancePresenter.java
...@@ -28,21 +28,19 @@ public class AccountBalancePresenter extends AccountBalanceContract.Presenter { ...@@ -28,21 +28,19 @@ public class AccountBalancePresenter extends AccountBalanceContract.Presenter {
public void onAttached() { public void onAttached() {
String price = "￥" + mActivity.getIntent().getIntExtra(Constants.ACCOUNT_BALANCE, 0); String price = "￥" + mActivity.getIntent().getIntExtra(Constants.ACCOUNT_BALANCE, 0);
totalPrice.set(price); totalPrice.set(price);
UserInfo userInfo = UserManager.getInstance().getUser(mActivity); UserInfo userInfo = UserManager.getInstance().getUser();
mAccoutId = Integer.parseInt(userInfo.getAccountId()); mAccoutId = Integer.parseInt(userInfo.getAccountId());
refresh(); refresh();
} }
@Override @Override
public void refresh() { public void refresh() {
super.refresh();
mPage = 1; mPage = 1;
getAccountBalanceList(mPage, Constants.PAGESIZE, mAccoutId); getAccountBalanceList(mPage, Constants.PAGESIZE, mAccoutId);
} }
@Override @Override
public void loadMore() { public void loadMore() {
super.loadMore();
getAccountBalanceList(mPage, Constants.PAGESIZE, mAccoutId); 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 { ...@@ -29,8 +29,8 @@ public class FeedBackPresenter extends FeedBackContract.Presenter {
@Override @Override
public void onAttached() { public void onAttached() {
mUserName = UserManager.getInstance().getUserName(mActivity); mUserName = UserManager.getInstance().getUserName();
mUserMobile = UserManager.getInstance().getUserPhone(mActivity); 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 { ...@@ -22,7 +22,7 @@ public class HomeOrderPresenter extends HomeOrderContract.Presenter {
@Override @Override
public void onAttached() { public void onAttached() {
UserInfo userInfo = UserManager.getInstance().getUser(mActivity); UserInfo userInfo = UserManager.getInstance().getUser();
mUserId = Integer.parseInt(userInfo.getAccountId()); mUserId = Integer.parseInt(userInfo.getAccountId());
mSiteId = Integer.parseInt(userInfo.getSiteId()); 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 { ...@@ -79,10 +79,10 @@ public class LoginPresenter extends LoginContract.Presenter {
dumpAndSave(userInfo); dumpAndSave(userInfo);
} else if (userInfo.getStatus() == 2) { } else if (userInfo.getStatus() == 2) {
ToastUtils.showShortToast(R.string.engineer_identity_auditing); ToastUtils.showShortToast(R.string.engineer_identity_auditing);
UserManager.getInstance().saveUser(mActivity, userInfo); UserManager.getInstance().saveUser(userInfo);
} else if (userInfo.getStatus() == 3) { } else if (userInfo.getStatus() == 3) {
showLoginDialog(); showLoginDialog();
UserManager.getInstance().saveUser(mActivity, userInfo); UserManager.getInstance().saveUser(userInfo);
} }
} }
})); }));
...@@ -119,7 +119,7 @@ public class LoginPresenter extends LoginContract.Presenter { ...@@ -119,7 +119,7 @@ public class LoginPresenter extends LoginContract.Presenter {
@Override @Override
public void dumpAndSave(UserInfo info) { public void dumpAndSave(UserInfo info) {
UserManager.getInstance().saveUser(mActivity, info); UserManager.getInstance().saveUser(info);
startActvityAndFinish(MainActivity.class); startActvityAndFinish(MainActivity.class);
} }
......
app/src/main/java/com/dayu/bigfish/presenter/main/MainPresenter.java
...@@ -46,7 +46,7 @@ public class MainPresenter extends MainContract.Presenter { ...@@ -46,7 +46,7 @@ public class MainPresenter extends MainContract.Presenter {
@Override @Override
public void onAttached() { public void onAttached() {
mUser = UserManager.getInstance().getUser(mActivity); mUser = UserManager.getInstance().getUser();
mAccountId = Integer.parseInt(mUser.getAccountId()); mAccountId = Integer.parseInt(mUser.getAccountId());
mSiteId = Integer.parseInt(mUser.getSiteId()); mSiteId = Integer.parseInt(mUser.getSiteId());
request(); request();
...@@ -84,7 +84,7 @@ public class MainPresenter extends MainContract.Presenter { ...@@ -84,7 +84,7 @@ public class MainPresenter extends MainContract.Presenter {
@Override @Override
public void commitVersionInfo(int accoutId, String imei, String platform, String versionCode) { 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; return;
} }
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
...@@ -100,7 +100,7 @@ public class MainPresenter extends MainContract.Presenter { ...@@ -100,7 +100,7 @@ public class MainPresenter extends MainContract.Presenter {
ApiFactory.commitVersionInfo(requestBody).subscribe(baseObserver(new Consumer<Boolean>() { ApiFactory.commitVersionInfo(requestBody).subscribe(baseObserver(new Consumer<Boolean>() {
@Override @Override
public void accept(Boolean aBoolean) throws Exception { 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 { ...@@ -40,21 +40,19 @@ public class messagePresenter extends messageContract.Presenter {
@Override @Override
public void onAttached() { public void onAttached() {
mCategory = ((MessageFragment) mView).getArguments().getInt("category", 1); mCategory = ((MessageFragment) mView).getArguments().getInt("category", 1);
UserInfo userInfo = UserManager.getInstance().getUser(mActivity); UserInfo userInfo = UserManager.getInstance().getUser();
mHxId = userInfo.getHxAccount(); mHxId = userInfo.getHxAccount();
refresh(); refresh();
} }
@Override @Override
public void refresh() { public void refresh() {
super.refresh();
mPage = 1; mPage = 1;
getHxMessage(mHxId, mCategory, mPage, Constants.PAGESIZE); getHxMessage(mHxId, mCategory, mPage, Constants.PAGESIZE);
} }
@Override @Override
public void loadMore() { public void loadMore() {
super.loadMore();
getHxMessage(mHxId, mCategory, mPage, Constants.PAGESIZE); 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 { ...@@ -27,7 +27,7 @@ public class MyHeadPresenter extends MyHeadContract.Presenter {
@Override @Override
public void onAttached() { public void onAttached() {
mUserInfo = UserManager.getInstance().getUser(mActivity); mUserInfo = UserManager.getInstance().getUser();
mAccountId = Integer.parseInt(mUserInfo.getAccountId()); mAccountId = Integer.parseInt(mUserInfo.getAccountId());
headUrl.set(mUserInfo.getHeaderImg()); headUrl.set(mUserInfo.getHeaderImg());
} }
...@@ -57,7 +57,7 @@ public class MyHeadPresenter extends MyHeadContract.Presenter { ...@@ -57,7 +57,7 @@ public class MyHeadPresenter extends MyHeadContract.Presenter {
public void accept(Boolean aBoolean) throws Exception { public void accept(Boolean aBoolean) throws Exception {
headUrl.set(path); headUrl.set(path);
mUserInfo.setHeaderImg(path); mUserInfo.setHeaderImg(path);
UserManager.getInstance().saveUser(mActivity, mUserInfo); UserManager.getInstance().saveUser(mUserInfo);
PictureFileUtils.deleteCacheDirFile(mActivity); PictureFileUtils.deleteCacheDirFile(mActivity);
} }
})); }));
......
app/src/main/java/com/dayu/bigfish/presenter/orderdoing/OrderDoingPresenter.java
...@@ -39,7 +39,7 @@ public class OrderDoingPresenter extends orderDoingContract.Presenter { ...@@ -39,7 +39,7 @@ public class OrderDoingPresenter extends orderDoingContract.Presenter {
@Override @Override
public void onAttached() { public void onAttached() {
UserInfo userInfo = UserManager.getInstance().getUser(mActivity); UserInfo userInfo = UserManager.getInstance().getUser();
mUserId = Integer.parseInt(userInfo.getAccountId()); mUserId = Integer.parseInt(userInfo.getAccountId());
mSiteId = Integer.parseInt(userInfo.getSiteId()); mSiteId = Integer.parseInt(userInfo.getSiteId());
mState = mView.getState(); mState = mView.getState();
...@@ -47,7 +47,6 @@ public class OrderDoingPresenter extends orderDoingContract.Presenter { ...@@ -47,7 +47,6 @@ public class OrderDoingPresenter extends orderDoingContract.Presenter {
@Override @Override
public void refresh() { public void refresh() {
super.refresh();
if (mView instanceof OrderThreeTabFragment) { if (mView instanceof OrderThreeTabFragment) {
mView.showDialog(); mView.showDialog();
getErrorOrder(); getErrorOrder();
...@@ -59,7 +58,6 @@ public class OrderDoingPresenter extends orderDoingContract.Presenter { ...@@ -59,7 +58,6 @@ public class OrderDoingPresenter extends orderDoingContract.Presenter {
@Override @Override
public void loadMore() { public void loadMore() {
super.loadMore();
getOrders(mState, mUserId, mSiteId, mPage, Constants.PAGESIZE); 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 { ...@@ -24,7 +24,7 @@ public class PersonInfoPresenter extends PersonInfoContract.Presenter {
@Override @Override
public void onAttached() { public void onAttached() {
UserInfo info = UserManager.getInstance().getUser(mActivity); UserInfo info = UserManager.getInstance().getUser();
mAccountId = Integer.parseInt(info.getAccountId()); mAccountId = Integer.parseInt(info.getAccountId());
mView.showDialog(); mView.showDialog();
queryInfo(mAccountId); queryInfo(mAccountId);
......
app/src/main/java/com/dayu/bigfish/presenter/processorder/ProcessOrderContract.java
...@@ -3,7 +3,6 @@ package com.dayu.bigfish.presenter.processorder; ...@@ -3,7 +3,6 @@ package com.dayu.bigfish.presenter.processorder;
import com.dayu.bigfish.base.BasePresenter; import com.dayu.bigfish.base.BasePresenter;
import com.dayu.bigfish.base.BaseView; import com.dayu.bigfish.base.BaseView;
import com.dayu.bigfish.ui.ProcessOrderActivity;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -26,7 +25,7 @@ public interface ProcessOrderContract { ...@@ -26,7 +25,7 @@ public interface ProcessOrderContract {
void initPhotoView(ArrayList<String> list); void initPhotoView(ArrayList<String> list);
} }
abstract class Presenter extends BasePresenter<ProcessOrderActivity> { abstract class Presenter extends BasePresenter<View> {
public abstract void getOrderInfo(int orderId); 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 { ...@@ -59,7 +59,7 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter {
public void onAttached() { public void onAttached() {
mOrderId = mActivity.getIntent().getIntExtra(Constants.ORDER_ID, 0); mOrderId = mActivity.getIntent().getIntExtra(Constants.ORDER_ID, 0);
mPosition = mActivity.getIntent().getIntExtra(Constants.ORDER_POSTION, 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()); mAccountId = Integer.parseInt(userInfo.getAccountId());
mOrderInfoDao = GreenDaoManager.getInstance().getmDaoSession().getOrderInfoDao(); mOrderInfoDao = GreenDaoManager.getInstance().getmDaoSession().getOrderInfoDao();
mView.showDialog(); mView.showDialog();
...@@ -79,8 +79,7 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter { ...@@ -79,8 +79,7 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter {
mOrderInfo.setId(mOrderId); mOrderInfo.setId(mOrderId);
mOrderInfo.setEngineerId(mAccountId); mOrderInfo.setEngineerId(mAccountId);
} }
mView.mBind.setInfo(mOrderInfo); mOrderField.set(mOrderInfo);
// mOrderField.set(mOrderInfo);
if (mOrderInfo != null && TextUtils.isEmpty(mOrderInfo.getDoorPrice()) && TextUtils.isEmpty(mOrderInfo.getServerPrice()) if (mOrderInfo != null && TextUtils.isEmpty(mOrderInfo.getDoorPrice()) && TextUtils.isEmpty(mOrderInfo.getServerPrice())
&& TextUtils.isEmpty(mOrderInfo.getMaterialCost()) && TextUtils.isEmpty(mOrderInfo.getOtherPrice())) { && TextUtils.isEmpty(mOrderInfo.getMaterialCost()) && TextUtils.isEmpty(mOrderInfo.getOtherPrice())) {
buttonState.set(false); buttonState.set(false);
...@@ -94,17 +93,11 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter { ...@@ -94,17 +93,11 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter {
public void swtichButton() { public void swtichButton() {
buttonState.set(!buttonState.get()); buttonState.set(!buttonState.get());
if (!buttonState.get()) { if (!buttonState.get()) {
// mOrderField.get().setDoorPrice(""); mOrderField.get().setDoorPrice("");
// mOrderField.get().setServerPrice(""); mOrderField.get().setServerPrice("");
// mOrderField.get().setMaterialCost(""); mOrderField.get().setMaterialCost("");
// mOrderField.get().setOtherPrice(""); mOrderField.get().setOtherPrice("");
// mOrderField.get().setOtherInfo(""); mOrderField.get().setOtherInfo("");
mView.mBind.getInfo().setDoorPrice("");
mView.mBind.getInfo().setServerPrice("");
mView.mBind.getInfo().setMaterialCost("");
mView.mBind.getInfo().setOtherPrice("");
mView.mBind.getInfo().setOtherInfo("");
} }
} }
...@@ -113,8 +106,7 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter { ...@@ -113,8 +106,7 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter {
ApiFactory.getOrderInfo(orderId).subscribe(baseObserver(new Consumer<OrderDetail>() { ApiFactory.getOrderInfo(orderId).subscribe(baseObserver(new Consumer<OrderDetail>() {
@Override @Override
public void accept(OrderDetail detail) throws Exception { public void accept(OrderDetail detail) throws Exception {
mView.mBind.setItem(detail); mDetail.set(detail);
// mDetail.set(detail);
mAnyContacts = detail.getAnyContacts(); mAnyContacts = detail.getAnyContacts();
} }
})); }));
...@@ -190,8 +182,7 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter { ...@@ -190,8 +182,7 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter {
ApiFactory.uploadPhoto(part).subscribe(baseObserver(new Consumer<List<String>>() { ApiFactory.uploadPhoto(part).subscribe(baseObserver(new Consumer<List<String>>() {
@Override @Override
public void accept(List<String> list) throws Exception { public void accept(List<String> list) throws Exception {
// OrderInfo info = mOrderField.get(); OrderInfo info = mOrderField.get();
OrderInfo info = mView.mBind.getInfo();
commitOrder(list, mOrderId, info.getServerRecord(), commitOrder(list, mOrderId, info.getServerRecord(),
mAccountId, isPay, info.getDoorPrice(), info.getOtherInfo(), mAccountId, isPay, info.getDoorPrice(), info.getOtherInfo(),
info.getServerPrice(), info.getMaterialCost(), info.getOtherPrice()); info.getServerPrice(), info.getMaterialCost(), info.getOtherPrice());
...@@ -204,11 +195,9 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter { ...@@ -204,11 +195,9 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter {
@Override @Override
public void saveOrder() { public void saveOrder() {
if (mImages != null && mImages.size() > 0) { if (mImages != null && mImages.size() > 0) {
// mOrderField.get().setImgPath(mImages); mOrderField.get().setImgPath(mImages);
mView.mBind.getInfo().setImgPath(mImages);
} }
mOrderInfoDao.insertOrReplace(mView.mBind.getInfo()); mOrderInfoDao.insertOrReplace(mOrderField.get());
// mOrderInfoDao.insertOrReplace(mOrderField.get());
mView.showToast(R.string.order_save_success); mView.showToast(R.string.order_save_success);
mActivity.finish(); mActivity.finish();
} }
...@@ -225,8 +214,7 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter { ...@@ -225,8 +214,7 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter {
mView.showDialog(); mView.showDialog();
commitPhoto(mImages); commitPhoto(mImages);
} else { } else {
OrderInfo info = mView.mBind.getInfo(); OrderInfo info = mOrderField.get();
// OrderInfo info = mOrderField.get();
commitOrder(null, mOrderId, info.getServerRecord(), commitOrder(null, mOrderId, info.getServerRecord(),
mAccountId, isPay, info.getDoorPrice(), info.getOtherInfo(), mAccountId, isPay, info.getDoorPrice(), info.getOtherInfo(),
info.getServerPrice(), info.getMaterialCost(), info.getOtherPrice()); 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 { ...@@ -39,7 +39,7 @@ public class ReceivingPresenter extends ReceivingContract.Presenter {
@Override @Override
public void onAttached() { public void onAttached() {
UserInfo userInfo = UserManager.getInstance().getUser(mActivity); UserInfo userInfo = UserManager.getInstance().getUser();
mUserId = Integer.parseInt(userInfo.getAccountId()); mUserId = Integer.parseInt(userInfo.getAccountId());
mSiteId = Integer.parseInt(userInfo.getSiteId()); mSiteId = Integer.parseInt(userInfo.getSiteId());
refresh(); refresh();
...@@ -92,7 +92,6 @@ public class ReceivingPresenter extends ReceivingContract.Presenter { ...@@ -92,7 +92,6 @@ public class ReceivingPresenter extends ReceivingContract.Presenter {
@Override @Override
public void refresh() { public void refresh() {
super.refresh();
mPage = 1; mPage = 1;
getOrders(Constants.WATING_ORDER, mUserId, mSiteId, mPage, Constants.PAGESIZE); 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 { ...@@ -39,17 +39,17 @@ public class SettingPresenter extends SettingContract.Presenter {
@Override @Override
public void onAttached() { public void onAttached() {
UserInfo userInfo = UserManager.getInstance().getUser(mActivity); UserInfo userInfo = UserManager.getInstance().getUser();
mHxAccount = userInfo.getHxAccount(); mHxAccount = userInfo.getHxAccount();
mHxPwd = userInfo.getHxPwd(); 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); buttonState.set(flag);
} }
@Override @Override
public void switchButton() { public void switchButton() {
buttonState.set(!buttonState.get()); buttonState.set(!buttonState.get());
SPUtils.put(mActivity, Constants.MESSAGE_STATE, buttonState.get()); SPUtils.put(Constants.MESSAGE_STATE, buttonState.get());
if (buttonState.get()) { if (buttonState.get()) {
if (!(TextUtils.isEmpty(mHxAccount)) && !(TextUtils.isEmpty(mHxPwd))) { if (!(TextUtils.isEmpty(mHxAccount)) && !(TextUtils.isEmpty(mHxPwd))) {
EMClient.getInstance().login(mHxAccount, mHxPwd, new EMCallBack() { EMClient.getInstance().login(mHxAccount, mHxPwd, new EMCallBack() {
...@@ -90,7 +90,7 @@ public class SettingPresenter extends SettingContract.Presenter { ...@@ -90,7 +90,7 @@ public class SettingPresenter extends SettingContract.Presenter {
@Override @Override
public void exite() { public void exite() {
UserManager.getInstance().clearUserInfo(mActivity); UserManager.getInstance().clearUserInfo();
EMClient.getInstance().logout(true); EMClient.getInstance().logout(true);
Intent Intents = new Intent(mActivity, LoginActivity.class); Intent Intents = new Intent(mActivity, LoginActivity.class);
Intents.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK); 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 { ...@@ -34,7 +34,7 @@ public class OrderRecordPresenter extends OrderRecordContract.Presenter {
@Override @Override
public void onAttached() { public void onAttached() {
UserInfo userInfo = UserManager.getInstance().getUser(mActivity); UserInfo userInfo = UserManager.getInstance().getUser();
mUserId = Integer.parseInt(userInfo.getAccountId()); mUserId = Integer.parseInt(userInfo.getAccountId());
mSiteId = Integer.parseInt(userInfo.getSiteId()); mSiteId = Integer.parseInt(userInfo.getSiteId());
serchStr.addOnPropertyChangedCallback(new Observable.OnPropertyChangedCallback() { 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 ...@@ -54,7 +54,7 @@ public class SopWebViewActivity extends DataBindingActivity<ActivityWebviewBindi
@Override @Override
public void initView() { public void initView() {
mActivity = this; mActivity = this;
UserInfo userInfo = UserManager.getInstance().getUser(mActivity); UserInfo userInfo = UserManager.getInstance().getUser();
mToken = userInfo.getToken(); mToken = userInfo.getToken();
mOrderId = getIntent().getIntExtra(Constants.ORDER_ID, 0); mOrderId = getIntent().getIntExtra(Constants.ORDER_ID, 0);
mPositon = getIntent().getIntExtra(Constants.ORDER_POSTION, 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 ...@@ -52,7 +52,7 @@ public class HomePersonFragment extends BaseFragment<HomePersonPresenter, Fragme
@Override @Override
public void initView() { public void initView() {
UserInfo userInfo = UserManager.getInstance().getUser(mActivity); UserInfo userInfo = UserManager.getInstance().getUser();
userId = Integer.parseInt(userInfo.getAccountId()); userId = Integer.parseInt(userInfo.getAccountId());
siteId = Integer.parseInt(userInfo.getSiteId()); siteId = Integer.parseInt(userInfo.getSiteId());
} }
...@@ -60,7 +60,7 @@ public class HomePersonFragment extends BaseFragment<HomePersonPresenter, Fragme ...@@ -60,7 +60,7 @@ public class HomePersonFragment extends BaseFragment<HomePersonPresenter, Fragme
@Override @Override
public void onResume() { public void onResume() {
super.onResume(); super.onResume();
UserInfo userInfo = UserManager.getInstance().getUser(mActivity); UserInfo userInfo = UserManager.getInstance().getUser();
mPresenter.mUrl.set(userInfo.getHeaderImg()); mPresenter.mUrl.set(userInfo.getHeaderImg());
} }
...@@ -96,8 +96,8 @@ public class HomePersonFragment extends BaseFragment<HomePersonPresenter, Fragme ...@@ -96,8 +96,8 @@ public class HomePersonFragment extends BaseFragment<HomePersonPresenter, Fragme
mBind.tvAge.setText(info.getAge() + mActivity.getString(R.string.age)); mBind.tvAge.setText(info.getAge() + mActivity.getString(R.string.age));
mUserPhone = info.getMobile(); mUserPhone = info.getMobile();
mBind.tvPhone.setText(mUserPhone); mBind.tvPhone.setText(mUserPhone);
SPUtils.put(mActivity, "USER_PHONE", mUserPhone); SPUtils.put("USER_PHONE", mUserPhone);
SPUtils.put(mActivity, "USER_NAME", mUserName); SPUtils.put("USER_NAME", mUserName);
} }
@Override @Override
...@@ -133,10 +133,10 @@ public class HomePersonFragment extends BaseFragment<HomePersonPresenter, Fragme ...@@ -133,10 +133,10 @@ public class HomePersonFragment extends BaseFragment<HomePersonPresenter, Fragme
@Override @Override
public void showAlipayDialog() { 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) { if (isShow) {
showAlertDialog(); 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; ...@@ -3,6 +3,8 @@ package com.dayu.bigfish.utils;
import android.content.Context; import android.content.Context;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import com.dayu.bigfish.MyApplication;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.Map; import java.util.Map;
...@@ -19,13 +21,12 @@ public class SPUtils { ...@@ -19,13 +21,12 @@ public class SPUtils {
/** /**
* 保存数据的方法，我们需要拿到保存数据的具体类型，然后根据类型调用不同的保存方法 * 保存数据的方法，我们需要拿到保存数据的具体类型，然后根据类型调用不同的保存方法
* *
* @param context
* @param key * @param key
* @param object 存储的数据类型 * @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); Context.MODE_PRIVATE);
SharedPreferences.Editor editor = sp.edit(); SharedPreferences.Editor editor = sp.edit();
if (object instanceof String) { if (object instanceof String) {
...@@ -48,11 +49,12 @@ public class SPUtils { ...@@ -48,11 +49,12 @@ public class SPUtils {
/** /**
* 得到保存数据的方法,我们根据默认值得到保存的数据的具体类型,然后调用相对于的方法获取值 * 得到保存数据的方法,我们根据默认值得到保存的数据的具体类型,然后调用相对于的方法获取值
*/ */
public static Object get(Context context,String key, Object defaultObject) { public static Object get(String key, Object defaultObject) {
return get(context, FILE_NAME, key, 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); Context.MODE_PRIVATE);
if (defaultObject instanceof String) { if (defaultObject instanceof String) {
return sp.getString(key, (String) defaultObject); return sp.getString(key, (String) defaultObject);
...@@ -72,12 +74,12 @@ public class SPUtils { ...@@ -72,12 +74,12 @@ public class SPUtils {
/** /**
* 移除某个key值已经对应的值 * 移除某个key值已经对应的值
*/ */
public static void remove(Context context, String key) { public static void remove(String key) {
remove(context, FILE_NAME, key); remove(FILE_NAME, key);
} }
public static void remove(Context context, String spName, String key) { public static void remove(String spName, String key) {
SharedPreferences sp = context.getSharedPreferences(spName, SharedPreferences sp = MyApplication.getContext().getSharedPreferences(spName,
Context.MODE_PRIVATE); Context.MODE_PRIVATE);
SharedPreferences.Editor editor = sp.edit(); SharedPreferences.Editor editor = sp.edit();
editor.remove(key); editor.remove(key);
...@@ -87,12 +89,12 @@ public class SPUtils { ...@@ -87,12 +89,12 @@ public class SPUtils {
/** /**
* 清除所有数据 * 清除所有数据
*/ */
public static void clear(Context context) { public static void clear() {
clear(context, FILE_NAME); clear(FILE_NAME);
} }
public static void clear(Context context, String spName) { public static void clear(String spName) {
SharedPreferences sp = context.getSharedPreferences(spName, Context.MODE_PRIVATE); SharedPreferences sp = MyApplication.getContext().getSharedPreferences(spName, Context.MODE_PRIVATE);
SharedPreferences.Editor editor = sp.edit(); SharedPreferences.Editor editor = sp.edit();
editor.clear(); editor.clear();
SharedPreferencesCompat.apply(editor); SharedPreferencesCompat.apply(editor);
...@@ -101,24 +103,24 @@ public class SPUtils { ...@@ -101,24 +103,24 @@ public class SPUtils {
/** /**
* 查询某个key是否已经存在 * 查询某个key是否已经存在
*/ */
public static boolean contains(Context context, String key) { public static boolean contains(String key) {
return contains(context, FILE_NAME, key); return contains(FILE_NAME, key);
} }
public static boolean contains(Context context, String spName, String key) { public static boolean contains(String spName, String key) {
SharedPreferences sp = context.getSharedPreferences(spName, Context.MODE_PRIVATE); SharedPreferences sp = MyApplication.getContext().getSharedPreferences(spName, Context.MODE_PRIVATE);
return sp.contains(key); return sp.contains(key);
} }
/** /**
* 返回所有的键值对 * 返回所有的键值对
*/ */
public static Map<String, ?> getAll(Context context) { public static Map<String, ?> getAll() {
return getAll(context, FILE_NAME); return getAll(FILE_NAME);
} }
public static Map<String, ?> getAll(Context context, String spName) { public static Map<String, ?> getAll(String spName) {
SharedPreferences sp = context.getSharedPreferences(spName, SharedPreferences sp = MyApplication.getContext().getSharedPreferences(spName,
Context.MODE_PRIVATE); Context.MODE_PRIVATE);
return sp.getAll(); return sp.getAll();
} }
......
app/src/main/java/com/dayu/bigfish/utils/managers/UserManager.java
package com.dayu.bigfish.utils.managers; package com.dayu.bigfish.utils.managers;
import android.content.Context;
import android.text.TextUtils; import android.text.TextUtils;
import com.dayu.bigfish.bean.UserInfo; import com.dayu.bigfish.bean.UserInfo;
...@@ -27,37 +26,37 @@ public class UserManager { ...@@ -27,37 +26,37 @@ public class UserManager {
} }
public void saveUser(Context context, UserInfo info) { public void saveUser(UserInfo info) {
if (info != null) { 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) { public UserInfo getUser() {
return new Gson().fromJson((String) SPUtils.get(context, "big_fish", "USER_INFO", ""), UserInfo.class); return new Gson().fromJson((String) SPUtils.get("big_fish", "USER_INFO", ""), UserInfo.class);
} }
public String getUserName(Context context) { public String getUserName() {
return (String) SPUtils.get(context, "USER_NAME", ""); return (String) SPUtils.get("USER_NAME", "");
} }
public String getUserPhone(Context context) { public String getUserPhone() {
return (String) SPUtils.get(context, "USER_PHONE", ""); return (String) SPUtils.get("USER_PHONE", "");
} }
/** /**
* 清空 userInfo中数据 * 清空 userInfo中数据
* 一般用在退出登录 * 一般用在退出登录
*/ */
public void clearUserInfo(Context context) { public void clearUserInfo() {
SPUtils.remove(context, "USER_INFO"); SPUtils.remove("USER_INFO");
} }
/** /**
* 判断UserInfo中是否有数据 * 判断UserInfo中是否有数据
*/ */
public boolean hasUserInfo(Context context) { public boolean hasUserInfo() {
UserInfo userInfo = getUser(context); UserInfo userInfo = getUser();
if (userInfo != null) { if (userInfo != null) {
//有数据 //有数据
if ((!TextUtils.isEmpty(userInfo.getAccountId())) && !TextUtils.isEmpty(userInfo.getSiteId()) if ((!TextUtils.isEmpty(userInfo.getAccountId())) && !TextUtils.isEmpty(userInfo.getSiteId())
......
app/src/main/res/layout/activity_process_order.xml
...@@ -11,12 +11,12 @@ ...@@ -11,12 +11,12 @@
name="presenter" name="presenter"
type="ProcessOrderPresenter" /> type="ProcessOrderPresenter" />
<variable <!--<variable-->
name="item" <!--name="item"-->
type="com.dayu.bigfish.bean.OrderDetail" /> <!--type="com.dayu.bigfish.bean.OrderDetail" />-->
<variable <!--<variable-->
name="info" <!--name="info"-->
type="com.dayu.bigfish.bean.sqlbean.OrderInfo"/> <!--type="com.dayu.bigfish.bean.sqlbean.OrderInfo"/>-->
</data> </data>
<RelativeLayout <RelativeLayout
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
android:text="@string/sop_finish" android:text="@string/sop_finish"
android:textColor="@color/cl_white" android:textColor="@color/cl_white"
android:textSize="13.3sp" android:textSize="13.3sp"
android:visibility="@{item.subStatus == 5?View.VISIBLE:View.GONE}" /> android:visibility="@{presenter.mDetail.subStatus == 5?View.VISIBLE:View.GONE}" />
<ImageView <ImageView
style="@style/card_line" style="@style/card_line"
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
android:layout_marginStart="22dp" android:layout_marginStart="22dp"
android:layout_toEndOf="@+id/text_one_text" android:layout_toEndOf="@+id/text_one_text"
android:layout_toRightOf="@+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:textColor="@color/cl_selector_hui"
android:textSize="@dimen/sp_15" /> android:textSize="@dimen/sp_15" />
</RelativeLayout> </RelativeLayout>
...@@ -133,7 +133,7 @@ ...@@ -133,7 +133,7 @@
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/dp_21.3" android:layout_marginLeft="@dimen/dp_21.3"
android:layout_toRightOf="@id/text_two_text" 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:textColor="@color/cl_selector_hui"
android:textSize="@dimen/sp_15" /> android:textSize="@dimen/sp_15" />
</RelativeLayout> </RelativeLayout>
...@@ -168,7 +168,7 @@ ...@@ -168,7 +168,7 @@
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/dp_21.3" android:layout_marginLeft="@dimen/dp_21.3"
android:layout_toRightOf="@id/text_six_text" 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:textColor="@color/cl_selector_hui"
android:textSize="@dimen/sp_15" /> android:textSize="@dimen/sp_15" />
</RelativeLayout> </RelativeLayout>
...@@ -207,7 +207,7 @@ ...@@ -207,7 +207,7 @@
android:hint="@string/order_hint" android:hint="@string/order_hint"
android:paddingLeft="@dimen/dp_13" android:paddingLeft="@dimen/dp_13"
android:paddingTop="@dimen/dp_11" android:paddingTop="@dimen/dp_11"
android:text="@={info.serverRecord}" android:text="@={presenter.mOrderField.serverRecord}"
android:textColor="@color/cl_home_title_text_color" android:textColor="@color/cl_home_title_text_color"
android:textColorHint="@color/cl_selector_hui" android:textColorHint="@color/cl_selector_hui"
android:textSize="@dimen/sp_13.3" /> android:textSize="@dimen/sp_13.3" />
...@@ -314,7 +314,7 @@ ...@@ -314,7 +314,7 @@
android:background="@null" android:background="@null"
android:hint="@string/input_up_door_money" android:hint="@string/input_up_door_money"
android:inputType="number" android:inputType="number"
android:text="@={info.doorPrice}" android:text="@={presenter.mOrderField.doorPrice}"
android:textColor="@color/cl_home_title_text_color" android:textColor="@color/cl_home_title_text_color"
android:textColorHint="@color/cl_selector_hui" android:textColorHint="@color/cl_selector_hui"
android:textSize="@dimen/sp_13.3" /> android:textSize="@dimen/sp_13.3" />
...@@ -359,7 +359,7 @@ ...@@ -359,7 +359,7 @@
android:background="@null" android:background="@null"
android:hint="@string/input_up_money" android:hint="@string/input_up_money"
android:inputType="number" android:inputType="number"
android:text="@={info.serverPrice}" android:text="@={presenter.mOrderField.serverPrice}"
android:textColor="@color/cl_home_title_text_color" android:textColor="@color/cl_home_title_text_color"
android:textColorHint="@color/cl_selector_hui" android:textColorHint="@color/cl_selector_hui"
android:textSize="@dimen/sp_13.3" android:textSize="@dimen/sp_13.3"
...@@ -406,7 +406,7 @@ ...@@ -406,7 +406,7 @@
android:background="@null" android:background="@null"
android:hint="@string/input_cailiao_money" android:hint="@string/input_cailiao_money"
android:inputType="number" android:inputType="number"
android:text="@={info.materialCost}" android:text="@={presenter.mOrderField.materialCost}"
android:textColor="@color/cl_home_title_text_color" android:textColor="@color/cl_home_title_text_color"
android:textColorHint="@color/cl_selector_hui" android:textColorHint="@color/cl_selector_hui"
android:textSize="@dimen/sp_13.3" /> android:textSize="@dimen/sp_13.3" />
...@@ -451,7 +451,7 @@ ...@@ -451,7 +451,7 @@
android:background="@null" android:background="@null"
android:hint="@string/input_other_money" android:hint="@string/input_other_money"
android:inputType="number" android:inputType="number"
android:text="@={info.otherPrice}" android:text="@={presenter.mOrderField.otherPrice}"
android:textColor="@color/cl_home_title_text_color" android:textColor="@color/cl_home_title_text_color"
android:textColorHint="@color/cl_selector_hui" android:textColorHint="@color/cl_selector_hui"
android:textSize="@dimen/sp_13.3" /> android:textSize="@dimen/sp_13.3" />
...@@ -485,7 +485,7 @@ ...@@ -485,7 +485,7 @@
android:gravity="top" android:gravity="top"
android:hint="@string/tv_order_other" android:hint="@string/tv_order_other"
android:paddingTop="@dimen/dp_11" android:paddingTop="@dimen/dp_11"
android:text="@={info.otherInfo}" android:text="@={presenter.mOrderField.otherInfo}"
android:textColor="@color/cl_home_title_text_color" android:textColor="@color/cl_home_title_text_color"
android:textColorHint="@color/cl_selector_hui" android:textColorHint="@color/cl_selector_hui"
android:textSize="@dimen/sp_13.3" /> android:textSize="@dimen/sp_13.3" />
......
app/src/main/res/mipmap-hdpi/bg_splash.png
app/src/main/res/mipmap-hdpi/bg_splash.png

30.6 KB | W: | H:

app/src/main/res/mipmap-hdpi/bg_splash.png

39.8 KB | W: | H:

app/src/main/res/mipmap-hdpi/bg_splash.png
app/src/main/res/mipmap-hdpi/bg_splash.png
app/src/main/res/mipmap-hdpi/bg_splash.png
app/src/main/res/mipmap-hdpi/bg_splash.png
  • 2-up
  • Swipe
  • Onion skin
app/src/main/res/mipmap-mdpi/bg_splash.png
app/src/main/res/mipmap-mdpi/bg_splash.png

16.8 KB | W: | H:

app/src/main/res/mipmap-mdpi/bg_splash.png

21.8 KB | W: | H:

app/src/main/res/mipmap-mdpi/bg_splash.png
app/src/main/res/mipmap-mdpi/bg_splash.png
app/src/main/res/mipmap-mdpi/bg_splash.png
app/src/main/res/mipmap-mdpi/bg_splash.png
  • 2-up
  • Swipe
  • Onion skin
app/src/main/res/mipmap-xhdpi/bg_splash.png
app/src/main/res/mipmap-xhdpi/bg_splash.png

47 KB | W: | H:

app/src/main/res/mipmap-xhdpi/bg_splash.png

60.2 KB | W: | H:

app/src/main/res/mipmap-xhdpi/bg_splash.png
app/src/main/res/mipmap-xhdpi/bg_splash.png
app/src/main/res/mipmap-xhdpi/bg_splash.png
app/src/main/res/mipmap-xhdpi/bg_splash.png
  • 2-up
  • Swipe
  • Onion skin
app/src/main/res/mipmap-xxhdpi/bg_splash.png
app/src/main/res/mipmap-xxhdpi/bg_splash.png

88.6 KB | W: | H:

app/src/main/res/mipmap-xxhdpi/bg_splash.png

112 KB | W: | H:

app/src/main/res/mipmap-xxhdpi/bg_splash.png
app/src/main/res/mipmap-xxhdpi/bg_splash.png
app/src/main/res/mipmap-xxhdpi/bg_splash.png
app/src/main/res/mipmap-xxhdpi/bg_splash.png
  • 2-up
  • Swipe
  • Onion skin
app/src/main/res/mipmap-xxxhdpi/bg_splash.png
app/src/main/res/mipmap-xxxhdpi/bg_splash.png

140 KB | W: | H:

app/src/main/res/mipmap-xxxhdpi/bg_splash.png

171 KB | W: | H:

app/src/main/res/mipmap-xxxhdpi/bg_splash.png
app/src/main/res/mipmap-xxxhdpi/bg_splash.png
app/src/main/res/mipmap-xxxhdpi/bg_splash.png
app/src/main/res/mipmap-xxxhdpi/bg_splash.png
  • 2-up
  • Swipe
  • Onion skin
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment