Skip to content

android / dayu

Go to a project
Commit 6faa6c8a by 罗翻
Options

新增多任务

parent 493772ab
Expand all
Inline Side-by-side
Showing with 83 additions and 27 deletions
app/release/output.json
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":10},"path":"app-release.apk","properties":{"packageId":"com.dayu.bigfish","split":"","minSdkVersion":"16"}}] [{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":10},"path":"app-release.apk","properties":{"packageId":"com.dayu.bigfis","split":"","minSdkVersion":"16"}}]
\ No newline at end of file \ No newline at end of file
baseSDK/src/main/java/com/dayu/common/Constants.java
...@@ -17,8 +17,8 @@ public class Constants { ...@@ -17,8 +17,8 @@ public class Constants {
public static final String BASE_URL = "http://47.94.101.239:3112"; public static final String BASE_URL = "http://47.94.101.239:3112";
public final static String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply"; public final static String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply";
public final static String WEB_SOP = "http://47.94.101.239:9004/#/sop"; public final static String WEB_SOP = "http://47.94.101.239:9004/#/sop";
public final static String CHECK_MULTI_WEB_SOP = "http://192.168.2.181:8080/#/manyServiceResult"; public final static String CHECK_MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manyServiceResult";
public final static String MULTI_WEB_SOP = "http://192.168.2.181:8080/#/manySop"; public final static String MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manySop";
public final static String WEB_SOP_DETAIL = "http://47.94.101.239:9004/#/sopdetail"; public final static String WEB_SOP_DETAIL = "http://47.94.101.239:9004/#/sopdetail";
public final static String WEB_ZHI_SHI = "http://47.94.101.239:9004/#/detail"; public final static String WEB_ZHI_SHI = "http://47.94.101.239:9004/#/detail";
public static final boolean IS_DEBUG = true; public static final boolean IS_DEBUG = true;
...@@ -45,6 +45,8 @@ public class Constants { ...@@ -45,6 +45,8 @@ public class Constants {
// public final static String WEB_SOP = "https://sop.kf.ai/#/sop"; // public final static String WEB_SOP = "https://sop.kf.ai/#/sop";
// public final static String WEB_SOP_DETAIL = "https://sop.kf.ai/#/sopdetail"; // public final static String WEB_SOP_DETAIL = "https://sop.kf.ai/#/sopdetail";
// public final static String WEB_ZHI_SHI = "https://sop.kf.ai/#/detail"; // public final static String WEB_ZHI_SHI = "https://sop.kf.ai/#/detail";
// public final static String CHECK_MULTI_WEB_SOP = "http://192.168.2.181:8080/#/manyServiceResult";
// public final static String MULTI_WEB_SOP = "http://192.168.2.181:8080/#/manySop";
// public static final boolean IS_DEBUG = false; // public static final boolean IS_DEBUG = false;
/** /**
......
orderCenter/src/main/java/com/dayu/order/presenter/multiprocessorder/MultiProcessOrderPresenter.java
...@@ -166,6 +166,8 @@ public class MultiProcessOrderPresenter extends MultiProcessOrderContract.Presen ...@@ -166,6 +166,8 @@ public class MultiProcessOrderPresenter extends MultiProcessOrderContract.Presen
commitOrder(list); commitOrder(list);
})); }));
} }
}else {
commitOrder(null);
} }
} }
......
orderCenter/src/main/java/com/dayu/order/presenter/serverlist/ServerListContract.java
...@@ -15,5 +15,7 @@ public interface ServerListContract { ...@@ -15,5 +15,7 @@ public interface ServerListContract {
abstract class Presenter extends BaseListPresenter<View> { abstract class Presenter extends BaseListPresenter<View> {
public abstract void getServerList(); public abstract void getServerList();
public abstract void dumpToProcess();
} }
} }
orderCenter/src/main/java/com/dayu/order/presenter/serverlist/ServerListPresenter.java
package com.dayu.order.presenter.serverlist; package com.dayu.order.presenter.serverlist;
import android.databinding.ObservableField; import android.databinding.ObservableField;
import android.os.Bundle;
import com.dayu.common.Constants; import com.dayu.common.Constants;
import com.dayu.order.api.OrderApiFactory; import com.dayu.order.api.OrderApiFactory;
import com.dayu.order.api.protocol.Spu; import com.dayu.order.api.protocol.Spu;
import com.dayu.order.common.OrderConstant; import com.dayu.order.common.OrderConstant;
import com.dayu.order.ui.activity.MultipleProcessActivity;
import java.util.ArrayList;
/** /**
* Created by luofan * Created by luofan
...@@ -49,6 +53,13 @@ public class ServerListPresenter extends ServerListContract.Presenter { ...@@ -49,6 +53,13 @@ public class ServerListPresenter extends ServerListContract.Presenter {
} }
@Override @Override
public void dumpToProcess() {
Bundle bundle = new Bundle();
bundle.putParcelableArrayList(OrderConstant.SPUS,(ArrayList<Spu>)mDatas.get());
mView.startActivity(MultipleProcessActivity.class,bundle);
}
@Override
public void refresh() { public void refresh() {
getServerList(); getServerList();
} }
......
orderCenter/src/main/java/com/dayu/order/ui/activity/OrderDetailsActivity.java
...@@ -48,6 +48,7 @@ public class OrderDetailsActivity extends BaseActivity<OrderDetailPresenter, Act ...@@ -48,6 +48,7 @@ public class OrderDetailsActivity extends BaseActivity<OrderDetailPresenter, Act
@Override @Override
public void setPresenter() { public void setPresenter() {
getPackageName();
} }
@Override @Override
......
orderCenter/src/main/java/com/dayu/order/ui/activity/ServerListActivity.java
...@@ -68,6 +68,7 @@ public class ServerListActivity extends BaseActivity<ServerListPresenter, Activi ...@@ -68,6 +68,7 @@ public class ServerListActivity extends BaseActivity<ServerListPresenter, Activi
@Override @Override
public void onResume() { public void onResume() {
super.onResume(); super.onResume();
showDialog();
mPresenter.getServerList(); mPresenter.getServerList();
} }
} }
orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderAdapter.java
...@@ -359,9 +359,11 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi ...@@ -359,9 +359,11 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
if (order.getSpus().size() > 1) { if (order.getSpus().size() > 1) {
intent = new Intent(mContext, ServerInfoActivity.class); intent = new Intent(mContext, ServerInfoActivity.class);
bundle.putInt(Constants.ID, order.getId()); bundle.putInt(Constants.ID, order.getId());
} else { } else if (order.getSpus().size() == 1) {
intent = new Intent(mContext, ServerListActivity.class); intent = new Intent(mContext, ServerListActivity.class);
bundle.putInt(Constants.ID,order.getSpus().get(0).getId()); bundle.putInt(Constants.ID, order.getSpus().get(0).getId());
} else {
return;
} }
intent.putExtra(Constants.BUNDLE, bundle); intent.putExtra(Constants.BUNDLE, bundle);
mContext.startActivity(intent); mContext.startActivity(intent);
......
orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderFourTabAdapter.java
...@@ -6,7 +6,9 @@ import android.view.View; ...@@ -6,7 +6,9 @@ import android.view.View;
import com.dayu.base.ui.adapter.CoreAdapter; import com.dayu.base.ui.adapter.CoreAdapter;
import com.dayu.order.R; import com.dayu.order.R;
import com.dayu.order.api.protocol.Order; import com.dayu.order.api.protocol.Order;
import com.dayu.order.api.protocol.Spu;
import com.dayu.order.databinding.FragmentOrderCancleItemBinding; import com.dayu.order.databinding.FragmentOrderCancleItemBinding;
import com.dayu.utils.UIUtils;
import com.dayu.utils.UtilsDate; import com.dayu.utils.UtilsDate;
import static com.dayu.utils.UtilsDate.FORMAT_ONE; import static com.dayu.utils.UtilsDate.FORMAT_ONE;
...@@ -54,6 +56,27 @@ public class OrderFourTabAdapter extends CoreAdapter<Order, FragmentOrderCancleI ...@@ -54,6 +56,27 @@ public class OrderFourTabAdapter extends CoreAdapter<Order, FragmentOrderCancleI
helper.itemTextDizhi.setText(item.getProvinceName() + item.getCityName() + helper.itemTextDizhi.setText(item.getProvinceName() + item.getCityName() +
item.getDistrictName() + item.getAddress()); item.getDistrictName() + item.getAddress());
helper.errorState.setText(mContext.getString(R.string.order_cancle)); helper.errorState.setText(mContext.getString(R.string.order_cancle));
if (item.getCreatedSource() == 4) {
if (item.getSpus().size() < 1) {
return;
}
helper.itemTextWeixiu.setText(item.getSpus().get(0).getProviderTypeName());
helper.itemTextWeixiuLeixing.setText(item.getSpus().get(0).getKaSpuName());
Spu spu = item.getSpus().get(0);
if (item.getSpus().size() > 1) {
String str = UIUtils.getString(R.string.server_num);
String result = String.format(str, item.getSpus().size());
helper.serverStyle.setText(result);
} else {
String str = UIUtils.getString(R.string.single_server_num);
String result = String.format(str, spu.getFinNum(), spu.getFinNum());
helper.serverStyle.setText(result);
}
helper.serverStyle.setVisibility(View.VISIBLE);
}else {
helper.serverStyle.setVisibility(View.GONE);
}
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
......
orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderThreeTabAdapter.java
...@@ -29,7 +29,7 @@ public class OrderThreeTabAdapter extends CoreAdapter<ErrorOrder, FragmentOrderE ...@@ -29,7 +29,7 @@ public class OrderThreeTabAdapter extends CoreAdapter<ErrorOrder, FragmentOrderE
@Override @Override
protected void onBind(FragmentOrderErrorItemBinding holder, ErrorOrder item, int position) { protected void onBind(FragmentOrderErrorItemBinding holder, ErrorOrder item, int position) {
super.onBind(holder, item,position); super.onBind(holder, item, position);
initData(holder, item); initData(holder, item);
} }
...@@ -56,27 +56,29 @@ public class OrderThreeTabAdapter extends CoreAdapter<ErrorOrder, FragmentOrderE ...@@ -56,27 +56,29 @@ public class OrderThreeTabAdapter extends CoreAdapter<ErrorOrder, FragmentOrderE
helper.itemTextWeixiuLeixing.setText(item.getCategoryName()); helper.itemTextWeixiuLeixing.setText(item.getCategoryName());
helper.itemTextDizhi.setText(item.getProvinceName() + item.getCityName() + helper.itemTextDizhi.setText(item.getProvinceName() + item.getCityName() +
item.getDistrictName() + item.getAddress()); item.getDistrictName() + item.getAddress());
int errorState = item.getExcptionCode();
if (errorState == 1) {
helper.errorState.setText(mContext.getString(R.string.receive_time_out));
} else if (errorState == 2) {
helper.errorState.setText(mContext.getString(R.string.appointment_time_out));
} else if (errorState == 3) {
helper.errorState.setText(mContext.getString(R.string.server_time_out));
} else if (errorState == 4) {
helper.errorState.setText(mContext.getString(R.string.delivery_time_out));
}
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
int errorState = item.getExcptionCode();
if (errorState == 1) {
helper.errorState.setText(mContext.getString(R.string.receive_time_out));
} else if (errorState == 2) {
helper.errorState.setText(mContext.getString(R.string.appointment_time_out));
} else if (errorState == 3) {
helper.errorState.setText(mContext.getString(R.string.server_time_out));
} else if (errorState == 4) {
helper.errorState.setText(mContext.getString(R.string.delivery_time_out));
}
if (item.getCreatedSource() == 4) { if (item.getCreatedSource() == 4) {
if (item.getSpus().size() < 1) {
return;
}
helper.itemTextWeixiu.setText(item.getSpus().get(0).getProviderTypeName()); helper.itemTextWeixiu.setText(item.getSpus().get(0).getProviderTypeName());
helper.itemTextWeixiuLeixing.setText(item.getSpus().get(0).getKaSpuName()); helper.itemTextWeixiuLeixing.setText(item.getSpus().get(0).getKaSpuName());
Spu spu = item.getSpus().get(0); Spu spu = item.getSpus().get(0);
if (item.getSpus().size() > 1) { if (item.getSpus().size() > 1) {
String str = UIUtils.getString(R.string.server_name); String str = UIUtils.getString(R.string.server_num);
String result = String.format(str, item.getSpus().size()); String result = String.format(str, item.getSpus().size());
helper.serverStyle.setText(result); helper.serverStyle.setText(result);
} else { } else {
...@@ -84,8 +86,10 @@ public class OrderThreeTabAdapter extends CoreAdapter<ErrorOrder, FragmentOrderE ...@@ -84,8 +86,10 @@ public class OrderThreeTabAdapter extends CoreAdapter<ErrorOrder, FragmentOrderE
String result = String.format(str, spu.getFinNum(), spu.getFinNum()); String result = String.format(str, spu.getFinNum(), spu.getFinNum());
helper.serverStyle.setText(result); helper.serverStyle.setText(result);
} }
helper.serverStyle.setVisibility(View.VISIBLE);
}else {
helper.serverStyle.setVisibility(View.GONE);
} }
} }
} }
orderCenter/src/main/res/layout/activity_server_list_recycle.xml
...@@ -46,6 +46,7 @@ ...@@ -46,6 +46,7 @@
android:background="#f5f5f5" android:background="#f5f5f5"
app:itemType="@layout/activity_server_list" app:itemType="@layout/activity_server_list"
app:needCoreAdapter="true" app:needCoreAdapter="true"
android:layout_marginBottom="50dp"
app:needFoot="false" /> app:needFoot="false" />
</LinearLayout> </LinearLayout>
...@@ -56,6 +57,7 @@ ...@@ -56,6 +57,7 @@
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:background='@{presenter.mCanProcess?@color/bg_button:@color/cl_selector_hui}' android:background='@{presenter.mCanProcess?@color/bg_button:@color/cl_selector_hui}'
android:clickable='@{presenter.mCanProcess?true:true}' android:clickable='@{presenter.mCanProcess?true:true}'
android:onClick="@{()->presenter.dumpToProcess()}"
android:gravity="center" android:gravity="center"
android:text="提交验收" android:text="提交验收"
android:textColor="@color/white" android:textColor="@color/white"
......
orderCenter/src/main/res/layout/fragment_multi_detail.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android" <layout xmlns:android="http://schemas.android.com/apk/res/android">
xmlns:app="http://schemas.android.com/apk/res-auto">
<data> <data>
...@@ -295,6 +294,8 @@ ...@@ -295,6 +294,8 @@
android:layout_marginLeft="19dp" android:layout_marginLeft="19dp"
android:layout_marginTop="@dimen/dp_15" android:layout_marginTop="@dimen/dp_15"
android:layout_toRightOf="@+id/tv_address" android:layout_toRightOf="@+id/tv_address"
android:ellipsize="end"
android:maxLines="2"
android:text='@{item.provinceName+item.cityName+item.districtName+item.address}' android:text='@{item.provinceName+item.cityName+item.districtName+item.address}'
android:textColor="@color/cl_home_title_text_color" android:textColor="@color/cl_home_title_text_color"
android:textSize="14sp" /> android:textSize="14sp" />
......
orderCenter/src/main/res/layout/recycler_server_info_header.xml
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
<variable <variable
name="item" name="item"
type="com.dayu.order.api.protocol.Order" /> type="com.dayu.order.api.protocol.Order" />
<import type="android.text.TextUtils"/>
</data> </data>
...@@ -66,7 +67,7 @@ ...@@ -66,7 +67,7 @@
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_below="@+id/tv_type" android:layout_below="@+id/tv_type"
android:layout_marginTop="14dp" android:layout_marginTop="14dp"
android:text="@{item.customerName}" android:text='@{!TextUtils.isEmpty(item.customerName)?item.customerMobile:@string/no_data}'
android:textColor="@color/tv_cl" android:textColor="@color/tv_cl"
android:textSize="14sp" /> android:textSize="14sp" />
...@@ -87,7 +88,7 @@ ...@@ -87,7 +88,7 @@
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_below="@+id/tv_name" android:layout_below="@+id/tv_name"
android:layout_marginTop="14dp" android:layout_marginTop="14dp"
android:text="@{item.customerMobile}" android:text='@{!TextUtils.isEmpty(item.customerMobile)?item.customerMobile:@string/no_data}'
android:textColor="@color/tv_cl" android:textColor="@color/tv_cl"
android:textSize="14sp" /> android:textSize="14sp" />
...@@ -107,7 +108,7 @@ ...@@ -107,7 +108,7 @@
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_below="@+id/tv_mobile" android:layout_below="@+id/tv_mobile"
android:layout_marginTop="14dp" android:layout_marginTop="14dp"
android:text="@{item.customerTelphome}" android:text='@{!TextUtils.isEmpty(item.customerTelphome)?item.customerMobile:@string/no_data}'
android:textColor="@color/tv_cl" android:textColor="@color/tv_cl"
android:textSize="14sp" /> android:textSize="14sp" />
......
userCenter/src/main/java/com/dayu/usercenter/presenter/login/LoginPresenter.java
...@@ -12,6 +12,8 @@ import com.dayu.usercenter.api.UserApiFactory; ...@@ -12,6 +12,8 @@ import com.dayu.usercenter.api.UserApiFactory;
import com.dayu.usercenter.ui.activity.AgreementActivity; import com.dayu.usercenter.ui.activity.AgreementActivity;
import com.dayu.usercenter.ui.activity.IdentityCertificationActivity; import com.dayu.usercenter.ui.activity.IdentityCertificationActivity;
import com.dayu.utils.LogUtils; import com.dayu.utils.LogUtils;
import com.dayu.utils.ToastUtils;
import com.dayu.utils.UIUtils;
import com.dayu.utils.UserManager; import com.dayu.utils.UserManager;
import com.dayu.utils.UtilsUserAccountMatcher; import com.dayu.utils.UtilsUserAccountMatcher;
import com.hyphenate.EMCallBack; import com.hyphenate.EMCallBack;
...@@ -79,6 +81,8 @@ public class LoginPresenter extends LoginContract.Presenter { ...@@ -79,6 +81,8 @@ public class LoginPresenter extends LoginContract.Presenter {
else if (userInfo.getDetectStatus() == 2 || userInfo.getDetectStatus() == 3) { else if (userInfo.getDetectStatus() == 2 || userInfo.getDetectStatus() == 3) {
showLoginDialog(); showLoginDialog();
UserManager.getInstance().saveUser(userInfo); UserManager.getInstance().saveUser(userInfo);
}else {
ToastUtils.showShortToast(UIUtils.getString(R.string.login_faile));
} }
})); }));
} }
......
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