Skip to content

Y
YDL-Component-Medical
Commit 49d0ed8f by 严久程
Options

课程、支付

parent c4e5e321
Showing with 429 additions and 339 deletions
m-course/src/main/AndroidManifest.xml
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.yidianling.course"/>
package="com.yidianling.course">
<application>
<!--课程首页-->
<activity
android:name=".CourseActivity"
android:screenOrientation="portrait" />
<activity
android:name=".CoursePosterActivity"
android:hardwareAccelerated="false"
android:screenOrientation="portrait"
android:theme="@style/CoursePosterShowTheme" />
<activity
android:name=".coursePlay.CourseCommentActivity"
android:screenOrientation="portrait"
android:windowSoftInputMode="adjustResize" />
<activity
android:name=".coursePlay.CoursePlayActivity"
android:configChanges="orientation|screenSize|keyboardHidden"
android:launchMode="singleTask"
android:screenOrientation="portrait"
android:theme="@style/CourseTheme" />
<!--课程课后笔记列表-->
<activity
android:name=".coursePlay.CourseReplyListActivity"
android:configChanges="orientation|screenSize|keyboardHidden"
android:launchMode="singleTask"
android:screenOrientation="portrait" />
<!--课程分类列表-->
<activity
android:name=".courseNew.courseList.CourseListContainerActivity"
android:screenOrientation="portrait"
android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
<activity android:name=".courseNew.CourseTopicActivity" />
<activity android:name=".courseSearch.CourseSearchActivity"
android:screenOrientation="portrait"
/>
<activity
android:name=".courseNew.mine.MyCourseActivity"
android:screenOrientation="portrait" />
<activity
android:name=".course_special_list.activity.CourseSpecialListActivity"
android:screenOrientation="portrait" />
</application>
</manifest>
m-course/src/main/java/com/yidianling/course/CourseActivity.java
package com.yidianling.course;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.view.View;
import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.TextView;
import butterknife.BindView;
import butterknife.ButterKnife;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.ydl.ydlcommon.base.BaseActivity;
import com.yidianling.course.courseNew.mine.MyCourseActivity;
import com.yidianling.course.router.CourseIn;
import com.yidianling.course.widget.SearchBarView;
/**
* 课程首页Activity（心理课程）
......
m-course/src/main/java/com/yidianling/course/CourseConstants.kt
package com.yidianling.course
import com.ydl.ydlcommon.base.config.HttpConfig
class CourseConstants {
companion object {
......@@ -7,9 +9,9 @@ class CourseConstants {
const val COURSE_PAGE_SIZE = 20
//课程详情H5地址
var COURSE_DETAIL_H5 = YdlRetrofitUtils.MH5_URL + "course/Detail/v2/"
var COURSE_DETAIL_H5 = HttpConfig.MH5_URL + "course/Detail/v2/"
//课程评价页面
var COURSE_COMMENT_H5 = YdlRetrofitUtils.MH5_URL + "course/all-comments/"
var COURSE_COMMENT_H5 = HttpConfig.MH5_URL + "course/all-comments/"
}
......
m-course/src/main/java/com/yidianling/course/CourseListFragment.java
......@@ -188,8 +188,6 @@ public class CourseListFragment extends BaseFragment implements PtrHandler, Load
lvContent.setVisibility(View.VISIBLE);
emptyTv.setVisibility(View.GONE);
ivEmptyView.setVisibility(View.GONE);
if (getActivity() instanceof CourseActivity)
((CourseActivity) getActivity()).disPro();
if (loadMoreListViewContainer != null) {
loadMoreListViewContainer.loadMoreFinish(false, true);
}
......@@ -221,7 +219,7 @@ public class CourseListFragment extends BaseFragment implements PtrHandler, Load
ivEmptyView.setVisibility(View.VISIBLE);
lvContent.setVisibility(View.GONE);
emptyTv.setText("网络不给力哦，下拉刷新重试");
ivEmptyView.setImageResource(R.drawable.no_net);
ivEmptyView.setImageResource(R.drawable.course_no_net);
} else {
CourseRetrofitUtils.handleError(getActivity(), throwable);
}
......
m-course/src/main/java/com/yidianling/course/CourseListItemView.java
......@@ -9,12 +9,10 @@ import android.widget.LinearLayout;
import android.widget.TextView;
import com.ydl.ydl_router.manager.YDLRouterManager;
import com.yidianling.course.coursePlay.CourseCommentActivity;
import com.yidianling.course.bean.Course;
import com.yidianling.course.coursePlay.CourseCommentActivity;
import com.yidianling.course.widget.CourseItemNewView;
import butterknife.BindView;
import butterknife.ButterKnife;
/**
* Created by zqk on 6/22/17.
......@@ -22,16 +20,11 @@ import butterknife.ButterKnife;
public class CourseListItemView extends ConstraintLayout implements View.OnClickListener {
@BindView(R2.id.view_content)
CourseItemNewView courseItemNewView;
@BindView(R2.id.iv_export_btn_layout)
LinearLayout ivExportBtnLayout;
@BindView(R2.id.tv_line_bottom)
View tvLineBottom;
@BindView(R2.id.tv_course_item_first)
TextView tvCourseItemFirst;
@BindView(R2.id.tv_course_item_comment)
TextView tvCourseItemComment;
private Course mCourse;
......@@ -41,7 +34,12 @@ public class CourseListItemView extends ConstraintLayout implements View.OnClick
super(context);
this.context = context;
View view = inflate(context, R.layout.item_course_list, this);
ButterKnife.bind(this, view);
courseItemNewView = view.findViewById(R.id.view_content);
ivExportBtnLayout = view.findViewById(R.id.iv_export_btn_layout);
tvLineBottom = view.findViewById(R.id.tv_line_bottom);
tvCourseItemFirst = view.findViewById(R.id.tv_course_item_first);
tvCourseItemComment = view.findViewById(R.id.tv_course_item_comment);
}
@SuppressLint("SetTextI18n")
......
m-course/src/main/java/com/yidianling/course/CoursePosterActivity.kt
package com.yidianling.course
import android.annotation.SuppressLint
import android.app.Activity
import android.content.Intent
import android.graphics.Bitmap
......@@ -57,7 +58,7 @@ class CoursePosterActivity : BaseActivity() {
override fun initDataAndEvent() {
courseId = intent.getStringExtra(COURSE_ID)
StatusBarUtils.setWindowStatusBarColor(mContext, R.color.color_66000000)
StatusBarUtils.setWindowStatusBarColor(mContext, R.color.course_color_66000000)
if (TextUtils.isEmpty(courseId)) {
ToastUtil.toastShort("参数错误")
return
......@@ -105,6 +106,7 @@ class CoursePosterActivity : BaseActivity() {
}
}
@SuppressLint("CheckResult")
private fun getData() {
CourseRetrofitUtils.getPosterData(courseId)
.subscribeOn(Schedulers.io())
......
m-course/src/main/java/com/yidianling/course/bean/Course.java
package com.yidianling.course.bean;
import com.ydl.ydlcommon.bean.ShareData;
import com.yidianling.course.bean.CourseHostInfoBean;
//课程列表
//课程
......
m-course/src/main/java/com/yidianling/course/bean/CourseHostInfoBean.java
package com.yidianling.course.bean;
import com.yidianling.ydlcommon.data.ShareData;
import com.ydl.ydlcommon.bean.ShareData;
/**
* @author jiucheng
......
m-course/src/main/java/com/yidianling/course/courseNew/CourseTopicActivity.kt
......@@ -16,7 +16,6 @@ import com.ydl.ydl_image.module.GlideApp
import com.ydl.ydlcommon.actions.share.ShareUtils
import com.ydl.ydlcommon.base.BaseActivity
import com.ydl.ydlcommon.data.http.RxUtils
import com.ydl.ydlcommon.utils.UMEventUtils
import com.yidianling.common.tools.LogUtil
import com.yidianling.common.tools.RxNetTool
import com.yidianling.course.R
......@@ -26,7 +25,7 @@ import com.yidianling.course.model.TopicCourseBean
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.schedulers.Schedulers
import kotlinx.android.synthetic.main.activity_course_topic.*
import kotlinx.android.synthetic.main.layout_title_bar.*
import kotlinx.android.synthetic.main.course_layout_title_bar.*
/**
* 课程专题页面
......@@ -68,7 +67,6 @@ class CourseTopicActivity : BaseActivity(), View.OnClickListener, SwipeRefreshLa
swl.setColorSchemeResources(R.color.main_theme)
swl.setOnRefreshListener(this)
tv_left_menu.setOnClickListener {
UMEventUtils.umEvent("专题详情", "分享", "分享")
//分享
share()
}
......
m-course/src/main/java/com/yidianling/course/courseNew/courseList/CourseListContainerActivity.kt
......@@ -38,6 +38,7 @@ import com.yidianling.course.courseNew.courseList.widget.CourseGoodPopupWindow
import com.yidianling.course.courseNew.courseList.widget.CourseSortPopupWindow
import com.yidianling.course.net.CourseRetrofitUtils
import com.yidianling.course.bean.Course
import com.yidianling.course.constants.CourseBIConstants
import com.yidianling.course.model.CourseCategoryBean
import com.yidianling.course.router.CourseIn
import com.yidianling.course.widget.SearchBarView
......@@ -45,7 +46,7 @@ import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.schedulers.Schedulers
import kotlinx.android.synthetic.main.activity_courses.*
import kotlinx.android.synthetic.main.item_hot_search_view.view.*
import kotlinx.android.synthetic.main.layout_title_bar.*
import kotlinx.android.synthetic.main.course_layout_title_bar.*
import org.json.JSONException
import org.json.JSONObject
......@@ -117,7 +118,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
search_view.initBarType(SearchBarView.JUMP_TO_SEARCH_COURSE, null)
iv_back.setOnClickListener {
ActionCountUtils.count(BIConstants.CourseListEvent.POSITION_COURSE_LIST_RETURN_CLICK)
ActionCountUtils.count(CourseBIConstants.CourseListEvent.POSITION_COURSE_LIST_RETURN_CLICK)
finish()
}
......@@ -200,7 +201,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
classify_layout.setTextColor(
ContextCompat.getColor(
this@CourseListContainerActivity,
R.color.color_1DA1F2
R.color.course_color_1DA1F2
)
)
} else {
......@@ -208,7 +209,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
classify_layout.setTextColor(
ContextCompat.getColor(
this@CourseListContainerActivity,
R.color.color_242424
R.color.course_color_242424
)
)
}
......@@ -240,7 +241,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
getData(false)
ActionCountUtils.count(
BIConstants.CourseListEvent.POSITION_COURSE_LIST_SORT_CLICK,
CourseBIConstants.CourseListEvent.POSITION_COURSE_LIST_SORT_CLICK,
selectedSort
)
}
......@@ -281,7 +282,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
var name = if (selectedGoodsList.size == 0) "全部类型" else selectedGoodsList[0].name
ActionCountUtils.count(
BIConstants.CourseListEvent.POSITION_COURSE_LIST_CLASSIFICATION_CLICK,
CourseBIConstants.CourseListEvent.POSITION_COURSE_LIST_CLASSIFICATION_CLICK,
name
)
}
......@@ -292,7 +293,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
classify_layout.setTextColor(
ContextCompat.getColor(
this@CourseListContainerActivity,
R.color.color_1DA1F2
R.color.course_color_1DA1F2
)
)
} else {
......@@ -300,7 +301,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
classify_layout.setTextColor(
ContextCompat.getColor(
this@CourseListContainerActivity,
R.color.color_242424
R.color.course_color_242424
)
)
}
......@@ -311,7 +312,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
0
)
}
classify_layout.setTextColor(ContextCompat.getColor(this@CourseListContainerActivity, R.color.color_1DA1F2))
classify_layout.setTextColor(ContextCompat.getColor(this@CourseListContainerActivity, R.color.course_color_1DA1F2))
classify_layout.setCompoundDrawablesWithIntrinsicBounds(
0,
0,
......@@ -344,7 +345,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
if (isPromotion == 1) {
sign += "促销"
}
ActionCountUtils.count(BIConstants.CourseListEvent.POSITION_COURSE_LIST_FILTER_CLICK, sign)
ActionCountUtils.count(CourseBIConstants.CourseListEvent.POSITION_COURSE_LIST_FILTER_CLICK, sign)
}
})
popupWindow.setOnDismissListener {
......@@ -353,7 +354,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
filter_layout.setTextColor(
ContextCompat.getColor(
this@CourseListContainerActivity,
R.color.color_1DA1F2
R.color.course_color_1DA1F2
)
)
} else {
......@@ -361,7 +362,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
filter_layout.setTextColor(
ContextCompat.getColor(
this@CourseListContainerActivity,
R.color.color_242424
R.color.course_color_242424
)
)
}
......@@ -372,7 +373,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
0
)
}
filter_layout.setTextColor(ContextCompat.getColor(this@CourseListContainerActivity, R.color.color_1DA1F2))
filter_layout.setTextColor(ContextCompat.getColor(this@CourseListContainerActivity, R.color.course_color_1DA1F2))
filter_layout.setCompoundDrawablesWithIntrinsicBounds(
0,
0,
......@@ -580,7 +581,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
classify_layout.setTextColor(
ContextCompat.getColor(
this@CourseListContainerActivity,
R.color.color_1DA1F2
R.color.course_color_1DA1F2
)
)
} else {
......@@ -588,7 +589,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
classify_layout.setTextColor(
ContextCompat.getColor(
this@CourseListContainerActivity,
R.color.color_242424
R.color.course_color_242424
)
)
}
......@@ -627,7 +628,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
filter_layout.setTextColor(
ContextCompat.getColor(
this@CourseListContainerActivity,
R.color.color_1DA1F2
R.color.course_color_1DA1F2
)
)
} else {
......@@ -635,7 +636,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
filter_layout.setTextColor(
ContextCompat.getColor(
this@CourseListContainerActivity,
R.color.color_242424
R.color.course_color_242424
)
)
}
......@@ -665,7 +666,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
override fun onResume() {
super.onResume()
ActionCountUtils.count(BIConstants.CourseListEvent.POSITION_COURSE_LIST_PAGE_VISIT)
ActionCountUtils.count(CourseBIConstants.CourseListEvent.POSITION_COURSE_LIST_PAGE_VISIT)
}
override fun checkCanDoRefresh(frame: PtrFrameLayout?, content: View?, header: View?): Boolean {
......
m-course/src/main/java/com/yidianling/course/courseNew/courseList/widget/CourseSortPopupWindow.kt
......@@ -66,7 +66,7 @@ class CourseSortPopupWindow(val context: Context, var selectedSort: String, priv
}
private fun setSelect(textView: TextView) {
textView.setTextColor(ContextCompat.getColor(context, R.color.color_1DA1F2))
textView.setTextColor(ContextCompat.getColor(context, R.color.course_color_1DA1F2))
textView.typeface = Typeface.defaultFromStyle(Typeface.BOLD)
}
......
m-course/src/main/java/com/yidianling/course/courseNew/mine/MyCourseActivity.java
......@@ -16,7 +16,6 @@ import android.widget.TextView;
import com.ydl.ydlcommon.base.BaseActivity;
import com.ydl.ydlcommon.utils.DisplayUtils;
import com.ydl.ydlcommon.utils.UMEventUtils;
import com.yidianling.course.CourseListFragment;
import com.yidianling.course.R;
import com.yidianling.course.widget.CourseRedPacketView;
......
m-course/src/main/java/com/yidianling/course/coursePlay/CourseCommentActivity.kt
......@@ -66,10 +66,10 @@ class CourseCommentActivity : BaseActivity() {
override fun afterTextChanged(s: Editable?) {
if (TextUtils.isEmpty(s)) {
tv_input_length.text = "0"
tv_input_length.setTextColor(resources.getColor(R.color.color_B3B3B3))
tv_input_length.setTextColor(resources.getColor(R.color.course_color_B3B3B3))
} else {
tv_input_length.text = s!!.length.toString()
tv_input_length.setTextColor(resources.getColor(R.color.color_242424))
tv_input_length.setTextColor(resources.getColor(R.color.course_color_242424))
}
}
......
m-course/src/main/java/com/yidianling/course/coursePlay/CoursePlayActivity.kt
......@@ -156,7 +156,7 @@ class CoursePlayActivity : BaseActivity() {
if (index == position) {
gifView.visibility = View.VISIBLE
playView.visibility = View.GONE
bodyView.setBackgroundColor(this@CoursePlayActivity.resources.getColor(R.color.color_F8FCFF))
bodyView.setBackgroundColor(this@CoursePlayActivity.resources.getColor(R.color.course_color_F8FCFF))
if (isShowAnim) {
Glide.with(this@CoursePlayActivity).asGif().load(R.drawable.course_music).into(gifView)
} else {
......@@ -183,7 +183,7 @@ class CoursePlayActivity : BaseActivity() {
}
holder.setTextColor(
R.id.text_title,
this@CoursePlayActivity.resources.getColor(R.color.color_FF000000)
this@CoursePlayActivity.resources.getColor(R.color.course_color_FF000000)
)
}
......@@ -527,7 +527,7 @@ class CoursePlayActivity : BaseActivity() {
dialog.setCallBack(object : YDLShareDialog.ICallBack {
override fun callBack(type: Int) {
if (1 == type) {
if (!YdlCommonRouterManager.getYdlCommonRoute().isLogin()) {
if (YdlCommonRouterManager.getYdlCommonRoute().getUid()<=0) {
YdlCommonRouterManager.getYdlCommonRoute().startChooseLoginWay(this@CoursePlayActivity)
} else {
//分享到心事动态
......
m-course/src/main/java/com/yidianling/course/course_special_list/activity/CourseSpecialListActivity.kt
......@@ -16,7 +16,7 @@ import com.yidianling.course.course_special_list.event.CourseSpecialListEventImp
import com.yidianling.course.course_special_list.event.ICourseSpecialListEvent
import com.yidianling.course.course_special_list.presenter.CourseSpecialListPresenterImpl
import kotlinx.android.synthetic.main.course_special_list_activity.*
import kotlinx.android.synthetic.main.layout_title_bar.*
import kotlinx.android.synthetic.main.course_layout_title_bar.*
/**
* @author yuanwai
......
m-course/src/main/java/com/yidianling/course/flutterPlugin/CoursePlugin.kt
......@@ -10,6 +10,7 @@ import com.ydl.webview.H5Params
import com.ydl.webview.NewH5Activity
import com.ydl.ydl_router.manager.YDLRouterManager
import com.ydl.ydlcommon.base.BaseApp
import com.ydl.ydlcommon.base.flutter.base.BaseFlutterFragment
import com.ydl.ydlcommon.router.YdlCommonRouterManager
import com.yidianling.common.tools.LogUtil
import com.yidianling.common.tools.RxDeviceTool
......@@ -19,7 +20,6 @@ import com.yidianling.course.courseNew.mine.MyCourseActivity
import com.yidianling.course.course_special_list.activity.CourseSpecialListActivity
import com.yidianling.course.flutterPlugin.CourseSendPlugin
import com.yidianling.course.router.CourseIn
import com.yidianling.ydlcommon.flutter.base.BaseFlutterFragment
import io.flutter.plugin.common.MethodCall
import io.flutter.plugin.common.MethodChannel
import io.flutter.view.FlutterView
......@@ -70,10 +70,10 @@ class CoursePlugin : MethodChannel.MethodCallHandler {
var jumpUrl: String? = methodCall.arguments.toString()
if (!TextUtils.isEmpty(jumpUrl)) {
when {
jumpUrl!!.contains("user/login") -> mFragment!!.startActivity(CourseIn.loginWayIntent(mFragment!!.activity))
jumpUrl!!.contains("user/login") -> mFragment!!.startActivity(CourseIn.loginWayIntent(mFragment!!.activity!!))
jumpUrl.contains("course/myCourse") -> MyCourseActivity.start(mFragment!!.activity)
jumpUrl.contains("course/specialList") -> //跳转专题列表页
mFragment!!.activity.startActivity(
mFragment!!.activity!!.startActivity(
Intent(
mFragment!!.activity,
CourseSpecialListActivity::class.java
......@@ -104,12 +104,12 @@ class CoursePlugin : MethodChannel.MethodCallHandler {
}
private fun playMedia(fileInfo: Map<*, *>) {
if (PlayerFloatHelper.isShow(mFragment!!.activity)) {
if (PlayerFloatHelper.isShow(mFragment!!.activity!!)) {
PlayerFloatHelper.hide()
PlayerFloatHelper.removeView(mFragment!!.activity)
PlayerFloatHelper.removeView(mFragment!!.activity!!)
AudioPlayer.get().stopPlayer()
} else {
PlayerFloatHelper.removeView(mFragment!!.activity)
PlayerFloatHelper.removeView(mFragment!!.activity!!)
}
......
m-course/src/main/java/com/yidianling/course/widget/SearchBarView.kt
......@@ -17,7 +17,8 @@ import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
import com.ydl.ydlcommon.utils.actionutil.BIConstants
import com.yidianling.common.tools.RxImageTool
import com.yidianling.course.R
import kotlinx.android.synthetic.main.common_search_bar.view.*
import com.yidianling.course.constants.CourseBIConstants
import kotlinx.android.synthetic.main.course_common_search_bar.view.*
/**
......@@ -58,11 +59,11 @@ class SearchBarView : LinearLayout {
gravity = Gravity.CENTER
setBackgroundColor(Color.WHITE)
setPadding(0, RxImageTool.dp2px(5f), 0, RxImageTool.dp2px(5f))
View.inflate(context, R.layout.common_search_bar, this)
View.inflate(context, R.layout.course_common_search_bar, this)
setOnClickListener {
when (barType) {
JUMP_TO_SEARCH_COURSE -> {//搜索课程页面
ActionCountUtils.count(BIConstants.CourseHomeEvent.POSITION_COURSE_HOME_SEACH_CLICK)
ActionCountUtils.count(CourseBIConstants.CourseHomeEvent.POSITION_COURSE_HOME_SEACH_CLICK)
YDLRouterManager.router(IYDLRouterConstant.ROUTER_COURSE_SEARCH)
}
}
......
m-course/src/main/res/drawable/background_course_comment_push.xml
......@@ -4,7 +4,7 @@
<item android:state_enabled="true">
<shape>
<corners android:radius="16dp"/>
<solid android:color="@color/color_FFDB26"/>
<solid android:color="@color/course_color_FFDB26"/>
</shape>
</item>
</selector>
\ No newline at end of file
m-course/src/main/res/drawable/background_course_demo.xml
......@@ -2,7 +2,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="4dp"/>
<solid android:color="@color/color_FFDB26" />
<stroke android:width="1dp" android:color="@color/color_FFDB26"/>
<solid android:color="@color/course_color_FFDB26" />
<stroke android:width="1dp" android:color="@color/course_color_FFDB26"/>
</shape>
\ No newline at end of file
m-course/src/main/res/drawable/bg_item_course_list.xml
......@@ -2,5 +2,5 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="false" android:drawable="@color/white"/>
<item android:state_pressed="true" android:drawable="@color/color_f0f0f0"/>
<item android:state_pressed="true" android:drawable="@color/course_color_f0f0f0"/>
</selector>
\ No newline at end of file
m-course/src/main/res/drawable/course_background_course_coupon_detail_use.xml
......@@ -6,7 +6,7 @@
<corners android:radius="11dp"/>
<gradient
android:angle="180"
android:endColor="@color/color_FFC000" android:startColor="@color/color_FF8C00" />
android:endColor="@color/course_color_FFC000" android:startColor="@color/course_color_FF8C00" />
</shape>
</item>
</selector>
\ No newline at end of file
m-course/src/main/res/drawable/course_background_course_list_item_view.xml
......@@ -4,7 +4,7 @@
<item android:state_enabled="true">
<shape>
<corners android:radius="13dp"/>
<gradient android:endColor="@color/color_FFD814" android:startColor="@color/color_FFDB26" />
<gradient android:endColor="@color/course_color_FFD814" android:startColor="@color/course_color_FFDB26" />
</shape>
</item>
</selector>
\ No newline at end of file
m-course/src/main/res/drawable/course_background_course_poster_button.xml
......@@ -4,7 +4,7 @@
<item android:state_checked="true">
<shape>
<corners android:radius="4dp" />
<solid android:color="@color/color_30FFFFFF"/>
<solid android:color="@color/course_color_30FFFFFF"/>
</shape>
</item>
......
m-course/src/main/res/drawable/course_background_course_poster_circle.xml
......@@ -4,7 +4,7 @@
<item android:state_enabled="true">
<shape android:shape="oval">
<solid android:color="@color/color_0D1A30" />
<solid android:color="@color/course_color_0D1A30" />
<size android:width="15dp" android:height="15dp" />
</shape>
......@@ -14,7 +14,7 @@
<item android:state_enabled="false">
<shape android:shape="oval">
<solid android:color="@color/color_FDD33D" />
<solid android:color="@color/course_color_FDD33D" />
<size android:width="15dp" android:height="15dp" />
</shape>
......
m-course/src/main/res/drawable/course_background_course_poster_line.xml
......@@ -3,7 +3,7 @@
<item android:state_enabled="true">
<shape android:shape="line">
<stroke android:width="2px" android:color="@color/color_0D1A30" android:dashWidth="15px" android:dashGap="20px" />
<stroke android:width="2px" android:color="@color/course_color_0D1A30" android:dashWidth="15px" android:dashGap="20px" />
<size android:height="1dp" />
......@@ -14,7 +14,7 @@
<item android:state_enabled="false">
<shape android:shape="line">
<stroke android:width="2px" android:color="@color/color_FDD33D" android:dashWidth="15px" android:dashGap="20px" />
<stroke android:width="2px" android:color="@color/course_color_FDD33D" android:dashWidth="15px" android:dashGap="20px" />
<size android:height="1dp" />
......
m-course/src/main/res/drawable/course_background_qrcode_bord.xml
......@@ -5,7 +5,7 @@
<shape>
<corners android:radius="2dp" />
<solid android:color="@color/white" />
<stroke android:width="0.5dp" android:color="@color/color_BFBFBF" />
<stroke android:width="0.5dp" android:color="@color/course_color_BFBFBF" />
</shape>
</item>
</selector>
\ No newline at end of file
m-course/src/main/res/drawable/course_comment_item_btn_background.xml
......@@ -4,6 +4,6 @@
<corners android:radius="14dp" />
<solid android:color="@color/color_FFDB26" />
<solid android:color="@color/course_color_FFDB26" />
</shape>
\ No newline at end of file
m-course/src/main/res/drawable/common_search_bar_back.xml → m-course/src/main/res/drawable/course_common_search_bar_back.xml
......@@ -6,6 +6,6 @@
android:radius="20dp"/>
<solid
android:color="@color/color_F7F7F7"/>
android:color="@color/course_color_F7F7F7"/>
</shape>
\ No newline at end of file
m-course/src/main/res/drawable/course_dot_seekbar.xml
......@@ -5,6 +5,6 @@
android:width="17dp"
android:height="17dp" />
<stroke android:color="@color/white" android:width="6dp"/>
<solid android:color="@color/color_FFDB26" />
<solid android:color="@color/course_color_FFDB26" />
</shape>
\ No newline at end of file
m-course/src/main/res/drawable/course_filter_reset_btn_bg.xml
......@@ -4,7 +4,7 @@
<corners android:radius="6dp" />
<solid android:color="@color/color_F7F7F7" />
<solid android:color="@color/course_color_F7F7F7" />
<stroke
android:width="0.5px"
......
m-course/src/main/res/drawable/course_filter_select_nor.xml
......@@ -5,5 +5,5 @@
<corners android:radius="4dp" />
<solid android:color="@color/color_F7F7F7" />
<solid android:color="@color/course_color_F7F7F7" />
</shape>
\ No newline at end of file
m-course/src/main/res/drawable/course_filter_select_sel.xml
......@@ -4,7 +4,7 @@
<corners android:radius="4dp" />
<stroke android:color="@color/color_1DA1F2" android:width="1px" />
<stroke android:color="@color/course_color_1DA1F2" android:width="1px" />
<solid android:color="@color/color_151DA1F2" />
<solid android:color="@color/course_color_151DA1F2" />
</shape>
\ No newline at end of file
m-course/src/main/res/drawable/course_layer_progress.xml
......@@ -19,7 +19,7 @@
<clip>
<shape>
<corners android:radius="3dp" />
<solid android:color="@color/color_FFDB26" />
<solid android:color="@color/course_color_FFDB26" />
</shape>
</clip>
</item>
......
m-course/src/main/res/drawable/tv_course_item_btn_background.xml
......@@ -5,5 +5,5 @@
<corners
android:radius="14dp"/>
<solid android:color="@color/color_F5F5F5"/>
<solid android:color="@color/course_color_F5F5F5"/>
</shape>
\ No newline at end of file
m-course/src/main/res/layout/activity_course_commeny.xml
......@@ -24,10 +24,11 @@
android:layout_height="45dp"
android:gravity="center"
android:text="写评论"
android:textColor="@color/color_242424"
android:textColor="@color/course_color_242424"
android:textSize="16sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
app:layout_constraintStart_toStartOf="parent"
tools:ignore="MissingConstraints" />
<TextView
android:id="@+id/tv_left_menu"
......@@ -40,7 +41,7 @@
android:paddingRight="16dp"
android:paddingBottom="5dp"
android:text="发布"
android:textColor="@color/color_242424"
android:textColor="@color/course_color_242424"
android:textSize="15sp"
app:layout_constraintBottom_toBottomOf="@+id/tv_title"
app:layout_constraintEnd_toEndOf="parent"
......@@ -50,7 +51,7 @@
android:id="@+id/view_line"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/color_F4F4F4"
android:background="@color/course_color_F4F4F4"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_title" />
......@@ -67,8 +68,8 @@
android:hint="评价返28元课程兑换券"
android:maxLength="500"
android:paddingBottom="45dp"
android:textColor="@color/color_242424"
android:textColorHint="@color/color_B3B3B3"
android:textColor="@color/course_color_242424"
android:textColorHint="@color/course_color_B3B3B3"
android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
......@@ -80,7 +81,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
android:textColor="@color/color_B3B3B3"
android:textColor="@color/course_color_B3B3B3"
android:textSize="15sp"
app:layout_constraintBottom_toBottomOf="@+id/tv_input_limt"
app:layout_constraintEnd_toStartOf="@+id/tv_input_limt" />
......@@ -92,7 +93,7 @@
android:layout_marginRight="15dp"
android:layout_marginBottom="20dp"
android:text="/500"
android:textColor="@color/color_B3B3B3"
android:textColor="@color/course_color_B3B3B3"
android:textSize="15sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
......
m-course/src/main/res/layout/activity_course_poster.xml
......@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_99000000"
android:background="@color/course_color_99000000"
tools:ignore="MissingDefaultResource">
<ImageView
......
m-course/src/main/res/layout/activity_course_reply_list.xml
......@@ -9,8 +9,9 @@
android:id="@+id/title_bar"
android:layout_width="match_parent"
android:layout_height="50dp"
app:title_text="课后笔记"
app:left_start_icon="@drawable/course_toolbar_back"/>
app:pa_title_text="课后笔记"
app:pa_left_start_icon="@drawable/course_toolbar_back"/>
<android.support.v7.widget.RecyclerView
android:id="@+id/recycler_list"
......
m-course/src/main/res/layout/activity_course_search.xml
......@@ -10,7 +10,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="44dp"
android:background="@color/color_FFFFFF"
android:background="@color/course_color_FFFFFF"
android:gravity="center"
android:orientation="horizontal"
android:paddingLeft="15dp">
......@@ -37,7 +37,7 @@
android:id="@+id/activity_course_search_unusual_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_FFFFFF"
android:background="@color/course_color_FFFFFF"
android:gravity="center_horizontal"
android:orientation="vertical"
android:visibility="invisible">
......@@ -54,7 +54,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="18dp"
android:textColor="@color/color_ACACAC"/>
android:textColor="@color/course_color_ACACAC"/>
</LinearLayout>
<android.support.v4.widget.SwipeRefreshLayout
......
m-course/src/main/res/layout/activity_course_topic.xml
......@@ -7,10 +7,10 @@
<include
android:id="@+id/v_no_network"
layout="@layout/view_no_network"
layout="@layout/course_view_no_network"
android:visibility="gone" />
<include layout="@layout/layout_title_bar" />
<include layout="@layout/course_layout_title_bar" />
<android.support.v4.widget.SwipeRefreshLayout
android:id="@+id/swl"
......
m-course/src/main/res/layout/activity_courses.xml
......@@ -8,7 +8,7 @@
android:orientation="vertical"
>
<include layout="@layout/layout_title_bar"/>
<include layout="@layout/course_layout_title_bar"/>
<com.yidianling.course.widget.SearchBarView
android:id="@+id/search_view"
......@@ -47,7 +47,7 @@
android:drawableRight="@drawable/course_ic_arrow_drop_down_grey_500_18dp"
android:gravity="center"
android:text="分类"
android:textColor="@color/color_242424"
android:textColor="@color/course_color_242424"
android:textSize="14sp"/>
<com.ydl.ydlcommon.view.DrawableRightTextView
......@@ -58,7 +58,7 @@
android:drawableRight="@drawable/course_ic_arrow_drop_down_grey_500_18dp"
android:gravity="center"
android:text="筛选"
android:textColor="@color/color_242424"
android:textColor="@color/course_color_242424"
android:textSize="14sp"/>
</LinearLayout>
......@@ -103,7 +103,7 @@
android:id="@+id/lv_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:divider="@color/color_EDEDED"
android:divider="@color/course_color_EDEDED"
android:dividerHeight="0dp"/>
<ImageView
......
m-course/src/main/res/layout/activity_my_course.xml
......@@ -6,7 +6,7 @@
android:background="@color/white"
android:orientation="vertical">
<include layout="@layout/layout_title_bar"/>
<include layout="@layout/course_layout_title_bar"/>
<com.yidianling.course.widget.CourseRedPacketView
......@@ -26,9 +26,9 @@
android:layout_height="40dp"
android:background="@color/white"
app:tabGravity="fill"
app:tabIndicatorColor="@color/google_green"
app:tabIndicatorColor="@color/main_theme"
app:tabMode="fixed"
app:tabSelectedTextColor="@color/google_green"
app:tabSelectedTextColor="@color/main_theme"
app:tabTextColor="#333"/>
<android.support.v4.view.ViewPager
......
m-course/src/main/res/layout/common_search_bar.xml → m-course/src/main/res/layout/course_common_search_bar.xml
......@@ -12,16 +12,16 @@
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:layout_weight="1"
android:background="@drawable/common_search_bar_back"
android:background="@drawable/course_common_search_bar_back"
android:gravity="center"
android:paddingLeft="15dp"
android:paddingRight="15dp">
<ImageView
android:id="@+id/common_search_bar_img"
android:layout_width="@dimen/dp_12"
android:layout_height="@dimen/dp_12"
android:src="@drawable/ico_search"/>
android:layout_width="12dp"
android:layout_height="12dp"
android:src="@drawable/course_ico_search"/>
<TextView
android:id="@+id/common_search_bar_text"
......@@ -29,7 +29,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:text="搜索课程标题或专家姓名"
android:textColor="@color/color_999999"
android:textColor="@color/course_color_999999"
android:textSize="12dp"/>
<EditText
......@@ -44,8 +44,8 @@
android:hint="搜索课程标题或专家姓名"
android:imeOptions="actionSearch"
android:singleLine="true"
android:textColor="@color/color_242424"
android:textColorHint="@color/color_999999"
android:textColor="@color/course_color_242424"
android:textColorHint="@color/course_color_999999"
android:textSize="12dp"
android:visibility="gone"
/>
......@@ -56,7 +56,7 @@
android:layout_width="14dp"
android:layout_height="14dp"
android:scaleType="centerCrop"
android:src="@drawable/delete"
android:src="@drawable/course_delete"
android:visibility="gone"/>
</LinearLayout>
......@@ -67,7 +67,7 @@
android:layout_height="wrap_content"
android:layout_marginRight="15dp"
android:text="取消"
android:textColor="@color/color_242424"
android:textColor="@color/course_color_242424"
android:visibility="gone"/>
</merge>
m-course/src/main/res/layout/course_filter_popup_window.xml
......@@ -17,7 +17,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="15dp"
android:layout_marginTop="22dp"
android:textColor="@color/color_242424"
android:textColor="@color/course_color_242424"
android:textSize="16sp"
android:textStyle="bold"
android:text="付费类型" />
......@@ -39,7 +39,7 @@
android:gravity="center"
android:orientation="vertical"
android:text="付费"
android:textColor="@color/color_242424"
android:textColor="@color/course_color_242424"
android:textSize="14dp" />
<TextView
......@@ -52,7 +52,7 @@
android:gravity="center"
android:orientation="vertical"
android:text="免费"
android:textColor="@color/color_242424"
android:textColor="@color/course_color_242424"
android:textSize="14dp" />
<TextView
......@@ -69,7 +69,7 @@
android:layout_marginLeft="15dp"
android:layout_marginTop="20dp"
android:layout_marginRight="15dp"
android:background="@color/color_F0F0F0" />
android:background="@color/course_color_F0F0F0" />
<TextView
android:id="@+id/tv_ageTitle"
......@@ -77,7 +77,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="15dp"
android:layout_marginTop="23dp"
android:textColor="@color/color_242424"
android:textColor="@color/course_color_242424"
android:textSize="16sp"
android:textStyle="bold"
android:text="活动类型" />
......@@ -99,7 +99,7 @@
android:gravity="center"
android:orientation="vertical"
android:text="限时促销"
android:textColor="@color/color_242424"
android:textColor="@color/course_color_242424"
android:textSize="14dp" />
<TextView
......@@ -112,7 +112,7 @@
android:gravity="center"
android:orientation="vertical"
android:text="邀请返利"
android:textColor="@color/color_242424"
android:textColor="@color/course_color_242424"
android:textSize="14dp" />
<TextView
......
m-course/src/main/res/layout/course_footer.xml
......@@ -3,7 +3,7 @@
android:layout_width="match_parent"
android:layout_height="45dp"
android:orientation="horizontal"
android:background="@color/color_50FFFFFF"
android:background="@color/course_color_50FFFFFF"
android:gravity="center">
<TextView
......
m-course/src/main/res/layout/course_good_popup_window.xml
......@@ -17,7 +17,7 @@
android:layout_marginLeft="15dp"
android:layout_marginTop="22dp"
android:text="课程类型"
android:textColor="@color/color_242424"
android:textColor="@color/course_color_242424"
android:textSize="16dp"
android:textStyle="bold" />
......
m-course/src/main/res/layout/layout_title_bar.xml → m-course/src/main/res/layout/course_layout_title_bar.xml
......@@ -20,7 +20,7 @@
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:textColor="@color/color_333333"
android:textColor="@color/course_color_333333"
android:textSize="18sp" />
<TextView
......
m-course/src/main/res/layout/course_redpacket_view.xml
......@@ -4,7 +4,7 @@
android:layout_width="match_parent"
android:layout_height="32dp"
android:orientation="horizontal"
android:background="@color/color_FFEEE6">
android:background="@color/course_color_FFEEE6">
<ImageView
android:id="@+id/imgTiXing"
android:layout_width="14dp"
......
m-course/src/main/res/layout/course_sort_popup_window.xml
......@@ -14,7 +14,7 @@
android:background="@color/white"
android:gravity="center"
android:text="综合排序"
android:textColor="@color/color_242424"
android:textColor="@color/course_color_242424"
android:textSize="15sp" />
<TextView
......@@ -24,7 +24,7 @@
android:background="@color/white"
android:gravity="center"
android:text="人气从高到低"
android:textColor="@color/color_242424"
android:textColor="@color/course_color_242424"
android:textSize="15sp" />
<TextView
......@@ -34,7 +34,7 @@
android:background="@color/white"
android:gravity="center"
android:text="价格从低到高"
android:textColor="@color/color_242424"
android:textColor="@color/course_color_242424"
android:textSize="15sp" />
<TextView
......@@ -44,7 +44,7 @@
android:background="@color/white"
android:gravity="center"
android:text="上架时间从新到旧"
android:textColor="@color/color_242424"
android:textColor="@color/course_color_242424"
android:textSize="15sp" />
<View
......
m-course/src/main/res/layout/course_special_item_view.xml
......@@ -20,7 +20,7 @@
android:layout_marginTop="20dp"
android:layout_marginBottom="20dp"
android:layout_marginLeft="15dp"
app:srcCompat="@color/color_EBEBEB"/>
app:srcCompat="@color/course_color_EBEBEB"/>
<TextView
android:id="@+id/tv_title"
......@@ -34,7 +34,7 @@
android:ellipsize="end"
android:maxLines="2"
android:text="标题"
android:textColor="@color/color_333333"
android:textColor="@color/course_color_333333"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintHorizontal_bias="1.0"
......@@ -50,7 +50,7 @@
android:layout_marginLeft="15dp"
android:layout_marginStart="15dp"
tools:text="共21节课程"
android:textColor="@color/color_666666"
android:textColor="@color/course_color_666666"
android:textSize="14sp"
app:layout_constraintBottom_toBottomOf="@+id/iv_head"
app:layout_constraintHorizontal_bias="0.0"
......@@ -61,7 +61,7 @@
android:id="@+id/divider_line"
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:background="@color/color_f0f0f0"
android:background="@color/course_color_f0f0f0"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
app:layout_constraintTop_toBottomOf="parent"/>
......
m-course/src/main/res/layout/course_special_list_activity.xml
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white">
android:background="@color/white"
android:orientation="vertical">
<include
android:id="@+id/v_no_network"
layout="@layout/view_no_network"
android:visibility="gone"/>
layout="@layout/course_view_no_network"
android:visibility="gone" />
<android.support.v4.widget.SwipeRefreshLayout
android:id="@+id/swipelayout"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<include layout="@layout/layout_title_bar"/>
<include layout="@layout/course_layout_title_bar" />
<android.support.v7.widget.RecyclerView
android:id="@+id/rv_list"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
android:layout_height="match_parent" />
</LinearLayout>
</android.support.v4.widget.SwipeRefreshLayout>
......
m-course/src/main/res/layout/course_view_course_coupon_detail.xml
......@@ -14,7 +14,7 @@
android:layout_height="wrap_content"
android:gravity="center"
android:lineSpacingExtra="0dp"
android:textColor="@color/color_FF9100"
android:textColor="@color/course_color_FF9100"
android:textSize="26sp"
android:textStyle="bold"
tools:text="50" />
......@@ -26,7 +26,7 @@
android:layout_below="@+id/tv_price"
android:gravity="center_horizontal"
android:lineSpacingExtra="0dp"
android:textColor="@color/color_FF9100"
android:textColor="@color/course_color_FF9100"
android:textSize="10sp"
tools:text="满500元可用" />
......@@ -50,7 +50,7 @@
android:ellipsize="end"
android:maxLength="20"
android:maxLines="1"
android:textColor="@color/color_242424"
android:textColor="@color/course_color_242424"
android:textSize="15sp"
tools:text="咨询优惠券" />
......@@ -61,7 +61,7 @@
android:layout_below="@+id/tv_title"
android:layout_marginTop="1dp"
android:text="有效期至2018-08-31"
android:textColor="@color/color_242424"
android:textColor="@color/course_color_242424"
android:textSize="11sp" />
......@@ -91,7 +91,7 @@
android:layout_marginTop="1dp"
android:layout_marginBottom="14dp"
android:text="指定课程使用"
android:textColor="@color/color_666666"
android:textColor="@color/course_color_666666"
android:textSize="11sp" />
</RelativeLayout>
......
m-course/src/main/res/layout/course_view_course_poster_template.xml
......@@ -29,7 +29,8 @@
android:layout_width="match_parent"
android:layout_height="130dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"/>
app:layout_constraintStart_toStartOf="parent"
tools:ignore="MissingConstraints" />
<TextView
android:id="@+id/tv_title"
......@@ -41,7 +42,7 @@
android:ellipsize="end"
android:lineSpacingExtra="3dp"
android:maxLines="3"
android:textColor="@color/color_242424"
android:textColor="@color/course_color_242424"
android:textSize="15sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
......@@ -60,7 +61,7 @@
android:ellipsize="end"
android:lineSpacingExtra="3dp"
android:maxLines="2"
android:textColor="@color/color_242424"
android:textColor="@color/course_color_242424"
android:textSize="12sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
......@@ -73,7 +74,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="￥"
android:textColor="@color/color_FF5A4C"
android:textColor="@color/course_color_FF5A4C"
android:textSize="10sp"
app:layout_constraintBottom_toBottomOf="@+id/tv_price"
app:layout_constraintStart_toStartOf="@+id/tv_intro"
......@@ -84,7 +85,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="7dp"
android:textColor="@color/color_FF5A4C"
android:textColor="@color/course_color_FF5A4C"
android:textSize="17sp"
android:textStyle="bold"
app:layout_constraintStart_toEndOf="@+id/tv_symbol"
......@@ -97,7 +98,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:textColor="@color/color_999999"
android:textColor="@color/course_color_999999"
android:textSize="9sp"
app:layout_constraintBottom_toBottomOf="@+id/tv_price"
app:layout_constraintStart_toEndOf="@+id/tv_price"
......@@ -109,7 +110,7 @@
android:id="@+id/tv_view_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/color_242424"
android:textColor="@color/course_color_242424"
android:textSize="10sp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@+id/tv_price"
......@@ -123,7 +124,7 @@
android:layout_height="wrap_content"
android:layout_marginEnd="4dp"
android:text="人已学 |"
android:textColor="@color/color_666666"
android:textColor="@color/course_color_666666"
android:textSize="10sp"
app:layout_constraintBottom_toBottomOf="@+id/tv_price"
app:layout_constraintEnd_toStartOf="@+id/tv_course_num"
......@@ -135,7 +136,7 @@
android:layout_height="wrap_content"
android:layout_marginEnd="11dp"
android:text="讲"
android:textColor="@color/color_666666"
android:textColor="@color/course_color_666666"
android:textSize="10sp"
app:layout_constraintBottom_toBottomOf="@+id/tv_price"
app:layout_constraintEnd_toEndOf="parent"
......@@ -145,7 +146,7 @@
android:id="@+id/tv_course_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/color_242424"
android:textColor="@color/course_color_242424"
android:textSize="10sp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@+id/tv_price"
......@@ -198,7 +199,7 @@
android:src="@drawable/course_poster_share_head"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/rl_line"
myapp:type="circle"/>
myapp:pa_type="pa_circle"/>
<TextView
......@@ -207,7 +208,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:text="壹点灵用户"
android:textColor="@color/color_242424"
android:textColor="@color/course_color_242424"
android:textSize="12sp"
android:textStyle="bold"
app:layout_constraintStart_toEndOf="@+id/iv_head"
......@@ -219,7 +220,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="向你推荐这门课"
android:textColor="@color/color_666666"
android:textColor="@color/course_color_666666"
android:textSize="9sp"
app:layout_constraintStart_toStartOf="@+id/tv_user_name"
app:layout_constraintTop_toBottomOf="@+id/tv_user_name"/>
......@@ -263,8 +264,8 @@
android:layout_height="match_parent"
android:layout_centerInParent="true"
android:layout_margin="0.5dp"
myapp:borderRadius="2dp"
myapp:type="round"/>
myapp:pa_borderRadius="2dp"
myapp:pa_type="pa_round"/>
</RelativeLayout>
......
m-course/src/main/res/layout/view_no_network.xml → m-course/src/main/res/layout/course_view_no_network.xml
......@@ -7,7 +7,7 @@
android:id="@+id/iv_network"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/no_net"
android:src="@drawable/course_no_net"
android:layout_centerInParent="true"/>
<TextView
android:id="@+id/tv_network_content"
......
m-course/src/main/res/layout/dialog_course_coupon.xml
......@@ -14,7 +14,7 @@
android:layout_height="397dp"
android:layout_marginLeft="33dp"
android:layout_marginRight="32dp"
android:background="@color/color_FFFFFF"
android:background="@color/course_color_FFFFFF"
app:cardCornerRadius="10dp">
<LinearLayout
......@@ -28,7 +28,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="28dp"
android:textColor="@color/color_242424"
android:textColor="@color/course_color_242424"
android:textSize="20sp"
tools:text="领取成功" />
......@@ -38,7 +38,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="未领到的优惠券已经被抢光了"
android:textColor="@color/color_666666"
android:textColor="@color/course_color_666666"
android:textSize="12sp"
android:visibility="gone" />
......
m-course/src/main/res/layout/fragment_course_list.xml
......@@ -18,7 +18,7 @@
android:id="@+id/lv_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:divider="@color/color_EDEDED"
android:divider="@color/course_color_EDEDED"
android:dividerHeight="0dp" />
<ImageView
......
m-course/src/main/res/layout/item_course_good_item.xml
......@@ -8,7 +8,7 @@
android:background="@drawable/course_filter_select_nor"
android:gravity="center"
android:orientation="vertical"
android:textColor="@color/color_242424"
android:textColor="@color/course_color_242424"
android:textSize="14dp"
tools:text="恋爱婚姻" />
m-course/src/main/res/layout/item_course_list.xml
......@@ -35,7 +35,7 @@
android:paddingLeft="11dp"
android:paddingRight="11dp"
android:text="和TA私聊"
android:textColor="@color/color_333333"
android:textColor="@color/course_color_333333"
android:textSize="12sp"
android:visibility="invisible" />
......@@ -49,7 +49,7 @@
android:paddingLeft="11dp"
android:paddingRight="11dp"
android:text="评价课程"
android:textColor="@color/color_242424"
android:textColor="@color/course_color_242424"
android:textSize="12sp"
android:visibility="invisible" />
......@@ -59,7 +59,7 @@
android:id="@+id/tv_line_bottom"
android:layout_width="0dp"
android:layout_height="1dp"
android:background="@color/color_F7F7F7"
android:background="@color/course_color_F7F7F7"
android:visibility="invisible"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
......
m-course/src/main/res/layout/item_course_new_list_view.xml
......@@ -16,10 +16,10 @@
android:layout_marginStart="2dp"
android:layout_marginTop="20dp"
android:scaleType="centerCrop"
app:borderRadius="4dp"
app:pa_borderRadius="4dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:type="round"
app:pa_type="pa_round"
tools:background="@color/main_theme"/>
......@@ -74,7 +74,7 @@
android:layout_marginStart="4dp"
android:ellipsize="end"
android:maxLines="2"
android:textColor="@color/color_333333"
android:textColor="@color/course_color_333333"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
......@@ -90,7 +90,7 @@
android:layout_marginTop="4dp"
android:ellipsize="end"
android:maxLines="1"
android:textColor="@color/color_242424"
android:textColor="@color/course_color_242424"
android:textSize="12sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/guide_line"
......@@ -103,7 +103,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginTop="4dp"
android:textColor="@color/color_999999"
android:textColor="@color/course_color_999999"
android:textSize="12sp"
app:layout_constraintStart_toEndOf="@+id/guide_line"
app:layout_constraintTop_toBottomOf="@+id/tv_doctor_info"
......@@ -115,7 +115,7 @@
android:layout_height="0dp"
android:layout_marginStart="6dp"
android:layout_marginEnd="2dp"
android:background="@color/color_EBEBEB"
android:background="@color/course_color_EBEBEB"
app:layout_constraintBottom_toBottomOf="@+id/tv_course_num"
app:layout_constraintStart_toEndOf="@+id/tv_course_info"
app:layout_constraintTop_toBottomOf="@+id/tv_doctor_info"
......@@ -127,7 +127,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginTop="4dp"
android:textColor="@color/color_999999"
android:textColor="@color/course_color_999999"
android:textSize="12sp"
app:layout_constraintStart_toEndOf="@+id/view_line"
app:layout_constraintTop_toBottomOf="@+id/tv_doctor_info"
......@@ -161,7 +161,7 @@
android:layout_height="wrap_content"
android:fontFamily="@font/dincond_bold"
android:text=".00"
android:textColor="@color/color_FF5040"
android:textColor="@color/course_color_FF5040"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="@+id/iv_head"
app:layout_constraintEnd_toEndOf="parent"/>
......@@ -172,7 +172,7 @@
android:layout_height="wrap_content"
android:layout_marginBottom="19dp"
android:fontFamily="@font/dincond_bold"
android:textColor="@color/color_FF5040"
android:textColor="@color/course_color_FF5040"
android:textSize="18sp"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/view_bottom_line"
......@@ -186,7 +186,7 @@
android:layout_marginTop="1dp"
android:layout_marginEnd="2dp"
android:text="¥"
android:textColor="@color/color_FF5040"
android:textColor="@color/course_color_FF5040"
android:textSize="11sp"
android:textStyle="bold"
app:layout_constraintEnd_toStartOf="@+id/tv_price"
......@@ -198,7 +198,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="3dp"
android:textColor="@color/color_BFBFBF"
android:textColor="@color/course_color_BFBFBF"
android:textSize="10sp"
app:layout_constraintBottom_toBottomOf="@+id/iv_head"
app:layout_constraintEnd_toStartOf="@+id/tv_price_si"
......@@ -211,7 +211,7 @@
android:background="@drawable/course_background_course_list_item_view"
android:gravity="center"
android:text="立即听课"
android:textColor="@color/color_242424"
android:textColor="@color/course_color_242424"
android:textSize="13dp"
android:textStyle="bold"
android:visibility="gone"
......@@ -224,7 +224,7 @@
android:layout_height="0.5dp"
android:layout_marginStart="2dp"
android:layout_marginTop="20dp"
android:background="@color/color_EBEBEB"
android:background="@color/course_color_EBEBEB"
app:layout_constraintTop_toBottomOf="@+id/iv_head"/>
</merge>
\ No newline at end of file
m-course/src/main/res/layout/item_course_play_head.xml
......@@ -14,7 +14,7 @@
android:layout_marginStart="15dp"
android:layout_marginTop="18dp"
android:layout_marginEnd="16dp"
android:textColor="@color/color_242424"
android:textColor="@color/course_color_242424"
android:textSize="22sp"
app:layout_constraintEnd_toStartOf="@+id/line_view"
app:layout_constraintStart_toStartOf="parent"
......@@ -39,7 +39,7 @@
android:layout_height="wrap_content"
android:layout_marginEnd="4dp"
android:text="详情"
android:textColor="@color/color_242424"
android:textColor="@color/course_color_242424"
android:textSize="14sp"
app:layout_constraintBottom_toBottomOf="@+id/text_user_des"
app:layout_constraintEnd_toStartOf="@+id/iv_more"
......@@ -79,7 +79,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:textColor="@color/color_242424"
android:textColor="@color/course_color_242424"
android:textSize="12sp"
tools:text="王昭君"/>
......@@ -92,7 +92,7 @@
android:layout_height="1dp"
android:layout_marginTop="18dp"
android:layout_marginEnd="15dp"
android:background="@color/color_F4F4F4"
android:background="@color/course_color_F4F4F4"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/text_user_des"
app:layout_constraintTop_toBottomOf="@+id/ll_info"/>
......@@ -103,7 +103,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:textColor="@color/color_666666"
android:textColor="@color/course_color_666666"
android:textSize="12sp"
app:layout_constraintStart_toStartOf="@+id/text_user_des"
app:layout_constraintTop_toBottomOf="@+id/view_hor_line"
......
m-course/src/main/res/layout/item_course_play_recylist.xml
......@@ -56,6 +56,6 @@
android:layout_height="0.5dp"
android:layout_marginTop="15dp"
android:layout_below="@+id/text_des"
android:background="@color/color_F5F5F5"/>
android:background="@color/course_color_F5F5F5"/>
</RelativeLayout>
\ No newline at end of file
m-course/src/main/res/layout/item_course_playlist_item.xml
......@@ -10,7 +10,7 @@
android:id="@+id/lin_body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/color_F8FCFF"
android:background="@color/course_color_F8FCFF"
android:orientation="horizontal"
android:paddingLeft="15dp"
android:paddingRight="15dp">
......@@ -43,7 +43,7 @@
android:paddingRight="5dp"
android:paddingBottom="2dp"
android:text="试听"
android:textColor="@color/color_242424"
android:textColor="@color/course_color_242424"
android:textSize="10sp" />
<TextView
......@@ -55,7 +55,7 @@
android:ellipsize="end"
android:gravity="center_vertical"
android:paddingLeft="13dp"
android:textColor="@color/color_242424"
android:textColor="@color/course_color_242424"
android:textSize="14sp"
tools:text="shishihihgoerrjgejgr" />
......
m-course/src/main/res/values/colors.xml
......@@ -105,38 +105,40 @@
<color name="color_F7F7F7" tools:ignore="MissingDefaultResource">#F7F7F7</color>
<color name="color_999999">#999999</color>
<color name="color_242424">#242424</color>
<color name="color_333333">#333333</color>
<color name="color_f0f0f0">#f0f0f0</color>
<color name="color_666666">#f666666</color>
<color name="color_EBEBEB" tools:ignore="MissingDefaultResource">#EBEBEB</color>
<color name="color_1DA1F2">#1DA1F2</color>
<color name="color_151DA1F2">#261DA1F2</color>
<color name="color_E0E0E0">#E0E0E0</color>
<color name="color_F0F0F0">#F0F0F0</color>
<color name="color_EDEDED">#EDEDED</color>
<color name="color_F5F5F5">#F5F5F5</color>
<color name="color_34CD65">#34CD65</color>
<color name="color_FFEEE6">#FFEEE6</color>
<color name="color_FFDB26">#FFDB26</color>
<color name="color_F4F4F4">#F4F4F4</color>
<color name="color_B3B3B3">#B3B3B3</color>
<color name="color_F8FCFF">#F8FCFF</color>
<color name="color_FF000000">#FF000000</color>
<color name="color_99000000">#99000000</color>
<color name="color_30FFFFFF">#4DFFFFFF</color>
<color name="color_66000000">#66000000</color>
<color name="color_FFFFFF">#FFFFFF</color>
<color name="color_ACACAC">#ACACAC</color>
<color name="color_50FFFFFF">#B3FFFFFF</color>
<color name="color_FF9100">#FF9100</color>
<color name="color_FFC000">#FFC000</color>
<color name="color_FF8C00">#FF8C00</color>
<color name="color_0D1A30">#0D1A30</color>
<color name="color_FDD33D">#FDD33D</color>
<color name="color_BFBFBF">#BFBFBF</color>
<color name="color_FF5040">#FF5040</color>
<color name="color_FFD814">#FFD814</color>
<color name="course_color_F7F7F7" tools:ignore="MissingDefaultResource">#F7F7F7</color>
<color name="course_color_999999">#999999</color>
<color name="course_color_242424">#242424</color>
<color name="course_color_333333">#333333</color>
<color name="course_color_f0f0f0">#f0f0f0</color>
<color name="course_color_666666">#666666</color>
<color name="course_color_EBEBEB" tools:ignore="MissingDefaultResource">#EBEBEB</color>
<color name="course_color_1DA1F2">#1DA1F2</color>
<color name="course_color_151DA1F2">#261DA1F2</color>
<color name="course_color_E0E0E0">#E0E0E0</color>
<color name="course_color_F0F0F0">#F0F0F0</color>
<color name="course_color_EDEDED">#EDEDED</color>
<color name="course_color_F5F5F5">#F5F5F5</color>
<color name="course_color_34CD65">#34CD65</color>
<color name="course_color_FFEEE6">#FFEEE6</color>
<color name="course_color_FFDB26">#FFDB26</color>
<color name="course_color_F4F4F4">#F4F4F4</color>
<color name="course_color_B3B3B3">#B3B3B3</color>
<color name="course_color_F8FCFF">#F8FCFF</color>
<color name="course_color_FF000000">#FF000000</color>
<color name="course_color_99000000">#99000000</color>
<color name="course_color_30FFFFFF">#4DFFFFFF</color>
<color name="course_color_66000000">#66000000</color>
<color name="course_color_FFFFFF">#FFFFFF</color>
<color name="course_color_ACACAC">#ACACAC</color>
<color name="course_color_50FFFFFF">#B3FFFFFF</color>
<color name="course_color_FF9100">#FF9100</color>
<color name="course_color_FFC000">#FFC000</color>
<color name="course_color_FF8C00">#FF8C00</color>
<color name="course_color_0D1A30">#0D1A30</color>
<color name="course_color_FDD33D">#FDD33D</color>
<color name="course_color_BFBFBF">#BFBFBF</color>
<color name="course_color_FF5040">#FF5040</color>
<color name="course_color_FFD814">#FFD814</color>
<color name="course_color_FAFAFA">#FAFAFA</color>
<color name="course_color_FF5A4C">#FF5A4C</color>
</resources>
\ No newline at end of file
m-course/src/main/res/values/styles.xml
......@@ -2,8 +2,33 @@
<resources>
<!-- 项目中的分割线 -->
<style name="viewline">
<item name="android:background">@color/color_E0E0E0</item>
<item name="android:background">@color/course_color_E0E0E0</item>
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">0.5dp</item>
</style>
<style name="CourseTheme" parent="@style/CourseCommonTheme">
<item name="android:fitsSystemWindows">false</item>
</style>
<style name="CourseCommonTheme" parent="Theme.AppCompat.Light.NoActionBar">
<item name="colorPrimary">@color/main_theme</item>
<item name="colorPrimaryDark">@color/main_theme</item>
<item name="android:fitsSystemWindows">true</item>
<item name="android:windowBackground">@color/course_color_FAFAFA</item>
<item name="android:textCursorDrawable">@null</item>
</style>
<style name="CoursePosterShowTheme" parent="@style/CourseCommonTheme">
<item name="android:windowIsTranslucent">true</item><!--半透明 -->
<item name="android:windowNoTitle">true</item><!--无标题-->
<item name="android:windowBackground">@color/transparent</item><!--背景透明 -->
<item name="android:backgroundDimEnabled">true</item><!--模糊-->
</style>
<style name="Theme.AppCompat.Light.NoActionBar">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
</style>
</resources>
\ No newline at end of file
m-course/src/xlzx/res/color/color_course_filter_selector.xml
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/color_34CD65" android:state_selected="true" android:state_enabled="true"/>
<item android:color="@color/color_666666" android:state_enabled="true"/>
<item android:color="@color/course_color_34CD65" android:state_selected="true" android:state_enabled="true"/>
<item android:color="@color/course_color_666666" android:state_enabled="true"/>
</selector>
\ No newline at end of file
m-course/src/xlzx/res/drawable/background_course_hot_search.xml
......@@ -6,13 +6,13 @@
<shape android:shape="rectangle">
<solid android:color="#EEFFF3" />
<corners android:radius="11dp" />
<stroke android:width="0.5dp" android:color="@color/color_34CD65" />
<stroke android:width="0.5dp" android:color="@color/course_color_34CD65" />
</shape>
</item>
<item android:state_enabled="true">
<shape>
<corners android:radius="11dp" />
<solid android:color="@color/color_F5F5F5" />
<solid android:color="@color/course_color_F5F5F5" />
</shape>
</item>
......
m-course/src/ydl/res/color/color_course_filter_selector.xml
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/main_theme" android:state_selected="true" android:state_enabled="true"/>
<item android:color="@color/color_666666" android:state_enabled="true"/>
<item android:color="@color/course_color_666666" android:state_enabled="true"/>
</selector>
\ No newline at end of file
m-course/src/ydl/res/drawable/background_course_hot_search.xml
......@@ -7,13 +7,13 @@
<shape android:shape="rectangle">
<solid android:color="#E8F6FF"/>
<corners android:radius="11dp"/>
<stroke android:width="0.5dp" android:color="@color/color_1DA1F2"/>
<stroke android:width="0.5dp" android:color="@color/course_color_1DA1F2"/>
</shape>
</item>
<item android:state_enabled="true">
<shape>
<corners android:radius="11dp"/>
<solid android:color="@color/color_F5F5F5"/>
<solid android:color="@color/course_color_F5F5F5"/>
</shape>
</item>
......
ydl-pay/build.gradle
......@@ -8,7 +8,7 @@ android {
defaultConfig {
minSdkVersion 28
minSdkVersion 17
targetSdkVersion 28
versionCode 1
versionName "1.0"
......
ydl-pay/src/main/java/com/yidianling/ydl_pay/CommonPayDialog.kt
......@@ -25,7 +25,7 @@ import com.yidianling.ydl_pay.http.utils.RxDeviceTool
import de.greenrobot.event.EventBus
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.schedulers.Schedulers
import kotlinx.android.synthetic.main.dialog_common_pay.*
import kotlinx.android.synthetic.main.pay_dialog_common_pay.*
import java.util.*
/**
......@@ -88,7 +88,7 @@ class CommonPayDialog : Dialog {
private const val PAY_ALI = 1025
}
private constructor(context: Context) : super(context, R.style.common_dialog_style)
private constructor(context: Context) : super(context, R.style.pay_common_dialog_style)
private constructor(build: Build) : this(build.mActivity) {
this.goodsId = build.goodsId
......@@ -99,7 +99,7 @@ class CommonPayDialog : Dialog {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.dialog_common_pay)
setContentView(R.layout.pay_dialog_common_pay)
window.attributes.width = WindowManager.LayoutParams.MATCH_PARENT
window.attributes.height = WindowManager.LayoutParams.WRAP_CONTENT
......
ydl-pay/src/main/java/com/yidianling/ydl_pay/widget/CouponInfoDetailView.kt
......@@ -68,28 +68,28 @@ class CouponInfoDetailView(context: Context) : RelativeLayout(context) {
tv_use_condition.text = bean.rangeCont
if (bean.isTheFailure) {
iv_background.setBackgroundResource(R.drawable.bg_kgq)
iv_background.setBackgroundResource(R.drawable.pay_bg_kgq)
} else {
iv_background.setBackgroundResource(R.drawable.item_coupon_background)
iv_background.setBackgroundResource(R.drawable.pay_item_coupon_background)
}
if (isUseAble) {
iv_select.visibility = View.VISIBLE
if (bean.hasSelected == 1) {
iv_select.setImageResource(R.drawable.img_coupon_selsect)
iv_select.setImageResource(R.drawable.pay_img_coupon_selsect)
} else {
iv_select.setImageResource(R.drawable.img_no_select)
iv_select.setImageResource(R.drawable.pay_img_no_select)
}
} else {
iv_select.visibility = View.GONE
tv_title.setTextColor(resources.getColor(R.color.color_666666))
tv_duration.setTextColor(resources.getColor(R.color.color_666666))
tv_use_condition.setTextColor(resources.getColor(R.color.color_666666))
iv_background.setBackgroundResource(R.drawable.item_coupon_background_unuse)
tv_title.setTextColor(resources.getColor(R.color.pay_color_666666))
tv_duration.setTextColor(resources.getColor(R.color.pay_color_666666))
tv_use_condition.setTextColor(resources.getColor(R.color.pay_color_666666))
iv_background.setBackgroundResource(R.drawable.pay_item_coupon_background_unuse)
if (bean.isTheFailure) {
iv_background.setBackgroundResource(R.drawable.bg_dis_kgq)
iv_background.setBackgroundResource(R.drawable.pay_bg_dis_kgq)
}
}
}
......
ydl-pay/src/main/java/com/yidianling/ydl_pay/widget/PayInfoDetailView.kt
......@@ -255,16 +255,16 @@ class PayInfoDetailView(context: Context, var listener: OnCouponDetailClickListe
payWay = way
when (payWay) {
PAY_WECHAT -> {//微信
img_weixin_way.setImageResource(R.drawable.img_select)
img_ali_way.setImageResource(R.drawable.img_no_select)
img_weixin_way.setImageResource(R.drawable.pay_img_select)
img_ali_way.setImageResource(R.drawable.pay_img_no_select)
}
PAY_ALI -> {//支付宝
img_weixin_way.setImageResource(R.drawable.img_no_select)
img_ali_way.setImageResource(R.drawable.img_select)
img_weixin_way.setImageResource(R.drawable.pay_img_no_select)
img_ali_way.setImageResource(R.drawable.pay_img_select)
}
else -> {
img_ali_way.setImageResource(R.drawable.img_no_select)
img_weixin_way.setImageResource(R.drawable.img_no_select)
img_ali_way.setImageResource(R.drawable.pay_img_no_select)
img_weixin_way.setImageResource(R.drawable.pay_img_no_select)
}
}
}
......@@ -275,9 +275,9 @@ class PayInfoDetailView(context: Context, var listener: OnCouponDetailClickListe
*/
private fun setChooseChangeMoney(isUse: Boolean) {
if (isUse) {
tv_change_money.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.img_select, 0)
tv_change_money.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.pay_img_select, 0)
} else {
tv_change_money.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.img_no_select, 0)
tv_change_money.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.pay_img_no_select, 0)
}
}
......
ydl-pay/src/main/res/drawable/background_choose_coupon.xml → ydl-pay/src/main/res/drawable/pay_background_choose_coupon.xml
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/color_F3F3F3" />
<solid android:color="@color/pay_color_F3F3F3" />
<corners android:radius="20dp" />
</shape>
\ No newline at end of file
ydl-pay/src/main/res/drawable/background_common_pay_dialog.xml → ydl-pay/src/main/res/drawable/pay_background_common_pay_dialog.xml
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/color_FFFFFF" />
<solid android:color="@color/pay_color_FFFFFF" />
<corners
android:bottomLeftRadius="0dp"
android:bottomRightRadius="0dp"
......
ydl-pay/src/main/res/drawable/background_coupon_ensure_button.xml → ydl-pay/src/main/res/drawable/pay_background_coupon_ensure_button.xml
......@@ -4,7 +4,7 @@
<item android:state_enabled="false">
<shape>
<corners android:radius="15dp" />
<solid android:color="@color/color_CCCCCC" />
<solid android:color="@color/pay_color_CCCCCC" />
</shape>
</item>
......@@ -12,7 +12,7 @@
<item android:state_enabled="true">
<shape>
<corners android:radius="15dp" />
<solid android:color="@color/color_FF6666" />
<solid android:color="@color/pay_color_FF6666" />
</shape>
</item>
......
ydl-pay/src/main/res/layout/head_course_code_view.xml
......@@ -26,7 +26,7 @@
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_marginTop="10dp"
android:background="@drawable/background_choose_coupon">
android:background="@drawable/pay_background_choose_coupon">
<EditText
android:id="@+id/rt_coupon_code"
......@@ -39,8 +39,8 @@
android:background="@null"
android:digits="1234567890qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDFGHJKLZXCVBNM"
android:hint="请输入课程兑换券码"
android:textColor="@color/color_242424"
android:textColorHint="@color/color_999999"
android:textColor="@color/pay_color_242424"
android:textColorHint="@color/pay_color_999999"
android:textSize="14sp" />
......@@ -51,13 +51,13 @@
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="5dp"
android:background="@drawable/background_coupon_ensure_button"
android:background="@drawable/pay_background_coupon_ensure_button"
android:enabled="false"
android:gravity="center"
android:paddingLeft="13dp"
android:paddingRight="12dp"
android:text="确认"
android:textColor="@color/color_FFFFFF"
android:textColor="@color/pay_color_FFFFFF"
android:textSize="15sp"
tools:enabled="true"
tools:text="取消使用" />
......
ydl-pay/src/main/res/layout/item_coupon_title.xml
......@@ -7,7 +7,7 @@
android:paddingTop="20dp"
android:paddingRight="15dp"
android:paddingBottom="10dp"
android:textColor="@color/color_3D3D3D"
android:textColor="@color/pay_color_3D3D3D"
android:textSize="15dp"
android:textStyle="bold" />
ydl-pay/src/main/res/layout/dialog_common_pay.xml → ydl-pay/src/main/res/layout/pay_dialog_common_pay.xml
......@@ -10,7 +10,7 @@
android:id="@+id/progress_layout"
android:layout_width="match_parent"
android:layout_height="411dp"
android:background="@drawable/background_common_pay_dialog">
android:background="@drawable/pay_background_common_pay_dialog">
<!--<ProgressBar-->
<!--android:id="@+id/progress"-->
......@@ -27,6 +27,6 @@
android:id="@+id/view_pager"
android:layout_width="match_parent"
android:layout_height="425dp"
android:background="@drawable/background_common_pay_dialog"
android:background="@drawable/pay_background_common_pay_dialog"
android:visibility="gone"/>
</RelativeLayout>
\ No newline at end of file
ydl-pay/src/main/res/layout/view_coupon_info_detail.xml
......@@ -11,7 +11,7 @@
android:id="@+id/iv_background"
android:layout_width="match_parent"
android:layout_height="100dp"
android:background="@drawable/item_coupon_background" />
android:background="@drawable/pay_item_coupon_background" />
<LinearLayout
......@@ -32,7 +32,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:lineSpacingExtra="0dp"
android:textColor="@color/color_FFFFFF"
android:textColor="@color/pay_color_FFFFFF"
android:textSize="25sp"
tools:text="¥100" />
......@@ -40,7 +40,7 @@
android:id="@+id/tv_discountCont"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/color_FFFFFF"
android:textColor="@color/pay_color_FFFFFF"
android:textSize="14sp"
android:visibility="gone"
tools:text="满50元可用" />
......@@ -62,7 +62,7 @@
android:layout_marginRight="10dp"
android:layout_toLeftOf="@+id/iv_select"
android:text="咨询优惠券"
android:textColor="@color/color_242424"
android:textColor="@color/pay_color_242424"
android:textSize="16dp"
tools:text="咨询优咨咨询优咨询优惠券惠券询优惠券惠券"
android:textStyle="bold" />
......@@ -73,7 +73,7 @@
android:layout_height="wrap_content"
android:layout_below="@+id/tv_title"
android:layout_marginTop="3dp"
android:textColor="@color/color_242424"
android:textColor="@color/pay_color_242424"
android:textSize="11sp"
tools:text="有效期至2018-08-31" />
......@@ -84,7 +84,7 @@
android:layout_alignParentBottom="true"
android:layout_marginBottom="11dp"
android:text="使用规则"
android:textColor="@color/color_666666"
android:textColor="@color/pay_color_666666"
android:textSize="10sp" />
......@@ -95,7 +95,7 @@
android:layout_alignParentRight="true"
android:layout_marginTop="18dp"
android:layout_marginRight="12dp"
android:src="@drawable/img_no_select" />
android:src="@drawable/pay_img_no_select" />
</RelativeLayout>
......
ydl-pay/src/main/res/layout/view_pay_coupon.xml
<?xml version="1.0" encoding="utf-8"?>
<merge xmlns:android="http://schemas.android.com/apk/res/android"
android:background="@color/color_FFFFFF">
android:background="@color/pay_color_FFFFFF">
<RelativeLayout
android:layout_width="match_parent"
......@@ -16,7 +16,7 @@
android:layout_height="18dp"
android:layout_centerVertical="true"
android:layout_marginLeft="15dp"
android:src="@drawable/img_pay_back"/>
android:src="@drawable/pay_img_pay_back"/>
</RelativeLayout>
......@@ -25,12 +25,12 @@
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="选择优惠"
android:textColor="@color/color_242424"
android:textColor="@color/pay_color_242424"
android:textSize="17sp"
android:textStyle="bold"/>
</RelativeLayout>
<View style="@style/divide_color_style"/>
<View style="@style/pay_divide_color_style"/>
<LinearLayout
android:layout_width="match_parent"
......@@ -54,7 +54,7 @@
android:layout_height="35dp"
android:layout_centerHorizontal="true"
android:layout_marginTop="75dp"
android:src="@drawable/img_empty"/>
android:src="@drawable/pay_img_empty"/>
<TextView
android:layout_width="wrap_content"
......@@ -63,7 +63,7 @@
android:layout_centerHorizontal="true"
android:layout_marginTop="10dp"
android:text="还没有优惠券哦"
android:textColor="@color/color_999999"
android:textColor="@color/pay_color_999999"
android:textSize="13sp"/>
</RelativeLayout>
......
ydl-pay/src/main/res/layout/view_pay_info_detail.xml
<?xml version="1.0" encoding="utf-8"?>
<merge xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:background="@color/color_FFFFFF">
android:background="@color/pay_color_FFFFFF">
<RelativeLayout
......@@ -15,7 +15,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:textColor="@color/color_242424"
android:textColor="@color/pay_color_242424"
android:textSize="17dp"
android:textStyle="bold"
tools:text="课程服务" />
......@@ -26,7 +26,7 @@
android:layout_centerVertical="true"
android:layout_toLeftOf="@+id/tv_price"
android:text="￥"
android:textColor="@color/color_242424"
android:textColor="@color/pay_color_242424"
android:textSize="12dp" />
<TextView
......@@ -35,7 +35,7 @@
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:textColor="@color/color_242424"
android:textColor="@color/pay_color_242424"
android:textSize="16dp"
android:textStyle="bold"
tools:text="129.00" />
......@@ -43,7 +43,7 @@
</RelativeLayout>
<View style="@style/divide_color_style" />
<View style="@style/pay_divide_color_style" />
<RelativeLayout
android:id="@+id/rl_discount"
......@@ -58,7 +58,7 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:text="优惠"
android:textColor="@color/color_242424"
android:textColor="@color/pay_color_242424"
android:textSize="15dp" />
<TextView
......@@ -68,7 +68,7 @@
android:layout_centerVertical="true"
android:layout_toLeftOf="@+id/tv_discount_money"
android:text="-￥"
android:textColor="@color/color_242424"
android:textColor="@color/pay_color_242424"
android:textSize="12dp" />
<TextView
......@@ -78,7 +78,7 @@
android:layout_centerVertical="true"
android:layout_marginRight="6dp"
android:layout_toLeftOf="@+id/tv_more"
android:textColor="@color/color_242424"
android:textColor="@color/pay_color_242424"
android:textSize="16dp"
android:textStyle="bold"
tools:text="129.00" />
......@@ -90,7 +90,7 @@
android:layout_centerVertical="true"
android:layout_marginRight="6dp"
android:layout_toLeftOf="@+id/tv_more"
android:textColor="@color/color_242424"
android:textColor="@color/pay_color_242424"
android:textSize="14dp"
android:visibility="gone"
tools:text="129.00" />
......@@ -102,11 +102,11 @@
android:layout_height="10dp"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:src="@drawable/ico_zf_more" />
android:src="@drawable/pay_ico_zf_more" />
</RelativeLayout>
<View style="@style/divide_color_style" />
<View style="@style/pay_divide_color_style" />
<RelativeLayout
android:layout_width="match_parent"
......@@ -120,7 +120,7 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:text="使用余额"
android:textColor="@color/color_242424"
android:textColor="@color/pay_color_242424"
android:textSize="15dp" />
<TextView
......@@ -130,7 +130,7 @@
android:layout_centerVertical="true"
android:layout_marginLeft="8dp"
android:layout_toRightOf="@+id/tv_change_title"
android:textColor="@color/color_666666"
android:textColor="@color/pay_color_666666"
android:textSize="13dp"
tools:text="[可用￥9.00]" />
......@@ -140,7 +140,7 @@
android:layout_centerVertical="true"
android:layout_toLeftOf="@+id/tv_change_money"
android:text="-￥"
android:textColor="@color/color_242424"
android:textColor="@color/pay_color_242424"
android:textSize="12dp" />
<TextView
......@@ -149,16 +149,16 @@
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:drawableRight="@drawable/img_select"
android:drawableRight="@drawable/pay_img_select"
android:drawablePadding="6dp"
android:textColor="@color/color_242424"
android:textColor="@color/pay_color_242424"
android:textSize="16dp"
android:textStyle="bold"
tools:text="129.00" />
</RelativeLayout>
<View style="@style/divide_color_style" />
<View style="@style/pay_divide_color_style" />
<RelativeLayout
android:layout_width="match_parent"
......@@ -171,7 +171,7 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:text="还需支付"
android:textColor="@color/color_242424"
android:textColor="@color/pay_color_242424"
android:textSize="15dp" />
<TextView
......@@ -180,7 +180,7 @@
android:layout_centerVertical="true"
android:layout_toLeftOf="@+id/tv_pay_money"
android:text="￥"
android:textColor="@color/color_FF5A4C"
android:textColor="@color/pay_color_FF5A4C"
android:textSize="12dp" />
<TextView
......@@ -190,7 +190,7 @@
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:drawablePadding="6dp"
android:textColor="@color/color_FF5A4C"
android:textColor="@color/pay_color_FF5A4C"
android:textSize="20dp"
android:textStyle="bold"
tools:text="129.00" />
......@@ -207,7 +207,7 @@
<TextView
android:layout_width="match_parent"
android:layout_height="30dp"
android:background="@color/color_F7F7F7"
android:background="@color/pay_color_F7F7F7"
android:gravity="bottom"
android:paddingLeft="15dp"
android:paddingBottom="4dp"
......@@ -228,7 +228,7 @@
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_centerVertical="true"
android:src="@drawable/wechat_for_pay" />
android:src="@drawable/pay_wechat_for_pay" />
<TextView
android:layout_width="wrap_content"
......@@ -238,7 +238,7 @@
android:layout_toRightOf="@+id/img_weixin"
android:gravity="center_vertical"
android:text="微信支付"
android:textColor="@color/color_242424"
android:textColor="@color/pay_color_242424"
android:textSize="15dp"
android:textStyle="bold" />
......@@ -249,12 +249,12 @@
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:src="@drawable/img_select" />
android:src="@drawable/pay_img_select" />
</RelativeLayout>
<View style="@style/divide_color_style" />
<View style="@style/pay_divide_color_style" />
<RelativeLayout
android:id="@+id/rl_ali_pay"
......@@ -270,7 +270,7 @@
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_centerVertical="true"
android:src="@drawable/zhifubao_for_pay" />
android:src="@drawable/pay_zhifubao_for_pay" />
<TextView
android:layout_width="wrap_content"
......@@ -280,7 +280,7 @@
android:layout_toRightOf="@+id/img_ali"
android:gravity="center_vertical"
android:text="支付宝支付"
android:textColor="@color/color_242424"
android:textColor="@color/pay_color_242424"
android:textSize="15dp"
android:textStyle="bold" />
......@@ -291,7 +291,7 @@
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:src="@drawable/img_no_select" />
android:src="@drawable/pay_img_no_select" />
</RelativeLayout>
......@@ -302,17 +302,17 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@color/color_F7F7F7"
android:background="@color/pay_color_F7F7F7"
android:visibility="gone" />
<TextView
android:id="@+id/tv_ensure_pay"
android:layout_width="match_parent"
android:layout_height="55dp"
android:background="@color/color_3D9EFF"
android:background="@color/pay_color_3D9EFF"
android:gravity="center"
android:text="确认付款"
android:textColor="@color/color_FFFFFF"
android:textColor="@color/pay_color_FFFFFF"
android:textSize="17dp"
android:textStyle="bold" />
</merge>
\ No newline at end of file
ydl-pay/src/main/res/values/colors.xml
......@@ -24,18 +24,18 @@
0% — 00
-->
<color name="color_242424">#242424</color>
<color name="color_E0E0E0">#E0E0E0</color>
<color name="color_EBEBEB">#EBEBEB</color>
<color name="color_666666">#666666</color>
<color name="color_F7F7F7">#F7F7F7</color>
<color name="color_FFFFFF">#FFFFFF</color>
<color name="color_FF5A4C">#FF5A4C</color>
<color name="color_3D9EFF">#3D9EFF</color>
<color name="color_3D3D3D">#3D3D3D</color>
<color name="color_F3F3F3">#F3F3F3</color>
<color name="color_999999">#999999</color>
<color name="color_CCCCCC">#CCCCCC</color>
<color name="color_FF6666">#FF6666</color>
<color name="pay_color_242424">#242424</color>
<color name="pay_color_E0E0E0">#E0E0E0</color>
<color name="pay_color_EBEBEB">#EBEBEB</color>
<color name="pay_color_666666">#666666</color>
<color name="pay_color_F7F7F7">#F7F7F7</color>
<color name="pay_color_FFFFFF">#FFFFFF</color>
<color name="pay_color_FF5A4C">#FF5A4C</color>
<color name="pay_color_3D9EFF">#3D9EFF</color>
<color name="pay_color_3D3D3D">#3D3D3D</color>
<color name="pay_color_F3F3F3">#F3F3F3</color>
<color name="pay_color_999999">#999999</color>
<color name="pay_color_CCCCCC">#CCCCCC</color>
<color name="pay_color_FF6666">#FF6666</color>
</resources>
ydl-pay/src/main/res/values/styles.xml
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="divide_color_style">
<style name="pay_divide_color_style">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">0.5dp</item>
<item name="android:layout_marginRight">15dp</item>
<item name="android:layout_marginLeft">15dp</item>
<item name="android:background">@color/color_E0E0E0</item>
<item name="android:background">@color/pay_color_E0E0E0</item>
</style>
<!--自定义分享-->
<style name="common_dialog_style" parent="android:style/Theme.Dialog">
<item name="colorPrimary">@color/color_3D9EFF</item>
<item name="colorPrimaryDark">@color/color_3D9EFF</item>
<style name="pay_common_dialog_style" parent="android:style/Theme.Dialog">
<item name="colorPrimary">@color/pay_color_3D9EFF</item>
<item name="colorPrimaryDark">@color/pay_color_3D9EFF</item>
<!-- 边框 -->
<item name="android:windowFrame">@null</item>
<!-- 是否浮现在activity之上 -->
......
ydl-platform/src/main/java/com/ydl/ydlcommon/base/flutter/base/BaseFlutterFragment.kt
......@@ -4,7 +4,7 @@ import android.os.Bundle
import android.view.LayoutInflater
import android.view.ViewGroup
import com.ydl.ydlcommon.base.flutter.io.flutter.facade.Flutter
import io.flutter.embedding.android.FlutterFragment
import com.ydl.ydlcommon.base.flutter.io.flutter.facade.FlutterFragment
import io.flutter.view.FlutterView
/**
......
ydl-platform/src/main/res/values/attrs.xml
......@@ -96,15 +96,15 @@
<!--弧度设置圆角Imageview-->
<attr name="Platform_borderRadius" format="dimension" />
<attr name="Platform_type">
<attr name="pa_borderRadius" format="dimension" />
<attr name="pa_type">
<enum name="pa_circle" value="0" />
<enum name="pa_round" value="1" />
</attr>
<declare-styleable name="Platform_RoundImageView">
<attr name="pa_borderRadius" format="dimension" />
<attr name="pa_type" format="integer"/>
<attr name="pa_borderRadius" />
<attr name="pa_type" />
</declare-styleable>
<!--九宫格解锁-->
......
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 to comment