Skip to content

android / dayu

Go to a project
Commit 5fb96c68 by mReturn
Options

友盟推送&工单优化

parent 8e495d2d
Inline Side-by-side
Showing with 543 additions and 145 deletions
app/proguard-rules.pro
......@@ -254,6 +254,10 @@ public static final int *;
public static final int *;
}
-keep public class * extends android.app.Service
-dontwarn com.vivo.push.**
-keep class com.vivo.push.**{*; }
-keep class com.vivo.vms.**{*; }
-keep class xxx.xxx.xxx.PushMessageReceiverImpl{*;}
......
app/src/main/java/com/dayu/bigfish/MyApplication.java
......@@ -8,6 +8,7 @@ import android.content.res.Resources;
import android.net.ConnectivityManager;
import android.net.wifi.WifiManager;
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.support.annotation.NonNull;
......@@ -17,9 +18,12 @@ import com.dayu.common.BaseApplication;
import com.dayu.common.Constants;
import com.dayu.location.base.LocationUtils;
import com.dayu.order.greendao.GreenDaoManager;
import com.dayu.order.ui.activity.OrderDetailsActivity;
import com.dayu.utils.LogUtils;
import com.dayu.utils.NetworkConnectChangedReceiver;
import com.dayu.utils.SPUtils;
import com.dayu.utils.ToastUtils;
import com.dayu.utils.UserManager;
import com.scwang.smartrefresh.header.MaterialHeader;
import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import com.scwang.smartrefresh.layout.api.DefaultRefreshFooterCreator;
......@@ -39,6 +43,7 @@ import com.umeng.socialize.PlatformConfig;
import org.android.agoo.huawei.HuaWeiRegister;
import org.android.agoo.oppo.OppoRegister;
import org.android.agoo.vivo.VivoRegister;
import org.android.agoo.xiaomi.MiPushRegistar;
import java.lang.reflect.Constructor;
......@@ -133,22 +138,31 @@ public class MyApplication extends BaseApplication {
//获取消息推送代理示例
PushAgent mPushAgent = PushAgent.getInstance(this);
//自定义推送通知栏点击事件处理
// UmengNotificationClickHandler notificationClickHandler = new UmengNotificationClickHandler() {
//
// @Override
// public void dealWithCustomAction(Context context, UMessage msg) {
// if (msg.extra!= null && msg.extra.containsKey("order_id")){
// LogUtils.e("Upush click0: "+ msg.extra.get("order_id"));
// }
// LogUtils.e("Upush click: "+ msg.custom);
// }
// };
// mPushAgent.setNotificationClickHandler(notificationClickHandler);
UmengNotificationClickHandler notificationClickHandler = new UmengNotificationClickHandler() {
@Override
public void dealWithCustomAction(Context context, UMessage msg) {
LogUtils.e("Upush click0: "+ msg.extra.get(Constants.ORDER_ID)+" "+msg.custom + UserManager.getInstance().hasUserInfo());
if (Constants.TO_DETAIL.equals(msg.custom)
&& msg.extra.containsKey(Constants.ORDER_ID) && UserManager.getInstance().hasUserInfo()){
Bundle bundle = new Bundle();
bundle.putInt(Constants.ORDER_ID, Integer.parseInt(msg.extra.get(Constants.ORDER_ID)));
Intent intent = new Intent(mContext,OrderDetailsActivity.class);
intent.putExtra(Constants.BUNDLE,bundle);
startActivity(intent);
MobclickAgent.onEvent(BaseApplication.getContext(), "push_check_order_detail");
}else {
startActivity(new Intent(mContext,InitializeActivity.class));
}
}
};
mPushAgent.setNotificationClickHandler(notificationClickHandler);
//注册推送服务，每次调用register方法都会回调该接口
mPushAgent.register(new IUmengRegisterCallback() {
@Override
public void onSuccess(String s) {
SPUtils.put(Constants.UMENG_DEVICE_TOKEN,s);
LogUtils.e("Upush device_token: "+s);
}
......@@ -161,6 +175,7 @@ public class MyApplication extends BaseApplication {
MiPushRegistar.register(mContext,"2882303761518127164","5201812712164");
HuaWeiRegister.register(this);
OppoRegister.register(this, "a69IwYs2f8gg48ck000W4c0kc", "425bEd757209c8101bEfE57eba86ddca");
VivoRegister.register(this);
}
/**
......
app/src/main/java/com/dayu/bigfish/api/APIService.java
......@@ -2,6 +2,7 @@ package com.dayu.bigfish.api;
import com.dayu.base.api.protocol.BaseResponse;
import com.dayu.bigfish.api.protocol.BindUmengData;
import com.dayu.bigfish.api.protocol.VersionInfo;
import com.dayu.common.Constants;
......@@ -73,5 +74,11 @@ public interface APIService {
@POST(Constants.COMMITE_LOCAITON)
Observable<BaseResponse<Boolean>> commiteLocation(@Body RequestBody body);
/**
* 绑定友盟devicetoken
*/
@POST(Constants.API_7400+"/umMessage/umengAccount")
Observable<BaseResponse<Boolean>> bindUmeng(@Body BindUmengData data);
}
app/src/main/java/com/dayu/bigfish/api/protocol/BindUmengData.java 0 → 100644
package com.dayu.bigfish.api.protocol;
public class BindUmengData {
public int accountId;
public String deviceToken;
public BindUmengData() {
}
public BindUmengData(int accountId, String deviceToken) {
this.accountId = accountId;
this.deviceToken = deviceToken;
}
}
app/src/main/java/com/dayu/bigfish/api/protocol/UmengPushData.java 0 → 100644
package com.dayu.bigfish.api.protocol;
import java.util.Map;
public class UmengPushData {
/**
* display_type : notification
* extra : {"orderId":"4165"}
* body : {"after_open":"go_custom","ticker":"12345","custom":"toDetail","title":"12345","play_sound":"true","play_lights":"false","play_vibrate":"false","text":"1232423553agbzzbd"}
* msg_id : uuwylog158581491919310
*/
private String display_type;
private Map<String,String> extra;
private BodyBean body;
private String msg_id;
public Map<String, String> getExtra() {
return extra;
}
public void setExtra(Map<String, String> extra) {
this.extra = extra;
}
public String getDisplay_type() {
return display_type;
}
public void setDisplay_type(String display_type) {
this.display_type = display_type;
}
public BodyBean getBody() {
return body;
}
public void setBody(BodyBean body) {
this.body = body;
}
public String getMsg_id() {
return msg_id;
}
public void setMsg_id(String msg_id) {
this.msg_id = msg_id;
}
public static class ExtraBean {
/**
* orderId : 4165
*/
private String orderId;
public String getOrderId() {
return orderId;
}
public void setOrderId(String orderId) {
this.orderId = orderId;
}
}
public static class BodyBean {
/**
* after_open : go_custom
* ticker : 12345
* custom : toDetail
* title : 12345
* play_sound : true
* play_lights : false
* play_vibrate : false
* text : 1232423553agbzzbd
*/
private String after_open;
private String ticker;
private String custom;
private String title;
private String play_sound;
private String play_lights;
private String play_vibrate;
private String text;
public String getAfter_open() {
return after_open;
}
public void setAfter_open(String after_open) {
this.after_open = after_open;
}
public String getTicker() {
return ticker;
}
public void setTicker(String ticker) {
this.ticker = ticker;
}
public String getCustom() {
return custom;
}
public void setCustom(String custom) {
this.custom = custom;
}
public String getTitle() {
return title;
}
public void setTitle(String title) {
this.title = title;
}
public String getPlay_sound() {
return play_sound;
}
public void setPlay_sound(String play_sound) {
this.play_sound = play_sound;
}
public String getPlay_lights() {
return play_lights;
}
public void setPlay_lights(String play_lights) {
this.play_lights = play_lights;
}
public String getPlay_vibrate() {
return play_vibrate;
}
public void setPlay_vibrate(String play_vibrate) {
this.play_vibrate = play_vibrate;
}
public String getText() {
return text;
}
public void setText(String text) {
this.text = text;
}
}
}
app/src/main/java/com/dayu/bigfish/presenter/main/MainPresenter.java
......@@ -46,7 +46,7 @@ public class MainPresenter extends MainContract.Presenter {
commitVersionInfo(mAccountId, AppUtils.getIMEI(), "2", AppUtils.getPackageNum());
getNewVersion(AppUtils.getPackageNum());
getReceiveOrder(Constants.WATING_ORDER, mAccountId, mSiteId, 1, 20);
getHxNum(mUser.getHxAccount());
// getHxNum(mUser.getHxAccount());
getUserInfo(Integer.parseInt(mUser.getAccountId()));
}
......
app/src/main/java/com/dayu/bigfish/ui/MainActivity.java
......@@ -6,12 +6,14 @@ import android.content.Intent;
import android.graphics.Color;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.os.Environment;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentTransaction;
import android.support.v4.app.NotificationCompat;
import android.support.v4.content.FileProvider;
import android.text.TextUtils;
import android.view.Gravity;
import android.view.KeyEvent;
import android.widget.TextView;
......@@ -19,11 +21,14 @@ import android.widget.TextView;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.bigfish.salecenter.event.SaleTabNumEvent;
import com.bigfish.salecenter.ui.fragment.HomeSaleFragment;
import com.dayu.base.api.Api;
import com.dayu.base.api.DownloadService;
import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.bigfish.BuildConfig;
import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.R;
import com.dayu.bigfish.api.APIService;
import com.dayu.bigfish.api.protocol.BindUmengData;
import com.dayu.bigfish.api.protocol.InformBean;
import com.dayu.bigfish.api.protocol.VersionInfo;
import com.dayu.bigfish.databinding.ActivityMainBinding;
......@@ -32,6 +37,7 @@ import com.dayu.bigfish.presenter.main.MainPresenter;
import com.dayu.bigfish.ui.fragment.HomeFirstTabFragment;
import com.dayu.bigfish.ui.service.LocationService;
import com.dayu.bigfish.utils.HxManager;
import com.dayu.common.BaseApplication;
import com.dayu.common.Constants;
import com.dayu.event.DownloadBean;
import com.dayu.event.UserInfo;
......@@ -39,6 +45,7 @@ import com.dayu.location.base.LocationUtils;
import com.dayu.managercenter.ui.fragment.ManagerFragment;
import com.dayu.message.ui.fragment.HomeMessageFragment;
import com.dayu.order.common.TabNumEvent;
import com.dayu.order.ui.activity.OrderDetailsActivity;
import com.dayu.order.ui.activity.ReceivingActivity;
import com.dayu.order.ui.fragment.HomeOrderFragment;
import com.dayu.provider.event.RefreshHxNum;
......@@ -48,8 +55,10 @@ import com.dayu.provider.router.RouterPath;
import com.dayu.usercenter.ui.activity2.BusinessTypeActivity;
import com.dayu.usercenter.ui.fragment.HomePersonFragment;
import com.dayu.usercenter.ui.fragment.HomeUserFragment;
import com.dayu.utils.LogUtils;
import com.dayu.utils.SPUtils;
import com.dayu.utils.TimeUtils;
import com.dayu.utils.ToastUtils;
import com.dayu.utils.UserManager;
import com.dayu.utils.badgeNumberManger.BadgeNumberManager;
import com.dayu.widgets.BadgeView;
......@@ -77,11 +86,11 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
private TextView[] mTabs;
private NotificationManager notificationManager;
private NotificationCompat.Builder builder;
// private ManagerFragment managerFragment;
// private ManagerFragment managerFragment;
// private HomeFirstTabFragment firstFragment;
private HomeSaleFragment saleFragment;
private HomeOrderFragment secondFragment;
// private HomeMessageFragment thirdFragment;
// private HomeMessageFragment thirdFragment;
// private HomePersonFragment fourFragment;
private HomeUserFragment fourFragment;
private int mFirstPositon = 0;
......@@ -96,7 +105,16 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
@Override
public void initView() {
MobclickAgent.onEvent(this,"go_home");
if (getIntent().hasExtra(Constants.ORDER_ID)) {
Bundle bundle = new Bundle();
bundle.putInt(Constants.ORDER_ID, Integer.parseInt(getIntent().getStringExtra(Constants.ORDER_ID)));
Intent intent = new Intent(this, OrderDetailsActivity.class);
intent.putExtra(Constants.BUNDLE, bundle);
startActivity(intent);
MobclickAgent.onEvent(BaseApplication.getContext(), "push_offline_check_order_detail");
}
initUser();
MobclickAgent.onEvent(this, "go_home");
saleFragment = HomeSaleFragment.newInstance();
secondFragment = HomeOrderFragment.newInstance();
// thirdFragment = HomeMessageFragment.newInstance();
......@@ -106,22 +124,33 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
// firstFragment = HomeFirstTabFragment.newInstance();
// mFragments = new Fragment[]{firstFragment, secondFragment, thirdFragment, fourFragment};
// mFirstPositon = 1;
mFragments = new Fragment[]{saleFragment,secondFragment, fourFragment};
mFragments = new Fragment[]{saleFragment, secondFragment, fourFragment};
mFirstPositon = 0;
} else if (UserManager.getInstance().getRole() == Constants.MANAGER_ENGINEER) {
// managerFragment = ManagerFragment.newInstance();
// mFragments = new Fragment[]{managerFragment, secondFragment, thirdFragment, fourFragment};
mFragments = new Fragment[]{ saleFragment,secondFragment, fourFragment};
mFragments = new Fragment[]{saleFragment, secondFragment, fourFragment};
mFirstPositon = 0;
mBind.tabFirst.setText(getString(R.string.send_order));
}
// mTabs = new TextView[]{mBind.tabFirst, mBind.tabSecond, mBind.tabThird, mBind.tabFour};
mTabs = new TextView[]{mBind.tabSale,mBind.tabSecond,mBind.tabFour};
mTabs = new TextView[]{mBind.tabSale, mBind.tabSecond, mBind.tabFour};
addFragment();
initListener();
doAction(getIntent());
startLocationService();
EventBus.getDefault().register(this);
setUmengDeviceToken();
}
//设置友盟devicetoken
private void setUmengDeviceToken() {
String deviceToken = (String) SPUtils.get(Constants.UMENG_DEVICE_TOKEN, "");
if (!TextUtils.isEmpty(deviceToken)) {
Api.getService(APIService.class).bindUmeng(new BindUmengData(mUserId, deviceToken)).
compose(Api.applySchedulers()).subscribe(mPresenter.baseObserver(
result -> LogUtils.e("bind_device_result " + result)));
}
}
@Override
......@@ -212,8 +241,8 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
}
@Subscribe
public void changeNum(TabNumEvent event){
if (event.num<=0)
public void changeNum(TabNumEvent event) {
if (event.num <= 0)
return;
if (mOrderBadgeView == null) {
// mOrderBadgeView = new BadgeView(this);
......@@ -226,7 +255,7 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
mOrderBadgeView = new BadgeView(this);
mOrderBadgeView.setTargetView(mBind.tabSecond);
mOrderBadgeView.setBadgeGravity(Gravity.CENTER|Gravity.TOP);
mOrderBadgeView.setBadgeGravity(Gravity.CENTER | Gravity.TOP);
mOrderBadgeView.setBadgeMargin(20, 0, 0, 0);
}
if (event.num < 100) {
......@@ -243,13 +272,13 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
}
@Subscribe
public void changeSaleNum(SaleTabNumEvent event){
if (event.num<=0)
public void changeSaleNum(SaleTabNumEvent event) {
if (event.num <= 0)
return;
if (mSaleBadgeView == null) {
mSaleBadgeView = new BadgeView(this);
mSaleBadgeView.setTargetView(mBind.tabSale);
mSaleBadgeView.setBadgeGravity(Gravity.CENTER|Gravity.TOP);
mSaleBadgeView.setBadgeGravity(Gravity.CENTER | Gravity.TOP);
mSaleBadgeView.setBadgeMargin(20, 0, 0, 0);
}
if (event.num < 100) {
......@@ -260,7 +289,6 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
}
@Override
public void showUpdateDialog(VersionInfo info) {
CustomDialog dialog = new CustomDialog(mActivity, R.style.CustomDialog, info.getUpgradePrompt(),
......@@ -339,8 +367,8 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
@Override
public void toServiceSence() {
Intent intent = new Intent(this,BusinessTypeActivity.class);
intent.putExtra(Constants.IS_FORCE,true);
Intent intent = new Intent(this, BusinessTypeActivity.class);
intent.putExtra(Constants.IS_FORCE, true);
startActivity(intent);
}
......
app/src/main/java/com/dayu/bigfish/ui/UmengPushNotifyActivity.java
......@@ -5,13 +5,18 @@ import android.os.Bundle;
import com.dayu.bigfish.InitializeActivity;
import com.dayu.bigfish.R;
import com.dayu.bigfish.api.protocol.UmengPushData;
import com.dayu.common.BaseApplication;
import com.dayu.common.Constants;
import com.dayu.order.ui.activity.OrderDetailsActivity;
import com.dayu.utils.GsonUtils;
import com.dayu.utils.LogUtils;
import com.dayu.utils.ToastUtils;
import com.dayu.utils.UserManager;
import com.megvii.idcardlib.util.Constant;
import com.umeng.analytics.MobclickAgent;
import com.umeng.message.UmengNotifyClickActivity;
import com.umeng.message.entity.UMessage;
import org.android.agoo.common.AgooConstants;
......@@ -29,15 +34,12 @@ 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");
UmengPushData pushData = GsonUtils.toBean(body,UmengPushData.class);
if (pushData != null && Constants.TO_DETAIL.equals(pushData.getBody().getCustom())
&& pushData.getExtra().containsKey(Constants.ORDER_ID) && UserManager.getInstance().hasUserInfo()){
Intent mainIntent = new Intent(this, MainActivity.class);
mainIntent.putExtra(Constants.ORDER_ID,pushData.getExtra().get(Constants.ORDER_ID));
startActivity(mainIntent);
}else{
startActivity(new Intent(this,InitializeActivity.class));
}
......
baseSDK/src/main/java/com/dayu/base/ui/adapter/PhotoViewAdapter.java
......@@ -81,7 +81,7 @@ public class PhotoViewAdapter extends RecyclerView.Adapter<PhotoViewAdapter.Hold
}
private void removeItem(int position) {
if (list.size() == 10 && !list.contains("add")) {
if (list.size() == 5 && !list.contains("add")) {
list.remove(position);
list.add("add");
} else {
......@@ -108,7 +108,7 @@ public class PhotoViewAdapter extends RecyclerView.Adapter<PhotoViewAdapter.Hold
public void showPicDialog() {
int size;
size = 11 - list.size();
size = 6 - list.size();
PictureSelectionModel selector = PictureSelector.create(context)
.openGallery(PictureMimeType.ofImage())//全部.PictureMimeType.ofAll()、图片.ofImage()、视频.ofVideo()
.maxSelectNum(size)// 最大图片选择数量 int
......
baseSDK/src/main/java/com/dayu/common/Constants.java
......@@ -111,6 +111,7 @@ public class Constants {
* 反馈.
*/
public final static String SET_IDEA_COMMIT = "/api-base/" + "suggest";
/**
* 版本更新检测.
*/
......@@ -171,6 +172,8 @@ public class Constants {
public final static String ACCOUNT_BALANCE = "account_balance";
public final static String ACCOUNT_ID = "accountId";
public final static String ORDER_ID = "orderId";
public final static String TO_DETAIL = "toDetail";
public final static String UMENG_DEVICE_TOKEN = "umeng_device_token";
public final static String ORDER_POSTION = "order_position";
//是否显示去设置alipay账户de对话框
public final static String IS_SHOW_ALIPAY_DILAOG = "is_show_alipay_dialog";
......
baseSDK/src/main/java/com/dayu/utils/CommonUtils.java
......@@ -22,7 +22,9 @@ import com.umeng.socialize.media.UMMin;
import com.umeng.socialize.media.UMWeb;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
* Created by mReturn
......@@ -123,6 +125,48 @@ public class CommonUtils {
}
/**
* List转String
* @param list
* @param <T>
* @return
*/
public static<T> String list2String(List<T> list){
StringBuilder sb = new StringBuilder();
String resultString = "";
if (list != null){
for(int i=0;i<list.size();i++){
if(i<list.size()-1){
sb.append(list.get(i));
sb.append(",");
}else{
sb.append(list.get(i));
}
}
}
resultString = sb.toString();
return resultString;
}
/**
* string转list并且过滤掉空字符串
* @param str
* @return
*/
public static List<String> string2ListF(String str){
List<String> list = new ArrayList<>();
if (!TextUtils.isEmpty(str)){
String [] strArr = str.split(",");
for (int i=0;i<strArr.length;i++){
if (!TextUtils.isEmpty(strArr[i])){
list.add(strArr[i]);
}
}
}
return list;
}
/**
* 获取订单状态描述
*
* @return
......@@ -169,7 +213,7 @@ public class CommonUtils {
}
/**
* 分享小程序
* 分享商品-微信小程序
**/
public static void shareProgram(Activity activity, String imgUrl, String title, String description,
int uid,int gid, SHARE_MEDIA platform, UMShareListener callBack) {
......
baseSDK/src/main/java/com/dayu/utils/GsonUtils.java
......@@ -51,6 +51,7 @@ public class GsonUtils {
try {
return gson.fromJson(jsonStr, clazz);
} catch (Exception e) {
LogUtils.e("GsonError toBean: "+e.toString());
return null;
}
}
......
baseSDK/src/main/res/values/strings.xml
......@@ -73,8 +73,9 @@
<string name="order_xuliehaoma">序列号码</string>
<string name="order_goumai_date">购买日期</string>
<string name="order_serve_type">服务类型</string>
<string name="order_photo_text">服务照片(故障及解决照片,限10张)</string>
<string name="order_hint">故障现象或服务需求描述,及解决方案描述,若没有解决请说明原因(最多200字)。</string>
<string name="order_photo_text">服务照片(故障及解决照片,限5张)</string>
<!--<string name="order_hint">故障现象或服务需求描述,及解决方案描述,若没有解决请说明原因(最多200字)。</string>-->
<string name="order_hint">请认真记录本次服务过程和最终完成情况，如有重要事项请详细说明。作为派单方和客户事后调查服务质量的重要依据。(最多200字)</string>
<string name="tv_about">关于我们</string>
<string name="tv_about_us">扫码关注我们的微信服务号</string>
<string name="tv_about_us_text">&#160;&#160;&#160;&#160;传统低效的客服体系，正在成为厂商、服务商、消费者的包袱。大鱼准备以科技之力进行客服产业革命。运用Ai、云和大数据等技术，连接厂商、销售商、服务商和消费者，打造去中心化的智能共享客户服务解决方案。</string>
......@@ -366,7 +367,7 @@
<string name="order_product_model">型号</string>
<string name="order_product_model_hint">产品详细型号</string>
<string name="order_serail">序列号</string>
<string name="order_serail_hint">产品序列号</string>
<string name="order_serail_hint">请准确输入或扫描</string>
<string name="order_payer">费用承担方</string>
<string name="order_select_payer">请选择费用承担方</string>
<string name="order_select_payer_notice">修改费用承担方可能会导致费用争议，请一定要确认清楚之后再操作</string>
......@@ -404,6 +405,7 @@
<string name="finish_signature">完成签名</string>
<string name="special_plane">座机</string>
<string name="sn_photo_not_null">序列号和序列号照片不能为空</string>
<string name="sn_not_null">序列号不能为空</string>
<string name="can_not_repet_get_money">您上次已经收取过客户费用，请勿重新收取!</string>
<string name="process_order_success">提交验收成功</string>
<string name="signature_name">请先签名!</string>
......
orderCenter/src/main/java/com/dayu/order/presenter/multipleprocess/MultipleProcessContract.java
......@@ -32,7 +32,7 @@ public interface MultipleProcessContract {
void showSignature();
void setPayStatus();
void setPayType(int type);
void setPayStatus(Boolean blooean);
......@@ -47,6 +47,8 @@ public interface MultipleProcessContract {
int getPayType();
void setPayBackGround(Integer payType);
void setOrderDetail(OrderDetail detail);
}
abstract class Presenter extends BaseListPresenter<View> {
......
orderCenter/src/main/java/com/dayu/order/presenter/multipleprocess/MultipleProcessPresenter.java
......@@ -49,6 +49,10 @@ public class MultipleProcessPresenter extends MultipleProcessContract.Presenter
private OrderDetail mOrderDetail;
private boolean mCanProcess;
public void setmCanProcess(boolean mCanProcess) {
this.mCanProcess = mCanProcess;
}
@Override
public void onAttached() {
mAccountId = Integer.parseInt(UserManager.getInstance().getUser().getAccountId());
......@@ -213,14 +217,17 @@ public class MultipleProcessPresenter extends MultipleProcessContract.Presenter
}
Integer payType = detail.getPayType();
Integer payState = detail.getPayStatus();
if ((payType != null && (payType == 1 || payType == 2)) && (payState == 3 || payState == 2)) {
mView.setPayStatus();
// if ((payType != null && (payType == 1 || payType == 2)) && (payState == 3 || payState == 2)) {
if (payType != null ) {
mView.setOrderDetail(detail);
mView.setPayType(payType);
}
if (detail.getPayStatus() == 3 && detail.getPayType() == 1) {
mCanProcess = true;
mView.paySuccess(detail);
mView.setPayBackGround(detail.getPayType());
}
}));
}
......
orderCenter/src/main/java/com/dayu/order/presenter/orderdoing/OrderDoingPresenter.java
......@@ -68,7 +68,8 @@ public class OrderDoingPresenter extends orderDoingContract.Presenter {
getErrorOrder();
}else if (mView instanceof OrderDoneFragment){
mPage = 1;
getDoneOrders();
getOrders(mState, mUserId, mSiteId, mPage, Constants.PAGESIZE);
// getDoneOrders();
}else {
mPage = 1;
getOrders(mState, mUserId, mSiteId, mPage, Constants.PAGESIZE);
......
orderCenter/src/main/java/com/dayu/order/presenter/receivingorder/ReceivingContract.java
......@@ -22,5 +22,8 @@ public interface ReceivingContract {
*/
public abstract void receiveOrder(int orders, int engineer);
public abstract void receiveOrderSuccess();
}
}
orderCenter/src/main/java/com/dayu/order/presenter/receivingorder/ReceivingPresenter.java
......@@ -61,10 +61,13 @@ public class ReceivingPresenter extends ReceivingContract.Presenter {
public void receiveOrder(int orders, int engineer) {
mView.showDialog();
OrderApiFactory.receiveOrder(orders, engineer).subscribe(baseObserver(
aBoolean -> receiveOrderSuccess(), responeThrowable -> {
// if ("ORDER0002".equals(responeThrowable.subCode) || "ORDER0003".equals(responeThrowable.subCode)) {
// }
refresh();
aBoolean -> {
mView.showToast(R.string.receive_order_success);
receiveOrderSuccess();
}, responeThrowable -> {
if ("ORDER0002".equals(responeThrowable.subCode) || "ORDER0003".equals(responeThrowable.subCode)) {
refresh();
}
}));
}
......@@ -75,9 +78,10 @@ public class ReceivingPresenter extends ReceivingContract.Presenter {
mPage++;
}
private void receiveOrderSuccess() {
@Override
public void receiveOrderSuccess() {
int num = mTotalRows - 1;
mView.showToast(R.string.receive_order_success);
getReceivingData();
// mView.dumpBack();
mDisPosable = Observable.timer(300, TimeUnit.MILLISECONDS).subscribe(aLong -> {
// EventBus.getDefault().post(new SwtichFragment(1));
......
orderCenter/src/main/java/com/dayu/order/ui/activity/MultipleProcessActivity.java
......@@ -49,7 +49,8 @@ import java.util.List;
* 提交验收
*/
public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresenter, ActivityMultipleProcessBinding> implements MultipleProcessContract.View {
public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresenter, ActivityMultipleProcessBinding>
implements MultipleProcessContract.View {
private EditText mDoorPrice;
private EditText mServerPrice;
private EditText mMaterialsPrice;
......@@ -65,7 +66,7 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent
private TextView mIcon;
private LinearLayout mSignature;
private boolean isShowSignature;
private boolean canPay;
private boolean payTypeSetted;
private TextView mTotalMoney;
private TextView mCashPay;
private TextView mPublicPay;
......@@ -129,15 +130,15 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent
llPaywayNotice = view.findViewById(R.id.ll_payway_notice);
mNoPay.setOnClickListener(v -> {
mPayType = 3;
clearData();
mRlPay.setVisibility(View.GONE);
llScanPay.setVisibility(View.GONE);
setBackGround(mNoPay);
// mPayType = 3;
// clearData();
// mRlPay.setVisibility(View.GONE);
// llScanPay.setVisibility(View.GONE);
// setPayWayBackGround(mNoPay);
});
mWechatPay.setOnClickListener(v -> {
if (canPay) {
ToastUtils.showShortToast(getString(R.string.can_not_repet_get_money));
if (payTypeSetted) {
// ToastUtils.showShortToast(getString(R.string.can_not_repet_get_money));
} else {
if (mWechatStatus) {
mPayType = 1;
......@@ -145,31 +146,31 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent
llScanPay.setVisibility(View.VISIBLE);
llPaywayNotice.setVisibility(View.VISIBLE);
mScanPay.setVisibility(View.VISIBLE);
setBackGround(mWechatPay);
setPayWayBackGround(mWechatPay);
} else {
ToastUtils.showShortToast("您公司未开通移动支付，请到服务商系统-设置-移动支付设置中进行开通。");
}
}
});
mCashPay.setOnClickListener(v -> {
if (canPay) {
ToastUtils.showShortToast(getString(R.string.can_not_repet_get_money));
} else {
mPayType = 2;
mRlPay.setVisibility(View.VISIBLE);
llScanPay.setVisibility(View.GONE);
setBackGround(mCashPay);
}
});
// mCashPay.setOnClickListener(v -> {
// if (payTypeSetted) {
//// ToastUtils.showShortToast(getString(R.string.can_not_repet_get_money));
// } else {
// mPayType = 2;
// mRlPay.setVisibility(View.VISIBLE);
// llScanPay.setVisibility(View.GONE);
// setPayWayBackGround(mCashPay);
// }
// });
mPublicPay.setOnClickListener(v -> {
if (canPay) {
ToastUtils.showShortToast(getString(R.string.can_not_repet_get_money));
if (payTypeSetted) {
// ToastUtils.showShortToast(getString(R.string.can_not_repet_get_money));
} else {
mPayType = 4;
mRlPay.setVisibility(View.VISIBLE);
llScanPay.setVisibility(View.GONE);
setBackGround(mPublicPay);
setPayWayBackGround(mPublicPay);
}
});
......@@ -188,15 +189,15 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent
initTotal();
mScanPay.setOnClickListener(v -> {
if (TextUtils.isEmpty(getSum()) || Double.parseDouble(getSum()) == 0.00) {
ToastUtils.showShortToast("请输入金额!");
return;
}
// if (TextUtils.isEmpty(getSum()) || Double.parseDouble(getSum()) == 0.00) {
// ToastUtils.showShortToast("请输入金额!");
// return;
// }
new IntentIntegrator(this).setOrientationLocked(false).setCaptureActivity(CustomScannerActivity.class).initiateScan();
});
}
private void setBackGround(TextView tv) {
private void setPayWayBackGround(TextView tv) {
mNoPay.setBackgroundResource(R.drawable.grey_commom);
mCashPay.setBackgroundResource(R.drawable.grey_commom);
mWechatPay.setBackgroundResource(R.drawable.grey_commom);
......@@ -248,22 +249,33 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent
mDoorInfo.setEnabled(false);
mScanPay.setEnabled(false);
llPaywayNotice.setVisibility(View.GONE);
setOrderDetail(detail);
}
@Override
public void setOrderDetail(OrderDetail detail) {
if (detail != null) {
// if (detail.getDoorPrice() != null) {
// mDoorPrice.setText(new DecimalFormat("0.00").format(detail.getDoorPrice()) + "");
// } else {
// mDoorPrice.setText("0.00");
// }
//商品货款
if (detail.getDoorPrice() != null) {
mDoorPrice.setText(new DecimalFormat("0.00").format(detail.getDoorPrice()) + "");
mMaterialsPrice.setText(new DecimalFormat("0.00").format(detail.getDoorPrice()) + "");
} else {
mDoorPrice.setText("0.00");
mMaterialsPrice.setText("0.00");
}
if (detail.getServicePrice() != null) {
mServerPrice.setText(new DecimalFormat("0.00").format(detail.getServicePrice()) + "");
} else {
mServerPrice.setText("0.00");
}
if (detail.getMaterialCost() != null) {
mMaterialsPrice.setText(new DecimalFormat("0.00").format(detail.getMaterialCost()) + "");
} else {
mMaterialsPrice.setText("0.00");
}
// if (detail.getMaterialCost() != null) {
// mMaterialsPrice.setText(new DecimalFormat("0.00").format(detail.getMaterialCost()) + "");
// } else {
// mMaterialsPrice.setText("0.00");
// }
if (detail.getOtherPrice() != null) {
mOtherPrice.setText(new DecimalFormat("0.00").format(detail.getOtherPrice()) + "");
} else {
......@@ -332,7 +344,8 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent
public HashMap<String, Object> getParams() {
HashMap<String, Object> params = new HashMap<>();
if (mDoorPrice != null) {
params.put("doorPrice", mDoorPrice.getText().toString().trim());
// params.put("doorPrice", mDoorPrice.getText().toString().trim());
params.put("doorPrice", mMaterialsPrice.getText().toString().trim());
params.put("servicePrice", mServerPrice.getText().toString().trim());
params.put("materialCost", mMaterialsPrice.getText().toString().trim());
params.put("otherPrice", mOtherPrice.getText().toString().trim());
......@@ -411,8 +424,33 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent
}
@Override
public void setPayStatus() {
canPay = true;
public void setPayType(int type) {
payTypeSetted = true;
mPayType = type;
switch (type){
case 1:
setPayWayBackGround(mWechatPay);
mRlPay.setVisibility(View.VISIBLE);
if (Double.parseDouble(getTotalMoney()) > 0){
llScanPay.setVisibility(View.VISIBLE);
llPaywayNotice.setVisibility(View.VISIBLE);
mScanPay.setVisibility(View.VISIBLE);
}else {
llScanPay.setVisibility(View.GONE);
llPaywayNotice.setVisibility(View.GONE);
mScanPay.setVisibility(View.GONE);
mPresenter.setmCanProcess(true);
}
break;
case 3:
setPayWayBackGround(mNoPay);
break;
case 4:
setPayWayBackGround(mPublicPay);
mRlPay.setVisibility(View.VISIBLE);
llScanPay.setVisibility(View.GONE);
break;
}
}
@Override
......
orderCenter/src/main/java/com/dayu/order/ui/activity/PdfWebViewActivity.java
......@@ -147,6 +147,7 @@ public class PdfWebViewActivity extends DataBindingActivity<ActivityWebviewBindi
private void downloadBySystem(String url, String contentDisposition, String mimeType) {
ToastUtils.showShortToast("开始下载");
// 指定下载地址
DownloadManager.Request request = new DownloadManager.Request(Uri.parse(url));
// 允许媒体扫描，根据下载的文件类型被加入相册、音乐等媒体库
......@@ -156,11 +157,11 @@ public class PdfWebViewActivity extends DataBindingActivity<ActivityWebviewBindi
// 设置通知栏的标题，如果不设置，默认使用文件名
// request.setTitle("This is title");
// 设置通知栏的描述
// request.setDescription("This is description");
request.setDescription("正在下载");
// 允许在计费流量下下载
request.setAllowedOverMetered(false);
request.setAllowedOverMetered(true);
// 允许该记录在下载管理界面可见
request.setVisibleInDownloadsUi(false);
request.setVisibleInDownloadsUi(true);
// 允许漫游时下载
request.setAllowedOverRoaming(true);
// 允许下载的网路类型
......
orderCenter/src/main/java/com/dayu/order/ui/fragment/MultiOrderDetailFragment.java
......@@ -8,11 +8,15 @@ import android.view.LayoutInflater;
import android.view.View;
import android.widget.ImageView;
import com.dayu.base.ui.activity.ImgGalleryActivty;
import com.dayu.base.ui.adapter.CoreAdapter;
import com.dayu.base.ui.fragment.BaseFragment;
import com.dayu.base.ui.fragment.DataBindingFragment;
import com.dayu.base.ui.presenter.SImplePresenter;
import com.dayu.common.Constants;
import com.dayu.location.base.LocationUtils;
import com.dayu.order.R;
import com.dayu.order.api.OrderApiFactory;
import com.dayu.order.api.protocol.OrderDetail;
import com.dayu.order.api.protocol.Spu;
import com.dayu.order.common.OperatePhoneEvent;
......@@ -25,6 +29,7 @@ import com.dayu.order.databinding.ItemDetailServerInfoBinding;
import com.dayu.order.ui.activity.PdfWebViewActivity;
import com.dayu.order.ui.activity.QrCodeActivity;
import com.dayu.order.ui.activity.ServerInstructionActivity;
import com.dayu.provider.event.TakeOrderSuccessEvent;
import com.dayu.utils.CommonUtils;
import com.dayu.utils.GlideImageLoader;
import com.dayu.utils.ToastUtils;
......@@ -46,12 +51,13 @@ import java.util.List;
* on 2018/5/21.
*/
public class MultiOrderDetailFragment extends DataBindingFragment<FragmentMultiDetailBinding> {
public class MultiOrderDetailFragment extends BaseFragment<SImplePresenter, FragmentMultiDetailBinding> {
private CoreAdapter<Spu, ItemDetailServerInfoBinding> mServerAdapter;
private CoreAdapter<Spu.SpuModels, ItemDetailDeviceCountBinding> mDeviceAdapter;
private CoreAdapter mFujianAdapter;
private boolean mFlag = true;
private int orderId;
List<String> phones = new ArrayList<>();
public static MultiOrderDetailFragment newInstance(OrderDetail detail) {
......@@ -69,9 +75,11 @@ public class MultiOrderDetailFragment extends DataBindingFragment<FragmentMultiD
@Override
public void initView() {
initUser();
EventBus.getDefault().register(this);
setListenter();
OrderDetail detail = (OrderDetail) getArguments().getSerializable(Constants.ORDER_DETAIL);
orderId = detail.getId();
setListenter();
mBind.setItem(detail);
mServerAdapter = new CoreAdapter<>(false);
mBind.rlServerContent.setLayoutManager(new LinearLayoutManager(mActivity));
......@@ -79,7 +87,7 @@ public class MultiOrderDetailFragment extends DataBindingFragment<FragmentMultiD
mBind.rlServerContent.setAdapter(mServerAdapter);
mServerAdapter.setData(detail.getSpus());
//设备数量
if (detail.getSpus() != null && detail.getSpus().size()>0 && detail.getSpus().get(0).getSpuModels()!= null){
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);
......@@ -87,7 +95,7 @@ public class MultiOrderDetailFragment extends DataBindingFragment<FragmentMultiD
mDeviceAdapter.setViewType(R.layout.item_detail_device_count);
mBind.rlDeviceCount.setAdapter(mDeviceAdapter);
mDeviceAdapter.setData(detail.getSpus().get(0).getSpuModels());
}else{
} else {
mBind.rlDeviceCount.setVisibility(View.GONE);
mBind.tvNoDevice.setVisibility(View.VISIBLE);
}
......@@ -142,6 +150,7 @@ public class MultiOrderDetailFragment extends DataBindingFragment<FragmentMultiD
} else {
mBind.customerAcceptance.setVisibility(View.GONE);
}
mBind.tvTakeOrder.setVisibility(detail.getStatus() == 1 ? View.VISIBLE : View.GONE);
mBind.customerAcceptance.setOnClickListener(v -> {
Bundle bundle = new Bundle();
bundle.putInt(Constants.ORDER_ID, detail.getId());
......@@ -157,18 +166,31 @@ public class MultiOrderDetailFragment extends DataBindingFragment<FragmentMultiD
}
private void setListenter() {
mBind.tvContactSeller.setOnClickListener(v->{
if (phones == null || phones.size() ==0){
mBind.tvContactSeller.setOnClickListener(v -> {
if (phones == null || phones.size() == 0) {
ToastUtils.showShortToast(R.string.no_mobile);
}else {
if (phones.size() == 1){
CommonUtils.dialPhone(mActivity,phones.get(0));
}else {
TextDialog.getInstance().showCenterDialog(mActivity,phones,pos ->
CommonUtils.dialPhone(mActivity,phones.get(pos)));
} else {
if (phones.size() == 1) {
CommonUtils.dialPhone(mActivity, phones.get(0));
} else {
TextDialog.getInstance().showCenterDialog(mActivity, phones, pos ->
CommonUtils.dialPhone(mActivity, phones.get(pos)));
}
}
});
mBind.tvTakeOrder.setOnClickListener(v -> {
showDialog();
OrderApiFactory.receiveOrder(orderId, mUserId).subscribe(mPresenter.baseObserver(
aBoolean -> {
EventBus.getDefault().post(new TakeOrderSuccessEvent());
ToastUtils.showLongToast(R.string.take_oreder_success_tosee);
mBind.tvTakeOrder.setVisibility(View.GONE);
}, responeThrowable ->{
EventBus.getDefault().post(new TakeOrderSuccessEvent());
ToastUtils.showShortToast(R.string.take_order_failure);
}
));
});
}
private void showOpenMarketDialog() {
......@@ -218,14 +240,15 @@ public class MultiOrderDetailFragment extends DataBindingFragment<FragmentMultiD
public void imgMax(String url) {
LayoutInflater inflater = LayoutInflater.from(mActivity);
View imgEntryView = inflater.inflate(R.layout.dialog_image, null);
final AlertDialog dialog = new AlertDialog.Builder(mActivity).create();
ImageView img = imgEntryView.findViewById(R.id.large_image);
GlideImageLoader.loadDrawable(mActivity, url, img);
dialog.setView(imgEntryView);
dialog.show();
imgEntryView.setOnClickListener(paramView -> dialog.cancel());
ImgGalleryActivty.launch(mActivity, url);
// LayoutInflater inflater = LayoutInflater.from(mActivity);
// View imgEntryView = inflater.inflate(R.layout.dialog_image, null);
// final AlertDialog dialog = new AlertDialog.Builder(mActivity).create();
// ImageView img = imgEntryView.findViewById(R.id.large_image);
// GlideImageLoader.loadDrawable(mActivity, url, img);
// dialog.setView(imgEntryView);
// dialog.show();
// imgEntryView.setOnClickListener(paramView -> dialog.cancel());
}
@Override
......@@ -235,8 +258,13 @@ public class MultiOrderDetailFragment extends DataBindingFragment<FragmentMultiD
}
@Subscribe
public void getOperatePhones(OperatePhoneEvent event){
public void getOperatePhones(OperatePhoneEvent event) {
phones = event.phones;
// phones.addAll(event.phones);
}
@Override
public void setPresenter() {
}
}
orderCenter/src/main/java/com/dayu/order/ui/fragment/OrderDoneFragment.java
......@@ -69,7 +69,7 @@ public class OrderDoneFragment extends BaseFragment<OrderDoingPresenter, Fragmen
@Override
public int getState() {
return Constants.WATING_SERVER;
return Constants.FINISH_ORDER;
}
@Override
......
orderCenter/src/main/java/com/dayu/order/ui/fragment/OrderReceivingFragment.java
......@@ -15,7 +15,9 @@ import com.dayu.order.presenter.receivingorder.ReceivingContract;
import com.dayu.order.presenter.receivingorder.ReceivingPresenter;
import com.dayu.order.ui.adapter.OrderAdapter;
import com.dayu.provider.event.RefreshApoiment;
import com.dayu.provider.event.TakeOrderSuccessEvent;
import com.dayu.provider.router.RouterPath;
import com.dayu.utils.LogUtils;
import com.dayu.utils.ProgressUtil;
import com.dayu.utils.ToastUtils;
import com.dayu.utils.UserManager;
......@@ -43,6 +45,7 @@ public class OrderReceivingFragment extends BaseFragment<ReceivingPresenter, Fra
@Override
public void initView() {
EventBus.getDefault().register(this);
mAdapter = new OrderAdapter(true);
mAdapter.setViewType(R.layout.fragment_orderdoing_item);
mAdapter.setLoadMore(false);
......@@ -102,5 +105,11 @@ public class OrderReceivingFragment extends BaseFragment<ReceivingPresenter, Fra
ProgressUtil.startLoad(mActivity);
mBind.recyclerView.Refresh();
}
@Subscribe
public void RefreshData(TakeOrderSuccessEvent event) {
LogUtils.e("TakeOrderSuccessEvent refresh");
mPresenter.receiveOrderSuccess();
}
}
orderCenter/src/main/release/AndroidManifest.xml
......@@ -42,8 +42,9 @@
android:name=".ui.activity.QrCodeActivity"
android:screenOrientation="portrait" />
<activity
android:name="com.dayu.order.ui.activity.OrderDetailsActivity"
android:name=".ui.activity.OrderDetailsActivity"
android:configChanges="orientation|screenSize|keyboardHidden"
android:launchMode="singleTask"
android:windowSoftInputMode="adjustResize"
android:screenOrientation="portrait" />
<activity
......
orderCenter/src/main/res/layout/fragment_multi_detail.xml
......@@ -557,5 +557,14 @@
android:text="@string/customer_acceptance"
android:textColor="@color/white"
android:textSize="16sp" />
<TextView
android:id="@+id/tv_take_order"
android:layout_width="match_parent"
android:layout_height="49dp"
android:background="@color/cl_home_button"
android:gravity="center"
android:text="@string/take_oreder_now"
android:textColor="@color/white"
android:textSize="16sp" />
</LinearLayout>
</layout>
\ No newline at end of file
orderCenter/src/main/res/layout/item_multi_process_foot.xml
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:tools="http://schemas.android.com/tools"
xmlns:android="http://schemas.android.com/apk/res/android">
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
<data>
......@@ -10,7 +10,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:orientation="vertical">
<TextView
......@@ -24,7 +24,6 @@
android:textColor="@color/tv_cl"
android:textSize="14sp" />
<RelativeLayout
android:id="@+id/rl_player"
android:layout_width="match_parent"
......@@ -178,18 +177,6 @@
android:textSize="14sp" />
<TextView
android:id="@+id/cash_pay"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="15dp"
android:background="@drawable/grey_commom"
android:padding="8dp"
android:text="@string/cash_pay"
android:textColor="@color/cl_tab_init"
android:textSize="14sp"
android:visibility="gone" />
<TextView
android:id="@+id/public_pay"
android:layout_width="wrap_content"
android:layout_height="match_parent"
......@@ -201,6 +188,20 @@
android:text="@string/public_pay"
android:textColor="@color/cl_tab_init"
android:textSize="14sp" />
<TextView
android:id="@+id/cash_pay"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_marginLeft="15dp"
android:background="@drawable/grey_commom"
android:padding="8dp"
android:text="@string/cash_pay"
android:textColor="@color/cl_tab_init"
android:textSize="14sp"
android:visibility="invisible" />
</LinearLayout>
<ImageView
......@@ -208,10 +209,10 @@
style="@style/line" />
<RelativeLayout
android:visibility="gone"
android:id="@+id/rl_pay"
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:visibility="gone">
<RelativeLayout
android:id="@+id/up_door"
......@@ -276,6 +277,7 @@
android:textSize="@dimen/sp_13.3" />
<EditText
android:enabled="false"
android:id="@+id/et_serve_price"
android:layout_width="@dimen/dp_205"
android:layout_height="match_parent"
......@@ -323,6 +325,7 @@
android:textSize="@dimen/sp_13.3" />
<EditText
android:enabled="false"
android:id="@+id/et_materials_price"
android:layout_width="@dimen/dp_205"
android:layout_height="match_parent"
......@@ -452,8 +455,8 @@
android:layout_centerHorizontal="true"
android:layout_marginLeft="@dimen/dp_13.3"
android:layout_marginTop="10dp"
android:layout_marginBottom="15dp"
android:layout_marginRight="@dimen/dp_13.3"
android:layout_marginBottom="15dp"
android:background="@drawable/subscribe_time_shape"
android:gravity="top"
android:hint="@string/tv_order_other"
......@@ -477,28 +480,29 @@
android:id="@+id/ll_payway_notice"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:layout_marginBottom="15dp"
android:layout_gravity="center_horizontal"
android:layout_marginBottom="15dp"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/icon_pay_ali"
/>
android:src="@drawable/icon_pay_ali" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/icon_pay_wechat"
android:layout_marginLeft="15dp"
/>
android:src="@drawable/icon_pay_wechat" />
<TextView
style="@style/common_text_style"
android:text="@string/pls_show_pay_code"
android:layout_marginLeft="20dp"
android:textSize="14sp"
/>
android:text="@string/pls_show_pay_code"
android:textSize="14sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/scan_pay"
android:layout_width="match_parent"
......@@ -530,7 +534,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/values/strings.xml
......@@ -26,4 +26,6 @@
<string name="collect_device_info">收集设备信息</string>
<string name="record_service_result">记录服务结果</string>
<string name="pls_fill_pre_sn">请先补全上面的序列号</string>
<string name="take_order_failure">抢单失败</string>
<string name="take_oreder_success_tosee">接单成功,请移至待预约列表查看</string>
</resources>
provider/src/main/java/com/dayu/provider/event/TakeOrderSuccessEvent.java 0 → 100644
package com.dayu.provider.event;
//接单成功
public class TakeOrderSuccessEvent {
}
umeng/AndroidManifest.xml
......@@ -22,6 +22,13 @@
<application>
<meta-data
android:name="com.vivo.push.api_key"
android:value="6444f965-8da8-40ba-9852-c06c10cb33e6" />
<meta-data
android:name="com.vivo.push.app_id"
android:value="19962" />
<service
android:name="com.taobao.accs.ChannelService"
android:exported="true"
......
umeng/build.gradle
......@@ -57,6 +57,9 @@ dependencies {
//Oppo Push通道
api 'com.umeng.umsdk:oppo-push:1.0.1'
api 'com.umeng.umsdk:oppo-umengaccs:1.0.3'
//vivo Push通道
api 'com.umeng.umsdk:vivo-push:2.3.1'
api 'com.umeng.umsdk:vivo-umengaccs:1.0.4'
}
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