Skip to content

android / dayu

Go to a project
Commit 212ed087 by wukun
Options

可运行

parent 7c116bb1
Inline Side-by-side
Showing with 175 additions and 105 deletions
app/src/main/java/com/dayu/bigfish/presenter/feedBack/FeedBackPresenter.java
package com.dayu.bigfish.presenter.feedBack; package com.dayu.bigfish.presenter.feedBack;
import android.databinding.ObservableField;
import android.text.TextUtils; import android.text.TextUtils;
import androidx.databinding.ObservableField;
import com.dayu.bigfish.R; import com.dayu.bigfish.R;
import com.dayu.bigfish.api.ApiFactory; import com.dayu.bigfish.api.ApiFactory;
import com.dayu.utils.ToastUtils; import com.dayu.utils.ToastUtils;
......
app/src/main/java/com/dayu/bigfish/presenter/main/MainPresenter.java
package com.dayu.bigfish.presenter.main; package com.dayu.bigfish.presenter.main;
import android.databinding.ObservableField;
import android.text.TextUtils; import android.text.TextUtils;
import androidx.databinding.ObservableField;
import com.dayu.base.api.Api; import com.dayu.base.api.Api;
import com.dayu.bigfish.MyApplication; import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.api.APIService; import com.dayu.bigfish.api.APIService;
......
app/src/main/java/com/dayu/bigfish/presenter/setting/SettingPresenter.java
package com.dayu.bigfish.presenter.setting; package com.dayu.bigfish.presenter.setting;
import android.content.Intent; import android.content.Intent;
import android.databinding.ObservableBoolean;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.os.Environment; import android.os.Environment;
import androidx.databinding.ObservableBoolean;
import com.dayu.bigfish.R; import com.dayu.bigfish.R;
import com.dayu.bigfish.api.ApiFactory; import com.dayu.bigfish.api.ApiFactory;
import com.dayu.bigfish.ui.AboutUsActivity; import com.dayu.bigfish.ui.AboutUsActivity;
......
baseSDK/src/main/java/com/dayu/base/api/protocol/EngineerBean.java
package com.dayu.base.api.protocol; package com.dayu.base.api.protocol;
import android.databinding.BaseObservable;
import android.databinding.Bindable; import androidx.databinding.BaseObservable;
import androidx.databinding.Bindable;
import java.io.Serializable; import java.io.Serializable;
......
baseSDK/src/main/java/com/dayu/base/ui/activity/BaseActivity.java
...@@ -3,12 +3,13 @@ package com.dayu.base.ui.activity; ...@@ -3,12 +3,13 @@ package com.dayu.base.ui.activity;
import android.annotation.TargetApi; import android.annotation.TargetApi;
import android.app.NotificationManager; import android.app.NotificationManager;
import android.content.Intent; import android.content.Intent;
import android.databinding.ViewDataBinding;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.v4.app.NotificationCompat; import android.support.v4.app.NotificationCompat;
import android.text.TextUtils; import android.text.TextUtils;
import androidx.databinding.ViewDataBinding;
import com.alibaba.android.arouter.launcher.ARouter; import com.alibaba.android.arouter.launcher.ARouter;
import com.cjt2325.cameralibrary.util.LogUtil; import com.cjt2325.cameralibrary.util.LogUtil;
import com.dayu.base.api.APIService; import com.dayu.base.api.APIService;
......
baseSDK/src/main/java/com/dayu/base/ui/activity/DataBindingActivity.java
...@@ -3,12 +3,13 @@ package com.dayu.base.ui.activity; ...@@ -3,12 +3,13 @@ package com.dayu.base.ui.activity;
import android.app.Activity; import android.app.Activity;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.content.res.Resources; import android.content.res.Resources;
import android.databinding.DataBindingUtil;
import android.databinding.ViewDataBinding;
import android.os.Bundle; import android.os.Bundle;
import android.support.v7.app.AppCompatActivity; import android.support.v7.app.AppCompatActivity;
import android.view.View; import android.view.View;
import androidx.databinding.DataBindingUtil;
import androidx.databinding.ViewDataBinding;
import com.dayu.common.BaseConstant; import com.dayu.common.BaseConstant;
public abstract class DataBindingActivity<B extends ViewDataBinding> extends AppCompatActivity { public abstract class DataBindingActivity<B extends ViewDataBinding> extends AppCompatActivity {
......
baseSDK/src/main/java/com/dayu/base/ui/adapter/BaseViewHolder.java
package com.dayu.base.ui.adapter; package com.dayu.base.ui.adapter;
import android.databinding.ViewDataBinding;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
import androidx.databinding.ViewDataBinding;
/** /**
* Created by luofan on 2017/12/9. * Created by luofan on 2017/12/9.
*/ */
......
baseSDK/src/main/java/com/dayu/base/ui/adapter/CoreAdapter.java
...@@ -2,13 +2,14 @@ package com.dayu.base.ui.adapter; ...@@ -2,13 +2,14 @@ package com.dayu.base.ui.adapter;
import android.animation.ObjectAnimator; import android.animation.ObjectAnimator;
import android.content.Context; import android.content.Context;
import android.databinding.DataBindingUtil;
import android.support.annotation.LayoutRes; import android.support.annotation.LayoutRes;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import androidx.databinding.DataBindingUtil;
import com.dayu.base.api.protocol.BasePageBean; import com.dayu.base.api.protocol.BasePageBean;
import com.dayu.base.ui.presenter.BaseListPresenter; import com.dayu.base.ui.presenter.BaseListPresenter;
import com.dayu.baselibrary.BR; import com.dayu.baselibrary.BR;
......
baseSDK/src/main/java/com/dayu/base/ui/fragment/BaseFragment.java
package com.dayu.base.ui.fragment; package com.dayu.base.ui.fragment;
import android.content.Intent; import android.content.Intent;
import android.databinding.ViewDataBinding;
import android.os.Bundle; import android.os.Bundle;
import androidx.databinding.ViewDataBinding;
import com.alibaba.android.arouter.launcher.ARouter; import com.alibaba.android.arouter.launcher.ARouter;
import com.dayu.base.api.APIService; import com.dayu.base.api.APIService;
import com.dayu.base.api.Api; import com.dayu.base.api.Api;
......
baseSDK/src/main/java/com/dayu/base/ui/fragment/DataBindingFragment.java
...@@ -2,8 +2,6 @@ package com.dayu.base.ui.fragment; ...@@ -2,8 +2,6 @@ package com.dayu.base.ui.fragment;
import android.app.Activity; import android.app.Activity;
import android.content.Context; import android.content.Context;
import android.databinding.DataBindingUtil;
import android.databinding.ViewDataBinding;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
...@@ -12,6 +10,9 @@ import android.view.LayoutInflater; ...@@ -12,6 +10,9 @@ import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import androidx.databinding.DataBindingUtil;
import androidx.databinding.ViewDataBinding;
import com.dayu.utils.LogUtils; import com.dayu.utils.LogUtils;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
......
baseSDK/src/main/java/com/dayu/base/ui/presenter/BaseListPresenter.java
package com.dayu.base.ui.presenter; package com.dayu.base.ui.presenter;
import android.databinding.ObservableField;
import androidx.databinding.ObservableField;
/** /**
* Created by luofan * Created by luofan
......
baseSDK/src/main/java/com/dayu/utils/BindingUtils.java
package com.dayu.utils; package com.dayu.utils;
import android.databinding.BindingAdapter;
import android.databinding.BindingConversion;
import android.databinding.Observable;
import android.graphics.Typeface; import android.graphics.Typeface;
import android.text.TextUtils; import android.text.TextUtils;
import android.widget.ImageView; import android.widget.ImageView;
...@@ -26,6 +23,10 @@ import java.util.List; ...@@ -26,6 +23,10 @@ import java.util.List;
import static com.dayu.utils.UtilsDate.LONG_TIME_FORMAT_TWO; import static com.dayu.utils.UtilsDate.LONG_TIME_FORMAT_TWO;
import static com.dayu.utils.UtilsDate.SHORT_DATE_FORMAT; import static com.dayu.utils.UtilsDate.SHORT_DATE_FORMAT;
import androidx.databinding.BindingAdapter;
import androidx.databinding.BindingConversion;
import androidx.databinding.Observable;
/** /**
* Created by luofan * Created by luofan
* on 2017/12/12. * on 2017/12/12.
......
build.gradle
...@@ -3,11 +3,11 @@ ...@@ -3,11 +3,11 @@
buildscript { buildscript {
ext.compile_sdk_version = 27 ext.compile_sdk_version = 27
ext.build_tools_version = "27.0.3" ext.build_tools_version = "27.0.3"
ext.min_sdk_version = 19 ext.min_sdk_version = 21
ext.target_sdk_version = 26 ext.target_sdk_version = 26
ext.version_code = 303 ext.version_code = 303
ext.verson_name = "3.0.3" ext.verson_name = "3.0.3"
ext.gradle_version = '3.1.4' ext.gradle_version = '4.0.1'
ext.isReleaseMinify = false ext.isReleaseMinify = false
ext.isDebugMinify = false ext.isDebugMinify = false
ext.arouter_api_version = '1.3.1' ext.arouter_api_version = '1.3.1'
...@@ -25,7 +25,7 @@ buildscript { ...@@ -25,7 +25,7 @@ buildscript {
} }
dependencies { dependencies {
classpath "com.android.tools.build:gradle:$gradle_version" classpath "com.android.tools.build:gradle:$gradle_version"
classpath 'org.greenrobot:greendao-gradle-plugin:3.2.0' classpath 'org.greenrobot:greendao-gradle-plugin:3.3.0'
// classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
} }
} }
......
gradle.properties
...@@ -18,3 +18,4 @@ BASE_URL=http://47.94.101.239:3112 ...@@ -18,3 +18,4 @@ BASE_URL=http://47.94.101.239:3112
IS_64_BIT=false IS_64_BIT=false
Android.useDeprecatedNdk=true Android.useDeprecatedNdk=true
android.useAndroidX=true
\ No newline at end of file
gradle/wrapper/gradle-wrapper.properties
...@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME ...@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
learnCenter/src/main/java/com/dayu/learncenter/presenter/common_learn/CommonLearnPresenter.java
package com.dayu.learncenter.presenter.common_learn; package com.dayu.learncenter.presenter.common_learn;
import android.databinding.ObservableField;
import android.text.TextUtils; import android.text.TextUtils;
import androidx.databinding.ObservableField;
import com.dayu.base.api.Api; import com.dayu.base.api.Api;
import com.dayu.base.api.protocol.BasePageBean; import com.dayu.base.api.protocol.BasePageBean;
import com.dayu.base.api.protocol.BaseResponse; import com.dayu.base.api.protocol.BaseResponse;
......
managercenter/src/main/java/com/dayu/managercenter/data/OrderDetail.java
...@@ -72,7 +72,7 @@ public class OrderDetail implements Serializable { ...@@ -72,7 +72,7 @@ public class OrderDetail implements Serializable {
private Integer anyContacts; private Integer anyContacts;
private Integer kaCompanyId; private Integer kaCompanyId;
private Integer createdSource; //1.自建单2.厂商系统派3.ka系统4.多任务5，sp的eu报修 private Integer createdSource; //1.自建单2.厂商系统派3.ka系统4.多任务5，sp的eu报修
private List<accessories> accessories; private List<Accessories> accessories;
private List<Spu> spus; private List<Spu> spus;
private Integer needEsignature;//1:需要2：不需要. private Integer needEsignature;//1:需要2：不需要.
private String esignatureImg; private String esignatureImg;
...@@ -650,11 +650,11 @@ public class OrderDetail implements Serializable { ...@@ -650,11 +650,11 @@ public class OrderDetail implements Serializable {
this.anyContacts = anyContacts; this.anyContacts = anyContacts;
} }
public List<OrderDetail.accessories> getAccessories() { public List<Accessories> getAccessories() {
return accessories; return accessories;
} }
public void setAccessories(List<OrderDetail.accessories> accessories) { public void setAccessories(List<Accessories> accessories) {
this.accessories = accessories; this.accessories = accessories;
} }
...@@ -837,7 +837,7 @@ public class OrderDetail implements Serializable { ...@@ -837,7 +837,7 @@ public class OrderDetail implements Serializable {
} }
} }
public static class accessories implements Serializable { public static class Accessories implements Serializable {
private int id; private int id;
private String name; private String name;
private int orderId; private int orderId;
......
managercenter/src/main/java/com/dayu/managercenter/presenter/allorder/AllOrderPresenter.java
package com.dayu.managercenter.presenter.allorder; package com.dayu.managercenter.presenter.allorder;
import android.databinding.ObservableField;
import android.os.Bundle; import android.os.Bundle;
import androidx.databinding.ObservableField;
import com.dayu.common.Constants; import com.dayu.common.Constants;
import com.dayu.event.ServiceStation; import com.dayu.event.ServiceStation;
import com.dayu.event.UserInfo; import com.dayu.event.UserInfo;
......
managercenter/src/main/java/com/dayu/managercenter/presenter/bargainorder/BargainPresenter.java
package com.dayu.managercenter.presenter.bargainorder; package com.dayu.managercenter.presenter.bargainorder;
import android.databinding.ObservableField;
import androidx.databinding.ObservableField;
import com.dayu.common.Constants; import com.dayu.common.Constants;
import com.dayu.event.ServiceStation; import com.dayu.event.ServiceStation;
......
managercenter/src/main/java/com/dayu/managercenter/presenter/changeorder/ChangeOrderPresenter.java
package com.dayu.managercenter.presenter.changeorder; package com.dayu.managercenter.presenter.changeorder;
import android.databinding.ObservableField;
import android.os.Bundle; import android.os.Bundle;
import androidx.databinding.ObservableField;
import com.dayu.common.Constants; import com.dayu.common.Constants;
import com.dayu.event.ServiceStation; import com.dayu.event.ServiceStation;
import com.dayu.managercenter.api.ManagerApiFactory; import com.dayu.managercenter.api.ManagerApiFactory;
......
managercenter/src/main/java/com/dayu/managercenter/presenter/changereason/ChangeReasonPresenter.java
package com.dayu.managercenter.presenter.changereason; package com.dayu.managercenter.presenter.changereason;
import android.databinding.ObservableField;
import androidx.databinding.ObservableField;
import com.dayu.common.Constants; import com.dayu.common.Constants;
import com.dayu.managercenter.R; import com.dayu.managercenter.R;
......
managercenter/src/main/java/com/dayu/managercenter/presenter/createorder/CreateOrderPresenter.java
package com.dayu.managercenter.presenter.createorder; package com.dayu.managercenter.presenter.createorder;
import android.databinding.ObservableBoolean;
import android.databinding.ObservableField;
import android.os.Bundle; import android.os.Bundle;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.View; import android.view.View;
...@@ -46,6 +44,9 @@ import okhttp3.RequestBody; ...@@ -46,6 +44,9 @@ import okhttp3.RequestBody;
import static com.dayu.utils.UtilsDate.LONG_TIME_FORMAT_TWO; import static com.dayu.utils.UtilsDate.LONG_TIME_FORMAT_TWO;
import androidx.databinding.ObservableBoolean;
import androidx.databinding.ObservableField;
/** /**
* Created by luofan * Created by luofan
* on 2017/11/8. * on 2017/11/8.
...@@ -74,7 +75,7 @@ public class CreateOrderPresenter extends CreateOrderContract.Presenter { ...@@ -74,7 +75,7 @@ public class CreateOrderPresenter extends CreateOrderContract.Presenter {
private String mCategoryId; private String mCategoryId;
private int mSpuServerId; private int mSpuServerId;
private int mSource; private int mSource;
private ArrayList<OrderDetail.accessories> mAccessorites; private ArrayList<OrderDetail.Accessories> mAccessorites;
private int mRole; private int mRole;
private UserInfo mUser; private UserInfo mUser;
private ServiceStation mStation; private ServiceStation mStation;
...@@ -347,7 +348,7 @@ public class CreateOrderPresenter extends CreateOrderContract.Presenter { ...@@ -347,7 +348,7 @@ public class CreateOrderPresenter extends CreateOrderContract.Presenter {
mAccessorites = new ArrayList<>(); mAccessorites = new ArrayList<>();
if (mHttpUrl.size() > 0) { if (mHttpUrl.size() > 0) {
for (String str : mHttpUrl) { for (String str : mHttpUrl) {
OrderDetail.accessories accessories = new OrderDetail.accessories(); OrderDetail.Accessories accessories = new OrderDetail.Accessories();
accessories.setUrl(str); accessories.setUrl(str);
accessories.setUid(System.currentTimeMillis()); accessories.setUid(System.currentTimeMillis());
accessories.setName(getFileName(str)); accessories.setName(getFileName(str));
...@@ -360,7 +361,7 @@ public class CreateOrderPresenter extends CreateOrderContract.Presenter { ...@@ -360,7 +361,7 @@ public class CreateOrderPresenter extends CreateOrderContract.Presenter {
return; return;
} }
for (int i = 0; i < list.size(); i++) { for (int i = 0; i < list.size(); i++) {
OrderDetail.accessories accessories = new OrderDetail.accessories(); OrderDetail.Accessories accessories = new OrderDetail.Accessories();
accessories.setUrl(list.get(i)); accessories.setUrl(list.get(i));
accessories.setUid(System.currentTimeMillis()); accessories.setUid(System.currentTimeMillis());
accessories.setName(getFileName(imgs.get(i))); accessories.setName(getFileName(imgs.get(i)));
......
managercenter/src/main/java/com/dayu/managercenter/presenter/graborder/GrabPresenter.java
package com.dayu.managercenter.presenter.graborder; package com.dayu.managercenter.presenter.graborder;
import android.databinding.ObservableField;
import android.os.Bundle; import android.os.Bundle;
import androidx.databinding.ObservableField;
import com.dayu.common.Constants; import com.dayu.common.Constants;
import com.dayu.event.ServiceStation; import com.dayu.event.ServiceStation;
import com.dayu.managercenter.api.ManagerApiFactory; import com.dayu.managercenter.api.ManagerApiFactory;
......
managercenter/src/main/java/com/dayu/managercenter/presenter/senddetail/SendDetailPresenter.java
package com.dayu.managercenter.presenter.senddetail; package com.dayu.managercenter.presenter.senddetail;
import android.databinding.ObservableField;
import android.os.Bundle; import android.os.Bundle;
import androidx.databinding.ObservableField;
import com.dayu.common.Constants; import com.dayu.common.Constants;
import com.dayu.event.ServiceStation; import com.dayu.event.ServiceStation;
import com.dayu.managercenter.R; import com.dayu.managercenter.R;
......
managercenter/src/main/java/com/dayu/managercenter/presenter/sendorder/SendOrderPresenter.java
package com.dayu.managercenter.presenter.sendorder; package com.dayu.managercenter.presenter.sendorder;
import android.databinding.ObservableField;
import android.os.Bundle; import android.os.Bundle;
import androidx.databinding.ObservableField;
import com.dayu.common.Constants; import com.dayu.common.Constants;
import com.dayu.event.ServiceStation; import com.dayu.event.ServiceStation;
import com.dayu.event.UserInfo; import com.dayu.event.UserInfo;
......
managercenter/src/main/java/com/dayu/managercenter/presenter/servicestation/ServiceStationPresenter.java
package com.dayu.managercenter.presenter.servicestation; package com.dayu.managercenter.presenter.servicestation;
import android.databinding.ObservableField;
import androidx.databinding.ObservableField;
import com.alibaba.android.arouter.launcher.ARouter; import com.alibaba.android.arouter.launcher.ARouter;
import com.dayu.common.Constants; import com.dayu.common.Constants;
......
managercenter/src/main/java/com/dayu/managercenter/presenter/subcribeorder/SubcribeOrderPresenter.java
package com.dayu.managercenter.presenter.subcribeorder; package com.dayu.managercenter.presenter.subcribeorder;
import android.databinding.ObservableField;
import androidx.databinding.ObservableField;
import com.dayu.common.Constants; import com.dayu.common.Constants;
import com.dayu.event.ServiceStation; import com.dayu.event.ServiceStation;
......
managercenter/src/main/java/com/dayu/managercenter/ui/activity/CreateOrderActivity.java
...@@ -358,7 +358,7 @@ public class CreateOrderActivity extends BaseActivity<CreateOrderPresenter, Acti ...@@ -358,7 +358,7 @@ public class CreateOrderActivity extends BaseActivity<CreateOrderPresenter, Acti
mCityId = detail.getCityId(); mCityId = detail.getCityId();
mDistrict = detail.getDistrictName(); mDistrict = detail.getDistrictName();
mDistrictId = detail.getDistrictId(); mDistrictId = detail.getDistrictId();
for (OrderDetail.accessories accessorie : detail.getAccessories()) { for (OrderDetail.Accessories accessorie : detail.getAccessories()) {
mImages.add(accessorie.getUrl()); mImages.add(accessorie.getUrl());
} }
if (mImages.size() > 0) { if (mImages.size() > 0) {
......
managercenter/src/main/java/com/dayu/managercenter/ui/activity/SubOrderDetailActivity.java
...@@ -70,7 +70,7 @@ public class SubOrderDetailActivity extends BaseActivity<SubDetailPresenter, Act ...@@ -70,7 +70,7 @@ public class SubOrderDetailActivity extends BaseActivity<SubDetailPresenter, Act
initPhoto(detail.getAccessories(), mBind.llPhoto); initPhoto(detail.getAccessories(), mBind.llPhoto);
} }
public void initPhoto(List<OrderDetail.accessories> list, LinearLayout layout) { public void initPhoto(List<OrderDetail.Accessories> list, LinearLayout layout) {
layout.removeAllViews(); layout.removeAllViews();
ArrayList<String> pics = new ArrayList<>(); ArrayList<String> pics = new ArrayList<>();
for (int i = 0; i < list.size(); i++) { for (int i = 0; i < list.size(); i++) {
......
messageCenter/src/main/java/com/dayu/message/presenter/message/messagePresenter.java
package com.dayu.message.presenter.message; package com.dayu.message.presenter.message;
import android.databinding.ObservableField;
import android.os.Bundle; import android.os.Bundle;
import android.view.View; import android.view.View;
import androidx.databinding.ObservableField;
import com.dayu.common.Constants; import com.dayu.common.Constants;
import com.dayu.event.UserInfo; import com.dayu.event.UserInfo;
import com.dayu.message.api.MessageApiFactory; import com.dayu.message.api.MessageApiFactory;
......
orderCenter/src/main/java/com/dayu/order/api/protocol/OrderDetail.java
...@@ -71,7 +71,7 @@ public class OrderDetail implements Serializable { ...@@ -71,7 +71,7 @@ public class OrderDetail implements Serializable {
private Integer anyContacts; private Integer anyContacts;
private Integer kaCompanyId; private Integer kaCompanyId;
private Integer createdSource; //1.自建单2.厂商系统派3.ka系统4.多任务5，sp的eu报修 private Integer createdSource; //1.自建单2.厂商系统派3.ka系统4.多任务5，sp的eu报修
private List<accessories> accessories; private List<Accessories> accessories;
private List<Spu> spus; private List<Spu> spus;
private Integer needEsignature;//1:需要2：不需要. private Integer needEsignature;//1:需要2：不需要.
private Integer needSerialNumPic;//1:需要2：不需要. private Integer needSerialNumPic;//1:需要2：不需要.
...@@ -726,11 +726,11 @@ public class OrderDetail implements Serializable { ...@@ -726,11 +726,11 @@ public class OrderDetail implements Serializable {
this.anyContacts = anyContacts; this.anyContacts = anyContacts;
} }
public List<OrderDetail.accessories> getAccessories() { public List<Accessories> getAccessories() {
return accessories; return accessories;
} }
public void setAccessories(List<OrderDetail.accessories> accessories) { public void setAccessories(List<Accessories> accessories) {
this.accessories = accessories; this.accessories = accessories;
} }
...@@ -913,7 +913,7 @@ public class OrderDetail implements Serializable { ...@@ -913,7 +913,7 @@ public class OrderDetail implements Serializable {
} }
} }
public static class accessories implements Serializable { public static class Accessories implements Serializable {
private int id; private int id;
private String name; private String name;
private int orderId; private int orderId;
......
orderCenter/src/main/java/com/dayu/order/presenter/commonSubmite/ApplayAndRefusePresenter.java
package com.dayu.order.presenter.commonSubmite; package com.dayu.order.presenter.commonSubmite;
import android.databinding.ObservableField;
import android.os.Bundle; import android.os.Bundle;
import android.text.TextUtils; import android.text.TextUtils;
import androidx.databinding.ObservableField;
import com.dayu.common.Constants; import com.dayu.common.Constants;
import com.dayu.order.R; import com.dayu.order.R;
import com.dayu.order.api.OrderApiFactory; import com.dayu.order.api.OrderApiFactory;
......
orderCenter/src/main/java/com/dayu/order/presenter/detailedite/EditePresenter.java
package com.dayu.order.presenter.detailedite; package com.dayu.order.presenter.detailedite;
import android.databinding.ObservableField;
import android.text.TextUtils; import android.text.TextUtils;
import androidx.databinding.ObservableField;
import com.dayu.common.Constants; import com.dayu.common.Constants;
import com.dayu.order.R; import com.dayu.order.R;
import com.dayu.order.api.OrderApiFactory; import com.dayu.order.api.OrderApiFactory;
......
orderCenter/src/main/java/com/dayu/order/presenter/kaaddress/KaAddressPresenter.java
package com.dayu.order.presenter.kaaddress; package com.dayu.order.presenter.kaaddress;
import android.databinding.ObservableField;
import android.os.Bundle; import android.os.Bundle;
import androidx.databinding.ObservableField;
import com.dayu.common.Constants; import com.dayu.common.Constants;
import com.dayu.order.api.OrderApiFactory; import com.dayu.order.api.OrderApiFactory;
import com.dayu.order.api.protocol.KaAddress; import com.dayu.order.api.protocol.KaAddress;
......
orderCenter/src/main/java/com/dayu/order/presenter/logisticsinfo/LogisticsInfoPresenter.java
package com.dayu.order.presenter.logisticsinfo; package com.dayu.order.presenter.logisticsinfo;
import android.databinding.ObservableField;
import android.os.Bundle; import android.os.Bundle;
import androidx.databinding.ObservableField;
import com.dayu.common.Constants; import com.dayu.common.Constants;
import com.dayu.order.api.OrderApiFactory; import com.dayu.order.api.OrderApiFactory;
......
orderCenter/src/main/java/com/dayu/order/presenter/multipleprocess/MultipleProcessPresenter.java
package com.dayu.order.presenter.multipleprocess; package com.dayu.order.presenter.multipleprocess;
import android.content.Intent; import android.content.Intent;
import android.databinding.ObservableField;
import android.os.Bundle; import android.os.Bundle;
import android.text.TextUtils; import android.text.TextUtils;
import androidx.databinding.ObservableField;
import com.alibaba.android.arouter.launcher.ARouter; import com.alibaba.android.arouter.launcher.ARouter;
import com.dayu.base.api.BaseApiFactory; import com.dayu.base.api.BaseApiFactory;
import com.dayu.common.Constants; import com.dayu.common.Constants;
......
orderCenter/src/main/java/com/dayu/order/presenter/multiprocessorder/MultiProcessOrderPresenter.java
...@@ -2,11 +2,12 @@ package com.dayu.order.presenter.multiprocessorder; ...@@ -2,11 +2,12 @@ package com.dayu.order.presenter.multiprocessorder;
import android.content.Intent; import android.content.Intent;
import android.databinding.ObservableField;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.text.TextUtils; import android.text.TextUtils;
import androidx.databinding.ObservableField;
import com.dayu.base.api.BaseApiFactory; import com.dayu.base.api.BaseApiFactory;
import com.dayu.common.BaseApplication; import com.dayu.common.BaseApplication;
import com.dayu.common.Constants; import com.dayu.common.Constants;
......
orderCenter/src/main/java/com/dayu/order/presenter/operate/OperatePresenter.java
package com.dayu.order.presenter.operate; package com.dayu.order.presenter.operate;
import android.databinding.ObservableField;
import android.os.Bundle; import android.os.Bundle;
import androidx.databinding.ObservableField;
import com.dayu.common.Constants; import com.dayu.common.Constants;
import com.dayu.order.api.OrderApiFactory; import com.dayu.order.api.OrderApiFactory;
import com.dayu.order.api.protocol.OperateInfo; import com.dayu.order.api.protocol.OperateInfo;
......
orderCenter/src/main/java/com/dayu/order/presenter/orderdoing/OrderDoingPresenter.java
package com.dayu.order.presenter.orderdoing; package com.dayu.order.presenter.orderdoing;
import android.databinding.ObservableField;
import android.os.Bundle; import android.os.Bundle;
import com.dayu.base.api.Api; import com.dayu.base.api.Api;
...@@ -36,6 +35,8 @@ import okhttp3.RequestBody; ...@@ -36,6 +35,8 @@ import okhttp3.RequestBody;
import static com.dayu.utils.UIUtils.getString; import static com.dayu.utils.UIUtils.getString;
import androidx.databinding.ObservableField;
/** /**
* Created by luofan * Created by luofan
* on 2017/11/8. * on 2017/11/8.
......
orderCenter/src/main/java/com/dayu/order/presenter/orderpart/OrderPartPresenter.java
package com.dayu.order.presenter.orderpart; package com.dayu.order.presenter.orderpart;
import android.databinding.ObservableField;
import android.os.Bundle; import android.os.Bundle;
import androidx.databinding.ObservableField;
import com.dayu.base.api.Api; import com.dayu.base.api.Api;
import com.dayu.common.Constants; import com.dayu.common.Constants;
import com.dayu.order.R; import com.dayu.order.R;
......
orderCenter/src/main/java/com/dayu/order/presenter/orderpart_receive/PartRecievePresenter.java
package com.dayu.order.presenter.orderpart_receive; package com.dayu.order.presenter.orderpart_receive;
import android.databinding.ObservableField;
import android.os.Bundle; import android.os.Bundle;
import android.text.TextUtils; import android.text.TextUtils;
import androidx.databinding.ObservableField;
import com.dayu.base.api.Api; import com.dayu.base.api.Api;
import com.dayu.base.api.BaseApiFactory; import com.dayu.base.api.BaseApiFactory;
import com.dayu.common.Constants; import com.dayu.common.Constants;
......
orderCenter/src/main/java/com/dayu/order/presenter/orderpart_send/PartSendPresenter.java
package com.dayu.order.presenter.orderpart_send; package com.dayu.order.presenter.orderpart_send;
import android.databinding.ObservableField;
import android.os.Bundle; import android.os.Bundle;
import android.text.TextUtils; import android.text.TextUtils;
import androidx.databinding.ObservableField;
import com.dayu.base.api.APIService; import com.dayu.base.api.APIService;
import com.dayu.base.api.Api; import com.dayu.base.api.Api;
import com.dayu.base.api.BaseApiFactory; import com.dayu.base.api.BaseApiFactory;
......
orderCenter/src/main/java/com/dayu/order/presenter/orderserver/OrderServerPresenter.java
package com.dayu.order.presenter.orderserver; package com.dayu.order.presenter.orderserver;
import android.databinding.ObservableField;
import android.os.Bundle; import android.os.Bundle;
import android.text.TextUtils; import android.text.TextUtils;
...@@ -22,6 +21,8 @@ import static com.dayu.common.Constants.ORDER_ID; ...@@ -22,6 +21,8 @@ import static com.dayu.common.Constants.ORDER_ID;
import static com.dayu.common.Constants.ORDER_STATE; import static com.dayu.common.Constants.ORDER_STATE;
import static com.dayu.order.common.OrderConstant.ORDER_SOP_FINISH; import static com.dayu.order.common.OrderConstant.ORDER_SOP_FINISH;
import androidx.databinding.ObservableField;
/** /**
* Created by luofan * Created by luofan
* on 2017/11/8. * on 2017/11/8.
......
orderCenter/src/main/java/com/dayu/order/presenter/processorder/ProcessOrderPresenter.java
...@@ -4,11 +4,12 @@ package com.dayu.order.presenter.processorder; ...@@ -4,11 +4,12 @@ package com.dayu.order.presenter.processorder;
import static com.dayu.order.common.OrderConstant.ORDER_FINISH; import static com.dayu.order.common.OrderConstant.ORDER_FINISH;
import static com.dayu.order.common.OrderConstant.ORDER_NOCONTACT_FINISH; import static com.dayu.order.common.OrderConstant.ORDER_NOCONTACT_FINISH;
import android.databinding.ObservableField;
import android.os.Bundle; import android.os.Bundle;
import android.os.Environment; import android.os.Environment;
import android.text.TextUtils; import android.text.TextUtils;
import androidx.databinding.ObservableField;
import com.dayu.base.api.BaseApiFactory; import com.dayu.base.api.BaseApiFactory;
import com.dayu.common.BaseApplication; import com.dayu.common.BaseApplication;
import com.dayu.common.Constants; import com.dayu.common.Constants;
......
orderCenter/src/main/java/com/dayu/order/presenter/receivingorder/ReceivingPresenter.java
package com.dayu.order.presenter.receivingorder; package com.dayu.order.presenter.receivingorder;
import android.databinding.ObservableField;
import android.os.Bundle; import android.os.Bundle;
import android.text.TextUtils; import android.text.TextUtils;
import androidx.databinding.ObservableField;
import com.dayu.base.api.Api; import com.dayu.base.api.Api;
import com.dayu.base.api.protocol.BasePageBean; import com.dayu.base.api.protocol.BasePageBean;
import com.dayu.common.Constants; import com.dayu.common.Constants;
......
orderCenter/src/main/java/com/dayu/order/presenter/redeploy/RedeployPresenter.java
package com.dayu.order.presenter.redeploy; package com.dayu.order.presenter.redeploy;
import android.databinding.ObservableField;
import android.os.Bundle; import android.os.Bundle;
import androidx.databinding.ObservableField;
import com.dayu.base.api.Api; import com.dayu.base.api.Api;
import com.dayu.common.Constants; import com.dayu.common.Constants;
import com.dayu.event.UserInfo; import com.dayu.event.UserInfo;
......
orderCenter/src/main/java/com/dayu/order/presenter/returnpart/ReturnPartPresenter.java
package com.dayu.order.presenter.returnpart; package com.dayu.order.presenter.returnpart;
import android.databinding.ObservableField;
import android.os.Bundle; import android.os.Bundle;
import androidx.databinding.ObservableField;
import com.dayu.common.Constants; import com.dayu.common.Constants;
import com.dayu.event.UserInfo; import com.dayu.event.UserInfo;
import com.dayu.order.api.OrderApiFactory; import com.dayu.order.api.OrderApiFactory;
......
orderCenter/src/main/java/com/dayu/order/presenter/serverinfo/ServerInfoPresenter.java
package com.dayu.order.presenter.serverinfo; package com.dayu.order.presenter.serverinfo;
import android.content.Intent; import android.content.Intent;
import android.databinding.ObservableField;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import androidx.databinding.ObservableField;
import com.dayu.common.Constants; import com.dayu.common.Constants;
import com.dayu.order.api.OrderApiFactory; import com.dayu.order.api.OrderApiFactory;
import com.dayu.order.api.protocol.Spu; import com.dayu.order.api.protocol.Spu;
......
orderCenter/src/main/java/com/dayu/order/presenter/serverinstruction/ServerInstructionPresenter.java
package com.dayu.order.presenter.serverinstruction; package com.dayu.order.presenter.serverinstruction;
import android.databinding.ObservableField;
import android.os.Bundle; import android.os.Bundle;
import androidx.databinding.ObservableField;
import com.dayu.base.api.protocol.BasePageBean; import com.dayu.base.api.protocol.BasePageBean;
import com.dayu.common.Constants; import com.dayu.common.Constants;
import com.dayu.order.api.OrderApiFactory; import com.dayu.order.api.OrderApiFactory;
......
orderCenter/src/main/java/com/dayu/order/presenter/serverlist/ServerListPresenter.java
package com.dayu.order.presenter.serverlist; package com.dayu.order.presenter.serverlist;
import android.content.Intent; import android.content.Intent;
import android.databinding.ObservableField;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import androidx.databinding.ObservableField;
import com.dayu.common.Constants; import com.dayu.common.Constants;
import com.dayu.order.api.OrderApiFactory; import com.dayu.order.api.OrderApiFactory;
import com.dayu.order.api.protocol.Spu; import com.dayu.order.api.protocol.Spu;
......
orderCenter/src/main/java/com/dayu/order/presenter/sop/SopPresenter.java
package com.dayu.order.presenter.sop; package com.dayu.order.presenter.sop;
import android.content.Intent; import android.content.Intent;
import android.databinding.ObservableField;
import android.net.Uri; import android.net.Uri;
import androidx.databinding.ObservableField;
import com.dayu.common.Constants; import com.dayu.common.Constants;
import com.dayu.order.api.OrderApiFactory; import com.dayu.order.api.OrderApiFactory;
import com.dayu.order.common.OrderConstant; import com.dayu.order.common.OrderConstant;
......
orderCenter/src/main/java/com/dayu/order/presenter/subcribeTime/SubcribeTimePresenter.java
...@@ -8,11 +8,12 @@ import static com.dayu.utils.UtilsDate.LONG_DATE; ...@@ -8,11 +8,12 @@ import static com.dayu.utils.UtilsDate.LONG_DATE;
import static com.dayu.utils.UtilsDate.LONG_DATE_FORMAT; import static com.dayu.utils.UtilsDate.LONG_DATE_FORMAT;
import static com.dayu.utils.UtilsDate.LONG_TIME_FORMAT_TWO; import static com.dayu.utils.UtilsDate.LONG_TIME_FORMAT_TWO;
import android.databinding.ObservableField;
import android.os.Bundle; import android.os.Bundle;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.View; import android.view.View;
import androidx.databinding.ObservableField;
import com.dayu.common.Constants; import com.dayu.common.Constants;
import com.dayu.order.R; import com.dayu.order.R;
import com.dayu.order.api.OrderApiFactory; import com.dayu.order.api.OrderApiFactory;
......
orderCenter/src/main/java/com/dayu/order/presenter/worksRecord/OrderRecordPresenter.java
package com.dayu.order.presenter.worksRecord; package com.dayu.order.presenter.worksRecord;
import android.databinding.ObservableField;
import android.os.Bundle; import android.os.Bundle;
import androidx.databinding.ObservableField;
import com.dayu.common.Constants; import com.dayu.common.Constants;
import com.dayu.event.UserInfo; import com.dayu.event.UserInfo;
import com.dayu.order.api.OrderApiFactory; import com.dayu.order.api.OrderApiFactory;
......
orderCenter/src/main/java/com/dayu/order/sqlbean/OrderInfo.java
package com.dayu.order.sqlbean; package com.dayu.order.sqlbean;
import android.databinding.BaseObservable;
import androidx.databinding.BaseObservable;
import org.greenrobot.greendao.annotation.Convert; import org.greenrobot.greendao.annotation.Convert;
import org.greenrobot.greendao.annotation.Entity; import org.greenrobot.greendao.annotation.Entity;
......
orderCenter/src/main/java/com/dayu/order/ui/fragment/MultiOrderDetailFragment.java
...@@ -147,9 +147,9 @@ public class MultiOrderDetailFragment extends BaseFragment<SImplePresenter, Frag ...@@ -147,9 +147,9 @@ public class MultiOrderDetailFragment extends BaseFragment<SImplePresenter, Frag
mFujianAdapter.setViewType(R.layout.item_accessories_layout); mFujianAdapter.setViewType(R.layout.item_accessories_layout);
mBind.rlFujian.setAdapter(mFujianAdapter); mBind.rlFujian.setAdapter(mFujianAdapter);
mFujianAdapter.setData(detail.getAccessories()); mFujianAdapter.setData(detail.getAccessories());
mFujianAdapter.setOnItemClickListener(new OnItemClickListener<OrderDetail.accessories, ItemAccessoriesLayoutBinding>() { mFujianAdapter.setOnItemClickListener(new OnItemClickListener<OrderDetail.Accessories, ItemAccessoriesLayoutBinding>() {
@Override @Override
public void OnItemClick(OrderDetail.accessories item, ItemAccessoriesLayoutBinding bind) { public void OnItemClick(OrderDetail.Accessories item, ItemAccessoriesLayoutBinding bind) {
if (item.getUrl().contains("png") || item.getUrl().contains("PNG") if (item.getUrl().contains("png") || item.getUrl().contains("PNG")
|| item.getUrl().contains("jpg") || item.getUrl().contains("JPG") || item.getUrl().contains("jpg") || item.getUrl().contains("JPG")
|| item.getUrl().contains("jpeg") || item.getUrl().contains("JPEG")) { || item.getUrl().contains("jpeg") || item.getUrl().contains("JPEG")) {
......
orderCenter/src/main/java/com/dayu/order/ui/fragment/OrderDetaillsFragment.java
...@@ -116,9 +116,9 @@ public class OrderDetaillsFragment extends DataBindingFragment<FragmentOrderData ...@@ -116,9 +116,9 @@ public class OrderDetaillsFragment extends DataBindingFragment<FragmentOrderData
mAdapter.setViewType(R.layout.item_accessories_layout); mAdapter.setViewType(R.layout.item_accessories_layout);
mBind.rlAccessories.setAdapter(mAdapter); mBind.rlAccessories.setAdapter(mAdapter);
mAdapter.setData(dataBean.getAccessories()); mAdapter.setData(dataBean.getAccessories());
mAdapter.setOnItemClickListener(new OnItemClickListener<OrderDetail.accessories, ItemAccessoriesLayoutBinding>() { mAdapter.setOnItemClickListener(new OnItemClickListener<OrderDetail.Accessories, ItemAccessoriesLayoutBinding>() {
@Override @Override
public void OnItemClick(OrderDetail.accessories item, ItemAccessoriesLayoutBinding bind) { public void OnItemClick(OrderDetail.Accessories item, ItemAccessoriesLayoutBinding bind) {
if (item.getUrl().contains("png") || item.getUrl().contains("PNG") if (item.getUrl().contains("png") || item.getUrl().contains("PNG")
|| item.getUrl().contains("jpg") || item.getUrl().contains("JPG") || item.getUrl().contains("jpg") || item.getUrl().contains("JPG")
|| item.getUrl().contains("jpeg") || item.getUrl().contains("JPEG")) { || item.getUrl().contains("jpeg") || item.getUrl().contains("JPEG")) {
......
orderCenter/src/main/res/layout/item_accessories_layout.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<variable <variable
name="item" name="item"
type="com.dayu.order.api.protocol.OrderDetail.accessories" /> type="com.dayu.order.api.protocol.OrderDetail.Accessories" />
</data> </data>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
......
saleCenter/src/main/java/com/bigfish/salecenter/presenter/saleorder/SaleOrderPresent.java
package com.bigfish.salecenter.presenter.saleorder; package com.bigfish.salecenter.presenter.saleorder;
import android.databinding.ObservableField;
import android.text.TextUtils; import android.text.TextUtils;
import androidx.databinding.ObservableField;
import com.bigfish.salecenter.api.SaleService; import com.bigfish.salecenter.api.SaleService;
import com.bigfish.salecenter.event.RefreshSaleTab; import com.bigfish.salecenter.event.RefreshSaleTab;
import com.bigfish.salecenter.presenter.saleproduct.SaleProductContract; import com.bigfish.salecenter.presenter.saleproduct.SaleProductContract;
......
saleCenter/src/main/java/com/bigfish/salecenter/presenter/saleproduct/SaleProductPresent.java
package com.bigfish.salecenter.presenter.saleproduct; package com.bigfish.salecenter.presenter.saleproduct;
import android.databinding.ObservableField;
import android.text.TextUtils; import android.text.TextUtils;
import androidx.databinding.ObservableField;
import com.bigfish.salecenter.api.SaleService; import com.bigfish.salecenter.api.SaleService;
import com.bigfish.salecenter.event.RefreshSaleTab; import com.bigfish.salecenter.event.RefreshSaleTab;
import com.bigfish.salecenter.model.CollectProductData; import com.bigfish.salecenter.model.CollectProductData;
......
userCenter/src/main/java/com/dayu/usercenter/data/protocol/EngineerInfo.java
package com.dayu.usercenter.data.protocol; package com.dayu.usercenter.data.protocol;
import android.databinding.BaseObservable;
import android.databinding.Bindable; import androidx.databinding.BaseObservable;
import androidx.databinding.Bindable;
import com.dayu.usercenter.BR; import com.dayu.usercenter.BR;
......
userCenter/src/main/java/com/dayu/usercenter/presenter/InviteTeamPresenter.java
package com.dayu.usercenter.presenter; package com.dayu.usercenter.presenter;
import android.databinding.ObservableField;
import androidx.databinding.ObservableField;
import com.dayu.base.api.Api; import com.dayu.base.api.Api;
import com.dayu.base.ui.presenter.BaseListPresenter; import com.dayu.base.ui.presenter.BaseListPresenter;
......
userCenter/src/main/java/com/dayu/usercenter/presenter/RedeployPresenter.java
package com.dayu.usercenter.presenter; package com.dayu.usercenter.presenter;
import android.databinding.ObservableField;
import androidx.databinding.ObservableField;
import com.dayu.base.api.Api; import com.dayu.base.api.Api;
import com.dayu.common.Constants; import com.dayu.common.Constants;
......
userCenter/src/main/java/com/dayu/usercenter/presenter/accountbalance/AccountBalancePresenter.java
package com.dayu.usercenter.presenter.accountbalance; package com.dayu.usercenter.presenter.accountbalance;
import android.databinding.ObservableField;
import android.os.Bundle; import android.os.Bundle;
import androidx.databinding.ObservableField;
import com.dayu.common.Constants; import com.dayu.common.Constants;
import com.dayu.event.UserInfo; import com.dayu.event.UserInfo;
import com.dayu.usercenter.api.UserApiFactory; import com.dayu.usercenter.api.UserApiFactory;
......
userCenter/src/main/java/com/dayu/usercenter/presenter/forgetpwd/ForgetPwdPresenter.java
package com.dayu.usercenter.presenter.forgetpwd; package com.dayu.usercenter.presenter.forgetpwd;
import android.databinding.ObservableField;
import android.os.Bundle; import android.os.Bundle;
import androidx.databinding.ObservableField;
import com.dayu.usercenter.R; import com.dayu.usercenter.R;
import com.dayu.usercenter.api.UserApiFactory; import com.dayu.usercenter.api.UserApiFactory;
import com.dayu.usercenter.common.UserConstant; import com.dayu.usercenter.common.UserConstant;
......
userCenter/src/main/java/com/dayu/usercenter/presenter/homefourtab/HomePersonPresenter.java
package com.dayu.usercenter.presenter.homefourtab; package com.dayu.usercenter.presenter.homefourtab;
import android.databinding.ObservableField;
import androidx.databinding.ObservableField;
import com.dayu.usercenter.api.UserApiFactory; import com.dayu.usercenter.api.UserApiFactory;
import com.dayu.usercenter.data.protocol.EngineerInfo; import com.dayu.usercenter.data.protocol.EngineerInfo;
......
userCenter/src/main/java/com/dayu/usercenter/presenter/homeuser/HomeUserPresenter.java
package com.dayu.usercenter.presenter.homeuser; package com.dayu.usercenter.presenter.homeuser;
import android.databinding.ObservableField;
import android.os.Bundle; import android.os.Bundle;
import androidx.databinding.ObservableField;
import com.dayu.base.api.APIService; import com.dayu.base.api.APIService;
import com.dayu.base.api.Api; import com.dayu.base.api.Api;
import com.dayu.common.Constants; import com.dayu.common.Constants;
......
userCenter/src/main/java/com/dayu/usercenter/presenter/licencedetail/LicenceDetailPresenter.java
package com.dayu.usercenter.presenter.licencedetail; package com.dayu.usercenter.presenter.licencedetail;
import android.databinding.ObservableField;
import androidx.databinding.ObservableField;
import com.dayu.common.Constants; import com.dayu.common.Constants;
import com.dayu.usercenter.api.UserApiFactory; import com.dayu.usercenter.api.UserApiFactory;
......
userCenter/src/main/java/com/dayu/usercenter/presenter/login/LoginPresenter.java
package com.dayu.usercenter.presenter.login; package com.dayu.usercenter.presenter.login;
import android.databinding.ObservableField;
import android.text.TextUtils; import android.text.TextUtils;
import androidx.databinding.ObservableField;
import com.alibaba.android.arouter.launcher.ARouter; import com.alibaba.android.arouter.launcher.ARouter;
import com.dayu.event.UserInfo; import com.dayu.event.UserInfo;
import com.dayu.provider.router.RouterPath; import com.dayu.provider.router.RouterPath;
......
userCenter/src/main/java/com/dayu/usercenter/presenter/modifyperson/ModifyPersonPresenter.java
package com.dayu.usercenter.presenter.modifyperson; package com.dayu.usercenter.presenter.modifyperson;
import android.databinding.ObservableBoolean;
import android.databinding.ObservableField;
import android.os.Bundle; import android.os.Bundle;
import android.text.TextUtils; import android.text.TextUtils;
import androidx.databinding.ObservableBoolean;
import androidx.databinding.ObservableField;
import com.dayu.base.api.BaseApiFactory; import com.dayu.base.api.BaseApiFactory;
import com.dayu.common.Constants; import com.dayu.common.Constants;
import com.dayu.usercenter.R; import com.dayu.usercenter.R;
......
userCenter/src/main/java/com/dayu/usercenter/presenter/modifypwd/ModifyPwdPresenter.java
package com.dayu.usercenter.presenter.modifypwd; package com.dayu.usercenter.presenter.modifypwd;
import android.databinding.ObservableField;
import android.os.Bundle; import android.os.Bundle;
import androidx.databinding.ObservableField;
import com.dayu.usercenter.R; import com.dayu.usercenter.R;
import com.dayu.usercenter.api.UserApiFactory; import com.dayu.usercenter.api.UserApiFactory;
import com.dayu.usercenter.common.UserConstant; import com.dayu.usercenter.common.UserConstant;
......
userCenter/src/main/java/com/dayu/usercenter/presenter/myhead/MyHeadPresenter.java
package com.dayu.usercenter.presenter.myhead; package com.dayu.usercenter.presenter.myhead;
import android.databinding.ObservableField;
import androidx.databinding.ObservableField;
import com.dayu.base.api.BaseApiFactory; import com.dayu.base.api.BaseApiFactory;
import com.dayu.event.UserInfo; import com.dayu.event.UserInfo;
......
userCenter/src/main/java/com/dayu/usercenter/presenter/newpwd/NewPwdPresenter.java
package com.dayu.usercenter.presenter.newpwd; package com.dayu.usercenter.presenter.newpwd;
import android.databinding.ObservableField;
import android.os.Bundle; import android.os.Bundle;
import androidx.databinding.ObservableField;
import com.dayu.usercenter.R; import com.dayu.usercenter.R;
import com.dayu.usercenter.api.UserApiFactory; import com.dayu.usercenter.api.UserApiFactory;
import com.dayu.usercenter.common.UserConstant; import com.dayu.usercenter.common.UserConstant;
......
userCenter/src/main/java/com/dayu/usercenter/presenter/personinfo/PersonInfoPresenter.java
package com.dayu.usercenter.presenter.personinfo; package com.dayu.usercenter.presenter.personinfo;
import android.databinding.ObservableField;
import android.os.Bundle; import android.os.Bundle;
import android.text.TextUtils; import android.text.TextUtils;
import androidx.databinding.ObservableField;
import com.dayu.base.api.BaseApiFactory; import com.dayu.base.api.BaseApiFactory;
import com.dayu.event.UserInfo; import com.dayu.event.UserInfo;
import com.dayu.usercenter.R; import com.dayu.usercenter.R;
......
userCenter/src/main/java/com/dayu/usercenter/presenter/pwlogin/PwLoginPresenter.java
package com.dayu.usercenter.presenter.pwlogin; package com.dayu.usercenter.presenter.pwlogin;
import android.databinding.ObservableField;
import android.os.Bundle; import android.os.Bundle;
import android.text.TextUtils; import android.text.TextUtils;
import androidx.databinding.ObservableField;
import com.alibaba.android.arouter.launcher.ARouter; import com.alibaba.android.arouter.launcher.ARouter;
import com.dayu.common.BaseApplication; import com.dayu.common.BaseApplication;
import com.dayu.common.Constants; import com.dayu.common.Constants;
......
userCenter/src/main/java/com/dayu/usercenter/presenter/quality/QualityCertificaitonPresenter.java
package com.dayu.usercenter.presenter.quality; package com.dayu.usercenter.presenter.quality;
import android.databinding.ObservableField;
import androidx.databinding.ObservableField;
import com.dayu.usercenter.api.UserApiFactory; import com.dayu.usercenter.api.UserApiFactory;
import com.dayu.utils.UserManager; import com.dayu.utils.UserManager;
......
userCenter/src/main/java/com/dayu/usercenter/presenter/smslogin/SmsLoginPresenter.java
package com.dayu.usercenter.presenter.smslogin; package com.dayu.usercenter.presenter.smslogin;
import android.databinding.ObservableField;
import android.os.Bundle; import android.os.Bundle;
import android.text.TextUtils; import android.text.TextUtils;
import androidx.databinding.ObservableField;
import com.alibaba.android.arouter.launcher.ARouter; import com.alibaba.android.arouter.launcher.ARouter;
import com.dayu.common.BaseApplication; import com.dayu.common.BaseApplication;
import com.dayu.common.Constants; import com.dayu.common.Constants;
......
userCenter/src/main/java/com/dayu/usercenter/presenter/userinfo/UserInfoPresenter.java
package com.dayu.usercenter.presenter.userinfo; package com.dayu.usercenter.presenter.userinfo;
import android.databinding.ObservableField;
import androidx.databinding.ObservableField;
import com.dayu.base.api.APIService; import com.dayu.base.api.APIService;
import com.dayu.base.api.Api; import com.dayu.base.api.Api;
......
userCenter/src/main/java/com/dayu/usercenter/presenter/userlicence/UserLicencePresent.java
package com.dayu.usercenter.presenter.userlicence; package com.dayu.usercenter.presenter.userlicence;
import android.databinding.ObservableField;
import androidx.databinding.ObservableField;
import com.dayu.base.api.Api; import com.dayu.base.api.Api;
import com.dayu.common.Constants; import com.dayu.common.Constants;
......
userCenter/src/main/java/com/dayu/usercenter/presenter/Withdrawals/WithdrawalsContract.java → userCenter/src/main/java/com/dayu/usercenter/presenter/withdrawals/WithdrawalsContract.java
package com.dayu.usercenter.presenter.Withdrawals; package com.dayu.usercenter.presenter.withdrawals;
import com.dayu.base.ui.presenter.BasePresenter; import com.dayu.base.ui.presenter.BasePresenter;
......
userCenter/src/main/java/com/dayu/usercenter/presenter/Withdrawals/WithdrawalsPresenter.java → userCenter/src/main/java/com/dayu/usercenter/presenter/withdrawals/WithdrawalsPresenter.java
package com.dayu.usercenter.presenter.Withdrawals; package com.dayu.usercenter.presenter.withdrawals;
import android.databinding.ObservableField;
import android.text.TextUtils; import android.text.TextUtils;
import androidx.databinding.ObservableField;
import com.dayu.common.Constants; import com.dayu.common.Constants;
import com.dayu.event.UserInfo; import com.dayu.event.UserInfo;
import com.dayu.usercenter.R; import com.dayu.usercenter.R;
......
userCenter/src/main/java/com/dayu/usercenter/ui/activity/RedeployActvity.java
package com.dayu.usercenter.ui.activity; package com.dayu.usercenter.ui.activity;
import android.databinding.Observable;
import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.facade.annotation.Route;
import com.dayu.base.api.Api; import com.dayu.base.api.Api;
......
userCenter/src/main/java/com/dayu/usercenter/ui/activity/WithdrawalsActivity.java
...@@ -3,8 +3,8 @@ package com.dayu.usercenter.ui.activity; ...@@ -3,8 +3,8 @@ package com.dayu.usercenter.ui.activity;
import com.dayu.base.ui.activity.BaseActivity; import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.usercenter.R; import com.dayu.usercenter.R;
import com.dayu.usercenter.databinding.ActivityWithdrawalsBinding; import com.dayu.usercenter.databinding.ActivityWithdrawalsBinding;
import com.dayu.usercenter.presenter.Withdrawals.WithdrawalsContract; import com.dayu.usercenter.presenter.withdrawals.WithdrawalsContract;
import com.dayu.usercenter.presenter.Withdrawals.WithdrawalsPresenter; import com.dayu.usercenter.presenter.withdrawals.WithdrawalsPresenter;
/** /**
* 账号绑定页面. * 账号绑定页面.
......
userCenter/src/main/res/layout/activity_withdrawals.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<variable <variable
name="presenter" name="presenter"
type="com.dayu.usercenter.presenter.Withdrawals.WithdrawalsPresenter" /> type="com.dayu.usercenter.presenter.withdrawals.WithdrawalsPresenter" />
</data> </data>
......
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