Skip to content

android / dayu

Go to a project
Commit 113866b8 by wukun
Options

20230705需求

parent b1b03e71
Inline Side-by-side
Showing with 92 additions and 54 deletions
baseSDK/src/main/java/com/dayu/common/Constants.java
...@@ -45,21 +45,21 @@ public class Constants { ...@@ -45,21 +45,21 @@ public class Constants {
/** /**
* dev环境配置. * dev环境配置.
*/ */
// public static String ENVIROMENT = "debug"; public static String ENVIROMENT = "debug";
// public static String PHOTO = "dev"; public static String PHOTO = "dev";
// public static int LOG_LEVEL = LogUtils.LEVEL_ALL; public static 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=dev/sp/mobile/android/business/checkApply"; public static final String UP_PHOTO = "/file/uploadMore?targetPath=dev/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 boolean IS_DEBUG = true; public static 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/#/";
/** /**
...@@ -85,21 +85,21 @@ public class Constants { ...@@ -85,21 +85,21 @@ public class Constants {
/** /**
* 正式环境. * 正式环境.
*/ */
public static String ENVIROMENT = "release"; // public static String ENVIROMENT = "release";
public static String PHOTO = "online"; // public static String PHOTO = "online";
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 boolean IS_DEBUG = false; // public static 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
...@@ -1008,7 +1008,7 @@ C) 在甲方使用大鱼平台服务过程中产生的业务数据，客户数 ...@@ -1008,7 +1008,7 @@ C) 在甲方使用大鱼平台服务过程中产生的业务数据，客户数
<string name="find_course">查找课程</string> <string name="find_course">查找课程</string>
<array name="learn_top_tab_item"> <array name="learn_top_tab_item">
<item>公开课</item> <item>公开课</item>
<item>经验交流</item> <!--<item>经验交流</item>-->
<item>直播</item> <item>直播</item>
<item>考试</item> <item>考试</item>
</array> </array>
......
build.gradle
...@@ -5,8 +5,8 @@ buildscript { ...@@ -5,8 +5,8 @@ buildscript {
ext.build_tools_version = "29.0.2" ext.build_tools_version = "29.0.2"
ext.min_sdk_version = 21 ext.min_sdk_version = 21
ext.target_sdk_version = 29 ext.target_sdk_version = 29
ext.version_code = 313 ext.version_code = 314
ext.verson_name = "3.1.3" ext.verson_name = "3.1.4"
ext.gradle_version = '4.0.1' ext.gradle_version = '4.0.1'
ext.isReleaseMinify = false ext.isReleaseMinify = false
ext.isDebugMinify = false ext.isDebugMinify = false
......
learnCenter/src/main/java/com/dayu/learncenter/ui/fragment/HomeLearnFragment.java
...@@ -43,7 +43,6 @@ import java.util.concurrent.TimeUnit; ...@@ -43,7 +43,6 @@ import java.util.concurrent.TimeUnit;
import cn.jzvd.JzvdStd; import cn.jzvd.JzvdStd;
import io.reactivex.Observable; import io.reactivex.Observable;
import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.functions.Consumer;
import io.reactivex.schedulers.Schedulers; import io.reactivex.schedulers.Schedulers;
public class HomeLearnFragment extends BaseFragment<SImplePresenter, FragmentHomeLearnBinding> { public class HomeLearnFragment extends BaseFragment<SImplePresenter, FragmentHomeLearnBinding> {
...@@ -110,7 +109,7 @@ public class HomeLearnFragment extends BaseFragment<SImplePresenter, FragmentHom ...@@ -110,7 +109,7 @@ public class HomeLearnFragment extends BaseFragment<SImplePresenter, FragmentHom
private void initTabPage() { private void initTabPage() {
list_fragments = new ArrayList<>(); list_fragments = new ArrayList<>();
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(3)); // list_fragments.add(CommonLearnFragment.newInstance(3));
webFragment = CommeWebViewFragment.newInstance(); webFragment = CommeWebViewFragment.newInstance();
...@@ -135,10 +134,10 @@ public class HomeLearnFragment extends BaseFragment<SImplePresenter, FragmentHom ...@@ -135,10 +134,10 @@ public class HomeLearnFragment extends BaseFragment<SImplePresenter, FragmentHom
} }
mTabNumTv = tab.getCustomView().findViewById(R.id.tabtext); mTabNumTv = tab.getCustomView().findViewById(R.id.tabtext);
mTabTextTv = tab.getCustomView().findViewById(R.id.tabicon); mTabTextTv = tab.getCustomView().findViewById(R.id.tabicon);
if (temp == 2) { if (temp == 1) {
mTabNumTv.setTextColor(getResources().getColor(R.color.common_red)); mTabNumTv.setTextColor(getResources().getColor(R.color.common_red));
mTabTextTv.setTextColor(getResources().getColor(R.color.common_red)); mTabTextTv.setTextColor(getResources().getColor(R.color.common_red));
} else if (temp == 4) { } else if (temp == 3) {
mTabTextTv.setTextColor(getResources().getColor(R.color.bg_button)); mTabTextTv.setTextColor(getResources().getColor(R.color.bg_button));
} else { } else {
mTabNumTv.setTextColor(getResources().getColor(R.color.bg_button)); mTabNumTv.setTextColor(getResources().getColor(R.color.bg_button));
...@@ -154,7 +153,7 @@ public class HomeLearnFragment extends BaseFragment<SImplePresenter, FragmentHom ...@@ -154,7 +153,7 @@ public class HomeLearnFragment extends BaseFragment<SImplePresenter, FragmentHom
return; return;
} }
int temp = tab.getPosition(); int temp = tab.getPosition();
if (temp != 4) { if (temp != 3) {
mTabNumTv.setTextColor(getResources().getColor(R.color.cl_tab_init)); mTabNumTv.setTextColor(getResources().getColor(R.color.cl_tab_init));
} }
mTabTextTv.setTextColor(getResources().getColor(R.color.cl_tab_init)); mTabTextTv.setTextColor(getResources().getColor(R.color.cl_tab_init));
...@@ -173,17 +172,17 @@ public class HomeLearnFragment extends BaseFragment<SImplePresenter, FragmentHom ...@@ -173,17 +172,17 @@ 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.getPaperNum(), tabBean.getPublishes()}; tabNum = new int[]{tabBean.getTotalProviderCourses(), 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};
} }
if (isFirstAddTab) { if (isFirstAddTab) {
mBind.tabLearn.removeAllTabs(); mBind.tabLearn.removeAllTabs();
mBind.tabLearn.addTab(mBind.tabLearn.newTab().setCustomView(CreatTab(0, tabNum[0], tabDesc[0]))); mBind.tabLearn.addTab(mBind.tabLearn.newTab().setCustomView(CreatTab(0, tabNum[0], tabDesc[0])));
mBind.tabLearn.addTab(mBind.tabLearn.newTab().setCustomView(CreatTab(1, tabNum[1], tabDesc[1]))); mBind.tabLearn.addTab(mBind.tabLearn.newTab().setCustomView(CreatTab(1, tabNum[1], tabDesc[1])));
mBind.tabLearn.addTab(mBind.tabLearn.newTab().setCustomView(CreatTab(2, tabNum[2], tabDesc[2]))); mBind.tabLearn.addTab(mBind.tabLearn.newTab().setCustomView(CreatTab(2, tabNum[2], tabDesc[2])));
mBind.tabLearn.addTab(mBind.tabLearn.newTab().setCustomView(CreatTab(3, tabNum[3], tabDesc[3]))); // mBind.tabLearn.addTab(mBind.tabLearn.newTab().setCustomView(CreatTab(3, tabNum[3], tabDesc[3])));
mBind.tabLearn.addTab(mBind.tabLearn.newTab().setCustomView(CreateLearnTab())); mBind.tabLearn.addTab(mBind.tabLearn.newTab().setCustomView(CreateLearnTab()));
isFirstAddTab = false; isFirstAddTab = false;
} else { } else {
......
learnCenter/src/main/res/layout/activity_course_detail.xml
...@@ -111,7 +111,8 @@ ...@@ -111,7 +111,8 @@
android:layout_marginLeft="10dp" android:layout_marginLeft="10dp"
android:layout_marginRight="10dp" android:layout_marginRight="10dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal"
android:visibility="gone">
<TextView <TextView
android:id="@+id/tv_component" android:id="@+id/tv_component"
...@@ -177,7 +178,8 @@ ...@@ -177,7 +178,8 @@
android:layout_margin="10dp" android:layout_margin="10dp"
android:focusable="true" android:focusable="true"
android:focusableInTouchMode="true" android:focusableInTouchMode="true"
android:orientation="horizontal"> android:orientation="horizontal"
android:visibility="gone">
<ImageView <ImageView
android:id="@+id/iv_avatar" android:id="@+id/iv_avatar"
...@@ -216,7 +218,8 @@ ...@@ -216,7 +218,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="10dp" android:layout_marginLeft="10dp"
android:layout_marginRight="10dp" /> android:layout_marginRight="10dp"
android:visibility="gone"/>
</LinearLayout> </LinearLayout>
</androidx.core.widget.NestedScrollView> </androidx.core.widget.NestedScrollView>
</com.scwang.smartrefresh.layout.SmartRefreshLayout> </com.scwang.smartrefresh.layout.SmartRefreshLayout>
......
learnCenter/src/main/res/layout/fragment_home_learn.xml
...@@ -89,7 +89,8 @@ ...@@ -89,7 +89,8 @@
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_marginRight="30dp" android:layout_marginRight="30dp"
android:layout_marginBottom="50dp" android:layout_marginBottom="50dp"
android:src="@drawable/icon_add_blue" /> android:src="@drawable/icon_add_blue"
android:visibility="gone"/>
</RelativeLayout> </RelativeLayout>
</layout> </layout>
\ No newline at end of file
orderCenter/src/main/java/com/dayu/order/ui/fragment/MultiOrderDetailFragment.java
...@@ -185,6 +185,21 @@ public class MultiOrderDetailFragment extends BaseFragment<SImplePresenter, Frag ...@@ -185,6 +185,21 @@ public class MultiOrderDetailFragment extends BaseFragment<SImplePresenter, Frag
mBind.customerAcceptance.setVisibility(View.GONE); mBind.customerAcceptance.setVisibility(View.GONE);
} }
mBind.tvTakeOrder.setVisibility(detail.getStatus() == 1 ? View.VISIBLE : View.GONE); mBind.tvTakeOrder.setVisibility(detail.getStatus() == 1 ? View.VISIBLE : View.GONE);
if (detail.getStatus() == 1){
mBind.customerName.setVisibility(View.GONE);
mBind.tvCustomerName.setVisibility(View.GONE);
mBind.customerSignature.setVisibility(View.GONE);
mBind.tvCustomerMobile.setVisibility(View.GONE);
mBind.customerMoblie.setVisibility(View.GONE);
mBind.tvContactTel.setVisibility(View.GONE);
}else{
mBind.customerName.setVisibility(View.VISIBLE);
mBind.tvCustomerName.setVisibility(View.VISIBLE);
mBind.customerSignature.setVisibility(View.VISIBLE);
mBind.tvCustomerMobile.setVisibility(View.VISIBLE);
mBind.customerMoblie.setVisibility(View.VISIBLE);
mBind.tvContactTel.setVisibility(View.VISIBLE);
}
mBind.customerAcceptance.setOnClickListener(v -> { mBind.customerAcceptance.setOnClickListener(v -> {
UserInfo info = UserManager.getInstance().getUser(); UserInfo info = UserManager.getInstance().getUser();
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
......
orderCenter/src/main/java/com/dayu/order/ui/fragment/OrderDetaillsFragment.java
...@@ -69,6 +69,21 @@ public class OrderDetaillsFragment extends DataBindingFragment<FragmentOrderData ...@@ -69,6 +69,21 @@ public class OrderDetaillsFragment extends DataBindingFragment<FragmentOrderData
public void initDataView(OrderDetail dataBean) { public void initDataView(OrderDetail dataBean) {
mBind.setItem(dataBean); mBind.setItem(dataBean);
if (dataBean.getStatus() == 1){
mBind.twoTextThree.setVisibility(View.GONE);
mBind.tvCustomerName.setVisibility(View.GONE);
mBind.customerSignature.setVisibility(View.GONE);
mBind.twoTextFour.setVisibility(View.GONE);
mBind.tvContactMode.setVisibility(View.GONE);
mBind.tvContactTel.setVisibility(View.GONE);
}else{
mBind.twoTextThree.setVisibility(View.VISIBLE);
mBind.tvCustomerName.setVisibility(View.VISIBLE);
mBind.customerSignature.setVisibility(View.VISIBLE);
mBind.twoTextFour.setVisibility(View.VISIBLE);
mBind.tvContactMode.setVisibility(View.VISIBLE);
mBind.tvContactTel.setVisibility(View.VISIBLE);
}
mBind.tvOrderState.setText(getStaus(dataBean.getStatus())); mBind.tvOrderState.setText(getStaus(dataBean.getStatus()));
mBind.tvLookMore.setOnClickListener(o -> lookMore()); mBind.tvLookMore.setOnClickListener(o -> lookMore());
mBind.tvServerLookMore.setOnClickListener(o -> lookRMore()); mBind.tvServerLookMore.setOnClickListener(o -> lookRMore());
......
orderCenter/src/main/res/layout/fragment_operate_detail.xml
...@@ -128,7 +128,8 @@ ...@@ -128,7 +128,8 @@
android:text="留言" android:text="留言"
android:textColor="@color/cl_home_title_text_color" android:textColor="@color/cl_home_title_text_color"
android:textSize="14sp" android:textSize="14sp"
android:textStyle="bold" /> android:textStyle="bold"
android:visibility="gone"/>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -136,7 +137,8 @@ ...@@ -136,7 +137,8 @@
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_margin="10dp" android:layout_margin="10dp"
android:background="@color/cl_white" android:background="@color/cl_white"
android:orientation="horizontal"> android:orientation="horizontal"
android:visibility="gone">
<ImageView <ImageView
android:id="@+id/iv_avatar" android:id="@+id/iv_avatar"
...@@ -173,7 +175,8 @@ ...@@ -173,7 +175,8 @@
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rl_component" android:id="@+id/rl_component"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content"
android:visibility="gone"/>
</LinearLayout> </LinearLayout>
......
orderCenter/src/main/res/layout/fragment_order_datails.xml
...@@ -34,8 +34,8 @@ ...@@ -34,8 +34,8 @@
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"> android:layout_alignParentTop="true">
<TextView <TextView
...@@ -306,9 +306,9 @@ ...@@ -306,9 +306,9 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/rl_info_server" android:layout_below="@id/rl_info_server"
android:layout_marginBottom="5dp"
android:layout_marginLeft="@dimen/dp_13" android:layout_marginLeft="@dimen/dp_13"
android:layout_marginTop="@dimen/dp_13" android:layout_marginTop="@dimen/dp_13"
android:layout_marginBottom="5dp"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView
...@@ -425,11 +425,11 @@ ...@@ -425,11 +425,11 @@
android:id="@+id/customer_signature" android:id="@+id/customer_signature"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_below="@+id/tv_company_name" android:layout_below="@+id/tv_company_name"
android:layout_alignParentRight="true"
android:layout_marginLeft="19dp" android:layout_marginLeft="19dp"
android:layout_marginRight="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_15" android:layout_marginTop="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_15"
android:layout_toRightOf="@+id/tv_customer_name" android:layout_toRightOf="@+id/tv_customer_name"
android:gravity="right" android:gravity="right"
android:text="@string/check_signature" android:text="@string/check_signature"
...@@ -833,9 +833,9 @@ ...@@ -833,9 +833,9 @@
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_pay_type" android:layout_below="@id/tv_pay_type"
android:layout_marginBottom="10dp"
android:layout_marginLeft="@dimen/dp_10" android:layout_marginLeft="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_13" android:layout_marginTop="@dimen/dp_13"
android:layout_marginBottom="10dp"
android:layout_toRightOf="@id/tv_pay_state" android:layout_toRightOf="@id/tv_pay_state"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="2" android:maxLines="2"
......
saleCenter/src/main/res/layout/fragment_sale_instruction.xml
...@@ -144,7 +144,8 @@ ...@@ -144,7 +144,8 @@
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:layout_weight="1" android:layout_weight="1"
android:background="@color/cl_white" android:background="@color/cl_white"
android:orientation="vertical"> android:orientation="vertical"
android:visibility="gone">
<TextView <TextView
android:id="@+id/tv_component" android:id="@+id/tv_component"
......
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