Skip to content

android / dayu

Go to a project
Commit 8b44a422 by mReturn
Options

知识库新加知识大厅页面

parent 507193eb
Inline Side-by-side
Showing with 319 additions and 51 deletions
baseSDK/src/main/java/com/dayu/common/Constants.java
......@@ -42,19 +42,19 @@ public class Constants {
/**
* dev环境配置.
*/
// public static String ENVIROMENT = "debug";
// public static final int LOG_LEVEL = LogUtils.LEVEL_ALL;
// 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 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 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 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 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 int XLR_PID = 239; //小绿人商家id
public static String ENVIROMENT = "debug";
public static final int LOG_LEVEL = LogUtils.LEVEL_ALL;
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 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 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 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 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 int XLR_PID = 239; //小绿人商家id
/**
......@@ -80,19 +80,19 @@ public class Constants {
/**
* 正式环境.
*/
public static String ENVIROMENT = "release";
public static int LOG_LEVEL = LogUtils.LEVEL_OFF;
public static String BASE_URL = "https://mobile.kf.ai";
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_ZHI_SHI = "https://sop.kf.ai/#/detail";
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 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 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 int XLR_PID = 1936; //小绿人商家id
// public static String ENVIROMENT = "release";
// public static int LOG_LEVEL = LogUtils.LEVEL_OFF;
// public static String BASE_URL = "https://mobile.kf.ai";
// 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_ZHI_SHI = "https://sop.kf.ai/#/detail";
// 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 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 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 int XLR_PID = 1936; //小绿人商家id
......
baseSDK/src/main/res/values/strings.xml
......@@ -805,6 +805,7 @@ C) 在甲方使用大鱼平å°æœåŠ¡è¿‡ç¨‹ä¸­äº§ç”Ÿçš„业务数æ®ï¼Œå®¢æˆ·æ•°æ
<string name="just_before">刚刚</string>
<string name="public_pay">对公结算</string>
<string name="konwledge_querry">知识库查询</string>
<string name="konwledge_center">知识库</string>
<!--sale-->
......
learnCenter/src/main/java/com/dayu/learncenter/ui/fragment/HomeLearnFragment.java
......@@ -9,6 +9,7 @@ import android.view.LayoutInflater;
import android.view.View;
import android.widget.TextView;
import com.alibaba.android.arouter.launcher.ARouter;
import com.dayu.base.api.APIService;
import com.dayu.base.api.Api;
import com.dayu.base.ui.adapter.FragmentAdapter;
......@@ -22,6 +23,7 @@ import com.dayu.learncenter.databinding.FragmentHomeLearnBinding;
import com.dayu.learncenter.event.RefreshLeanTabEvent;
import com.dayu.learncenter.ui.activity.PubCourseActivity;
import com.dayu.livemodule.event.StartPushEvent;
import com.dayu.provider.router.RouterPath;
import com.dayu.utils.TabLayoutUtils;
import com.dayu.utils.UIUtils;
import com.dayu.utils.UserManager;
......@@ -61,19 +63,21 @@ public class HomeLearnFragment extends BaseFragment<SImplePresenter, FragmentHom
initUser();
tabDesc = UIUtils.getStrings(R.array.learn_top_tab_item);
mBind.ivPubCourse.setOnClickListener(view -> startActivity(PubCourseActivity.class));
// mBind.ivPubCourse.setOnClickListener(view -> ARouter.getInstance().build(RouterPath.PATH_ORDER_KONWLEDGE).navigation());
initTabPage();
getTabData();
EventBus.getDefault().register(this);
getUserInfo();
mBind.tvKonwledge.setOnClickListener(view ->
ARouter.getInstance().build(RouterPath.PATH_ORDER_KONWLEDGE_CENTER).navigation()
);
}
//获取用户信息
private void getUserInfo() {
Api.getService(APIService.class).getEngineerInfo(mUserId).compose(Api.applySchedulers())
.subscribe(mPresenter.baseObserver(info->{
if (mUserInfo != null){
.subscribe(mPresenter.baseObserver(info -> {
if (mUserInfo != null) {
mUserInfo.setLiveStatus(info.getLiveStatus());
mUserInfo.setLianmaiStatus(info.getLianmaiStatus());
UserManager.getInstance().saveUser(mUserInfo);
......@@ -151,7 +155,7 @@ public class HomeLearnFragment extends BaseFragment<SImplePresenter, FragmentHom
// EventBus.getDefault().post(new LearnTabNumEvent(1));
int[] tabNum;
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.getLeaners(), tabBean.getPublishes()};
// tabNum = new int[]{99, 999, 9999, 99999, 999999};
} else {
tabNum = new int[]{0, 0, 0, 0, 0};
......
learnCenter/src/main/res/layout/fragment_home_learn.xml
......@@ -17,6 +17,18 @@
<TextView
style="@style/text_title"
android:text="@string/learn_title" />
<TextView
android:id="@+id/tv_konwledge"
android:layout_height="30dp"
android:layout_width="80dp"
android:background="@drawable/btn_blue_commom"
android:gravity="center"
android:layout_centerVertical="true"
android:layout_alignParentRight="true"
android:layout_marginRight="10dp"
android:text="@string/konwledge_center"
android:textColor="@color/white"
android:textSize="12sp" />
</RelativeLayout>
......
orderCenter/src/main/java/com/dayu/order/api/protocol/bean/KnowledgeListBean.java
package com.dayu.order.api.protocol.bean;
import java.util.List;
public class KnowledgeListBean {
/**
* id : 1
* title : 标题
* brief : 知识内容
* detail : <div>知识内容</div>
* id : 56
* title : 区分附件
* brief : niu B
* detail : niu B
* accessories : null
* createTime : 2020-08-19 16:21:40
* created : admin
* updateTime : null
* createTime : 2020-09-18 14:12:49
* created : 孙路路
* updateTime : 2020-09-21 16:24:19
* updated : null
* status : 1
* providerId : 1
* providerId : 239
* files : [{"id":5,"knowledgeId":56,"type":1,"url":"http://dl.kf.ai/dev/sp/account/busnessHeaderImg/e8125019ecffaf6d129ce90bbf36a5f9.png?x-oss-process=style/pic","name":"681_logo.png"},{"id":6,"knowledgeId":56,"type":2,"url":"http://dl.kf.ai/dev/sp/account/busnessHeaderImg/456b6b7e7a56aea557b047c9df27065b.mp4?x-oss-process=style/pic","name":"ea0c7982cdf2336f52bad277d55fddc9.mp4"},{"id":7,"knowledgeId":56,"type":3,"url":"http://dl.kf.ai/dev/sp/account/busnessHeaderImg/1ff50c0178a785a5a84336003a4c8812.vue?x-oss-process=style/pic","name":"audioPlay.vue"},{"id":8,"knowledgeId":56,"type":3,"url":"http://dl.kf.ai/dev/sp/account/busnessHeaderImg/47d4dfcb0de2b3af320a073d517cde1a.exe?x-oss-process=style/pic","name":"chrome.exe"},{"id":9,"knowledgeId":56,"type":3,"url":"http://dl.kf.ai/dev/sp/account/busnessHeaderImg/b7e2364c0fed79a605dbfd50a5c55432.html?x-oss-process=style/pic","name":"任务.html"},{"id":10,"knowledgeId":56,"type":3,"url":"http://dl.kf.ai/dev/sp/account/busnessHeaderImg/ab316f1c0df45309e961b700ab2a46aa.rp?x-oss-process=style/pic","name":"商家营业执照&服务资质、师傅资质审核.rp"}]
* keyword : null
* kcateName : 分类1
* kcateId : 1
* startTime : null
* endTime : null
* kcateName : 涛
* kcateId : 14
*/
private int id;
......@@ -26,13 +32,16 @@ public class KnowledgeListBean {
private Object accessories;
private String createTime;
private String created;
private Object updateTime;
private String updateTime;
private Object updated;
private int status;
private int providerId;
private Object keyword;
private Object startTime;
private Object endTime;
private String kcateName;
private int kcateId;
private List<FilesBean> files;
public int getId() {
return id;
......@@ -90,11 +99,11 @@ public class KnowledgeListBean {
this.created = created;
}
public Object getUpdateTime() {
public String getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Object updateTime) {
public void setUpdateTime(String updateTime) {
this.updateTime = updateTime;
}
......@@ -130,6 +139,22 @@ public class KnowledgeListBean {
this.keyword = keyword;
}
public Object getStartTime() {
return startTime;
}
public void setStartTime(Object startTime) {
this.startTime = startTime;
}
public Object getEndTime() {
return endTime;
}
public void setEndTime(Object endTime) {
this.endTime = endTime;
}
public String getKcateName() {
return kcateName;
}
......@@ -145,4 +170,68 @@ public class KnowledgeListBean {
public void setKcateId(int kcateId) {
this.kcateId = kcateId;
}
public List<FilesBean> getFiles() {
return files;
}
public void setFiles(List<FilesBean> files) {
this.files = files;
}
public static class FilesBean {
/**
* id : 5
* knowledgeId : 56
* type : 1
* url : http://dl.kf.ai/dev/sp/account/busnessHeaderImg/e8125019ecffaf6d129ce90bbf36a5f9.png?x-oss-process=style/pic
* name : 681_logo.png
*/
private int id;
private int knowledgeId;
private int type;
private String url;
private String name;
public int getId() {
return id;
}
public void setId(int id) {
this.id = id;
}
public int getKnowledgeId() {
return knowledgeId;
}
public void setKnowledgeId(int knowledgeId) {
this.knowledgeId = knowledgeId;
}
public int getType() {
return type;
}
public void setType(int type) {
this.type = type;
}
public String getUrl() {
return url;
}
public void setUrl(String url) {
this.url = url;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
}
}
orderCenter/src/main/java/com/dayu/order/ui/activity/KnowledgeCenterActivity.java 0 → 100644
package com.dayu.order.ui.activity;
import android.os.Bundle;
import android.support.v7.widget.LinearLayoutManager;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.dayu.base.api.Api;
import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.base.ui.presenter.SImplePresenter;
import com.dayu.common.Constants;
import com.dayu.order.R;
import com.dayu.order.api.OrderService;
import com.dayu.order.api.protocol.bean.KnowledgeListBean;
import com.dayu.order.databinding.ActivityKonwledgeCenterBinding;
import com.dayu.provider.router.RouterPath;
import java.util.ArrayList;
import java.util.List;
/**
* 知识查询
*/
@Route(path = RouterPath.PATH_ORDER_KONWLEDGE_CENTER)
public class KnowledgeCenterActivity extends BaseActivity<SImplePresenter, ActivityKonwledgeCenterBinding> {
List<KnowledgeListBean> knowledgeList = new ArrayList<>();
BaseQuickAdapter<KnowledgeListBean, BaseViewHolder> knowledgeAdapter;
int mPage = 1;
@Override
public void setPresenter() {
}
@Override
public int getLayoutId() {
return R.layout.activity_konwledge_center;
}
@Override
public void initView() {
mBind.refreshLayout.setOnRefreshListener(refreshLayout -> {
mPage = 1;
queryKnowledge();
});
mBind.refreshLayout.setOnLoadMoreListener(refreshLayout -> {
queryKnowledge();
});
mBind.titleBack.setOnClickListener(v-> dumpBack());
mBind.tvSearch.setOnClickListener(v->startActivity(KnowledgeQueryActivity.class));
queryKnowledge();
}
//查询
private void queryKnowledge() {
showDialog();
Api.getService(OrderService.class).queryKnowledge("",1, mPage, Constants.PAGESIZE)
.compose(Api.applySchedulers()).subscribe(mPresenter.baseObserver(data -> {
mBind.refreshLayout.finishRefresh();
mBind.refreshLayout.finishLoadMore();
if (mPage == 1) {
knowledgeList.clear();
}
knowledgeList.addAll(data.getData());
setAdapter();
mBind.refreshLayout.setEnableLoadMore(mPage < data.getTotalPages());
mPage += 1;
}, responeThrowable -> {
mBind.refreshLayout.finishRefresh();
mBind.refreshLayout.finishLoadMore();
}));
}
private void setAdapter() {
if (knowledgeAdapter != null) {
knowledgeAdapter.notifyDataSetChanged();
} else {
knowledgeAdapter = new BaseQuickAdapter<KnowledgeListBean, BaseViewHolder>(R.layout.item_knowledge_list, knowledgeList) {
@Override
protected void convert(BaseViewHolder helper, KnowledgeListBean item) {
helper.setText(R.id.tv_title, item.getTitle());
helper.setText(R.id.tv_detail, item.getBrief());
helper.setOnClickListener(R.id.tv_to_detail, view -> {
Bundle bundle = new Bundle();
bundle.putInt(Constants.ID, item.getId());
bundle.putString(Constants.TITLE, item.getTitle());
startActivity(KnowledgeDetailActivity.class, bundle);
});
}
};
mBind.rvKnowledge.setLayoutManager(new LinearLayoutManager(mActivity));
mBind.rvKnowledge.setAdapter(knowledgeAdapter);
}
}
}
orderCenter/src/main/java/com/dayu/order/ui/activity/KnowledgeActivity.java → orderCenter/src/main/java/com/dayu/order/ui/activity/KnowledgeQueryActivity.java
......@@ -5,7 +5,6 @@ import android.os.Bundle;
import android.support.v7.widget.LinearLayoutManager;
import android.text.TextUtils;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.dayu.base.api.Api;
......@@ -16,7 +15,6 @@ import com.dayu.order.R;
import com.dayu.order.api.OrderService;
import com.dayu.order.api.protocol.bean.KnowledgeListBean;
import com.dayu.order.databinding.ActivityKonwledgeQueryBinding;
import com.dayu.provider.router.RouterPath;
import com.dayu.utils.FindUtils;
import java.util.ArrayList;
......@@ -25,8 +23,7 @@ import java.util.List;
/**
* 知识查询
*/
@Route(path = RouterPath.PATH_ORDER_KONWLEDGE)
public class KnowledgeActivity extends BaseActivity<SImplePresenter, ActivityKonwledgeQueryBinding> {
public class KnowledgeQueryActivity extends BaseActivity<SImplePresenter, ActivityKonwledgeQueryBinding> {
List<KnowledgeListBean> knowledgeList = new ArrayList<>();
BaseQuickAdapter<KnowledgeListBean, BaseViewHolder> knowledgeAdapter;
......
orderCenter/src/main/java/com/dayu/order/ui/fragment/OperateDetailFragment.java
......@@ -20,7 +20,7 @@ import com.dayu.order.R;
import com.dayu.order.api.OrderApiFactory;
import com.dayu.order.api.protocol.OperateInfo;
import com.dayu.order.databinding.FragmentOperateDetailBinding;
import com.dayu.order.ui.activity.KnowledgeActivity;
import com.dayu.order.ui.activity.KnowledgeQueryActivity;
import com.dayu.utils.CommonUtils;
import com.dayu.utils.GlideImageLoader;
import com.dayu.utils.ProgressUtil;
......@@ -89,7 +89,7 @@ public class OperateDetailFragment extends BaseFragment<SImplePresenter, Fragmen
CommonUtils.setVideoThumb(mActivity,mBind.jzVideo,url);
setListener();
mBind.tvKonwledge.setOnClickListener(view -> startActivity(KnowledgeActivity.class));
mBind.tvKonwledge.setOnClickListener(view -> startActivity(KnowledgeQueryActivity.class));
}
//下拉刷新
......
orderCenter/src/main/release/AndroidManifest.xml
......@@ -111,7 +111,7 @@
android:windowSoftInputMode="stateHidden|adjustPan"
/>
<activity
android:name=".ui.activity.KnowledgeActivity"
android:name=".ui.activity.KnowledgeQueryActivity"
android:screenOrientation="portrait"
android:windowSoftInputMode="stateHidden|adjustPan"
/>
......@@ -119,6 +119,10 @@
android:name=".ui.activity.KnowledgeDetailActivity"
android:screenOrientation="portrait"
/>
<activity
android:name=".ui.activity.KnowledgeCenterActivity"
android:screenOrientation="portrait"
/>
</application>
</manifest>
orderCenter/src/main/res/layout/activity_konwledge_center.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="#f5f5f5"
>
<RelativeLayout
android:id="@+id/rl_title"
style="@style/title">
<TextView
android:id="@+id/tv_title"
style="@style/text_title"
android:text="@string/konwledge_center" />
<ImageView
android:id="@+id/title_back"
style="@style/title_image_back"
/>
</RelativeLayout>
<ImageView style="@style/card_line" />
<TextView
android:id="@+id/tv_search"
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_marginLeft="13dp"
android:layout_marginRight="13dp"
android:background="@color/cl_white"
android:gravity="center"
android:text="@string/konwledge_querry"
android:textColor="@color/common_text_color" />
<com.scwang.smartrefresh.layout.SmartRefreshLayout
android:id="@+id/refresh_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="2dp"
>
<android.support.v7.widget.RecyclerView
android:id="@+id/rv_knowledge"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:overScrollMode="never" />
</com.scwang.smartrefresh.layout.SmartRefreshLayout>
</LinearLayout>
</layout>
\ No newline at end of file
provider/src/main/java/com/dayu/provider/router/RouterPath.java
......@@ -20,7 +20,7 @@ public class RouterPath {
*/
public final static String PATH_ORDER_DETAIL = "/order/detail";
public final static String PATH_ORDER_HISTORY = "/order/history";
public final static String PATH_ORDER_KONWLEDGE = "/order/konwledge";
public final static String PATH_ORDER_KONWLEDGE_CENTER = "/order/konwledge_center";
/**
* 我的模块.
......
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