Skip to content

android / dayu

Go to a project
Commit 8d476a37 by mReturn
Options

友盟推送&工单优化

parent baf60316
Expand all
Inline Side-by-side
Showing with 1707 additions and 549 deletions
app/proguard-rules.pro
......@@ -225,8 +225,38 @@ public static final int *;
-keep class com.umeng.error.BatteryUtils{ public *; }
#友盟push
-dontwarn com.umeng.**
-dontwarn com.taobao.**
-dontwarn anet.channel.**
-dontwarn anetwork.channel.**
-dontwarn org.android.**
-dontwarn org.apache.thrift.**
-dontwarn com.xiaomi.**
-dontwarn com.huawei.**
-dontwarn com.meizu.**
-keepattributes *Annotation*
-keep class com.taobao.** {*;}
-keep class org.android.** {*;}
-keep class anet.channel.** {*;}
-keep class com.umeng.** {*;}
-keep class com.xiaomi.** {*;}
-keep class com.huawei.** {*;}
-keep class com.meizu.** {*;}
-keep class org.apache.thrift.** {*;}
-keep class com.alibaba.sdk.android.**{*;}
-keep class com.ut.**{*;}
-keep class com.ta.**{*;}
-keep public class **.R$*{
public static final int *;
}
-keep public class * extends android.app.Service
#eventbus
-keepclassmembers class ** {
@org.greenrobot.eventbus.Subscribe <methods>;
......
app/src/main/AndroidManifest.xml
......@@ -151,10 +151,10 @@
android:screenOrientation="portrait" />
<!--<activity-->
<!--android:name="com.dayu.bigfish.ui.UmengPushNotifyActivity"-->
<!--android:launchMode="singleTask"-->
<!--android:exported="true" />-->
<activity
android:name="com.dayu.bigfish.ui.UmengPushNotifyActivity"
android:launchMode="singleTask"
android:exported="true" />
</application>
<!--华为小红点-->
......
app/src/main/java/com/dayu/bigfish/ui/UmengPushNotifyActivity.java
......@@ -3,8 +3,14 @@ package com.dayu.bigfish.ui;
import android.content.Intent;
import android.os.Bundle;
import com.dayu.bigfish.InitializeActivity;
import com.dayu.bigfish.R;
import com.dayu.common.BaseApplication;
import com.dayu.common.Constants;
import com.dayu.order.ui.activity.OrderDetailsActivity;
import com.dayu.utils.LogUtils;
import com.dayu.utils.UserManager;
import com.umeng.analytics.MobclickAgent;
import com.umeng.message.UmengNotifyClickActivity;
import org.android.agoo.common.AgooConstants;
......@@ -23,5 +29,17 @@ public class UmengPushNotifyActivity extends UmengNotifyClickActivity {
super.onMessage(intent); //此方法必须调用，否则无法统计打开数
String body = intent.getStringExtra(AgooConstants.MESSAGE_BODY);
LogUtils.e("UmengPushNotifyActivity", body);
if (UserManager.getInstance().hasUserInfo()){
Bundle bundle = new Bundle();
bundle.putInt(Constants.ORDER_ID, 4073);
Intent detailIntent = new Intent(this, OrderDetailsActivity.class);
if (bundle != null) {
detailIntent.putExtra(Constants.BUNDLE, bundle);
}
startActivity(detailIntent);
MobclickAgent.onEvent(BaseApplication.getContext(), "check_order_detail");
}else{
startActivity(new Intent(this,InitializeActivity.class));
}
}
}
baseSDK/build.gradle
......@@ -55,27 +55,25 @@ dependencies {
api 'com.squareup.retrofit2:converter-gson:2.4.0'
api 'com.squareup.retrofit2:adapter-rxjava2:2.4.0'
//图片选择
// api 'com.github.LuckSiege.PictureSelector:picture_library:v2.1.5'
// api 'com.github.LuckSiege.PictureSelector:picture_library:v2.1.5'
api 'com.github.LuckSiege.PictureSelector:picture_library:v2.1.9'
//ARouter
api "com.alibaba:arouter-api:$arouter_api_version"
//greendao数据库
api 'org.greenrobot:greendao:3.2.0'
//选择器
// compile 'com.contrarywind:Android-PickerView:3.2.7'
// compile 'com.contrarywind:Android-PickerView:3.2.7'
//jsbridge
api 'com.github.lzyzsd:jsbridge:1.0.4'
//zxing
api 'com.google.zxing:core:3.3.3'
api 'com.journeyapps:zxing-android-embedded:3.5.0'
api project(':locationComponent')
api project(':pickerview')
api 'cn.jzvd:jiaozivideoplayer:7.1.0'
// api 'tv.danmaku.ijk.media:ijkplayer-java:0.8.4'
// api 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.8.4'
// api 'tv.danmaku.ijk.media:ijkplayer-x86:0.8.4'
// api 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.8.4'
// api 'tv.danmaku.ijk.media:ijkplayer-x86:0.8.4'
api 'com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.35'
api 'com.badoo.mobile:android-weak-handler:1.1'
api 'com.youth.banner:banner:1.4.10'
......@@ -85,27 +83,5 @@ dependencies {
api 'com.google.android:flexbox:1.0.0'
api 'com.github.chrisbanes:PhotoView:2.0.0'
//友盟PushSDK必须依赖utdid库，所以需要加入对应依赖
api 'com.umeng.umsdk:utdid:1.5.2'
//友盟push相关依赖(必须)
api 'com.umeng.umsdk:push:6.0.5'
api 'com.umeng.umsdk:alicloud-httpdns:1.2.5'
api 'com.umeng.umsdk:alicloud-utils:1.1.5'
api 'com.umeng.umsdk:alicloud_beacon:1.0.1'
api 'com.umeng.umsdk:agoo-accs:3.3.8.8-open-fix2'
api 'com.umeng.umsdk:agoo_networksdk:3.5.5'
api 'com.umeng.umsdk:agoo_tlog:3.0.0.17'
api 'com.umeng.umsdk:agoo_tnet4android:3.1.14.9'
//小米Push通道
api 'com.umeng.umsdk:xiaomi-push:3.6.17'
api 'com.umeng.umsdk:xiaomi-umengaccs:1.1.0'
//华为Push通道
api 'com.umeng.umsdk:huawei-basetb:2.6.3.305'
api 'com.umeng.umsdk:huawei-pushtb:2.6.3.305'
api 'com.umeng.umsdk:huawei-umengaccs:1.2.1'
//Oppo Push通道
api 'com.umeng.umsdk:oppo-push:1.0.1'
api 'com.umeng.umsdk:oppo-umengaccs:1.0.3'
api project(':umeng')
}
baseSDK/src/main/AndroidManifest.xml
......@@ -22,151 +22,5 @@
android:configChanges="keyboardHidden|orientation|screenSize"
android:exported="true"
android:theme="@android:style/Theme.Translucent.NoTitleBar" />
<!-- 友盟push 以下为基本配置信息，需要自行添加至您的AndroidManifest文件中 start-->
<service
android:name="com.taobao.accs.ChannelService"
android:exported="true"
android:process=":channel">
<intent-filter>
<action android:name="com.taobao.accs.intent.action.SERVICE" />
</intent-filter>
<intent-filter>
<action android:name="com.taobao.accs.intent.action.ELECTION" />
</intent-filter>
</service>
<service
android:name="com.taobao.accs.data.MsgDistributeService"
android:exported="true">
<intent-filter>
<action android:name="com.taobao.accs.intent.action.RECEIVE" />
</intent-filter>
</service>
<receiver
android:name="com.taobao.accs.EventReceiver"
android:process=":channel">
<intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED" />
</intent-filter>
<intent-filter>
<action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.PACKAGE_REMOVED" />
<data android:scheme="package" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.USER_PRESENT" />
</intent-filter>
</receiver>
<receiver
android:name="com.taobao.accs.ServiceReceiver"
android:process=":channel">
<intent-filter>
<action android:name="com.taobao.accs.intent.action.COMMAND" />
</intent-filter>
<intent-filter>
<action android:name="com.taobao.accs.intent.action.START_FROM_AGOO" />
</intent-filter>
</receiver>
<service
android:name="com.taobao.accs.internal.AccsJobService"
android:permission="android.permission.BIND_JOB_SERVICE"
android:process=":channel"/>
<service
android:name="com.taobao.accs.ChannelService$KernelService"
android:process=":channel" />
<service
android:name="org.android.agoo.accs.AgooService"
android:exported="true">
<intent-filter>
<action android:name="com.taobao.accs.intent.action.RECEIVE" />
</intent-filter>
</service>
<service
android:name="com.umeng.message.UmengIntentService"
android:exported="true"
android:process=":channel">
<intent-filter>
<action android:name="org.agoo.android.intent.action.RECEIVE" />
</intent-filter>
</service>
<service
android:name="com.umeng.message.XiaomiIntentService"
android:exported="true"
android:process=":channel">
<intent-filter>
<action android:name="org.agoo.android.intent.action.RECEIVE" />
</intent-filter>
</service>
<receiver
android:name="com.taobao.agoo.AgooCommondReceiver"
android:exported="true"
android:process=":channel">
<intent-filter>
<action android:name="com.dayu.bigfish.intent.action.COMMAND" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.PACKAGE_REMOVED" />
<data android:scheme="package" />
</intent-filter>
</receiver>
<service
android:name="com.umeng.message.UmengMessageIntentReceiverService"
android:exported="true"
android:process=":channel">
<intent-filter>
<action android:name="org.android.agoo.client.MessageReceiverService" />
</intent-filter>
</service>
<receiver
android:name="com.umeng.message.NotificationProxyBroadcastReceiver"
android:exported="false" />
<service
android:name="com.umeng.message.UmengMessageCallbackHandlerService"
android:permission="android.permission.BIND_JOB_SERVICE"
android:exported="false">
<intent-filter>
<action android:name="com.umeng.messge.registercallback.action" />
</intent-filter>
<intent-filter>
<action android:name="com.umeng.message.enablecallback.action" />
</intent-filter>
<intent-filter>
<action android:name="com.umeng.message.disablecallback.action" />
</intent-filter>
<intent-filter>
<action android:name="com.umeng.message.message.handler.action" />
</intent-filter>
<intent-filter>
<action android:name="com.umeng.message.message.sendmessage.action" />
</intent-filter>
</service>
<service
android:name="com.umeng.message.UmengDownloadResourceService"
android:permission="android.permission.BIND_JOB_SERVICE"
android:exported="false" />
<provider
android:name="com.umeng.message.provider.MessageProvider"
android:authorities="com.dayu.bigfish.umeng.message"
android:exported="false">
<grant-uri-permission android:pathPattern=".*" />
</provider>
<!-- 以下为基本配置信息，需要自行添加至您的AndroidManifest文件中 end-->
</application>
</manifest>
baseSDK/src/main/java/com/dayu/base/ui/adapter/MediaChooseAdapter.java
......@@ -27,18 +27,31 @@ import java.util.ArrayList;
public class MediaChooseAdapter extends RecyclerView.Adapter<MediaChooseAdapter.Holder> {
private final int mIvSize;
private int mIvSize;
private Activity context;
private ArrayList<String> list;
private ArrayList<String> list = new ArrayList<>();
private int maxCount = 1;
private int mimeType = PictureMimeType.ofVideo();
private int videoLength = 30;
private int requestCode = PictureConfig.CHOOSE_REQUEST;
private OnItemClickListener<MediaChooseAdapter.Holder, Integer> listener;
public MediaChooseAdapter( Activity context,ArrayList<String> list) {
mIvSize = (UtilsScreen.getScreenWidth(context) - UtilsScreen.dip2px(context, 20)) / 5;
this.context = context;
this.list = list;
if (list.size()<maxCount)
list.add("add");
}
public MediaChooseAdapter(Activity context, ArrayList<String> list, int maxCount, int mimeType) {
mIvSize = (UtilsScreen.getScreenWidth(context) - UtilsScreen.dip2px(context, 20)) / 5;
this.context = context;
this.list = list;
this.maxCount = maxCount;
this.mimeType = mimeType;
if (list.size()<maxCount)
list.add("add");
}
public void setMaxCount(int maxCount) {
......@@ -49,11 +62,22 @@ public class MediaChooseAdapter extends RecyclerView.Adapter<MediaChooseAdapter.
this.mimeType = mimeType;
}
public void setRequestCode(int requestCode) {
this.requestCode = requestCode;
}
public void setData(ArrayList<String> list) {
this.list = list;
if (list.size()<maxCount)
list.add("add");
notifyDataSetChanged();
}
public ArrayList<String> getData() {
return this.list;
}
@NonNull
@Override
public Holder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
......@@ -137,7 +161,7 @@ public class MediaChooseAdapter extends RecyclerView.Adapter<MediaChooseAdapter.
.synOrAsy(true);//同步true或异步false 压缩 默认同步、
// .enableCrop(true)//是否裁剪
// .freeStyleCropEnabled(true)
selector.forResult(PictureConfig.CHOOSE_REQUEST);
selector.forResult(requestCode);
}
private String getPath() {
......
baseSDK/src/main/java/com/dayu/utils/GsonUtils.java
package com.dayu.utils;
import android.text.TextUtils;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonParser;
import com.google.gson.reflect.TypeToken;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
......@@ -19,4 +26,47 @@ public class GsonUtils {
}.getType());
return map;
}
/**
* 将对象转换为 JSON String
*/
public static String toJsonStr(final Object object) {
Gson gson = new Gson();
try {
return gson.toJson(object);
} catch (Exception e) {
return "";
}
}
/**
* 将 JSON String 映射为指定类型对象
*/
public static <T> T toBean(final String jsonStr, final Class<T> clazz) {
if (TextUtils.isEmpty(jsonStr))
return null;
Gson gson = new Gson();
try {
return gson.fromJson(jsonStr, clazz);
} catch (Exception e) {
return null;
}
}
/**
* 转成list
*/
public static <T> List<T> toList(String json, Class<T> cls) {
Gson gson = new Gson();
List<T> list = new ArrayList<T>();
JsonArray array = new JsonParser().parse(json).getAsJsonArray();
for(final JsonElement elem : array){
list.add(gson.fromJson(elem, cls));
}
return list;
}
}
build.gradle
......@@ -4,7 +4,7 @@ buildscript {
ext.compile_sdk_version = 27
ext.build_tools_version = "27.0.3"
ext.min_sdk_version = 16
ext.target_sdk_version = 26
ext.target_sdk_version = 25
ext.version_code = 240
ext.verson_name = "dev_2.4.0"
ext.gradle_version = '3.1.4'
......
orderCenter/src/main/debug/AndroidManifest.xml
......@@ -17,7 +17,7 @@
</intent-filter>
</activity>
<activity
android:name=".ui.activity.ApplyAndRefuseActivity"
android:name=".ui.activity.ApplyAndRefuseNewActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.SopWebViewActivity"
......@@ -51,7 +51,7 @@
android:name=".ui.activity.OrderDetailsActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.ReturnPartActivity"
android:name=".ui.activity.ReturnPartNewActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.ServerInstructionActivity"
......
orderCenter/src/main/java/com/dayu/order/api/OrderService.java
......@@ -17,11 +17,11 @@ import com.dayu.order.api.protocol.Pay;
import com.dayu.order.api.protocol.ServerInstruction;
import com.dayu.order.api.protocol.ShipperCompany;
import com.dayu.order.api.protocol.SopItemBean;
import com.dayu.order.api.protocol.SopResult;
import com.dayu.order.api.protocol.Spu;
import com.dayu.order.api.protocol.Tab;
import com.dayu.order.api.protocol.companyManager;
import com.dayu.order.common.OrderConstant;
import com.megvii.idcardlib.util.Constant;
import java.util.List;
......@@ -427,6 +427,12 @@ public interface OrderService {
Observable<BaseResponse<List<SopItemBean>>> getSopItems(@Path("itemId") int itemId);
/**
* 工单sop信息Result
*/
@GET(Constants.API_7200+"/ordersRelationSpuItemSop/sopResult/{itemId}")
Observable<BaseResponse<List<SopResult>>> getSopItemResult(@Path("itemId") int itemId);
/**
* 待接单
*/
@GET(Constants.API_7500+"/ordersStatistics/satisfiedOrders")
......
orderCenter/src/main/java/com/dayu/order/api/protocol/SopItemBean.java
......@@ -24,6 +24,15 @@ public class SopItemBean {
private int status;
private String example;
private boolean showRemark;
private SopResultDetail resultDetail = new SopResultDetail();
public SopResultDetail getResultDetail() {
return resultDetail;
}
public void setResultDetail(SopResultDetail resultDetail) {
this.resultDetail = resultDetail;
}
public boolean isShowRemark() {
return showRemark;
......
orderCenter/src/main/java/com/dayu/order/api/protocol/SopResult.java 0 → 100644
package com.dayu.order.api.protocol;
public class SopResult {
/**
* id : 6654
* ordersRelationSpuItemId : 4681
* spuSopId : 354
* result : [{"status":"success","name":"1584408736285532.png","size":33688,"percentage":100,"uid":1585300725968,"raw":{"uid":1585300725968,"url":"http://dl.kf.ai/test/sp/serviceOrder/sop/8f596d1e1b7e3c8ad23fb78f9bd27074.png?x-oss-process=style/pic"},"url":"http://dl.kf.ai/test/sp/serviceOrder/sop/8f596d1e1b7e3c8ad23fb78f9bd27074.png?x-oss-process=style/pic","response":{"code":0,"subCode":null,"data":"http://dl.kf.ai/test/sp/serviceOrder/sop/8f596d1e1b7e3c8ad23fb78f9bd27074.png?x-oss-process=style/pic","msg":"成功"}}]
* remark : hddjdjfossocksokvskvokzovksockizmvizmvizmivmzcmzicmzmcmzicmzicmizcMozcmzocMozcmzicmsocmoscmsomcosmc
*/
// private int id;
private int ordersRelationSpuItemId;
private int spuSopId;
private String result;
private String remark;
// public int getId() {
// return id;
// }
//
// public void setId(int id) {
// this.id = id;
// }
public int getOrdersRelationSpuItemId() {
return ordersRelationSpuItemId;
}
public void setOrdersRelationSpuItemId(int ordersRelationSpuItemId) {
this.ordersRelationSpuItemId = ordersRelationSpuItemId;
}
public int getSpuSopId() {
return spuSopId;
}
public void setSpuSopId(int spuSopId) {
this.spuSopId = spuSopId;
}
public String getResult() {
return result;
}
public void setResult(String result) {
this.result = result;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
}
orderCenter/src/main/java/com/dayu/order/api/protocol/SopResultDetail.java 0 → 100644
package com.dayu.order.api.protocol;
import java.util.ArrayList;
import java.util.List;
public class SopResultDetail {
public int type;
public ArrayList<String> urls = new ArrayList<>();
public boolean isSelected;
public SopResultDetail() {
}
public SopResultDetail(int type, ArrayList<String> urls) {
this.type = type;
this.urls = urls;
}
}
orderCenter/src/main/java/com/dayu/order/api/protocol/SopResultDetailBean.java 0 → 100644
package com.dayu.order.api.protocol;
public class SopResultDetailBean {
/**
* status : success
* name : 1584408736285532.png
* size : 33688
* percentage : 100
* uid : 1585300725968
* raw : {"uid":1585300725968,"url":"http://dl.kf.ai/test/sp/serviceOrder/sop/8f596d1e1b7e3c8ad23fb78f9bd27074.png?x-oss-process=style/pic"}
* url : http://dl.kf.ai/test/sp/serviceOrder/sop/8f596d1e1b7e3c8ad23fb78f9bd27074.png?x-oss-process=style/pic
* response : {"code":0,"subCode":null,"data":"http://dl.kf.ai/test/sp/serviceOrder/sop/8f596d1e1b7e3c8ad23fb78f9bd27074.png?x-oss-process=style/pic","msg":"成功"}
*/
private String status;
private String name;
private int size;
private int percentage;
private long uid;
private RawBean raw;
private String url;
private ResponseBean response;
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public int getSize() {
return size;
}
public void setSize(int size) {
this.size = size;
}
public int getPercentage() {
return percentage;
}
public void setPercentage(int percentage) {
this.percentage = percentage;
}
public long getUid() {
return uid;
}
public void setUid(long uid) {
this.uid = uid;
}
public RawBean getRaw() {
return raw;
}
public void setRaw(RawBean raw) {
this.raw = raw;
}
public String getUrl() {
return url;
}
public void setUrl(String url) {
this.url = url;
}
public ResponseBean getResponse() {
return response;
}
public void setResponse(ResponseBean response) {
this.response = response;
}
public static class RawBean {
/**
* uid : 1585300725968
* url : http://dl.kf.ai/test/sp/serviceOrder/sop/8f596d1e1b7e3c8ad23fb78f9bd27074.png?x-oss-process=style/pic
*/
private long uid;
private String url;
public long getUid() {
return uid;
}
public void setUid(long uid) {
this.uid = uid;
}
public String getUrl() {
return url;
}
public void setUrl(String url) {
this.url = url;
}
}
public static class ResponseBean {
/**
* code : 0
* subCode : null
* data : http://dl.kf.ai/test/sp/serviceOrder/sop/8f596d1e1b7e3c8ad23fb78f9bd27074.png?x-oss-process=style/pic
* msg : 成功
*/
private int code;
private Object subCode;
private String data;
private String msg;
public int getCode() {
return code;
}
public void setCode(int code) {
this.code = code;
}
public Object getSubCode() {
return subCode;
}
public void setSubCode(Object subCode) {
this.subCode = subCode;
}
public String getData() {
return data;
}
public void setData(String data) {
this.data = data;
}
public String getMsg() {
return msg;
}
public void setMsg(String msg) {
this.msg = msg;
}
}
}
orderCenter/src/main/java/com/dayu/order/api/protocol/Spu.java
......@@ -36,9 +36,66 @@ public class Spu implements Serializable, Parcelable {
*/
private String customerCheckComment;
private List<Pic> listPic;
private List<SpuModels> spuModels;
private Integer needSerialNumPic;//1需要；2不需要.
private String serialNumPicUrl;
public List<SpuModels> getSpuModels() {
return spuModels;
}
public void setSpuModels(List<SpuModels> spuModels) {
this.spuModels = spuModels;
}
public class SpuModels implements Serializable{
private int id;
private int orderRelationSpuId;
private String config;
private String productModel;
private int num;
public int getId() {
return id;
}
public void setId(int id) {
this.id = id;
}
public int getOrderRelationSpuId() {
return orderRelationSpuId;
}
public void setOrderRelationSpuId(int orderRelationSpuId) {
this.orderRelationSpuId = orderRelationSpuId;
}
public String getConfig() {
return config;
}
public void setConfig(String config) {
this.config = config;
}
public String getProductModel() {
return productModel;
}
public void setProductModel(String productModel) {
this.productModel = productModel;
}
public int getNum() {
return num;
}
public void setNum(int num) {
this.num = num;
}
}
public Integer getNeedSerialNumPic() {
return needSerialNumPic;
}
......
orderCenter/src/main/java/com/dayu/order/presenter/orderpart/OrderPartPresenter.java
......@@ -10,8 +10,10 @@ import com.dayu.order.api.OrderApiFactory;
import com.dayu.order.api.protocol.OrderDetail;
import com.dayu.order.api.protocol.OrderPart;
import com.dayu.order.ui.activity.ApplyAndRefuseActivity;
import com.dayu.order.ui.activity.ApplyAndRefuseNewActivity;
import com.dayu.order.ui.activity.LogisticsInfoActivity;
import com.dayu.order.ui.activity.ReturnPartActivity;
import com.dayu.order.ui.activity.ReturnPartNewActivity;
import com.dayu.utils.UIUtils;
import com.dayu.utils.UserManager;
import com.umeng.analytics.MobclickAgent;
......
orderCenter/src/main/java/com/dayu/order/ui/activity/ApplyAndRefuseActivity.java
package com.dayu.order.ui.activity;
import android.text.TextUtils;
import android.view.View;
import com.dayu.base.api.APIService;
import com.dayu.base.api.Api;
import com.dayu.base.api.protocol.TreeAddressBean;
import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.common.Constants;
import com.dayu.order.R;
import com.dayu.order.databinding.ActivityApplyRefuseLayoutBinding;
import com.dayu.order.presenter.commonSubmite.ApplayAndRefusePresenter;
import com.dayu.order.presenter.commonSubmite.ApplyAndRefuseContract;
import com.dayu.widgets.WheelDialog;
import java.util.ArrayList;
import java.util.List;
/**
* Created by luofan
* on 2017/11/8.
* 申请备件
*/
public class ApplyAndRefuseActivity extends BaseActivity<ApplayAndRefusePresenter, ActivityApplyRefuseLayoutBinding>
implements ApplyAndRefuseContract.View {
private String name;
private String phone;
private String provinceName;
private String cityName;
private String areaName;
private String detailAddr;
private int provinceId;
private int cityId;
private int areaId;
private List<TreeAddressBean> provinceList = new ArrayList<>();
private List<TreeAddressBean> cityList = new ArrayList<>();
private List<TreeAddressBean> areaList = new ArrayList<>();
@Override
public int getLayoutId() {
return R.layout.activity_apply_refuse_layout;
......@@ -46,133 +21,9 @@ public class ApplyAndRefuseActivity extends BaseActivity<ApplayAndRefusePresente
@Override
public void initView() {
getTreeAddrData(-1, 1, false);
setListener();
}
private void setListener() {
mBind.tvArea.setOnClickListener(v -> {
if (TextUtils.isEmpty(provinceName)) {
getTreeAddrData(-1, 1, true);
} else if (TextUtils.isEmpty(cityName)) {
getTreeAddrData(provinceId, 2, true);
} else {
getTreeAddrData(cityId, 3, true);
}
});
mBind.tvCity.setOnClickListener(v -> {
if (TextUtils.isEmpty(provinceName)) {
getTreeAddrData(-1, 1, true);
} else {
getTreeAddrData(provinceId, 2, true);
}
});
mBind.tvProvince.setOnClickListener(v -> {
getTreeAddrData(-1, 1, true);
});
}
@Override
public void setPresenter() {
mBind.setPresenter(mPresenter);
}
/**
* 获取地址信息
*
* @param pId
* @param type 1.省 2.市 3.区
* @param showDialog 是否显示选择框
*/
private void getTreeAddrData(int pId, int type, boolean showDialog) {
if (Constants.treeAddressMap.containsKey(pId) && Constants.treeAddressMap.get(pId).size() > 0) {
dealAddrData(type, showDialog, Constants.treeAddressMap.get(pId));
} else {
if (showDialog)
showDialog();
Api.getService(APIService.class).getTreeAddress(pId).compose(Api.applySchedulers())
.safeSubscribe(mPresenter.baseObserver(datas -> {
dealAddrData(type, showDialog, datas);
Constants.treeAddressMap.put(pId, datas);
}));
}
}
//处理获取到地址信息数据
private void dealAddrData(int type, boolean showDialog, List<TreeAddressBean> datas) {
switch (type) {
case 1:
provinceList = datas;
break;
case 2:
cityList = datas;
break;
case 3:
areaList = datas;
break;
}
if (showDialog)
showAddrDialog(type, datas);
}
/**
* 地址选择弹框
*
* @param type
* @param addressList
*/
private void showAddrDialog(int type, List<TreeAddressBean> addressList) {
List<String> addrs = new ArrayList<>();
for (int i = 0; i < addressList.size(); i++) {
addrs.add(addressList.get(i).getText());
}
WheelDialog.getInstance().show(this, addrs, pos -> {
onAddrChoosed(type, pos);
});
}
//选择弹框内的地址后
private void onAddrChoosed(int type, int index) {
switch (type) {
case 1:
if (provinceList.get(index).getText().equals(provinceName))
return;
provinceId = Integer.parseInt(provinceList.get(index).getId());
provinceName = provinceList.get(index).getText();
getTreeAddrData(provinceId, 2, false);
cityList.clear();
areaList.clear();
updateAddressView();
break;
case 2:
if (cityList.get(index).getText().equals(cityName))
return;
cityId = Integer.parseInt(cityList.get(index).getId());
cityName = cityList.get(index).getText();
getTreeAddrData(cityId, 3, false);
areaList.clear();
updateAddressView();
break;
case 3:
if (areaList.get(index).getText().equals(areaName))
return;
areaId = Integer.parseInt(areaList.get(index).getId());
areaName = areaList.get(index).getText();
mBind.tvArea.setText(areaName);
// updateSubmitState();
break;
}
}
//更新选择地址布局显示
private void updateAddressView() {
cityId = cityList.size() > 0 ? cityId : 0;
cityName = cityList.size() > 0 ? cityName : "";
areaId = areaList.size() > 0 ? areaId : 0;
areaName = areaList.size() > 0 ? areaName : "";
mBind.tvProvince.setText(provinceName);
mBind.tvCity.setText(cityName);
mBind.tvArea.setText(areaName);
// updateSubmitState();
}
}
orderCenter/src/main/java/com/dayu/order/ui/activity/ApplyAndRefuseNewActivity.java 0 → 100644
package com.dayu.order.ui.activity;
import android.text.TextUtils;
import com.dayu.base.api.APIService;
import com.dayu.base.api.Api;
import com.dayu.base.api.protocol.TreeAddressBean;
import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.common.Constants;
import com.dayu.order.R;
import com.dayu.order.databinding.ActivityApplyRefuseNewBinding;
import com.dayu.order.presenter.commonSubmite.ApplayAndRefusePresenter;
import com.dayu.order.presenter.commonSubmite.ApplyAndRefuseContract;
import com.dayu.widgets.WheelDialog;
import java.util.ArrayList;
import java.util.List;
/**
* Created by luofan
* on 2017/11/8.
* 申请备件
*/
public class ApplyAndRefuseNewActivity extends BaseActivity<ApplayAndRefusePresenter, ActivityApplyRefuseNewBinding>
implements ApplyAndRefuseContract.View {
private String name;
private String phone;
private String provinceName;
private String cityName;
private String areaName;
private String detailAddr;
private int provinceId;
private int cityId;
private int areaId;
private List<TreeAddressBean> provinceList = new ArrayList<>();
private List<TreeAddressBean> cityList = new ArrayList<>();
private List<TreeAddressBean> areaList = new ArrayList<>();
@Override
public int getLayoutId() {
return R.layout.activity_apply_refuse_new;
}
@Override
public void initView() {
getTreeAddrData(-1, 1, false);
setListener();
}
private void setListener() {
mBind.tvArea.setOnClickListener(v -> {
if (TextUtils.isEmpty(provinceName)) {
getTreeAddrData(-1, 1, true);
} else if (TextUtils.isEmpty(cityName)) {
getTreeAddrData(provinceId, 2, true);
} else {
getTreeAddrData(cityId, 3, true);
}
});
mBind.tvCity.setOnClickListener(v -> {
if (TextUtils.isEmpty(provinceName)) {
getTreeAddrData(-1, 1, true);
} else {
getTreeAddrData(provinceId, 2, true);
}
});
mBind.tvProvince.setOnClickListener(v -> {
getTreeAddrData(-1, 1, true);
});
}
@Override
public void setPresenter() {
mBind.setPresenter(mPresenter);
}
/**
* 获取地址信息
*
* @param pId
* @param type 1.省 2.市 3.区
* @param showDialog 是否显示选择框
*/
private void getTreeAddrData(int pId, int type, boolean showDialog) {
if (Constants.treeAddressMap.containsKey(pId) && Constants.treeAddressMap.get(pId).size() > 0) {
dealAddrData(type, showDialog, Constants.treeAddressMap.get(pId));
} else {
if (showDialog)
showDialog();
Api.getService(APIService.class).getTreeAddress(pId).compose(Api.applySchedulers())
.safeSubscribe(mPresenter.baseObserver(datas -> {
dealAddrData(type, showDialog, datas);
Constants.treeAddressMap.put(pId, datas);
}));
}
}
//处理获取到地址信息数据
private void dealAddrData(int type, boolean showDialog, List<TreeAddressBean> datas) {
switch (type) {
case 1:
provinceList = datas;
break;
case 2:
cityList = datas;
break;
case 3:
areaList = datas;
break;
}
if (showDialog)
showAddrDialog(type, datas);
}
/**
* 地址选择弹框
*
* @param type
* @param addressList
*/
private void showAddrDialog(int type, List<TreeAddressBean> addressList) {
List<String> addrs = new ArrayList<>();
for (int i = 0; i < addressList.size(); i++) {
addrs.add(addressList.get(i).getText());
}
WheelDialog.getInstance().show(this, addrs, pos -> {
onAddrChoosed(type, pos);
});
}
//选择弹框内的地址后
private void onAddrChoosed(int type, int index) {
switch (type) {
case 1:
if (provinceList.get(index).getText().equals(provinceName))
return;
provinceId = Integer.parseInt(provinceList.get(index).getId());
provinceName = provinceList.get(index).getText();
getTreeAddrData(provinceId, 2, false);
cityList.clear();
areaList.clear();
updateAddressView();
break;
case 2:
if (cityList.get(index).getText().equals(cityName))
return;
cityId = Integer.parseInt(cityList.get(index).getId());
cityName = cityList.get(index).getText();
getTreeAddrData(cityId, 3, false);
areaList.clear();
updateAddressView();
break;
case 3:
if (areaList.get(index).getText().equals(areaName))
return;
areaId = Integer.parseInt(areaList.get(index).getId());
areaName = areaList.get(index).getText();
mBind.tvArea.setText(areaName);
// updateSubmitState();
break;
}
}
//更新选择地址布局显示
private void updateAddressView() {
cityId = cityList.size() > 0 ? cityId : 0;
cityName = cityList.size() > 0 ? cityName : "";
areaId = areaList.size() > 0 ? areaId : 0;
areaName = areaList.size() > 0 ? areaName : "";
mBind.tvProvince.setText(provinceName);
mBind.tvCity.setText(cityName);
mBind.tvArea.setText(areaName);
// updateSubmitState();
}
}
orderCenter/src/main/java/com/dayu/order/ui/activity/ReturnPartActivity.java
package com.dayu.order.ui.activity;
import android.content.Intent;
import android.view.View;
import com.bigkoo.pickerview.builder.OptionsPickerBuilder;
import com.bigkoo.pickerview.listener.OnOptionsSelectListener;
import com.bigkoo.pickerview.view.OptionsPickerView;
......@@ -11,19 +8,12 @@ import com.dayu.order.R;
import com.dayu.order.databinding.ActivityReturnPartBinding;
import com.dayu.order.presenter.returnpart.ReturnPartContract;
import com.dayu.order.presenter.returnpart.ReturnPartPresenter;
import com.dayu.utils.GlideImageLoader;
import com.dayu.utils.UIUtils;
import com.google.zxing.integration.android.IntentIntegrator;
import com.google.zxing.integration.android.IntentResult;
import com.luck.picture.lib.PictureSelector;
import com.luck.picture.lib.config.PictureConfig;
import com.luck.picture.lib.entity.LocalMedia;
import java.util.List;
/**
* Created by luofan on 2018/1/20.
* 寄回备件
*/
public class ReturnPartActivity extends BaseActivity<ReturnPartPresenter, ActivityReturnPartBinding> implements ReturnPartContract.View {
......@@ -34,9 +24,7 @@ public class ReturnPartActivity extends BaseActivity<ReturnPartPresenter, Activi
@Override
public void initView() {
mBind.scan.setOnClickListener(v ->
new IntentIntegrator(this).setOrientationLocked(false)
.setCaptureActivity(CustomScannerActivity.class).initiateScan());
}
@Override
......@@ -59,18 +47,4 @@ public class ReturnPartActivity extends BaseActivity<ReturnPartPresenter, Activi
public void hideInput() {
UIUtils.hideInput(mActivity);
}
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
IntentResult result = IntentIntegrator.parseActivityResult(requestCode, resultCode, data);
if (result != null && requestCode == IntentIntegrator.REQUEST_CODE) {
if (result.getContents() == null) {
// toast = "Cancelled from fragment";
} else {
mBind.edtTransCode.setText(result.getContents());
}
return;
}
}
}
orderCenter/src/main/java/com/dayu/order/ui/activity/ReturnPartNewActivity.java 0 → 100644
package com.dayu.order.ui.activity;
import android.content.Intent;
import com.bigkoo.pickerview.builder.OptionsPickerBuilder;
import com.bigkoo.pickerview.listener.OnOptionsSelectListener;
import com.bigkoo.pickerview.view.OptionsPickerView;
import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.order.R;
import com.dayu.order.databinding.ActivityReturnPartNewBinding;
import com.dayu.order.presenter.returnpart.ReturnPartContract;
import com.dayu.order.presenter.returnpart.ReturnPartPresenter;
import com.dayu.utils.UIUtils;
import com.google.zxing.integration.android.IntentIntegrator;
import com.google.zxing.integration.android.IntentResult;
import java.util.List;
/**
* Created by luofan on 2018/1/20.
* 寄回备件
*/
public class ReturnPartNewActivity extends BaseActivity<ReturnPartPresenter, ActivityReturnPartNewBinding> implements ReturnPartContract.View {
@Override
public int getLayoutId() {
return R.layout.activity_return_part_new;
}
@Override
public void initView() {
mBind.scan.setOnClickListener(v ->
new IntentIntegrator(this).setOrientationLocked(false)
.setCaptureActivity(CustomScannerActivity.class).initiateScan());
}
@Override
public void setPresenter() {
mBind.setPresenter(mPresenter);
}
@Override
public void showCouriesDialog(List<String> cardItem, OnOptionsSelectListener listener) {
//条件选择器
OptionsPickerView pvOptions = new OptionsPickerBuilder(this, listener)
.setContentTextSize(18)
.setLineSpacingMultiplier(2.0f)
.build();
pvOptions.setPicker(cardItem);
pvOptions.show();
}
@Override
public void hideInput() {
UIUtils.hideInput(mActivity);
}
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
IntentResult result = IntentIntegrator.parseActivityResult(requestCode, resultCode, data);
if (result != null && requestCode == IntentIntegrator.REQUEST_CODE) {
if (result.getContents() == null) {
// toast = "Cancelled from fragment";
} else {
mBind.edtTransCode.setText(result.getContents());
}
return;
}
}
}
orderCenter/src/main/java/com/dayu/order/ui/activity/SopWebViewActivity.java
......@@ -69,8 +69,8 @@ public class SopWebViewActivity extends BaseActivity<SopPresenter,ActivitySopWeb
public void onCreate(Bundle savedInstanceState) {
Bundle bundle = getIntent().getBundleExtra(Constants.BUNDLE);
mOrderId = bundle.getInt(Constants.ORDER_ID, 0);
SopLocalActivity.launch(this,mOrderId);
finish();
// SopLocalActivity.launch(this,mOrderId);
// finish();
super.onCreate(savedInstanceState);
}
......
orderCenter/src/main/java/com/dayu/order/ui/fragment/MultiOrderDetailFragment.java
......@@ -20,6 +20,7 @@ import com.dayu.order.common.OrderConstant;
import com.dayu.order.databinding.FragmentMultiDetailBinding;
import com.dayu.order.databinding.FragmentOrderDatailsBinding;
import com.dayu.order.databinding.ItemAccessoriesLayoutBinding;
import com.dayu.order.databinding.ItemDetailDeviceCountBinding;
import com.dayu.order.databinding.ItemDetailServerInfoBinding;
import com.dayu.order.ui.activity.PdfWebViewActivity;
import com.dayu.order.ui.activity.QrCodeActivity;
......@@ -48,6 +49,7 @@ import java.util.List;
public class MultiOrderDetailFragment extends DataBindingFragment<FragmentMultiDetailBinding> {
private CoreAdapter<Spu, ItemDetailServerInfoBinding> mServerAdapter;
private CoreAdapter<Spu.SpuModels, ItemDetailDeviceCountBinding> mDeviceAdapter;
private CoreAdapter mFujianAdapter;
private boolean mFlag = true;
List<String> phones = new ArrayList<>();
......@@ -61,6 +63,11 @@ public class MultiOrderDetailFragment extends DataBindingFragment<FragmentMultiD
}
@Override
public int getLayoutId() {
return R.layout.fragment_multi_detail;
}
@Override
public void initView() {
EventBus.getDefault().register(this);
setListenter();
......@@ -71,6 +78,20 @@ public class MultiOrderDetailFragment extends DataBindingFragment<FragmentMultiD
mServerAdapter.setViewType(R.layout.item_detail_server_info);
mBind.rlServerContent.setAdapter(mServerAdapter);
mServerAdapter.setData(detail.getSpus());
//设备数量
if (detail.getSpus() != null && detail.getSpus().size()>0 && detail.getSpus().get(0).getSpuModels()!= null){
mBind.rlDeviceCount.setVisibility(View.VISIBLE);
mBind.tvNoDevice.setVisibility(View.GONE);
mDeviceAdapter = new CoreAdapter<>(false);
mBind.rlDeviceCount.setLayoutManager(new LinearLayoutManager(mActivity));
mDeviceAdapter.setViewType(R.layout.item_detail_device_count);
mBind.rlDeviceCount.setAdapter(mDeviceAdapter);
mDeviceAdapter.setData(detail.getSpus().get(0).getSpuModels());
}else{
mBind.rlDeviceCount.setVisibility(View.GONE);
mBind.tvNoDevice.setVisibility(View.VISIBLE);
}
mBind.navigation.setOnClickListener(v -> LocationUtils.openMap(mActivity, detail.getProvinceName()
+ detail.getCityName() + detail.getDistrictName() + detail.getAddress(), this::showOpenMarketDialog));
// mServerAdapter.setOnItemClickListener(new OnItemClickListener<Spu, ItemDetailServerInfoBinding>() {
......@@ -195,10 +216,6 @@ public class MultiOrderDetailFragment extends DataBindingFragment<FragmentMultiD
}
}
@Override
public int getLayoutId() {
return R.layout.fragment_multi_detail;
}
public void imgMax(String url) {
LayoutInflater inflater = LayoutInflater.from(mActivity);
......
orderCenter/src/main/release/AndroidManifest.xml
......@@ -9,7 +9,7 @@
android:name=".ui.activity.TestActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.ApplyAndRefuseActivity"
android:name=".ui.activity.ApplyAndRefuseNewActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.SopWebViewActivity"
......@@ -47,7 +47,7 @@
android:windowSoftInputMode="adjustResize"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.ReturnPartActivity"
android:name=".ui.activity.ReturnPartNewActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.ServerInstructionActivity"
......@@ -91,6 +91,12 @@
<activity
android:name=".ui.activity.SopLocalActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.ApplyAndRefuseActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.ReturnPartActivity"
android:screenOrientation="portrait" />
</application>
</manifest>
orderCenter/src/main/res/layout/activity_apply_refuse_layout.xml
......@@ -12,9 +12,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/cl_white"
android:orientation="vertical"
android:padding="1dp">
android:background="@color/cl_home_listview_bg"
android:orientation="vertical">
<RelativeLayout
android:id="@+id/title_idea"
......@@ -28,7 +27,8 @@
<ImageView
android:id="@+id/title_back"
style="@style/title_image_back"
android:onClick="@{()->presenter.dumpBack()}" />
android:onClick="@{()->presenter.dumpBack()}"
/>
<TextView
android:id="@+id/tv_right_title"
......@@ -36,167 +36,26 @@
android:onClick="@{()->presenter.commite()}"
android:text="@string/submit"
android:textColor="@color/cl_home_button"
android:textSize="15sp"
android:visibility="gone" />
android:textSize="15sp" />
</RelativeLayout>
<ImageView style="@style/card_line" />
<android.support.v4.widget.NestedScrollView
<EditText
android:id="@+id/et_content"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:orientation="vertical">
<TextView
style="@style/common_text_style"
android:layout_marginTop="5dp"
android:drawableLeft="@drawable/icon_star_necessary"
android:text="@string/part_material_list" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_marginTop="5dp"
android:orientation="horizontal">
<TextView
style="@style/sale_item_text"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="3"
android:background="@drawable/bg_order_step_title1"
android:gravity="center"
android:text="@string/part_model_config" />
<TextView
style="@style/sale_item_text"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@drawable/bg_order_step_title3"
android:gravity="center"
android:text="@string/count_str" />
</LinearLayout>
<TextView
android:id="@+id/apply_part"
android:layout_width="50dp"
android:layout_height="40dp"
android:layout_marginTop="5dp"
android:background="@drawable/btn_blue_commom"
android:gravity="center"
android:text="+"
android:textColor="@color/white"
android:textSize="26sp" />
<TextView
style="@style/common_text_style"
android:layout_marginTop="15dp"
android:layout_marginBottom="5dp"
android:text="@string/part_apply_reason" />
<EditText
android:id="@+id/et_content"
android:layout_width="match_parent"
android:layout_height="80dp"
android:layout_gravity="center"
android:background="@drawable/bg_input_gray_react"
android:gravity="top"
android:hint="@{presenter.mHint}"
android:padding="10dp"
android:text="@={presenter.mComment}"
android:textColor="@color/cl_home_title_text_color"
android:textColorHint="@color/cl_selector_hui"
android:textSize="@dimen/sp_13.3" />
<LinearLayout
style="@style/ll_part_bottom">
<TextView
style="@style/part_left_text"
android:drawableLeft="@drawable/icon_star_necessary"
android:text="@string/part_receiver_addr" />
android:layout_height="@dimen/dp_163"
android:layout_gravity="center"
android:background="@color/white"
android:gravity="top"
android:hint="@{presenter.mHint}"
android:paddingLeft="@dimen/dp_13"
android:paddingTop="@dimen/dp_17"
android:text="@={presenter.mComment}"
android:textColor="@color/cl_home_title_text_color"
android:textColorHint="@color/cl_selector_hui"
android:textSize="@dimen/sp_13.3" />
<TextView
android:id="@+id/tv_province"
style="@style/part_select_addr"
android:hint="@string/province_str" />
<TextView
android:id="@+id/tv_city"
style="@style/part_select_addr"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:hint="@string/city_str" />
<TextView
android:id="@+id/tv_area"
style="@style/part_select_addr"
android:hint="@string/zone_str" />
</LinearLayout>
<EditText
android:id="@+id/edt_detail_addr"
style="@style/part_addr_edit"
android:layout_marginLeft="80dp"
android:layout_marginTop="10dp"
android:hint="@string/customer_detail_address" />
<LinearLayout
style="@style/ll_part_bottom">
<TextView
style="@style/part_left_text"
android:drawableLeft="@drawable/icon_star_necessary"
android:text="@string/part_receiver_addr" />
<EditText
android:id="@+id/edt_name"
style="@style/part_addr_edit"
android:hint="@string/str_name" />
</LinearLayout>
<LinearLayout
style="@style/ll_part_bottom">
<TextView
style="@style/part_left_text"
android:drawableLeft="@drawable/icon_star_necessary"
android:text="@string/part_receiver_addr" />
<EditText
android:id="@+id/edt_phone"
style="@style/part_addr_edit"
android:hint="@string/ka_address_mobile" />
</LinearLayout>
</LinearLayout>
</android.support.v4.widget.NestedScrollView>
<TextView
android:id="@+id/tv_submit"
android:layout_width="match_parent"
android:layout_height="45dp"
android:gravity="center"
android:textColor="@color/white"
android:textSize="@dimen/sp_16"
android:background="@drawable/btn_blue_commom"
android:text="@string/submit_part_apply"
android:layout_marginLeft="40dp"
android:layout_marginRight="40dp"
android:layout_marginBottom="20dp"
android:layout_marginTop="15dp"
/>
</LinearLayout>
</layout>
\ No newline at end of file
orderCenter/src/main/res/layout/activity_apply_refuse_new.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android">
<data>
<variable
name="presenter"
type="com.dayu.order.presenter.commonSubmite.ApplayAndRefusePresenter" />
</data>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/cl_white"
android:orientation="vertical"
android:padding="1dp">
<RelativeLayout
android:id="@+id/title_idea"
style="@style/title">
<TextView
android:id="@+id/text_idea"
style="@style/text_title"
android:text="@={presenter.mTitle}" />
<ImageView
android:id="@+id/title_back"
style="@style/title_image_back"
android:onClick="@{()->presenter.dumpBack()}" />
<TextView
android:id="@+id/tv_right_title"
style="@style/title_right_text"
android:onClick="@{()->presenter.commite()}"
android:text="@string/submit"
android:textColor="@color/cl_home_button"
android:textSize="15sp"
android:visibility="gone" />
</RelativeLayout>
<ImageView style="@style/card_line" />
<android.support.v4.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:orientation="vertical">
<TextView
style="@style/common_text_style"
android:layout_marginTop="5dp"
android:drawableLeft="@drawable/icon_star_necessary"
android:text="@string/part_material_list" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_marginTop="5dp"
android:orientation="horizontal">
<TextView
style="@style/sale_item_text"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="3"
android:background="@drawable/bg_order_step_title1"
android:gravity="center"
android:text="@string/part_model_config" />
<TextView
style="@style/sale_item_text"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@drawable/bg_order_step_title3"
android:gravity="center"
android:text="@string/count_str" />
</LinearLayout>
<TextView
android:id="@+id/apply_part"
android:layout_width="50dp"
android:layout_height="40dp"
android:layout_marginTop="5dp"
android:background="@drawable/btn_blue_commom"
android:gravity="center"
android:text="+"
android:textColor="@color/white"
android:textSize="26sp" />
<TextView
style="@style/common_text_style"
android:layout_marginTop="15dp"
android:layout_marginBottom="5dp"
android:text="@string/part_apply_reason" />
<EditText
android:id="@+id/et_content"
android:layout_width="match_parent"
android:layout_height="80dp"
android:layout_gravity="center"
android:background="@drawable/bg_input_gray_react"
android:gravity="top"
android:hint="@{presenter.mHint}"
android:padding="10dp"
android:text="@={presenter.mComment}"
android:textColor="@color/cl_home_title_text_color"
android:textColorHint="@color/cl_selector_hui"
android:textSize="@dimen/sp_13.3" />
<LinearLayout
style="@style/ll_part_bottom">
<TextView
style="@style/part_left_text"
android:drawableLeft="@drawable/icon_star_necessary"
android:text="@string/part_receiver_addr" />
<TextView
android:id="@+id/tv_province"
style="@style/part_select_addr"
android:hint="@string/province_str" />
<TextView
android:id="@+id/tv_city"
style="@style/part_select_addr"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:hint="@string/city_str" />
<TextView
android:id="@+id/tv_area"
style="@style/part_select_addr"
android:hint="@string/zone_str" />
</LinearLayout>
<EditText
android:id="@+id/edt_detail_addr"
style="@style/part_addr_edit"
android:layout_marginLeft="80dp"
android:layout_marginTop="10dp"
android:hint="@string/customer_detail_address" />
<LinearLayout
style="@style/ll_part_bottom">
<TextView
style="@style/part_left_text"
android:drawableLeft="@drawable/icon_star_necessary"
android:text="@string/part_receiver_addr" />
<EditText
android:id="@+id/edt_name"
style="@style/part_addr_edit"
android:hint="@string/str_name" />
</LinearLayout>
<LinearLayout
style="@style/ll_part_bottom">
<TextView
style="@style/part_left_text"
android:drawableLeft="@drawable/icon_star_necessary"
android:text="@string/part_receiver_addr" />
<EditText
android:id="@+id/edt_phone"
style="@style/part_addr_edit"
android:hint="@string/ka_address_mobile" />
</LinearLayout>
</LinearLayout>
</android.support.v4.widget.NestedScrollView>
<TextView
android:id="@+id/tv_submit"
android:layout_width="match_parent"
android:layout_height="45dp"
android:gravity="center"
android:textColor="@color/white"
android:textSize="@dimen/sp_16"
android:background="@drawable/btn_blue_commom"
android:text="@string/submit_part_apply"
android:layout_marginLeft="40dp"
android:layout_marginRight="40dp"
android:layout_marginBottom="20dp"
android:layout_marginTop="15dp"
/>
</LinearLayout>
</layout>
\ No newline at end of file
orderCenter/src/main/res/layout/activity_return_part_new.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android">
<data>
<variable
name="presenter"
type="com.dayu.order.presenter.returnpart.ReturnPartPresenter" />
<import type="android.text.TextUtils" />
</data>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/cl_white"
android:orientation="vertical">
<RelativeLayout
android:id="@+id/title_back"
style="@style/title">
<TextView
android:id="@+id/tv_title"
style="@style/text_title"
android:text="@string/return_order_part_title" />
<ImageView
android:id="@+id/receiving_back"
style="@style/title_image_back"
android:onClick="@{()->presenter.dumpBack()}" />
<TextView
android:id="@+id/tv_right_title"
style="@style/title_right_text"
android:onClick="@{()->presenter.retrunPart()}"
android:text="@string/submit"
android:textColor="@color/cl_home_button"
android:textSize="15sp"
android:visibility="gone" />
</RelativeLayout>
<ImageView style="@style/card_line" />
<android.support.v4.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:orientation="vertical">
<TextView
style="@style/common_text_style"
android:layout_marginTop="5dp"
android:drawableLeft="@drawable/icon_star_necessary"
android:text="@string/part_material_list" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_marginTop="5dp"
android:orientation="horizontal">
<TextView
style="@style/sale_item_text"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="3"
android:background="@drawable/bg_order_step_title1"
android:gravity="center"
android:text="@string/part_model_config" />
<TextView
style="@style/sale_item_text"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@drawable/bg_order_step_title3"
android:gravity="center"
android:text="@string/count_str" />
</LinearLayout>
<TextView
android:id="@+id/apply_part"
android:layout_width="50dp"
android:layout_height="40dp"
android:layout_marginTop="5dp"
android:background="@drawable/btn_blue_commom"
android:gravity="center"
android:text="+"
android:textColor="@color/white"
android:textSize="26sp" />
<TextView
style="@style/common_text_style"
android:layout_marginTop="15dp"
android:layout_marginBottom="5dp"
android:text="@string/remark_order" />
<EditText
android:id="@+id/et_content"
android:layout_width="match_parent"
android:layout_height="80dp"
android:layout_gravity="center"
android:background="@drawable/bg_input_gray_react"
android:gravity="top"
android:hint="@string/part_remart_hint"
android:padding="10dp"
android:textColor="@color/cl_home_title_text_color"
android:textColorHint="@color/cl_selector_hui"
android:textSize="@dimen/sp_13.3" />
<LinearLayout style="@style/ll_part_bottom">
<TextView
style="@style/part_left_text"
android:text="@string/part_comany_name" />
<TextView
android:id="@+id/tv_company_name"
style="@style/common_text_style" />
</LinearLayout>
<LinearLayout style="@style/ll_part_bottom">
<TextView
style="@style/part_left_text"
android:text="@string/part_comany_addr" />
<TextView
android:id="@+id/tv_company_addr"
style="@style/common_text_style" />
</LinearLayout>
<LinearLayout style="@style/ll_part_bottom">
<TextView
style="@style/part_left_text"
android:text="@string/part_comany_contacter" />
<TextView
android:id="@+id/tv_company_contacter"
style="@style/common_text_style" />
</LinearLayout>
<LinearLayout style="@style/ll_part_bottom">
<TextView
style="@style/part_left_text"
android:drawableLeft="@drawable/icon_star_necessary"
android:text="@string/part_trans_code" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="35dp"
android:orientation="horizontal"
android:background="@drawable/bg_input_gray_react"
android:gravity="center_vertical"
>
<EditText
android:id="@+id/edt_trans_code"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="match_parent"
android:background="@color/transparent"
android:padding="5dp"
android:singleLine="true"
android:text="@={presenter.courierNum}" />
<ImageView
android:id="@+id/scan"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="15dp"
android:src="@drawable/icon_scan" />
</LinearLayout>
</LinearLayout>
<LinearLayout style="@style/ll_part_bottom">
<TextView
style="@style/part_left_text"
android:drawableLeft="@drawable/icon_star_necessary"
android:text="@string/part_trans_company" />
<TextView
android:id="@+id/tv_trans_company"
style="@style/common_text_style"
android:layout_width="match_parent"
android:layout_height="35dp"
android:background="@drawable/btn_gray_commom"
android:drawableRight="@drawable/icon_arrow_right_gray32"
android:gravity="center"
android:hint="@string/setlect_trans_company_hint"
android:onClick="@{()->presenter.getCourier()}"
android:paddingRight="5dp"
android:text="@={presenter.courierCompany}" />
</LinearLayout>
</LinearLayout>
</android.support.v4.widget.NestedScrollView>
<TextView
android:id="@+id/tv_submit"
android:layout_width="match_parent"
android:layout_height="45dp"
android:layout_marginLeft="40dp"
android:layout_marginTop="15dp"
android:layout_marginRight="40dp"
android:layout_marginBottom="20dp"
android:background="@drawable/btn_blue_commom"
android:gravity="center"
android:text="@string/notify_comany_receive"
android:textColor="@color/white"
android:textSize="@dimen/sp_16" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:drawableLeft="@drawable/icon_ka_address"
android:drawablePadding="4dp"
android:onClick="@{()->presenter.dumpToKaInfo()}"
android:paddingTop="@dimen/dp_20"
android:paddingRight="@dimen/dp_15"
android:text="厂商收货信息"
android:textColor="#FF3FAAFC"
android:textSize="14sp"
android:visibility="gone" />
</LinearLayout>
</layout>
\ No newline at end of file
orderCenter/src/main/res/layout/activity_sop_local.xml
......@@ -36,8 +36,42 @@
<android.support.v7.widget.RecyclerView
android:id="@+id/rv_sop"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:overScrollMode="never" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="10dp"
android:layout_marginBottom="20dp"
android:orientation="horizontal">
<Button
android:id="@+id/btn_cancel"
android:layout_width="0dp"
android:layout_height="35dp"
android:layout_marginLeft="30dp"
android:layout_weight="1"
android:background="@drawable/tab_gray_react"
android:onClick="onClick"
android:text="@string/cancle"
android:textColor="#8b8b8b" />
<Button
android:id="@+id/btn_submit"
android:layout_width="0dp"
android:layout_height="35dp"
android:layout_marginLeft="30dp"
android:layout_marginRight="30dp"
android:layout_weight="1"
android:background="@drawable/tab_blue_react"
android:onClick="onClick"
android:text="@string/save_str"
android:textColor="@color/white" />
</LinearLayout>
</LinearLayout>
</layout>
\ No newline at end of file
orderCenter/src/main/res/layout/fragment_multi_detail.xml
......@@ -142,23 +142,34 @@
android:textColor="@color/tv_cl"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_device_count"
android:layout_width="wrap_content"
<RelativeLayout
android:id="@+id/ll_device_count"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/ll_server_content"
android:layout_below="@id/ll_server_content"
android:layout_marginLeft="19dp"
android:layout_marginTop="15dp"
android:layout_toRightOf="@+id/tv_device_count_"
android:text='@{!TextUtils.isEmpty(item.productModel)?item.productModel:@string/no_data}'
android:textColor="@color/cl_home_title_text_color"
android:textSize="14sp" />
android:layout_toRightOf="@+id/tv_content">
<TextView
android:id="@+id/tv_no_device"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/no_data"
android:textColor="@color/cl_home_title_text_color"
android:textSize="14sp" />
<android.support.v7.widget.RecyclerView
android:id="@+id/rl_device_count"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</RelativeLayout>
<TextView
android:id="@+id/tv_remark"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_device_count"
android:layout_below="@+id/ll_device_count"
android:layout_marginTop="15dp"
android:text="@string/order_remark"
android:textColor="@color/tv_cl"
......@@ -169,7 +180,7 @@
android:id="@+id/rl_info_detail"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_device_count"
android:layout_below="@+id/ll_device_count"
android:layout_marginLeft="19dp"
android:layout_marginTop="@dimen/dp_15"
android:layout_toRightOf="@+id/tv_remark">
......
orderCenter/src/main/res/layout/item_detail_device_count.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android">
<data>
<variable
name="item"
type="com.dayu.order.api.protocol.Spu.SpuModels" />
</data>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginRight="15dp"
android:orientation="horizontal">
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1">
<TextView
android:id="@+id/tv_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:text='@{item.productModel}'
android:maxLines="1"
android:maxEms="12"
android:textColor="@color/cl_home_title_text_color"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:text='@{"x"+item.num}'
android:paddingLeft="3dp"
android:textColor="@color/cl_home_title_text_color"
android:textSize="14sp" />
</LinearLayout>
</LinearLayout>
</layout>
\ No newline at end of file
orderCenter/src/main/res/layout/item_multi_process_foot.xml
......@@ -530,7 +530,7 @@
android:id="@+id/rl_signature_all"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone">
>
<RelativeLayout
android:id="@+id/rl_signature_title"
......
orderCenter/src/main/res/layout/item_sop_local.xml
......@@ -62,14 +62,14 @@
android:orientation="horizontal"
>
<RadioButton
android:id="@+id/cb_yes"
android:id="@+id/rb_yes"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:text="@string/yes_str"
/>
<RadioButton
android:id="@+id/cb_no"
android:id="@+id/rb_no"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
......
settings.gradle
......@@ -8,4 +8,4 @@ include ':app', ':saleCenter',
':locationComponent',
':pickerview',
':wheelview',
':IDCardLib'
':IDCardLib', ':umeng'
umeng/AndroidManifest.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.umeng.message.lib"
android:versionCode="1"
android:versionName="1.0">
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
<uses-permission android:name="android.permission.BROADCAST_PACKAGE_ADDED" />
<uses-permission android:name="android.permission.BROADCAST_PACKAGE_CHANGED" />
<uses-permission android:name="android.permission.BROADCAST_PACKAGE_INSTALL" />
<uses-permission android:name="android.permission.BROADCAST_PACKAGE_REPLACED" />
<uses-permission android:name="android.permission.RESTART_PACKAGES" />
<uses-permission android:name="android.permission.GET_TASKS" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
<application>
<service
android:name="com.taobao.accs.ChannelService"
android:exported="true"
android:process=":channel">
<intent-filter>
<action android:name="com.taobao.accs.intent.action.SERVICE" />
</intent-filter>
<intent-filter>
<action android:name="com.taobao.accs.intent.action.ELECTION" />
</intent-filter>
</service>
<service
android:name="com.taobao.accs.data.MsgDistributeService"
android:exported="true">
<intent-filter>
<action android:name="com.taobao.accs.intent.action.RECEIVE" />
</intent-filter>
</service>
<receiver
android:name="com.taobao.accs.EventReceiver"
android:process=":channel">
<intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED" />
</intent-filter>
<intent-filter>
<action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.PACKAGE_REMOVED" />
<data android:scheme="package" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.USER_PRESENT" />
</intent-filter>
</receiver>
<receiver
android:name="com.taobao.accs.ServiceReceiver"
android:process=":channel">
<intent-filter>
<action android:name="com.taobao.accs.intent.action.COMMAND" />
</intent-filter>
<intent-filter>
<action android:name="com.taobao.accs.intent.action.START_FROM_AGOO" />
</intent-filter>
</receiver>
<service
android:name="com.taobao.accs.internal.AccsJobService"
android:permission="android.permission.BIND_JOB_SERVICE"
android:process=":channel"/>
<service
android:name="com.taobao.accs.ChannelService$KernelService"
android:process=":channel" />
<service
android:name="org.android.agoo.accs.AgooService"
android:exported="true">
<intent-filter>
<action android:name="com.taobao.accs.intent.action.RECEIVE" />
</intent-filter>
</service>
<service
android:name="com.umeng.message.UmengIntentService"
android:exported="true"
android:process=":channel">
<intent-filter>
<action android:name="org.agoo.android.intent.action.RECEIVE" />
</intent-filter>
</service>
<service
android:name="com.umeng.message.XiaomiIntentService"
android:exported="true"
android:process=":channel">
<intent-filter>
<action android:name="org.agoo.android.intent.action.RECEIVE" />
</intent-filter>
</service>
<receiver
android:name="com.taobao.agoo.AgooCommondReceiver"
android:exported="true"
android:process=":channel">
<intent-filter>
<action android:name="com.dayu.bigfish.intent.action.COMMAND" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.PACKAGE_REMOVED" />
<data android:scheme="package" />
</intent-filter>
</receiver>
<service
android:name="com.umeng.message.UmengMessageIntentReceiverService"
android:exported="true"
android:process=":channel">
<intent-filter>
<action android:name="org.android.agoo.client.MessageReceiverService" />
</intent-filter>
</service>
<receiver
android:name="com.umeng.message.NotificationProxyBroadcastReceiver"
android:exported="false" />
<service
android:name="com.umeng.message.UmengMessageCallbackHandlerService"
android:permission="android.permission.BIND_JOB_SERVICE"
android:exported="false">
<intent-filter>
<action android:name="com.umeng.messge.registercallback.action" />
</intent-filter>
<intent-filter>
<action android:name="com.umeng.message.enablecallback.action" />
</intent-filter>
<intent-filter>
<action android:name="com.umeng.message.disablecallback.action" />
</intent-filter>
<intent-filter>
<action android:name="com.umeng.message.message.handler.action" />
</intent-filter>
<intent-filter>
<action android:name="com.umeng.message.message.sendmessage.action" />
</intent-filter>
</service>
<service
android:name="com.umeng.message.UmengDownloadResourceService"
android:permission="android.permission.BIND_JOB_SERVICE"
android:exported="false" />
<provider
android:name="com.umeng.message.provider.MessageProvider"
android:authorities="com.dayu.bigfish.umeng.message"
android:exported="false">
<grant-uri-permission android:pathPattern=".*" />
</provider>
</application>
</manifest>
\ No newline at end of file
umeng/build.gradle 0 → 100644
apply plugin: 'com.android.library'
android {
compileSdkVersion compile_sdk_version
buildToolsVersion build_tools_version
defaultConfig {
minSdkVersion min_sdk_version
targetSdkVersion target_sdk_version
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
}
debug {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
}
}
sourceSets {
main {
manifest.srcFile 'AndroidManifest.xml'
java.srcDirs = ['src']
resources.srcDirs = ['src']
aidl.srcDirs = ['src']
renderscript.srcDirs = ['src']
res.srcDirs = ['res']
assets.srcDirs = ['assets']
jniLibs.srcDirs = ['libs']
}
debug.setRoot('build-types/debug')
release.setRoot('build-types/release')
}
android {
lintOptions {
abortOnError false
}
}
}
dependencies {
api fileTree(include: ['*.jar'], dir: 'libs')
//小米Push通道
api 'com.umeng.umsdk:xiaomi-push:3.6.17'
api 'com.umeng.umsdk:xiaomi-umengaccs:1.1.0'
//华为Push通道
api 'com.umeng.umsdk:huawei-basetb:2.6.3.305'
api 'com.umeng.umsdk:huawei-pushtb:2.6.3.305'
api 'com.umeng.umsdk:huawei-umengaccs:1.2.1'
//Oppo Push通道
api 'com.umeng.umsdk:oppo-push:1.0.1'
api 'com.umeng.umsdk:oppo-umengaccs:1.0.3'
}
umeng/project.properties 0 → 100644
# This file is automatically generated by Android Tools.
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
#
# This file must be checked in Version Control Systems.
#
# To customize properties used by the Ant build system use,
# "ant.properties", and override values to adapt the script to your
# project structure.
# Project target.
target=android-19
android.library=true
umeng/res/layout/upush_bar_image_notification.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="64dp">
<ImageView
android:id="@+id/notification_bar_image"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="fitCenter"/>
</LinearLayout>
\ No newline at end of file
umeng/res/layout/upush_notification.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:background="#ffffff"
android:layout_height="64dp">
<RelativeLayout
android:id="@+id/upush_notification1"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginBottom="10dp"
android:layout_marginTop="10dp">
<ImageView
android:id="@+id/notification_large_icon1"
android:layout_width="48dp"
android:layout_height="48dp"
android:scaleType="fitXY" />
<TextView
android:id="@+id/notification_title"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginTop="3dp"
android:layout_toRightOf="@+id/notification_large_icon1"
android:maxLines="1"
android:text="Title"
android:textColor="#000000"
android:textSize="16sp" />
<TextView
android:id="@+id/notification_text"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/notification_title"
android:layout_marginLeft="10dp"
android:layout_marginTop="3dp"
android:layout_toRightOf="@+id/notification_large_icon1"
android:ellipsize="marquee"
android:focusable="true"
android:focusableInTouchMode="true"
android:marqueeRepeatLimit="marquee_forever"
android:scrollHorizontally="false"
android:fadingEdge="horizontal"
android:singleLine="true"
android:text="Message"
android:textColor="#000000" />
<requestFocus />
</RelativeLayout>
<RelativeLayout
android:id="@+id/upush_notification2"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone">
<ImageView
android:id="@+id/notification_large_icon2"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="fitXY" />
</RelativeLayout>
</RelativeLayout>
\ No newline at end of file
umeng/res/values/string.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<resources>
</resources>
userCenter/src/main/java/com/dayu/usercenter/ui/activity2/CashRecordActivity.java
package com.dayu.usercenter.ui.activity2;
import android.support.v7.widget.LinearLayoutManager;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.dayu.base.api.Api;
import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.base.ui.presenter.SImplePresenter;
import com.dayu.common.Constants;
import com.dayu.usercenter.R;
import com.dayu.usercenter.api.UserService2;
import com.dayu.usercenter.databinding.ActivityCashRecordBinding;
import com.dayu.usercenter.event.RefreshSaleRecordEvent;
import com.dayu.usercenter.model.bean.SaleArriveListBean;
import org.greenrobot.eventbus.EventBus;
import java.util.ArrayList;
import java.util.List;
public class CashRecordActivity extends BaseActivity<SImplePresenter,ActivityCashRecordBinding> {
BaseQuickAdapter<SaleArriveListBean, BaseViewHolder> mAdapter;
List<SaleArriveListBean> mDatas = new ArrayList<>();
int page = 1;
@Override
public void setPresenter() {
......@@ -18,6 +35,53 @@ public class CashRecordActivity extends BaseActivity<SImplePresenter,ActivityCas
@Override
public void initView() {
initUser();
mBind.receivingBack.setOnClickListener(view -> dumpBack());
mBind.refreshLayout.setEnableLoadMore(false);
mBind.refreshLayout.setOnRefreshListener(refreshLayout -> {
page = 1;
getDetailData();
});
mBind.refreshLayout.setOnLoadMoreListener(refreshLayout -> {
EventBus.getDefault().post(new RefreshSaleRecordEvent());
getDetailData();
});
showDialog();
getDetailData();
}
private void getDetailData(){
Api.getService(UserService2.class).getSaleArriveList(mUserId,1, page, Constants.PAGESIZE).compose(Api.applySchedulers())
.subscribe(mPresenter.baseObserver(data ->{
mBind.refreshLayout.finishRefresh();
mBind.refreshLayout.finishLoadMore();
if (page == 1) {
mDatas.clear();
}
mDatas.addAll(data.getData());
setAdapter();
mBind.refreshLayout.setEnableLoadMore(page < data.getTotalPages());
page += 1;
}, responeThrowable -> {
mBind.refreshLayout.finishRefresh();
mBind.refreshLayout.finishLoadMore();
}));
}
private void setAdapter() {
if (mAdapter != null){
mAdapter.notifyDataSetChanged();
}else{
mAdapter = new BaseQuickAdapter<SaleArriveListBean, BaseViewHolder>(R.layout.item_record_arrive, mDatas) {
@Override
protected void convert(BaseViewHolder helper, SaleArriveListBean item) {
helper.setText(R.id.tv_item1, item.getCreateTime());
helper.setText(R.id.tv_item2, item.getPrice()+"");
}
};
mBind.rvCache.setLayoutManager(new LinearLayoutManager(mActivity));
mBind.rvCache.setAdapter(mAdapter);
}
}
}
userCenter/src/main/res/layout/fragment_home_user.xml
......@@ -222,16 +222,21 @@
android:background="@color/cl_work_raiod"
android:visibility="gone" />
<LinearLayout
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="70dp"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:gravity="center_vertical"
android:orientation="horizontal"
android:background="@drawable/personal_center_selector"
android:onClick="@{()->presenter.dumpToCacheRecord()}">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:orientation="horizontal"
android:layout_centerHorizontal="true"
>
<TextView
style="@style/tv_user_bottom1"
android:layout_marginTop="0dp"
......@@ -245,7 +250,8 @@
android:layout_marginLeft="10dp"
android:text="0"
android:textColor="@color/cl_order_item_date" />
</LinearLayout>
</LinearLayout>
</RelativeLayout>
<LinearLayout style="@style/ll_user_bottom"
android:layout_marginTop="10dp"
......
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