Skip to content

android / dayu

Go to a project
Commit 9cea3504 by luofan
Options

feat:学习模块增加，

parent 73ac99df
Expand all
Inline Side-by-side
Showing with 738 additions and 149 deletions
baseSDK/build.gradle
...@@ -56,7 +56,7 @@ dependencies { ...@@ -56,7 +56,7 @@ dependencies {
api 'com.squareup.retrofit2:adapter-rxjava2:2.8.1' api 'com.squareup.retrofit2:adapter-rxjava2:2.8.1'
//图片选择 //图片选择
// api 'com.github.LuckSiege.PictureSelector:picture_library:v2.1.5' // api 'com.github.LuckSiege.PictureSelector:picture_library:v2.1.5'
api 'com.github.LuckSiege.PictureSelector:picture_library:v2.1.9' api 'io.github.lucksiege:pictureselector:v2.1.9'
//ARouter //ARouter
api "com.alibaba:arouter-api:$arouter_api_version" api "com.alibaba:arouter-api:$arouter_api_version"
//greendao数据库 //greendao数据库
......
baseSDK/src/main/java/com/dayu/common/Constants.java
...@@ -45,20 +45,20 @@ public class Constants { ...@@ -45,20 +45,20 @@ public class Constants {
/** /**
* dev环境配置. * dev环境配置.
*/ */
// public static String ENVIROMENT = "debug"; public static String ENVIROMENT = "debug";
// public static final int LOG_LEVEL = LogUtils.LEVEL_ALL; public static final int LOG_LEVEL = LogUtils.LEVEL_ALL;
// public static String BASE_URL = "http://47.94.101.239:3112"; public static String BASE_URL = "http://47.94.101.239:3112";
// public static String WEB_SOP = "http://47.94.101.239:9004/#/sop"; public static String WEB_SOP = "http://47.94.101.239:9004/#/sop";
// public static String CHECK_MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manyServiceResult"; public static String CHECK_MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manyServiceResult";
// public static String MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manySop"; public static String MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manySop";
// public static String WEB_SOP_DETAIL = "http://47.94.101.239:9004/#/sopdetail"; public static String WEB_SOP_DETAIL = "http://47.94.101.239:9004/#/sopdetail";
// public static String WEB_ZHI_SHI = "http://47.94.101.239:9004/#/detail"; public static String WEB_ZHI_SHI = "http://47.94.101.239:9004/#/detail";
// public static final String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply"; public static final String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply";
// public static final String UP_VIDEO = "/file/uploadVideoOne?targetPath=dev/video"; public static final String UP_VIDEO = "/file/uploadVideoOne?targetPath=dev/video";
// public static final boolean IS_DEBUG = true; public static final boolean IS_DEBUG = true;
// public static String VIDEO_SHARE_URL = "http://uat.kf.ai:9099/#/shareVideo?type=_type&id="; //uat 学习视频分享链接 type(课程: course 直播: live) public static String VIDEO_SHARE_URL = "http://uat.kf.ai:9099/#/shareVideo?type=_type&id="; //uat 学习视频分享链接 type(课程: course 直播: live)
// public static int XLR_PID = 239; //小绿人商家id public static int XLR_PID = 239; //小绿人商家id
// public static String SCHEME_9099 = "http://dev.kf.ai:9099/#/"; public static String SCHEME_9099 = "http://dev.kf.ai:9099/#/";
/** /**
...@@ -83,20 +83,20 @@ public class Constants { ...@@ -83,20 +83,20 @@ public class Constants {
/** /**
* 正式环境. * 正式环境.
*/ */
public static String ENVIROMENT = "release"; // public static String ENVIROMENT = "release";
public static int LOG_LEVEL = LogUtils.LEVEL_OFF; // public static int LOG_LEVEL = LogUtils.LEVEL_OFF;
public static String BASE_URL = "https://mobile.kf.ai"; // public static String BASE_URL = "https://mobile.kf.ai";
public static String WEB_SOP = "https://sop.kf.ai/#/sop"; // public static String WEB_SOP = "https://sop.kf.ai/#/sop";
public static String WEB_SOP_DETAIL = "https://sop.kf.ai/#/sopdetail"; // public static String WEB_SOP_DETAIL = "https://sop.kf.ai/#/sopdetail";
public static String WEB_ZHI_SHI = "https://sop.kf.ai/#/detail"; // public static String WEB_ZHI_SHI = "https://sop.kf.ai/#/detail";
public static String CHECK_MULTI_WEB_SOP = "https://sop.kf.ai/#/manyServiceResult"; // public static String CHECK_MULTI_WEB_SOP = "https://sop.kf.ai/#/manyServiceResult";
public static String MULTI_WEB_SOP = "https://sop.kf.ai/#/manySop"; // public static String MULTI_WEB_SOP = "https://sop.kf.ai/#/manySop";
public static final String UP_PHOTO = "/file/uploadMore?targetPath=online/sp/mobile/android/business/checkApply"; // public static final String UP_PHOTO = "/file/uploadMore?targetPath=online/sp/mobile/android/business/checkApply";
public static final String UP_VIDEO = "/file/uploadVideoOne?targetPath=online/video"; // public static final String UP_VIDEO = "/file/uploadVideoOne?targetPath=online/video";
public static final boolean IS_DEBUG = false; // public static final boolean IS_DEBUG = false;
public static String VIDEO_SHARE_URL = "http://app.dl.kf.ai/ext/#/shareVideo?type=_type&id="; //学习视频分享链接 type(课程: course 直播: live) // public static String VIDEO_SHARE_URL = "http://app.dl.kf.ai/ext/#/shareVideo?type=_type&id="; //学习视频分享链接 type(课程: course 直播: live)
public static int XLR_PID = 1936; //小绿人商家id // public static int XLR_PID = 1936; //小绿人商家id
public static String SCHEME_9099 = "http://app.dl.kf.ai/ext/#/"; // public static String SCHEME_9099 = "http://app.dl.kf.ai/ext/#/";
/** /**
......
baseSDK/src/main/res/values/strings.xml
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<string name="tv_person_center_phone">暂无</string> <string name="tv_person_center_phone">暂无</string>
<string name="tv_person_center_fen">3.5分</string> <string name="tv_person_center_fen">3.5分</string>
<string name="tv_person_center_jinriyeji">今日业绩(元)</string> <string name="tv_person_center_jinriyeji">今日业绩(元)</string>
<string name="tv_person_center_licence">认证资质</string> <string name="tv_person_center_licence">资质证书</string>
<string name="tv_person_center_jinrijiedan">账户余额(元)</string> <string name="tv_person_center_jinrijiedan">账户余额(元)</string>
<string name="tv_person_center_jinriyeji_value">8</string> <string name="tv_person_center_jinriyeji_value">8</string>
<string name="tv_login">登&#160;录</string> <string name="tv_login">登&#160;录</string>
...@@ -917,7 +917,7 @@ C) 在甲方使用大鱼平å°æœåŠ¡è¿‡ç¨‹ä¸­äº§ç”Ÿçš„业务数æ®ï¼Œå®¢æˆ·æ•°æ ...@@ -917,7 +917,7 @@ C) 在甲方使用大鱼平å°æœåŠ¡è¿‡ç¨‹ä¸­äº§ç”Ÿçš„业务数æ®ï¼Œå®¢æˆ·æ•°æ
<string name="user_customer_satisfied">客户满意度</string> <string name="user_customer_satisfied">客户满意度</string>
<string name="user_cash_arrive">已到账现金:</string> <string name="user_cash_arrive">已到账现金:</string>
<string name="cash_arrive_record">现金到账记录</string> <string name="cash_arrive_record">现金到账记录</string>
<string name="user_sale_reward">销售奖金</string> <string name="user_sale_reward">销售奖励</string>
<string name="user_invate_reward">邀请奖励</string> <string name="user_invate_reward">邀请奖励</string>
<string name="invate_person_count">邀请人数</string> <string name="invate_person_count">邀请人数</string>
<string name="reward_total_money">奖励总额</string> <string name="reward_total_money">奖励总额</string>
...@@ -929,7 +929,7 @@ C) 在甲方使用大鱼平å°æœåŠ¡è¿‡ç¨‹ä¸­äº§ç”Ÿçš„业务数æ®ï¼Œå®¢æˆ·æ•°æ ...@@ -929,7 +929,7 @@ C) 在甲方使用大鱼平å°æœåŠ¡è¿‡ç¨‹ä¸­äº§ç”Ÿçš„业务数æ®ï¼Œå®¢æˆ·æ•°æ
<string name="user_service_record">服务业绩</string> <string name="user_service_record">服务业绩</string>
<string name="user_sale_record">销售奖励</string> <string name="user_sale_record">销售奖励</string>
<string name="user_word_orders">工单总数</string> <string name="user_word_orders">工单总数</string>
<string name="user_business_type">业务品类</string> <string name="user_business_type">服务技能</string>
<string name="user_info_setting">个人资料设置</string> <string name="user_info_setting">个人资料设置</string>
<string name="user_register_info">基本注册信息</string> <string name="user_register_info">基本注册信息</string>
<string name="user_name_str">姓名:</string> <string name="user_name_str">姓名:</string>
...@@ -1010,8 +1010,7 @@ C) 在甲方使用大鱼平å°æœåŠ¡è¿‡ç¨‹ä¸­äº§ç”Ÿçš„业务数æ®ï¼Œå®¢æˆ·æ•°æ ...@@ -1010,8 +1010,7 @@ C) 在甲方使用大鱼平å°æœåŠ¡è¿‡ç¨‹ä¸­äº§ç”Ÿçš„业务数æ®ï¼Œå®¢æˆ·æ•°æ
<item>公开课</item> <item>公开课</item>
<item>经验交流</item> <item>经验交流</item>
<item>直播</item> <item>直播</item>
<item>已学习</item> <item>考试</item>
<item>已发布</item>
</array> </array>
<string name="pub_course_title">我要开课</string> <string name="pub_course_title">我要开课</string>
<string name="course_theme">课程主题:</string> <string name="course_theme">课程主题:</string>
......
learnCenter/src/main/java/com/dayu/learncenter/api/bean/LearnTabBean.java
...@@ -12,9 +12,27 @@ public class LearnTabBean { ...@@ -12,9 +12,27 @@ public class LearnTabBean {
private int publishes; private int publishes;
private int totalCourses; private int totalCourses;
private int lives; private int lives;
private int paperNum;
private String paperListUrl;
private int totalEngineerCourses; private int totalEngineerCourses;
private int totalProviderCourses; private int totalProviderCourses;
public int getPaperNum() {
return paperNum;
}
public void setPaperNum(int paperNum) {
this.paperNum = paperNum;
}
public String getPaperListUrl() {
return paperListUrl;
}
public void setPaperListUrl(String paperListUrl) {
this.paperListUrl = paperListUrl;
}
public int getTotalEngineerCourses() { public int getTotalEngineerCourses() {
return totalEngineerCourses; return totalEngineerCourses;
} }
......
learnCenter/src/main/java/com/dayu/learncenter/ui/fragment/CommeWebViewFragment.java 0 → 100644
package com.dayu.learncenter.ui.fragment;
import android.annotation.SuppressLint;
import android.net.Uri;
import android.os.Build;
import android.view.View;
import android.webkit.ValueCallback;
import android.webkit.WebChromeClient;
import android.webkit.WebSettings;
import android.webkit.WebView;
import android.widget.LinearLayout;
import com.alibaba.android.arouter.launcher.ARouter;
import com.dayu.base.ui.fragment.DataBindingFragment;
import com.dayu.learncenter.R;
import com.dayu.learncenter.databinding.FragmentWebviewBinding;
import com.dayu.utils.ProgressUtil;
import com.dayu.utils.ToastUtils;
import com.dayu.utils.UserManager;
import com.github.lzyzsd.jsbridge.BridgeHandler;
import com.github.lzyzsd.jsbridge.BridgeWebView;
import com.github.lzyzsd.jsbridge.CallBackFunction;
import java.io.File;
/**
* Created by luofan
* on 2018/5/25.
*/
public class CommeWebViewFragment extends DataBindingFragment<FragmentWebviewBinding> {
private BridgeWebView mWebView;
private String mUrl;
public static CommeWebViewFragment newInstance() {
return new CommeWebViewFragment();
}
@Override
public int getLayoutId() {
return R.layout.fragment_webview;
}
@Override
public void initView() {
mWebView = new BridgeWebView(mActivity);
mWebView.setLayoutParams(new LinearLayout.LayoutParams(
LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT));
mBind.llWeb.addView(mWebView);
initWebView();
}
@SuppressLint("SetJavaScriptEnabled")
private void initWebView() {
WebSettings settings = mWebView.getSettings();
// >= 19(SDK4.4)启动硬件加速，否则启动软件加速
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
mWebView.setLayerType(View.LAYER_TYPE_HARDWARE, null);
settings.setLoadsImagesAutomatically(true); //支持自动加载图片
} else {
mWebView.setLayerType(View.LAYER_TYPE_SOFTWARE, null);
settings.setLoadsImagesAutomatically(false);
}
settings.setUseWideViewPort(true);//设定支持viewport
settings.setLoadWithOverviewMode(true);//自适应屏幕
settings.setDomStorageEnabled(true);
settings.setSaveFormData(true);
settings.setAppCacheEnabled(false);
settings.setCacheMode(WebSettings.LOAD_NO_CACHE);
settings.setAppCachePath(mActivity.getFilesDir().getAbsolutePath() + "/Android/data/com.dayu.bigfish/cache");
settings.setJavaScriptEnabled(true); //启用支持javascript
settings.setJavaScriptCanOpenWindowsAutomatically(true);
settings.setSupportZoom(true);//设定支持缩放
settings.setBuiltInZoomControls(true); //make sure your pinch zoom is enabled
settings.setDisplayZoomControls(false);//don't show the zoom controls
//5.0 以上 webView图片不显示 以下没问题
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
settings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
}
mWebView.setVerticalScrollbarOverlay(false); //指定的垂直滚动条有叠加样式
mWebView.setVerticalScrollBarEnabled(true);
mWebView.setOverScrollMode(View.OVER_SCROLL_NEVER); // 取消WebView中滚动或拖动到顶部、底部时的阴影
mWebView.setScrollBarStyle(View.SCROLLBARS_INSIDE_OVERLAY); // 取消滚动条白边效果
mWebView.requestFocus();
mWebView.setDefaultHandler(new MyHandler());
mWebView.setWebChromeClient(new WebChromeClient() {
public void openFileChooser(ValueCallback<Uri> uploadMsg, String AcceptType, String capture) {
this.openFileChooser(uploadMsg);
}
public void openFileChooser(ValueCallback<Uri> uploadMsg, String AcceptType) {
this.openFileChooser(uploadMsg);
}
public void openFileChooser(ValueCallback<Uri> uploadMsg) {
}
@Override
public boolean onShowFileChooser(WebView webView, ValueCallback<Uri[]> uploadMsg, FileChooserParams fileChooserParams) {
return true;
}
@Override
public void onProgressChanged(WebView view, int newProgress) {
if (newProgress == 100) {
ProgressUtil.stopLoad();
}
}
});
mWebView.callHandler("dayuEngineerInfo", UserManager.getInstance().getUserJson(), data ->
ToastUtils.showShortToast("信息提交成功")
);
ProgressUtil.startLoad(mActivity);
}
public void setUrl(String url){
mWebView.loadUrl(url);
}
private class MyHandler implements BridgeHandler {
@Override
public void handler(String data, CallBackFunction function) {
if (function != null) {
function.onCallBack("DefaultHandler response data");
}
}
}
@Override
public void onDetach() {
super.onDetach();
clearCach();
}
public void clearCach() {
try {
File appCacheDir = new File(mActivity.getFilesDir().getAbsolutePath() + "/Android/data/com.dayu.bigfish/cache");
File webviewCacheDir = new File(mActivity.getCacheDir().getAbsolutePath() + "/webviewCache");
if (webviewCacheDir.exists()) {
deleteFile(webviewCacheDir);
}
if (appCacheDir.exists()) {
deleteFile(appCacheDir);
}
} catch (Exception e) {
e.printStackTrace();
}
mBind.llWeb.removeAllViews();
}
/**
* 递归删除 文件/文件夹
*
* @param file
*/
public void deleteFile(File file) {
if (file.exists()) {
if (file.isFile()) {
file.delete();
} else if (file.isDirectory()) {
File files[] = file.listFiles();
for (int i = 0; i < files.length; i++) {
deleteFile(files[i]);
}
}
file.delete();
} else {
}
}
}
learnCenter/src/main/java/com/dayu/learncenter/ui/fragment/HomeLearnFragment.java
...@@ -53,6 +53,7 @@ public class HomeLearnFragment extends BaseFragment<SImplePresenter, FragmentHom ...@@ -53,6 +53,7 @@ public class HomeLearnFragment extends BaseFragment<SImplePresenter, FragmentHom
private boolean isFirstAddTab = true; private boolean isFirstAddTab = true;
private String[] tabDesc; private String[] tabDesc;
private LearnTabBean tabBean; private LearnTabBean tabBean;
private CommeWebViewFragment webFragment;
WeakHandler weakHandler = new WeakHandler(); WeakHandler weakHandler = new WeakHandler();
@Override @Override
...@@ -98,6 +99,8 @@ public class HomeLearnFragment extends BaseFragment<SImplePresenter, FragmentHom ...@@ -98,6 +99,8 @@ public class HomeLearnFragment extends BaseFragment<SImplePresenter, FragmentHom
Api.getService(LearnService.class).getLearTabNum(mUserId).compose(Api.applySchedulers()) Api.getService(LearnService.class).getLearTabNum(mUserId).compose(Api.applySchedulers())
.subscribe(mPresenter.baseObserver(data -> { .subscribe(mPresenter.baseObserver(data -> {
tabBean = data; tabBean = data;
String url = data.getPaperListUrl() + "?accountId=" + mUserInfo.getAccountId() + "&token=" + mUserInfo.getToken();
webFragment.setUrl(url);
setTabNum(); setTabNum();
})); }));
} }
...@@ -108,9 +111,11 @@ public class HomeLearnFragment extends BaseFragment<SImplePresenter, FragmentHom ...@@ -108,9 +111,11 @@ public class HomeLearnFragment extends BaseFragment<SImplePresenter, FragmentHom
list_fragments.add(CommonLearnFragment.newInstance(1)); list_fragments.add(CommonLearnFragment.newInstance(1));
list_fragments.add(CommonLearnFragment.newInstance(4)); list_fragments.add(CommonLearnFragment.newInstance(4));
list_fragments.add(new LiveListFragment()); list_fragments.add(new LiveListFragment());
list_fragments.add(CommonLearnFragment.newInstance(2));
// list_fragments.add(CommonLearnFragment.newInstance(3)); // list_fragments.add(CommonLearnFragment.newInstance(3));
webFragment = CommeWebViewFragment.newInstance();
list_fragments.add(webFragment);
list_fragments.add(KnowledgeCenterFragment.newInstance()); list_fragments.add(KnowledgeCenterFragment.newInstance());
// list_fragments.add(new TCVideoListFragment()); // list_fragments.add(new TCVideoListFragment());
adapter = new FragmentAdapter(getFragmentManager(), list_fragments); adapter = new FragmentAdapter(getFragmentManager(), list_fragments);
mBind.vpLearn.setAdapter(adapter); mBind.vpLearn.setAdapter(adapter);
...@@ -167,7 +172,7 @@ public class HomeLearnFragment extends BaseFragment<SImplePresenter, FragmentHom ...@@ -167,7 +172,7 @@ public class HomeLearnFragment extends BaseFragment<SImplePresenter, FragmentHom
// EventBus.getDefault().post(new LearnTabNumEvent(1)); // EventBus.getDefault().post(new LearnTabNumEvent(1));
int[] tabNum; int[] tabNum;
if (tabBean != null) { if (tabBean != null) {
tabNum = new int[]{tabBean.getTotalProviderCourses(), tabBean.getTotalEngineerCourses(), tabBean.getLives(), tabBean.getLeaners(), tabBean.getPublishes()}; tabNum = new int[]{tabBean.getTotalProviderCourses(), tabBean.getTotalEngineerCourses(), tabBean.getLives(), tabBean.getPaperNum(), tabBean.getPublishes()};
// tabNum = new int[]{99, 999, 9999, 99999, 999999}; // tabNum = new int[]{99, 999, 9999, 99999, 999999};
} else { } else {
tabNum = new int[]{0, 0, 0, 0, 0}; tabNum = new int[]{0, 0, 0, 0, 0};
......
learnCenter/src/main/res/layout/fragment_webview.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android">
<LinearLayout
android:id="@+id/ll_web"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" />
</layout>
\ No newline at end of file
orderCenter/src/main/java/com/dayu/order/api/protocol/OrderDetail.java
...@@ -87,6 +87,15 @@ public class OrderDetail implements Serializable { ...@@ -87,6 +87,15 @@ public class OrderDetail implements Serializable {
private String shortVideoUrl; private String shortVideoUrl;
private String showPrice; private String showPrice;
private String needShortVideo; private String needShortVideo;
private String teamName;
public String getTeamName() {
return teamName;
}
public void setTeamName(String teamName) {
this.teamName = teamName;
}
public String getNeedShortVideo() { public String getNeedShortVideo() {
return needShortVideo; return needShortVideo;
......
orderCenter/src/main/java/com/dayu/order/ui/fragment/MultiOrderDetailFragment.java
...@@ -36,7 +36,6 @@ import com.dayu.order.databinding.ItemAccessoriesLayoutBinding; ...@@ -36,7 +36,6 @@ import com.dayu.order.databinding.ItemAccessoriesLayoutBinding;
import com.dayu.order.databinding.ItemDetailDeviceCountBinding; import com.dayu.order.databinding.ItemDetailDeviceCountBinding;
import com.dayu.order.databinding.ItemDetailServerInfoBinding; import com.dayu.order.databinding.ItemDetailServerInfoBinding;
import com.dayu.order.ui.activity.PdfWebViewActivity; import com.dayu.order.ui.activity.PdfWebViewActivity;
import com.dayu.order.ui.activity.QrCodeActivity;
import com.dayu.order.ui.view.ToolImageDialog; import com.dayu.order.ui.view.ToolImageDialog;
import com.dayu.provider.event.TakeOrderSuccessEvent; import com.dayu.provider.event.TakeOrderSuccessEvent;
import com.dayu.provider.router.RouterPath; import com.dayu.provider.router.RouterPath;
...@@ -204,6 +203,9 @@ public class MultiOrderDetailFragment extends BaseFragment<SImplePresenter, Frag ...@@ -204,6 +203,9 @@ public class MultiOrderDetailFragment extends BaseFragment<SImplePresenter, Frag
} else { } else {
mBind.llBottomPrice.setVisibility(View.GONE); mBind.llBottomPrice.setVisibility(View.GONE);
} }
if (!TextUtils.isEmpty(detail.getTeamName())) {
mBind.teamName.setText("(" + detail.getTeamName() + "转派)");
}
} }
//小绿人相关信息 //小绿人相关信息
......
orderCenter/src/main/res/layout/activity_subscribe_time.xml
...@@ -62,6 +62,8 @@ ...@@ -62,6 +62,8 @@
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/dp_21.3" android:layout_marginLeft="@dimen/dp_21.3"
android:layout_toRightOf="@id/text_date" android:layout_toRightOf="@id/text_date"
android:drawableEnd="@drawable/icon_arrow_down_gray32"
android:drawablePadding="5dp"
android:hint="@string/tv_home_tab_updata_subscribe_data" android:hint="@string/tv_home_tab_updata_subscribe_data"
android:text="@={presenter.mDay}" android:text="@={presenter.mDay}"
android:textColor="@color/cl_black" android:textColor="@color/cl_black"
...@@ -93,6 +95,8 @@ ...@@ -93,6 +95,8 @@
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/dp_21.3" android:layout_marginLeft="@dimen/dp_21.3"
android:layout_toRightOf="@id/text_time" android:layout_toRightOf="@id/text_time"
android:drawableEnd="@drawable/icon_arrow_down_gray32"
android:drawablePadding="5dp"
android:hint="@string/tv_home_tab_updata_subscribe_time_two" android:hint="@string/tv_home_tab_updata_subscribe_time_two"
android:text="@={presenter.mHour}" android:text="@={presenter.mHour}"
android:textColor="@color/cl_black" android:textColor="@color/cl_black"
......
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:tools="http://schemas.android.com/tools">
<data> <data>
...@@ -722,7 +723,17 @@ ...@@ -722,7 +723,17 @@
android:layout_marginTop="@dimen/dp_15" android:layout_marginTop="@dimen/dp_15"
android:text='@{!TextUtils.isEmpty(item.createdProvider)?item.createdProvider:@string/dayu_platform}' android:text='@{!TextUtils.isEmpty(item.createdProvider)?item.createdProvider:@string/dayu_platform}'
android:textColor="@color/cl_home_title_text_color" android:textColor="@color/cl_home_title_text_color"
android:textSize="14sp" /> android:textSize="14sp"
tools:text="发给JFJF" />
<TextView
android:id="@+id/teamName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="2dp"
android:layout_marginTop="@dimen/dp_15"
android:textColor="@drawable/red"
android:textSize="14dp" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
...@@ -786,9 +797,9 @@ ...@@ -786,9 +797,9 @@
<android.support.v7.widget.RecyclerView <android.support.v7.widget.RecyclerView
android:id="@+id/rv_tools" android:id="@+id/rv_tools"
android:background="@color/white"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content"
android:background="@color/white" />
<TextView <TextView
android:id="@+id/tv_contact_seller" android:id="@+id/tv_contact_seller"
......
userCenter/src/main/java/com/dayu/usercenter/data/protocol/OrderRecord.java
...@@ -24,6 +24,33 @@ public class OrderRecord { ...@@ -24,6 +24,33 @@ public class OrderRecord {
private int salesCount; private int salesCount;
private double salesPrice ; private double salesPrice ;
private int categoryCounts; private int categoryCounts;
private int teamNum;
private int points;
private String pointsUrl;
public String getPointsUrl() {
return pointsUrl;
}
public void setPointsUrl(String pointsUrl) {
this.pointsUrl = pointsUrl;
}
public int getTeamNum() {
return teamNum;
}
public void setTeamNum(int teamNum) {
this.teamNum = teamNum;
}
public int getPoints() {
return points;
}
public void setPoints(int points) {
this.points = points;
}
public double getServiceTotalPrice() { public double getServiceTotalPrice() {
return serviceTotalPrice; return serviceTotalPrice;
......
userCenter/src/main/java/com/dayu/usercenter/model/bean/ServiceBean.java
...@@ -7,6 +7,60 @@ public class ServiceBean { ...@@ -7,6 +7,60 @@ public class ServiceBean {
private String lowestPriceDay; private String lowestPriceDay;
private String lowestPriceMonth; private String lowestPriceMonth;
private List<ServiceTypeBean> labels; private List<ServiceTypeBean> labels;
private String provinceName;
private String cityName;
private String districtName;
private int districtId;
private int cityId;
private int provinceId;
public int getDistrictId() {
return districtId;
}
public void setDistrictId(int districtId) {
this.districtId = districtId;
}
public int getCityId() {
return cityId;
}
public void setCityId(int cityId) {
this.cityId = cityId;
}
public int getProvinceId() {
return provinceId;
}
public void setProvinceId(int provinceId) {
this.provinceId = provinceId;
}
public String getProvinceName() {
return provinceName;
}
public void setProvinceName(String provinceName) {
this.provinceName = provinceName;
}
public String getCityName() {
return cityName;
}
public void setCityName(String cityName) {
this.cityName = cityName;
}
public String getDistrictName() {
return districtName;
}
public void setDistrictName(String districtName) {
this.districtName = districtName;
}
public String getLowestPriceHour() { public String getLowestPriceHour() {
return lowestPriceHour; return lowestPriceHour;
......
userCenter/src/main/java/com/dayu/usercenter/model/bean/ServiceSaveBean.java
...@@ -3,15 +3,24 @@ package com.dayu.usercenter.model.bean; ...@@ -3,15 +3,24 @@ package com.dayu.usercenter.model.bean;
import java.util.List; import java.util.List;
public class ServiceSaveBean { public class ServiceSaveBean {
private String lowestPriceHour;
private String lowestPriceDay; private String lowestPriceDay;
private String lowestPriceMonth;
private List<Long> labelIds; private List<Long> labelIds;
private int cityId;
private String cityName;
private int districtId;
private String districtName;
private int provinceId;
private String provinceName;
public ServiceSaveBean(String lowestPriceHour, String lowestPriceDay, String lowestPriceMonth, List<Long> labelIds) { public ServiceSaveBean(String lowestPriceDay, int provinceId, String provinceName, int cityId, String cityName, int districtId,
this.lowestPriceHour = lowestPriceHour; String districtName, List<Long> labelIds) {
this.lowestPriceDay = lowestPriceDay; this.lowestPriceDay = lowestPriceDay;
this.lowestPriceMonth = lowestPriceMonth;
this.labelIds = labelIds; this.labelIds = labelIds;
this.cityId = cityId;
this.cityName = cityName;
this.districtId = districtId;
this.districtName = districtName;
this.provinceId = provinceId;
this.provinceName = provinceName;
} }
} }
userCenter/src/main/java/com/dayu/usercenter/ui/activity/InviteTeamActvity.java
...@@ -7,19 +7,14 @@ import android.widget.EditText; ...@@ -7,19 +7,14 @@ import android.widget.EditText;
import com.dayu.base.api.Api; import com.dayu.base.api.Api;
import com.dayu.base.ui.activity.BaseActivity; 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.R;
import com.dayu.usercenter.adapter.InviteTeamAdapter; import com.dayu.usercenter.adapter.InviteTeamAdapter;
import com.dayu.usercenter.adapter.SelfLicenceAdapter;
import com.dayu.usercenter.api.UserService2; import com.dayu.usercenter.api.UserService2;
import com.dayu.usercenter.databinding.ActivityInviteTeamBinding; import com.dayu.usercenter.databinding.ActivityInviteTeamBinding;
import com.dayu.usercenter.presenter.InviteTeamPresenter; import com.dayu.usercenter.presenter.InviteTeamPresenter;
import com.dayu.utils.GlideImageLoader;
import com.dayu.utils.ToastUtils; import com.dayu.utils.ToastUtils;
import com.dayu.utils.UtilsUserAccountMatcher; import com.dayu.utils.UtilsUserAccountMatcher;
import com.dayu.widgets.CustomDialog; import com.dayu.widgets.CustomDialog;
import com.youth.banner.loader.ImageLoader;
import org.json.JSONObject; import org.json.JSONObject;
......
userCenter/src/main/java/com/dayu/usercenter/ui/fragment/HomeUserFragment.java
...@@ -256,6 +256,14 @@ public class HomeUserFragment extends BaseFragment<HomeUserPresenter, FragmentHo ...@@ -256,6 +256,14 @@ public class HomeUserFragment extends BaseFragment<HomeUserPresenter, FragmentHo
setLevelDesc(record.getScore()); setLevelDesc(record.getScore());
mBind.tvBusinessType.setText(record.getCategoryCounts() + ""); mBind.tvBusinessType.setText(record.getCategoryCounts() + "");
mBind.teamNum.setText(record.getTeamNum() + "");
mBind.point.setText(record.getPoints() + "");
mBind.scoreChange.setOnClickListener(v -> {
Bundle bundle = new Bundle();
bundle.putString("title", "我的积分");
bundle.putString(Constants.URL, record.getPointsUrl() + "?token=" + mUserInfo.getToken() + "&accountId=" + mUserInfo.getAccountId());
ARouter.getInstance().build(RouterPath.PATH_WEBVIEW).withBundle(Constants.BUNDLE, bundle).navigation();
});
} }
//师傅等级 //师傅等级
......
userCenter/src/main/res/layout/activity_pwlogin_layout.xml
...@@ -25,8 +25,8 @@ ...@@ -25,8 +25,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="25dp" android:layout_marginLeft="25dp"
android:layout_marginRight="25dp"
android:layout_marginTop="35dp" android:layout_marginTop="35dp"
android:layout_marginRight="25dp"
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView
...@@ -43,8 +43,8 @@ ...@@ -43,8 +43,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/tv_first" android:layout_below="@id/tv_first"
android:layout_marginBottom="64dp"
android:layout_marginTop="15dp" android:layout_marginTop="15dp"
android:layout_marginBottom="64dp"
android:text="@string/login_tip" android:text="@string/login_tip"
android:textColor="@color/default_editext_color" android:textColor="@color/default_editext_color"
android:textSize="14sp" /> android:textSize="14sp" />
...@@ -107,64 +107,26 @@ ...@@ -107,64 +107,26 @@
android:layout_marginTop="7.5dp" android:layout_marginTop="7.5dp"
android:background="@color/cl_line" /> android:background="@color/cl_line" />
<TextView
android:id="@+id/next"
android:layout_width="match_parent"
android:layout_height="47dp"
android:layout_below="@+id/ll_pwd"
android:layout_marginTop="38.5dp"
android:alpha="0.35"
android:background="@drawable/tab_blue_react"
android:gravity="center"
android:onClick="@{()->presenter.login()}"
android:text="@string/login"
android:textColor="@color/white"
android:textSize="16sp" />
<TextView
android:id="@+id/forget_pwd"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/next"
android:layout_centerHorizontal="true"
android:layout_marginTop="25dp"
android:text="@string/forget_pwd"
android:textColor="@color/bg_button"
android:textSize="15sp" />
<TextView
android:visibility="gone"
android:id="@+id/tv_register"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/next"
android:layout_centerHorizontal="true"
android:text="@string/register_account"
android:layout_toRightOf="@+id/forget_pwd"
android:layout_alignBaseline="@+id/forget_pwd"
android:layout_marginLeft="35dp"
android:textColor="@color/blue_register" />
</RelativeLayout>
<LinearLayout <LinearLayout
android:id="@+id/ll_agreement" android:id="@+id/ll_agreement"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:layout_below="@+id/line_phone"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:paddingBottom="@dimen/dp_20" android:layout_marginTop="10dp"
android:layout_marginBottom="21dp"
android:orientation="horizontal"> android:orientation="horizontal">
<CheckBox <CheckBox
android:id="@+id/checkBox" android:id="@+id/checkBox"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"/> android:layout_height="wrap_content" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="我已同意并阅读" android:text="我已同意并阅读"
android:textColor="@color/text_color"
android:textSize="13sp" /> android:textSize="13sp" />
<TextView <TextView
...@@ -179,6 +141,7 @@ ...@@ -179,6 +141,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="及" android:text="及"
android:textColor="@color/text_color"
android:textSize="13sp" /> android:textSize="13sp" />
<TextView <TextView
...@@ -189,5 +152,45 @@ ...@@ -189,5 +152,45 @@
android:textColor="@color/cl_receiving_order_item_data" android:textColor="@color/cl_receiving_order_item_data"
android:textSize="13sp" /> android:textSize="13sp" />
</LinearLayout> </LinearLayout>
<TextView
android:id="@+id/next"
android:layout_width="match_parent"
android:layout_height="47dp"
android:layout_below="@+id/ll_agreement"
android:layout_marginTop="38.5dp"
android:alpha="0.35"
android:background="@drawable/tab_blue_react"
android:gravity="center"
android:onClick="@{()->presenter.login()}"
android:text="@string/login"
android:textColor="@color/white"
android:textSize="16sp" />
<TextView
android:id="@+id/forget_pwd"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/next"
android:layout_centerHorizontal="true"
android:layout_marginTop="25dp"
android:text="@string/forget_pwd"
android:textColor="@color/bg_button"
android:textSize="15sp" />
<TextView
android:id="@+id/tv_register"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/next"
android:layout_alignBaseline="@+id/forget_pwd"
android:layout_centerHorizontal="true"
android:layout_marginLeft="35dp"
android:layout_toRightOf="@+id/forget_pwd"
android:text="@string/register_account"
android:textColor="@color/blue_register"
android:visibility="gone" />
</RelativeLayout>
</RelativeLayout> </RelativeLayout>
</layout> </layout>
\ No newline at end of file
userCenter/src/main/res/layout/activity_sms_login.xml
...@@ -152,52 +152,13 @@ ...@@ -152,52 +152,13 @@
android:textColor="@color/cl_receiving_order_item_data" android:textColor="@color/cl_receiving_order_item_data"
android:textSize="14sp" /> android:textSize="14sp" />
<TextView
android:id="@+id/next"
android:layout_width="match_parent"
android:layout_height="47dp"
android:layout_below="@+id/tv_voice_code"
android:layout_marginLeft="25dp"
android:layout_marginTop="30dp"
android:layout_marginRight="25dp"
android:alpha="0.35"
android:background="@drawable/tab_blue_react"
android:gravity="center"
android:onClick="@{()->presenter.login()}"
android:text="@string/register_login"
android:textColor="@color/white"
android:textSize="16sp" />
<TextView
android:id="@+id/use_account"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/next"
android:layout_alignParentRight="true"
android:layout_marginRight="25dp"
android:layout_marginTop="25dp"
android:text="@string/use_account_login"
android:textColor="@color/text_color" />
<TextView
android:visibility="gone"
android:id="@+id/tv_register"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/next"
android:layout_centerHorizontal="true"
android:layout_marginTop="25dp"
android:text="@string/register_account"
android:layout_marginLeft="25dp"
android:textColor="@color/blue_register" />
<LinearLayout <LinearLayout
android:id="@+id/ll_agreement" android:id="@+id/ll_agreement"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:layout_below="@id/tv_voice_code"
android:layout_below="@id/btn_login" android:layout_marginTop="10dp"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginBottom="21dp"
android:orientation="horizontal"> android:orientation="horizontal">
<CheckBox <CheckBox
...@@ -209,6 +170,7 @@ ...@@ -209,6 +170,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="我已同意并阅读" android:text="我已同意并阅读"
android:textColor="@color/text_color"
android:textSize="13sp" /> android:textSize="13sp" />
<TextView <TextView
...@@ -223,6 +185,7 @@ ...@@ -223,6 +185,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="及" android:text="及"
android:textColor="@color/text_color"
android:textSize="13sp" /> android:textSize="13sp" />
<TextView <TextView
...@@ -233,5 +196,45 @@ ...@@ -233,5 +196,45 @@
android:textColor="@color/cl_receiving_order_item_data" android:textColor="@color/cl_receiving_order_item_data"
android:textSize="13sp" /> android:textSize="13sp" />
</LinearLayout> </LinearLayout>
<TextView
android:id="@+id/next"
android:layout_width="match_parent"
android:layout_height="47dp"
android:layout_below="@+id/ll_agreement"
android:layout_marginLeft="25dp"
android:layout_marginTop="30dp"
android:layout_marginRight="25dp"
android:alpha="0.35"
android:background="@drawable/tab_blue_react"
android:gravity="center"
android:onClick="@{()->presenter.login()}"
android:text="@string/register_login"
android:textColor="@color/white"
android:textSize="16sp" />
<TextView
android:id="@+id/use_account"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/next"
android:layout_alignParentRight="true"
android:layout_marginTop="25dp"
android:layout_marginRight="25dp"
android:text="@string/use_account_login"
android:textColor="@color/text_color" />
<TextView
android:visibility="gone"
android:id="@+id/tv_register"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/next"
android:layout_centerHorizontal="true"
android:layout_marginTop="25dp"
android:text="@string/register_account"
android:layout_marginLeft="25dp"
android:textColor="@color/blue_register" />
</RelativeLayout> </RelativeLayout>
</layout> </layout>
\ No newline at end of file
userCenter/src/main/res/layout/fragment_home_user.xml
...@@ -547,6 +547,41 @@ ...@@ -547,6 +547,41 @@
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<LinearLayout
style="@style/ll_user_bottom"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp">
<LinearLayout
android:id="@+id/withTeam"
style="@style/ll_user_bottom2">
<TextView
style="@style/tv_user_bottom1"
android:text="组队接单" />
<TextView
android:id="@+id/teamNum"
style="@style/tv_user_bottom2"
android:text="0" />
</LinearLayout>
<LinearLayout
android:id="@+id/scoreChange"
style="@style/ll_user_bottom2"
android:layout_marginLeft="10dp">
<TextView
style="@style/tv_user_bottom1"
android:text="积分兑换" />
<TextView
android:id="@+id/point"
style="@style/tv_user_bottom2"
android:text="0" />
</LinearLayout>
</LinearLayout>
<TextView <TextView
style="@style/common_text_style" style="@style/common_text_style"
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -574,12 +609,12 @@ ...@@ -574,12 +609,12 @@
android:textSize="18dp" /> android:textSize="18dp" />
<TextView <TextView
android:id="@+id/withTeam" android:layout_width="00dp"
android:layout_width="200dp"
android:layout_height="40dp" android:layout_height="40dp"
android:text="组队接单干活" android:text="组队接单干活"
android:layout_marginTop="15dp" android:layout_marginTop="15dp"
android:gravity="center" android:gravity="center"
android:visibility="gone"
android:layout_marginBottom="20dp" android:layout_marginBottom="20dp"
android:background="@drawable/btn_blue_react_4" android:background="@drawable/btn_blue_react_4"
android:textColor="@color/white" android:textColor="@color/white"
......
userCenter/src/main/res/layout/view_invite_dialog.xml
...@@ -11,11 +11,37 @@ ...@@ -11,11 +11,37 @@
<!-- android:paddingBottom="@dimen/dp_20"--> <!-- android:paddingBottom="@dimen/dp_20"-->
<!-- android:text="输入手机号" />--> <!-- android:text="输入手机号" />-->
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/text_color"
android:text="兄弟朋友和老乡," />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/text_color"
android:text="我来组队接大单," />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/text_color"
android:text="一起干活力量大," />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/text_color"
android:text="共同富裕奔小康！" />
<EditText <EditText
android:id="@+id/mobile" android:id="@+id/mobile"
android:layout_width="130dp" android:layout_width="130dp"
android:layout_height="30dp" android:layout_height="30dp"
android:background="@null" android:background="@null"
android:textColor="@color/text_color"
android:hint="输入手机号" android:hint="输入手机号"
android:inputType="number" /> android:inputType="number" />
</LinearLayout> </LinearLayout>
\ No newline at end of file
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