Skip to content

android / dayu

Go to a project
Commit de3cb8cb by mReturn
Options

Merge remote-tracking branch 'remotes/origin/dev'

parents c350fd94 69d53b70
Expand all
Inline Side-by-side
Showing with 630 additions and 50 deletions
baseSDK/build.gradle
......@@ -85,6 +85,8 @@ dependencies {
api 'com.google.android:flexbox:1.0.0'
api 'com.github.chrisbanes:PhotoView:2.0.0'
// api 'cjt.library.wheel:camera:1.1.9'
api 'de.hdodenhof:circleimageview:2.2.0'
api project(':umeng')
......
baseSDK/src/main/java/com/dayu/base/api/APIException.java
......@@ -89,7 +89,7 @@ public class APIException {
return ex;
} else {
ex = new ResponeThrowable(e, ERROR.UNKNOWN);
ex.message = BaseApplication.getContext().getString(R.string.error_unknow);
ex.message = e.toString();
return ex;
}
}
......
baseSDK/src/main/java/com/dayu/common/Constants.java
......@@ -33,7 +33,8 @@ public class Constants {
public final static String PATH_USER_REWARD= "/userCenter/user_reward";
public static final String PROGRAM_PATH = "pages/mallDetail/main?goodsId=gid&userId=uid&type=1"; //小程序路径
public static final String LEAEN_PROGRAM_PATH = " /pages/shareVideo/main?type=_type&id="; //课程视频小程序路径
public static final String LEAEN_PROGRAM_PATH = "/pages/shareVideo/main?type=_type&id="; //课程视频小程序路径
public static final String USER_PROGRAM_PATH = " /pages/masterInfo/main?id=";
public static final String INVITE_NEW_SHARE_URL = "http://app.dl.kf.ai/ext/#/shareMaster?code="; //邀请新人分享链接
public static final String INVITE_NEW_SHARE_URL_BUSINESS = "http://app.dl.kf.ai/ext/#/merchants?code="; //邀请商家分享链接
......@@ -156,6 +157,7 @@ public class Constants {
public final static String AppLogoUrl = "https://dayuoss.oss-cn-beijing.aliyuncs.com/saas/151508298725_.pic_hd.jpg";
public final static String AvatarUrl = "http://dl.kf.ai/test/sp/mobile/ios/business/checkApply/d1f55406ba3eeb90c4f7e8552131e623.JPG?x-oss-process=style/pic";
/***********************其他配置**********************************/
......
baseSDK/src/main/java/com/dayu/utils/CommonUtils.java
......@@ -378,7 +378,7 @@ public class CommonUtils {
*/
public static String getYearData(String dataStr) {
if (TextUtils.isEmpty(dataStr)) {
return UIUtils.getString(R.string.unknown);
return " ";
} else {
SimpleDateFormat df = null;
Date sDate = null;
......@@ -388,7 +388,9 @@ public class CommonUtils {
return df.format(sDate);
} catch (ParseException e) {
e.printStackTrace();
return UIUtils.getString(R.string.unknown);
// return UIUtils.getString(R.string.unknown);
return " ";
}
}
}
......
baseSDK/src/main/java/com/dayu/utils/UIUtils.java
......@@ -233,6 +233,70 @@ public class UIUtils {
}
return style;
}
/**
* drawStars.
*
* @param starLinearLayout .
* @param lev .
* @param totalLevel .
*/
public static void drawStars(Activity mActivity,LinearLayout starLinearLayout, String lev, String totalLevel) {
String level = "0";
if (!TextUtils.isEmpty(lev)) {
level = lev;
}
int max = Integer.parseInt(totalLevel);
int beginNum = 0;
int endNum = max;
boolean isNedHalf = false;
if (!TextUtils.isEmpty(level)) {
if (Float.parseFloat(level) > max) {
beginNum = max;
endNum = max - beginNum;
} else {
Float levelf = Float.parseFloat(level);
int leveli = Math.round(levelf);
if (leveli > levelf) {
beginNum = leveli - 1;
endNum = (max - 1) - beginNum;
isNedHalf = true;
} else {
beginNum = leveli;
endNum = max - beginNum;
}
}
}
starLinearLayout.removeAllViews();
LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(
ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
layoutParams.setMargins(3, 0, 3, 0);
for (int i = 0; i < beginNum; i++) {
ImageView starImg = new ImageView(mActivity);
Bitmap bm = BitmapFactory.decodeResource(mActivity.getResources(), R.drawable.
person_xingxing);
starImg.setImageBitmap(bm);
starLinearLayout.addView(starImg, layoutParams);
}
if (isNedHalf) {
ImageView starImg = new ImageView(mActivity);
Bitmap bm = BitmapFactory.decodeResource(mActivity.getResources(), R.drawable.person_banxing);
starImg.setImageBitmap(bm);
starLinearLayout.addView(starImg, layoutParams);
}
for (int i = 0; i < endNum; i++) {
ImageView starImg = new ImageView(mActivity);
Bitmap bm = BitmapFactory.decodeResource(mActivity.getResources(), R.drawable.
person_xing);
starImg.setImageBitmap(bm);
starLinearLayout.addView(starImg, layoutParams);
}
}
}
baseSDK/src/main/res/values/strings.xml
......@@ -162,6 +162,7 @@
<string name="title_agreement">用户协议</string>
<string name="agreement_detail">《用户协议》</string>
<string name="login_faile">登录失败</string>
<string name="login_faile_by_role">该账号不是大鱼师傅</string>
<string name="send_code_faile">发送验证码失败</string>
<string name="voice_code_notice">收不到短信？试试语音验证</string>
<string name="schedule">日程</string>
......@@ -679,10 +680,10 @@
<string name="agreement">
特别提示：\n
欢迎您注册使用大鱼U服（以下简称“大鱼平台”），您在申请注册流程中点击同意本协议之前，应当认真阅读本协议。请您务必审慎阅读、充分理解各条款内容，特别是免除或者限制责任的条款、法律适用和争议解决条款。免除或者限制责任的条款将以粗体以及下划线标识，您应重点阅读。如您对本协议有任何疑问，请与kf@kf.ai联系。当您按照注册页面提示填写信息、阅读并同意本协议且完成全部注册程序后，即表示您已充分阅读、理解并接受本协议的全部内容，并与北京大鱼创想网络科技有限公司达成一致，双方同意使用互联网信息技术以数据电文形式订立本用户协议并认同其效力。\n
欢迎您注册使用大鱼云服（以下简称“大鱼平台”），您在申请注册流程中点击同意本协议之前，应当认真阅读本协议。请您务必审慎阅读、充分理解各条款内容，特别是免除或者限制责任的条款、法律适用和争议解决条款。免除或者限制责任的条款将以粗体以及下划线标识，您应重点阅读。如您对本协议有任何疑问，请与kf@kf.ai联系。当您按照注册页面提示填写信息、阅读并同意本协议且完成全部注册程序后，即表示您已充分阅读、理解并接受本协议的全部内容，并与北京大鱼创想网络科技有限公司达成一致，双方同意使用互联网信息技术以数据电文形式订立本用户协议并认同其效力。\n
您的下载、注册、登录、使用及连接大鱼平台服务等行为均将被视为您已经完全了解、接受并同意遵守本协议项下的全部内容。本协议可由本公司根据需要不时的修改，并以网站或应用程序公示的方式进行公告，不再单独通知您。修改后的协议一经公布即替代原来的协议，构成您与本公司之间就本协议主题事由的全部、最新协议。您有义务不时关注并阅读最新版的协议以及网站或应用程序的公告。如您不同意更新后的协议，可以且应立即停止接受本公司依据本协议提供的服务；如您继续使用大鱼平台的服务的,即视为您同意更新后的协议。\n
第一条 定义\n
1. 大鱼平台：大鱼平台是由北京大鱼创想科技有限公司（以下简称“本公司”或者“乙方”）开发的提供服务的互联网产品，包含大鱼U服SAAS平台和大鱼师傅app。\n
1. 大鱼平台：大鱼平台是由北京大鱼创想科技有限公司（以下简称“本公司”或者“乙方”）开发的提供服务的互联网产品，包含大鱼云服SAAS平台和大鱼师傅app。\n
2. 大客户：是指服务需求的提供方，通过派遣服务单的方式提供服务需求给服务商，并对其服务进行验收的企业或个人。\n
3. 平台用户(以下简称“甲方”)：平台用户是指签署本协议并有权使用大鱼平台服务人员账户的个人，包括且不限于服务师傅，店长和服务商管理员。\n
4. 最终用户：用户是指通过大鱼平台完成全部注册程序后，提出服务申请并享受相关服务的个人。\n
......@@ -937,7 +938,7 @@ C) 雿輻憭折掉撟喳餈葉鈭抒嚗恥
<string name="user_bank_account">银行账号:</string>
<string name="user_bank_account_hint">请输入银行账号</string>
<string name="user_bank_holer">开户人姓名:</string>
<string name="fill_bank_notice">完善银行卡信息后，您的所有收入和奖励将会在下个月1号由平台提现到此卡上</string>
<string name="fill_bank_notice">完善银行卡信息后，您的所有收入和奖励将会在下个月初由平台提现到此卡上</string>
<string name="user_bank_holer_hint">请输入开户人姓名</string>
<string name="user_addr_info">快递地址信息</string>
<string name="user_receiver_addr">收件地址:</string>
......
baseSDK/src/main/res/values/styles.xml
......@@ -90,7 +90,7 @@
<item name="android:layout_height">35dp</item>
<item name="android:padding">3dp</item>
<item name="android:layout_marginLeft">10dp</item>
<item name="android:gravity">left|center_vertical</item>
<item name="android:gravity">left|top</item>
<item name="android:background">@drawable/bg_input_gray_react</item>
</style>
......
build.gradle
......@@ -5,8 +5,8 @@ buildscript {
ext.build_tools_version = "27.0.3"
ext.min_sdk_version = 17
ext.target_sdk_version = 26
ext.version_code = 259
ext.verson_name = "2.5.9"
ext.version_code = 260
ext.verson_name = "2.6.0"
ext.gradle_version = '3.1.4'
ext.isReleaseMinify = false
ext.isDebugMinify = false
......
learnCenter/src/main/java/com/dayu/learncenter/ui/activity/PrepareLiveActivity.java
......@@ -74,7 +74,7 @@ public class PrepareLiveActivity extends BaseActivity<SImplePresenter, ActivityP
private void initCover() {
// String strCover = TCUserMgr.getInstance().getCoverPic();
if (!TextUtils.isEmpty(coverUrl)) {
GlideImageLoader.load(this,mBind.ivCover,coverUrl,R.drawable.publish_background);
GlideImageLoader.loadFit(this,mBind.ivCover,coverUrl,R.drawable.publish_background);
// mBind.tvTips.setVisibility(View.GONE);
} else {
mBind.ivCover.setImageResource(com.dayu.livemodule.R.drawable.publish_background);
......
learnCenter/src/main/java/com/dayu/learncenter/ui/activity/VideoPlayActivity.java
......@@ -4,6 +4,7 @@ import android.content.Context;
import android.content.Intent;
import android.text.TextUtils;
import android.view.View;
import android.view.WindowManager;
import android.widget.ImageView;
import com.dayu.base.ui.activity.BaseActivity;
......@@ -32,6 +33,7 @@ public class VideoPlayActivity extends BaseActivity<SImplePresenter, ActivityVid
@Override
public int getLayoutId() {
getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
return R.layout.activity_video_play;
}
......
learnCenter/src/main/java/com/dayu/learncenter/ui/fragment/CommonLearnFragment.java
......@@ -186,7 +186,7 @@ public class CommonLearnFragment extends BaseFragment<CommonLearnPresenter, Frag
addShareRecord(data);
} else {
String imgUrl = CommonUtils.getVideoImg(item.getUrl());
LogUtils.e("shareImg: "+imgUrl);
LogUtils.e("sharevideo: "+item.getUrl());
CommonUtils.shareUrl(mActivity, url,imgUrl , item.getName(), item.getBrief(), SHARE_MEDIA.WEIXIN_CIRCLE, null);
AddShareRecordData data = new AddShareRecordData(mUserId, mUserInfo.getAccountName(),
"朋友圈", item.getId(), 1);
......
learnCenter/src/main/res/layout/activity_prepare_live.xml
......@@ -26,6 +26,7 @@
</RelativeLayout>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
......@@ -36,7 +37,6 @@
android:layout_height="200dp"
android:onClick="onClick"
android:background="@color/black"
android:scaleType="centerCrop"
/>
<TextView
......
learnCenter/src/main/res/layout/item_common_learn.xml
......@@ -49,7 +49,7 @@
android:gravity="center"
android:paddingLeft="15dp"
android:paddingRight="15dp"
android:text="发布时间 2020-01-01" />
android:text="发布时间 " />
<TextView
android:id="@+id/tv_disable"
......
liveModule/src/main/java/com/dayu/livemodule/xiaozhibo/anchor/TCCameraAnchorActivity2.java
......@@ -500,6 +500,15 @@ public class TCCameraAnchorActivity2 extends TCBaseAnchorActivity {
*/
@Override
public void onClick(View v) {
if (null != mAudioCtrl && mAudioCtrl.getVisibility() == View.VISIBLE) {
mAudioCtrl.setVisibility( View.GONE);
return;
}
if (mBeautyControl.isShown() || mBeautyControl.getVisibility() == View.VISIBLE) {
mBeautyControl.setVisibility( View.GONE);
return;
}
int i = v.getId();
if (i == R.id.switch_cam) {
if (mLiveRoom != null) {
......
liveModule/src/main/res/layout/activity_audience2.xml
......@@ -399,7 +399,7 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginRight="15dp"
android:layout_marginRight="125dp"
android:layout_marginBottom="10dp">
<com.dayu.livemodule.xiaozhibo.common.widget.like.TCHeartLayout
......
liveModule/src/main/res/layout/activity_camera_anchor2.xml
......@@ -328,16 +328,23 @@
android:stackFromBottom="true"
android:transcriptMode="normal" />
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:overScrollMode="never"
android:layout_marginBottom="60dp"
android:background="#00000000"
>
<com.dayu.livemodule.xiaozhibo.anchor.music.TCAudioControl
android:id="@+id/anchor_audio_control"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:background="#ffffff"
android:clickable="true"
android:orientation="vertical"
android:padding="0dp"
android:visibility="gone" />
</ScrollView>
<com.tencent.liteav.demo.beauty.BeautyPanel
android:id="@+id/beauty_panel"
......@@ -420,6 +427,7 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginRight="20dp"
android:layout_marginBottom="10dp">
<com.dayu.livemodule.xiaozhibo.common.widget.like.TCHeartLayout
......
liveModule/src/main/res/layout/dialog_input_text2.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/rl_outside_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<LinearLayout
android:id="@+id/rl_inputdlg_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/color_input_dialog_background"
android:orientation="horizontal"
android:layout_alignParentBottom="true">
<LinearLayout
android:id="@+id/barrage_area"
android:orientation="horizontal"
android:layout_weight="0.3"
android:layout_gravity="center_vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<Button
android:id="@+id/barrage_btn"
android:layout_width="40dp"
android:layout_marginLeft="10dp"
android:layout_height="25dp"
android:layout_marginRight="10dp"
android:background="@drawable/barrage_slider_off" />
</LinearLayout>
<View android:layout_width="0.5dp"
android:layout_height="match_parent"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:layout_marginLeft="6dp"
android:layout_marginStart="6dp"
android:background="@color/colorTransparentBlack"/>
<EditText
android:id="@+id/et_input_message"
android:hint="@string/dialog_input_text_hint"
android:layout_width="match_parent"
android:layout_weight="4"
android:layout_height="wrap_content"
android:imeActionId="@+id/login"
android:imeOptions="flagNoExtractUi"
android:inputType="text"
android:maxLength="32"
android:textColor="@color/black"
android:maxLines="1"
android:singleLine="true" />
<View android:layout_width="0.5dp"
android:layout_height="match_parent"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:layout_marginLeft="6dp"
android:layout_marginStart="6dp"
android:background="@color/colorTransparentBlack"/>
<LinearLayout
android:id="@+id/confirm_area"
android:layout_width="wrap_content"
android:layout_gravity="center"
android:layout_height="wrap_content">
<Button
android:id="@+id/confrim_btn"
android:layout_width="50dp"
android:layout_height="30dp"
android:background="@drawable/btn_send_message"
android:gravity="center"
android:textColor="@color/colorAccent"
android:text="@string/send" />
</LinearLayout>
</LinearLayout>
</RelativeLayout>
\ No newline at end of file
orderCenter/src/main/java/com/dayu/order/api/OrderService.java
......@@ -26,6 +26,7 @@ import com.dayu.order.api.protocol.TranCompanyBean;
import com.dayu.order.api.protocol.bean.ServiceProviderBean;
import com.dayu.order.api.protocol.bean.ServiceStationBean;
import com.dayu.order.api.protocol.companyManager;
import com.dayu.order.api.protocol.data.AddDialRecordData;
import com.dayu.order.api.protocol.data.ReceivePartData;
import com.dayu.order.api.protocol.data.SendPartData;
import com.dayu.order.common.OrderConstant;
......@@ -490,4 +491,10 @@ public interface OrderService {
*/
@GET(Constants.API_7200+"/ordersLogistics/{id}")
Observable<BaseResponse<OrderPardDeatilBean>> getPartDetail(@Path("id") int id);
/**
* 拨打电话记录
*/
@POST(Constants.API_7200+"/orderDialRecord")
Observable<BaseResponse<Boolean>> addDialRecord(@Body AddDialRecordData data);
}
orderCenter/src/main/java/com/dayu/order/api/protocol/data/AddDialRecordData.java 0 → 100644
package com.dayu.order.api.protocol.data;
public class AddDialRecordData {
/**
* createId : 0
* createTime : 2020-07-17T06:29:51.733Z
* created : string
* id : 0
* mobile : string
* orderId : 0
*/
private int createId;
private String createTime;
private String created;
private String mobile;
private int orderId;
public AddDialRecordData() {
}
public AddDialRecordData(int createId, String createTime, String created, String mobile, int orderId) {
this.createId = createId;
this.createTime = createTime;
this.created = created;
this.mobile = mobile;
this.orderId = orderId;
}
public int getCreateId() {
return createId;
}
public void setCreateId(int createId) {
this.createId = createId;
}
public String getCreateTime() {
return createTime;
}
public void setCreateTime(String createTime) {
this.createTime = createTime;
}
public String getCreated() {
return created;
}
public void setCreated(String created) {
this.created = created;
}
public String getMobile() {
return mobile;
}
public void setMobile(String mobile) {
this.mobile = mobile;
}
public int getOrderId() {
return orderId;
}
public void setOrderId(int orderId) {
this.orderId = orderId;
}
}
orderCenter/src/main/java/com/dayu/order/presenter/orderdoing/OrderDoingPresenter.java
......@@ -3,13 +3,16 @@ package com.dayu.order.presenter.orderdoing;
import android.databinding.ObservableField;
import android.os.Bundle;
import com.dayu.base.api.Api;
import com.dayu.common.BaseApplication;
import com.dayu.common.Constants;
import com.dayu.event.UserInfo;
import com.dayu.order.R;
import com.dayu.order.api.OrderApiFactory;
import com.dayu.order.api.OrderService;
import com.dayu.order.api.protocol.Order;
import com.dayu.order.api.protocol.Spu;
import com.dayu.order.api.protocol.data.AddDialRecordData;
import com.dayu.order.common.OrderConstant;
import com.dayu.order.ui.activity.MultiProcessOrderActivity;
import com.dayu.order.ui.activity.OrderDetailsActivity;
......@@ -21,6 +24,7 @@ import com.dayu.provider.event.RefreshTab;
import com.dayu.utils.AppManager;
import com.dayu.utils.ToastUtils;
import com.dayu.utils.UserManager;
import com.dayu.utils.UtilsDate;
import com.dayu.widgets.CustomDialog;
import com.megvii.idcardlib.util.ConUtil;
import com.megvii.licensemanager.Manager;
......@@ -49,10 +53,11 @@ public class OrderDoingPresenter extends orderDoingContract.Presenter {
private int mSiteId;
private int mState;
private int mPage;
UserInfo userInfo;
@Override
public void onAttached() {
UserInfo userInfo = UserManager.getInstance().getUser();
userInfo = UserManager.getInstance().getUser();
mUserId = Integer.parseInt(userInfo.getAccountId());
mSiteId = userInfo.getSiteId();
mState = mView.getState();
......@@ -207,4 +212,10 @@ public class OrderDoingPresenter extends orderDoingContract.Presenter {
public void onDetached() {
super.onDetached();
}
public void addDialRecord(String phoneNum,int orderId) {
String time = UtilsDate.getCurrDate("yyyy-MM-dd HH:mm:ss");
AddDialRecordData recordData = new AddDialRecordData(mUserId, time, userInfo.getAccountName(),phoneNum, orderId);
Api.getService(OrderService.class).addDialRecord(recordData).compose(Api.applySchedulers()).subscribe();
}
}
orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderAdapter.java
......@@ -30,7 +30,6 @@ import com.dayu.provider.event.RefreshServe;
import com.dayu.provider.event.RefreshTab;
import com.dayu.provider.router.RouterPath;
import com.dayu.utils.CommonUtils;
import com.dayu.utils.LogUtils;
import com.dayu.utils.ProgressUtil;
import com.dayu.utils.SPUtils;
import com.dayu.utils.UIUtils;
......@@ -41,9 +40,7 @@ import com.umeng.analytics.MobclickAgent;
import org.greenrobot.eventbus.EventBus;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
......@@ -234,6 +231,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
holder.tvSettlementDate.setTextColor(mContext.getResources().getColor(R.color.common_text_color));
}
holder.tvSettlementPrice.setText(CommonUtils.getMoneyStr(mContext,item.getSettlementPrice()));
holder.tvSettlementDate.setText(CommonUtils.getYearData(item.getSettlementDate()));
time = item.getConfirmDoorTime();
break;
......@@ -296,11 +294,11 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
if (item.getStatus() != 1) {
holder.itemTextPhone.setOnClickListener(v -> {
if (!TextUtils.isEmpty(item.getCustomerTelphome()) && !TextUtils.isEmpty(item.getCustomerMobile())) {
showMoblieDialog(item.getCustomerMobile(), item.getCustomerTelphome());
showMoblieDialog(item.getCustomerMobile(), item.getCustomerTelphome(),item.getId());
} else if (!TextUtils.isEmpty(item.getCustomerTelphome())){
takePhone(item.getCustomerTelphome());
takePhone(item.getCustomerTelphome(),item.getId());
}else if (!TextUtils.isEmpty(item.getCustomerMobile())){
takePhone(item.getCustomerMobile());
takePhone(item.getCustomerMobile(),item.getId());
}
Map<String, String> map_ekv = new HashMap<>();
if (item.getStatus() == 2) {
......@@ -531,12 +529,12 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
customDialog.show();
}
private void showMoblieDialog(String mobile, String tel) {
private void showMoblieDialog(String mobile, String tel, int id) {
List<String> list = new ArrayList<>();
list.add(mobile);
list.add(tel);
OptionsPickerView pvOptions = new OptionsPickerBuilder(mContext,
(options1, options2, options3, v) -> takePhone(list.get(options1)))
(options1, options2, options3, v) -> takePhone(list.get(options1),id))
.setContentTextSize(20)
.setLineSpacingMultiplier(2.0f)
.setContentTextSize(20)
......@@ -545,10 +543,13 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
pvOptions.show();
}
private void takePhone(String phone) {
private void takePhone(String phone,int orderId) {
Intent intent = new Intent(Intent.ACTION_DIAL);
intent.setData(Uri.parse("tel:" + phone));
mContext.startActivity(intent);
if (mPresenter != null)
mPresenter.addDialRecord(phone,orderId);
}
public void initPresenter(OrderDoingPresenter presenter) {
......
orderCenter/src/main/java/com/dayu/order/ui/fragment/MultiOrderDetailFragment.java
......@@ -2,11 +2,8 @@ package com.dayu.order.ui.fragment;
import android.content.Intent;
import android.os.Bundle;
import android.support.v7.app.AlertDialog;
import android.support.v7.widget.LinearLayoutManager;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.ImageView;
import com.alibaba.android.arouter.launcher.ARouter;
import com.dayu.base.api.APIService;
......@@ -14,14 +11,15 @@ import com.dayu.base.api.Api;
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.OrderService;
import com.dayu.order.api.protocol.OrderDetail;
import com.dayu.order.api.protocol.Spu;
import com.dayu.order.api.protocol.data.AddDialRecordData;
import com.dayu.order.common.OperatePhoneEvent;
import com.dayu.order.common.OrderConstant;
import com.dayu.order.databinding.FragmentMultiDetailBinding;
......@@ -31,17 +29,15 @@ 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;
import com.dayu.order.ui.activity.ServerInstructionActivity;
import com.dayu.provider.event.TakeOrderSuccessEvent;
import com.dayu.provider.router.RouterPath;
import com.dayu.utils.CommonUtils;
import com.dayu.utils.GlideImageLoader;
import com.dayu.utils.ToastUtils;
import com.dayu.utils.UIUtils;
import com.dayu.utils.UtilsDate;
import com.dayu.widgets.CustomDialog;
import com.dayu.widgets.TextDialog;
import com.dayu.widgets.listener.OnItemClickListener;
import com.megvii.idcardlib.util.DialogUtil;
import com.umeng.analytics.MobclickAgent;
import org.greenrobot.eventbus.EventBus;
......@@ -198,9 +194,15 @@ public class MultiOrderDetailFragment extends BaseFragment<SImplePresenter, Frag
} else {
if (phones.size() == 1) {
CommonUtils.dialPhone(mActivity, phones.get(0));
addDialPhoneRecord(phones.get(0));
} else {
TextDialog.getInstance().showCenterDialog(mActivity, phones, pos ->
CommonUtils.dialPhone(mActivity, phones.get(pos)));
TextDialog.getInstance().showCenterDialog(mActivity, phones, pos -> {
CommonUtils.dialPhone(mActivity, phones.get(pos));
addDialPhoneRecord(phones.get(pos));
}
);
}
}
});
......@@ -222,11 +224,17 @@ public class MultiOrderDetailFragment extends BaseFragment<SImplePresenter, Frag
});
}
private void addDialPhoneRecord(String phoneNum) {
String time = UtilsDate.getCurrDate("yyyy-MM-dd HH:mm:ss");
AddDialRecordData recordData = new AddDialRecordData(mUserId, time, mUserInfo.getAccountName(),phoneNum, orderId);
Api.getService(OrderService.class).addDialRecord(recordData).compose(Api.applySchedulers()).subscribe();
}
private void takeOrder() {
showDialog();
OrderApiFactory.receiveOrder(orderId, mUserId).subscribe(mPresenter.baseObserver(
aBoolean -> {
MobclickAgent.onEvent(mActivity,"get_serviceOrder");
MobclickAgent.onEvent(mActivity, "get_serviceOrder");
EventBus.getDefault().post(new TakeOrderSuccessEvent());
ToastUtils.showLongToast(R.string.take_oreder_success_tosee);
mBind.tvTakeOrder.setVisibility(View.GONE);
......
orderCenter/src/main/java/com/dayu/order/ui/fragment/OrderFirstTabFragment.java
......@@ -35,6 +35,7 @@ public class OrderFirstTabFragment extends BaseFragment<OrderDoingPresenter, Fra
public void initView() {
mAdapter = new OrderAdapter(true);
mAdapter.setViewType(R.layout.fragment_orderdoing_item);
mAdapter.initPresenter(mPresenter);
mBind.recyclerView.setAdapter(mAdapter);
mPresenter.refresh();
EventBus.getDefault().register(this);
......
saleCenter/src/main/java/com/bigfish/salecenter/ui/activity/PosterShareActivity.java
......@@ -138,7 +138,7 @@ public class PosterShareActivity extends BaseActivity<SImplePresenter, ActivityP
mBind.ivQr.setImageBitmap(bitmap);
} catch (Exception e) {
e.printStackTrace();
ToastUtils.showShortToast(R.string.error_unknow);
ToastUtils.showShortToast(e.toString());
}
}
......@@ -146,7 +146,7 @@ public class PosterShareActivity extends BaseActivity<SImplePresenter, ActivityP
@Override
public void onFailure(Call<ResponseBody> call, Throwable t) {
hideDialog();
ToastUtils.showShortToast(R.string.error_unknow);
ToastUtils.showShortToast(t.toString());
}
});
}
......
userCenter/src/main/java/com/dayu/usercenter/api/UserService2.java
package com.dayu.usercenter.api;
import com.dayu.base.api.protocol.AddressInfoBean;
import com.dayu.base.api.protocol.BasePageBean;
import com.dayu.base.api.protocol.BaseResponse;
import com.dayu.common.Constants;
import com.dayu.usercenter.model.AddUserCardData;
import com.dayu.usercenter.model.ApplyLicenceData;
import com.dayu.usercenter.model.ApplyWithdrawData;
import com.dayu.usercenter.model.EditBankData;
import com.dayu.usercenter.model.SaveSceneData;
import com.dayu.base.api.protocol.AddressInfoBean;
import com.dayu.usercenter.model.bean.BusinessSceneBean;
import com.dayu.usercenter.model.EditBankData;
import com.dayu.usercenter.model.bean.CommonRecordListBean;
import com.dayu.usercenter.model.bean.GlobelRateBean;
import com.dayu.usercenter.model.bean.InviteRecordBean;
......@@ -24,6 +26,8 @@ import com.dayu.usercenter.model.bean.UserLicenceBean;
import java.util.List;
import io.reactivex.Observable;
import okhttp3.ResponseBody;
import retrofit2.Call;
import retrofit2.http.Body;
import retrofit2.http.GET;
import retrofit2.http.POST;
......@@ -261,5 +265,22 @@ public interface UserService2 {
@Query("page") int page,
@Query("pageSize") int pageSize);
/**
* 添加发名片记录
*/
@POST(Constants.API_7100+"/engnieerCardShareRecord")
Observable<BaseResponse<Boolean>> addSendUserRecord(@Body AddUserCardData data);
/**
* 申请提现
*/
@POST(Constants.API_7800+"/payAccountWithdrawRecord/apply")
Observable<BaseResponse<Boolean>> appplyWithdraw(@Body ApplyWithdrawData data);
@GET("/api-third/WXUser/getWxQrCode")
Call<ResponseBody> createWxUrl(@Query("path") String path, @Query("width") int width);
}
userCenter/src/main/java/com/dayu/usercenter/model/AddUserCardData.java 0 → 100644
package com.dayu.usercenter.model;
public class AddUserCardData {
/**
* accountId : 0
* createTime : 2020-07-17T06:43:24.487Z
* id : 0
* operatorInfo : string
*/
private int accountId;
private String operatorInfo;
public AddUserCardData() {
}
public AddUserCardData(int accountId, String operatorInfo) {
this.accountId = accountId;
this.operatorInfo = operatorInfo;
}
public int getAccountId() {
return accountId;
}
public void setAccountId(int accountId) {
this.accountId = accountId;
}
public String getOperatorInfo() {
return operatorInfo;
}
public void setOperatorInfo(String operatorInfo) {
this.operatorInfo = operatorInfo;
}
}
userCenter/src/main/java/com/dayu/usercenter/model/ApplyWithdrawData.java 0 → 100644
package com.dayu.usercenter.model;
public class ApplyWithdrawData {
public int accountId;
public int type = 1; //1：大鱼师傅 2：小程序客户 3：大鱼商家 ,
public ApplyWithdrawData() {
}
public ApplyWithdrawData(int accountId) {
this.accountId = accountId;
}
}
userCenter/src/main/java/com/dayu/usercenter/model/bean/UserIncomeBean.java
......@@ -15,6 +15,15 @@ public class UserIncomeBean {
private double servicePrice;
private double inviteRewardPrice;
private double platformRewardPrice;
private double unWithdrawPrice;
public double getUnWithdrawPrice() {
return unWithdrawPrice;
}
public void setUnWithdrawPrice(double unWithdrawPrice) {
this.unWithdrawPrice = unWithdrawPrice;
}
public double getWithdrawPrice() {
return withdrawPrice;
......
userCenter/src/main/java/com/dayu/usercenter/presenter/login/LoginPresenter.java
......@@ -70,14 +70,13 @@ public class LoginPresenter extends LoginContract.Presenter {
}
mView.showDialog();
UserApiFactory.login(userName.get(), password.get(), "mobileLogin").subscribe(baseObserver(userInfo -> {
if (userInfo.getDetectStatus() == 1) {
loginHx(userInfo.getHxAccount(), userInfo.getHxPwd());
dumpAndSave(userInfo);
} else if (userInfo.getDetectStatus() == 2 || userInfo.getDetectStatus() == 3) {
showLoginDialog();
if (userInfo.getRoles() != null && (userInfo.getRoles().contains(2) || userInfo.getRoles().contains(3))){
userInfo.setSiteId(-1);
userInfo.setMobile(userName.get());
UserManager.getInstance().saveUser(userInfo);
} else {
ToastUtils.showShortToast(UIUtils.getString(R.string.login_faile));
ARouter.getInstance().build(RouterPath.PATH_MAIN).navigation();
}else {
ToastUtils.showShortToast(UIUtils.getString(R.string.login_faile_by_role));
}
}));
}
......
userCenter/src/main/java/com/dayu/usercenter/presenter/smslogin/SmsLoginPresenter.java
......@@ -12,7 +12,6 @@ import com.dayu.provider.router.RouterPath;
import com.dayu.usercenter.R;
import com.dayu.usercenter.api.UserApiFactory;
import com.dayu.usercenter.common.UserConstant;
import com.dayu.usercenter.ui.activity.IdentityCertificationActivity;
import com.dayu.utils.AppManager;
import com.dayu.utils.LogUtils;
import com.dayu.utils.StationManager;
......@@ -127,13 +126,13 @@ public class SmsLoginPresenter extends SmsLoginContract.Presenter {
@Override
public void dumpAndSave(UserInfo info) {
if (info.getRoles() != null && info.getRoles().contains(2)){
if (info.getRoles() != null && (info.getRoles().contains(2) || info.getRoles().contains(3))){
info.setSiteId(-1);
info.setMobile(phoneNume.get());
UserManager.getInstance().saveUser(info);
ARouter.getInstance().build(RouterPath.PATH_MAIN).navigation();
}else {
ToastUtils.showShortToast(UIUtils.getString(R.string.login_faile));
ToastUtils.showShortToast(UIUtils.getString(R.string.login_faile_by_role));
}
//// List<Integer> role = info.getRoles();
......
userCenter/src/main/java/com/dayu/usercenter/ui/activity2/ShareUserCardActivity.java 0 → 100644
package com.dayu.usercenter.ui.activity2;
import android.Manifest;
import android.annotation.SuppressLint;
import android.content.Intent;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import com.badoo.mobile.util.WeakHandler;
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.ActivityShareUserCardBinding;
import com.dayu.usercenter.model.AddUserCardData;
import com.dayu.utils.BitmapUtils;
import com.dayu.utils.CommonUtils;
import com.dayu.utils.GlideImageLoader;
import com.dayu.utils.MPermissionUtils;
import com.dayu.utils.ToastUtils;
import com.umeng.socialize.UMShareAPI;
import com.umeng.socialize.bean.SHARE_MEDIA;
import java.io.File;
import java.io.InputStream;
import java.util.concurrent.TimeUnit;
import io.reactivex.Observable;
import io.reactivex.android.schedulers.AndroidSchedulers;
import okhttp3.ResponseBody;
import retrofit2.Call;
import retrofit2.Callback;
import retrofit2.Response;
public class ShareUserCardActivity extends BaseActivity<SImplePresenter, ActivityShareUserCardBinding> {
WeakHandler weakHandler = new WeakHandler();
@Override
public void setPresenter() {
}
@Override
public int getLayoutId() {
return R.layout.activity_share_user_card;
}
@Override
public void initView() {
initUser();
mBind.tvName.setText("我是"+mUserInfo.getAccountName()+",很高兴为您服务!");
GlideImageLoader.load(this, mBind.ivAvatar, mUserInfo.getHeaderImg(), R.drawable.user);
mBind.titleBack.setOnClickListener(v -> finish());
mBind.btnShare.setOnClickListener(v -> {
showDialog();
saveAndShare();
});
initData();
}
private void saveAndShare() {
String[] mPerArr = new String[]{Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE};
MPermissionUtils.requestPermissionsResult(mActivity, 1, mPerArr, new MPermissionUtils.OnPermissionListener() {
@SuppressLint("CheckResult")
@Override
public void onPermissionGranted() {
Observable.timer(200, TimeUnit.MILLISECONDS)
.observeOn(AndroidSchedulers.mainThread())
.subscribe(aLong -> {
Bitmap bitmap = BitmapUtils.getBitmap(mBind.llPoster);
File file = BitmapUtils.saveBitmap2Local(bitmap, "card"+System.currentTimeMillis()+mUserId+ ".png");
if (file != null) {
CommonUtils.shareImg(ShareUserCardActivity.this, file, SHARE_MEDIA.WEIXIN_CIRCLE, null);
addShareCardRecord();
}else {
showToast("保存失败");
}
weakHandler.postDelayed(() -> {
hideDialog();
},200);
});
}
@Override
public void onPermissionDenied() {
ToastUtils.showShortToast(R.string.request_permission_failure);
}
});
}
private void addShareCardRecord() {
AddUserCardData data = new AddUserCardData(mUserId,"朋友圈");
Api.getService(UserService2.class).addSendUserRecord(data).compose(Api.applySchedulers()).subscribe();
}
private void initData() {
showDialog();
String path = Constants.USER_PROGRAM_PATH + mUserId;
Call<ResponseBody> call = Api.getService(UserService2.class).createWxUrl(path, 470);
call.enqueue(new Callback<ResponseBody>() {
@Override
public void onResponse(Call<ResponseBody> call, Response<ResponseBody> response) {
hideDialog();
try {
InputStream is = response.body().byteStream();
Bitmap bitmap = BitmapFactory.decodeStream(is);
is.close();
mBind.ivQr.setImageBitmap(bitmap);
} catch (Exception e) {
e.printStackTrace();
ToastUtils.showShortToast(e.toString());
}
}
@Override
public void onFailure(Call<ResponseBody> call, Throwable t) {
hideDialog();
ToastUtils.showShortToast(t.toString());
}
});
}
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
UMShareAPI.get(this).onActivityResult(requestCode, resultCode, data);
}
}
userCenter/src/main/release/AndroidManifest.xml
......@@ -102,6 +102,9 @@
android:name=".ui.activity2.InviteRecordActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity2.ShareUserCardActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity2.TestRecordActivity"
android:screenOrientation="portrait" />
</application>
......
userCenter/src/main/res/layout/activity_share_user_card.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_fa">
<RelativeLayout
android:id="@+id/rl_title"
style="@style/title">
<TextView
style="@style/text_title"
android:text="分享" />
<ImageView
android:id="@+id/title_back"
style="@style/title_image_back" />
<ImageView
style="@style/card_line"
android:layout_alignParentBottom="true" />
</RelativeLayout>
<LinearLayout
android:id="@+id/ll_poster"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/rl_title"
android:layout_marginLeft="30dp"
android:layout_marginRight="30dp"
android:background="@color/white"
android:orientation="vertical"
android:paddingLeft="20dp"
android:paddingRight="20dp"
android:paddingBottom="50dp">
<TextView
android:id="@+id/tv_name"
style="@style/common_text_style"
android:layout_gravity="center_horizontal"
android:layout_margin="15dp"
android:textStyle="bold"
android:lineSpacingExtra="3dp"
android:gravity="center"
android:textSize="16sp" />
<ImageView
android:id="@+id/iv_avatar"
android:layout_width="200dp"
android:layout_gravity="center_horizontal"
android:layout_height="200dp" />
<ImageView
android:id="@+id/iv_qr"
android:layout_width="130dp"
android:layout_height="130dp"
android:layout_marginTop="15dp"
android:layout_gravity="center_horizontal"
android:scaleType="fitCenter" />
</LinearLayout>
<Button
android:id="@+id/btn_share"
android:layout_width="match_parent"
android:layout_height="43dp"
android:layout_alignParentBottom="true"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:layout_marginBottom="10dp"
android:layout_weight="1"
android:background="@drawable/btn_blue_commom"
android:gravity="center"
android:text="保存海报,分享到朋友圈"
android:textColor="@color/white" />
</RelativeLayout>
</layout>
\ No newline at end of file
userCenter/src/main/res/values/strings.xml
......@@ -49,4 +49,11 @@
<string name="invite_new_share_content_business">邀请商家瓜分千万佣金！</string>
<string name="add_service_wechat">添加客服微信获得更多派单</string>
<string name="copy_wechat_num">复制微信号</string>
<string name="send_user_card">发名片</string>
<string name="user_level">等级</string>
<string name="user_level1">金牌师傅</string>
<string name="user_level2">银牌师傅</string>
<string name="user_level3">铜牌师傅</string>
<string name="user_level4">普通师傅</string>
<string name="apply_fetch">申请提现</string>
</resources>
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