.idea/gradle.xml
@@ -12,7 +12,6 @@ <option value="$PROJECT_DIR$/app" /> <option value="$PROJECT_DIR$/umeng_sdk" /> <option value="$PROJECT_DIR$/xldutils-kotlin" /> <option value="$PROJECT_DIR$/zxinglibrary" /> </set> </option> <option name="resolveExternalAnnotations" value="false" /> app/build.gradle
@@ -94,7 +94,6 @@ implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' implementation 'com.youth.banner:banner:2.0.11' implementation project(path: ':umeng_sdk') implementation project(path: ':zxinglibrary') implementation 'top.zibin:Luban:1.1.8'//图片压缩 implementation 'com.github.dueeeke.dkplayer:dkplayer-java:3.2.6' implementation 'com.github.dueeeke.dkplayer:dkplayer-ui:3.2.6' app/src/main/AndroidManifest.xml
@@ -78,34 +78,17 @@ android:name=".ui.home.MatchActivity" android:label="自主学习5-音图相配" android:screenOrientation="landscape" /> <activity android:name=".ui.course.MyCourseDetailActivity" android:label="课时详情" android:launchMode="singleTask" /> <activity android:name=".ui.course.EvaluationActivity" android:label="运动营成员评语" /> <activity android:name=".ui.discovery.NoticeDetailActivity" android:label="公告详情" /> <activity android:name=".ui.course.JoinedCourseDetailActivity" android:label="运动营详情" /> <activity android:name=".ui.course.ReportActivity" android:label="测试报告" /> <activity android:name=".ui.welfare.GoodsDetailActivity" android:name=".ui.shop.GoodsDetailActivity" android:label="商品详情" /> <activity android:name=".ui.welfare.ExchangeRecordActivity" android:name=".ui.mine.ExchangeRecordActivity" android:label="兑换记录" /> <activity android:name=".ui.welfare.ExchangeDetailActivity" android:label="商品详情" /> <activity android:name=".ui.welfare.OnlineShopActivity" android:screenOrientation="landscape"/> <activity android:name=".ui.home.WeekSelectActivity" android:label="第一年学习周目选择" android:screenOrientation="landscape"> <!-- <intent-filter>--> app/src/main/java/com/dollearn/student/MainActivity.kt
@@ -22,7 +22,6 @@ import com.dollearn.student.utils.Const import com.dollearn.student.utils.event.EmptyEvent import kotlinx.android.synthetic.main.activity_main.* import kotlinx.android.synthetic.main.fragment_shop.* import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe
File was deleted app/src/main/java/com/dollearn/student/dialog/CheckShopsDialog.kt
File was deleted app/src/main/java/com/dollearn/student/dialog/ConfirmShopDialog.kt
File was deleted app/src/main/java/com/dollearn/student/dialog/ConfirmShopsDialog.kt
File was deleted app/src/main/java/com/dollearn/student/dialog/CouponFilterPop.kt
File was deleted app/src/main/java/com/dollearn/student/dialog/CoursePayDialog.kt
File was deleted app/src/main/java/com/dollearn/student/dialog/FilterPop.kt
File was deleted app/src/main/java/com/dollearn/student/dialog/GetMyCourseDialog.kt
File was deleted app/src/main/java/com/dollearn/student/dialog/GoodsExchangeFilterPop.kt
File was deleted app/src/main/java/com/dollearn/student/dialog/MapTypeDialog.kt
File was deleted app/src/main/java/com/dollearn/student/dialog/MsgDialog.kt
File was deleted app/src/main/java/com/dollearn/student/dialog/PayDialog.kt
File was deleted app/src/main/java/com/dollearn/student/dialog/TimeFilterPop.kt
File was deleted app/src/main/java/com/dollearn/student/dialog/UndistributedClassHourialog.kt
File was deleted app/src/main/java/com/dollearn/student/ui/course/EvaluationActivity.kt
File was deleted app/src/main/java/com/dollearn/student/ui/course/JoinedCourseDetailActivity.kt
File was deleted app/src/main/java/com/dollearn/student/ui/course/MyCourseDetailActivity.kt
File was deleted app/src/main/java/com/dollearn/student/ui/course/ReportActivity.kt
File was deleted app/src/main/java/com/dollearn/student/ui/course/adapter/ClassHourChooseAdapter.kt
File was deleted app/src/main/java/com/dollearn/student/ui/course/adapter/CourseNameAdapter.kt
File was deleted app/src/main/java/com/dollearn/student/ui/course/adapter/CourseRecordAdapter.kt
File was deleted app/src/main/java/com/dollearn/student/ui/course/adapter/EvaluationAdapter.kt
File was deleted app/src/main/java/com/dollearn/student/ui/course/adapter/ExerciseGridAdapter.kt
File was deleted app/src/main/java/com/dollearn/student/ui/course/adapter/JoinedCourseAdapter.kt
File was deleted app/src/main/java/com/dollearn/student/ui/course/adapter/MedalGridAdapter.kt
File was deleted app/src/main/java/com/dollearn/student/ui/course/adapter/MyCoursListAdapter.kt
File was deleted app/src/main/java/com/dollearn/student/ui/course/adapter/MyCourseAdapter.kt
File was deleted app/src/main/java/com/dollearn/student/ui/course/adapter/PhotoAdapter.kt
File was deleted app/src/main/java/com/dollearn/student/ui/course/adapter/PracticeAdapter.kt
File was deleted app/src/main/java/com/dollearn/student/ui/course/adapter/SwitchStudentAdapter.kt
File was deleted app/src/main/java/com/dollearn/student/ui/discovery/NoticeDetailActivity.kt
File was deleted app/src/main/java/com/dollearn/student/ui/discovery/NoticeFragment.kt
File was deleted app/src/main/java/com/dollearn/student/ui/discovery/ShopViewPagerFragment.kt
File was deleted app/src/main/java/com/dollearn/student/ui/discovery/adapter/MineMenuAdapter.kt
File was deleted app/src/main/java/com/dollearn/student/ui/discovery/adapter/NoticeAdapter.kt
File was deleted app/src/main/java/com/dollearn/student/ui/discovery/adapter/QuestionAdapter.kt
File was deleted app/src/main/java/com/dollearn/student/ui/discovery/adapter/ShopAdapter.kt
File was deleted app/src/main/java/com/dollearn/student/ui/discovery/adapter/ShopCourseAdapter.kt
File was deleted app/src/main/java/com/dollearn/student/ui/home/PayResultActivity.kt
@@ -4,7 +4,7 @@ import com.dollearn.student.MainActivity import com.dollearn.student.R import com.dollearn.student.ui.TransparentStatusBarActivity import com.dollearn.student.ui.welfare.ExchangeRecordActivity import com.dollearn.student.ui.mine.ExchangeRecordActivity import kotlinx.android.synthetic.main.activity_pay_rlt.* import org.jetbrains.anko.startActivity
File was deleted app/src/main/java/com/dollearn/student/ui/home/adapter/CourseAdapter.kt
File was deleted app/src/main/java/com/dollearn/student/ui/home/adapter/CoursePayAdapter.kt
File was deleted app/src/main/java/com/dollearn/student/ui/home/adapter/FieldAdapter.kt
File was deleted app/src/main/java/com/dollearn/student/ui/home/adapter/LessonCountAdapter.kt
File was deleted app/src/main/java/com/dollearn/student/ui/home/adapter/MatchAdapter.kt
File was deleted app/src/main/java/com/dollearn/student/ui/home/adapter/MyPlaceAdapter.kt
File was deleted app/src/main/java/com/dollearn/student/ui/home/adapter/OpenCityAdapter.kt
File was deleted app/src/main/java/com/dollearn/student/ui/home/adapter/ShopMenuAdapter.kt
File was deleted app/src/main/java/com/dollearn/student/ui/home/adapter/VideoGridAdapter.kt
File was deleted app/src/main/java/com/dollearn/student/ui/home/adapter/VideoTypeAdapter.kt
File was deleted app/src/main/java/com/dollearn/student/ui/mine/ExchangeRecordActivity.kt
New file @@ -0,0 +1,67 @@ package com.dollearn.student.ui.mine import android.content.Intent import androidx.recyclerview.widget.LinearLayoutManager import com.dollearn.student.R import com.dollearn.student.network.HttpManager import com.dollearn.student.network.entity.ExchangeRecord import com.dollearn.student.network.request import com.dollearn.student.ui.TransparentStatusBarActivity import com.dollearn.student.ui.mine.adapter.ExchangeRecordAdapter import kotlinx.android.synthetic.main.activity_exchange_record.* class ExchangeRecordActivity : TransparentStatusBarActivity() { override fun setContentView() = R.layout.activity_exchange_record private val list = arrayListOf<ExchangeRecord>() private val adapter = ExchangeRecordAdapter(list) private var page = 1 override fun initClick() { } override fun initView() { rv_record.layoutManager = LinearLayoutManager(this) rv_record.adapter = adapter refreshLayout.setOnRefreshListener { page = 1 getData() } refreshLayout.setOnLoadMoreListener { page++ getData() } getData() } private fun getData() { HttpManager.exchangeRecord(page).request(this,success = {_,data-> if (page == 1) list.clear() list.addAll(data?.records?: arrayListOf()) adapter.notifyDataSetChanged() if (list.isEmpty()) refreshLayout.finishRefreshWithNoMoreData() else if (data?.records.isNullOrEmpty()) refreshLayout.finishLoadMoreWithNoMoreData() else if (page == 1) refreshLayout.finishRefresh() else refreshLayout.finishLoadMore() }){_,_-> if (page == 1) refreshLayout.finishRefresh(false) else refreshLayout.finishLoadMore(false) page-- } } override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { super.onActivityResult(requestCode, resultCode, data) if (resultCode == RESULT_OK){ getData() } } } app/src/main/java/com/dollearn/student/ui/mine/MineFragment.kt
@@ -13,7 +13,6 @@ import com.dollearn.student.network.entity.UserBean import com.dollearn.student.network.requestByF import com.dollearn.student.ui.login.LoginActivity import com.dollearn.student.ui.welfare.* import com.dollearn.student.utils.Const import com.dollearn.student.utils.event.EmptyEvent import com.dollearn.student.utils.extention.formatToChinese app/src/main/java/com/dollearn/student/ui/mine/adapter/ExchangeRecordAdapter.kt
New file @@ -0,0 +1,76 @@ package com.dollearn.student.ui.mine.adapter import android.widget.TextView import androidx.core.os.bundleOf import cn.sinata.xldutils.activity.BaseActivity import cn.sinata.xldutils.adapter.HFRecyclerAdapter import cn.sinata.xldutils.adapter.util.ViewHolder import cn.sinata.xldutils.gone import cn.sinata.xldutils.visible import com.dollearn.student.R import com.dollearn.student.dialog.TipDialog import com.dollearn.student.network.HttpManager import com.dollearn.student.network.entity.ExchangeRecord import com.dollearn.student.network.request import com.dollearn.student.ui.mine.ChangeAddressActivity import com.facebook.drawee.view.SimpleDraweeView import org.jetbrains.anko.startActivityForResult import java.util.ArrayList class ExchangeRecordAdapter(list: ArrayList<ExchangeRecord>) : HFRecyclerAdapter<ExchangeRecord>(list, R.layout.item_exchange_record) { override fun onBind(holder: ViewHolder, position: Int, data: ExchangeRecord) { holder.bind<SimpleDraweeView>(R.id.iv_good).setImageURI(data.coverImg) holder.setText(R.id.tv_name, data.goodsName) holder.setText(R.id.tv_price, "${data.integral}积分") holder.setText(R.id.tv_category, data.goodsType.joinToString(" | ") { it }) holder.setText(R.id.tv_count, "商品数量：${data.count}") holder.setText(R.id.tv_receiver, "收货信息：${data.consigneeName}｜${data.consigneePhone}｜${data.consigneeAddress}") val tvPost = holder.bind<TextView>(R.id.tv_post) val tvAction = holder.bind<TextView>(R.id.tv_action) val act = context as BaseActivity val state = when(data.state){//订单状态1待发货2已发货3已完成 1->{ tvAction.visible() tvAction.text = "修改地址" tvPost.gone() tvAction.setOnClickListener { act.startActivityForResult<ChangeAddressActivity>(1,"id" to data.orderId) } "待发货" } 2->{ tvAction.visible() tvAction.text = "已收货" tvPost.visible() tvPost.text = "发货信息：${data.express}｜${data.expressNumber}" tvAction.setOnClickListener { val tipDialog = TipDialog() tipDialog.arguments = bundleOf("msg" to "确认已收到货吗？") tipDialog.setCallback(object :TipDialog.OnClickCallback{ override fun onOk() { HttpManager.confirmStudy(data.orderId).request(act){_,_-> data.state = 3 notifyItemChanged(position) } } override fun onCancel() { } }) tipDialog.show(act.supportFragmentManager,"sure") } "平台已发货，请耐心等待" } else->{ tvAction.gone() tvPost.gone() "已完成" } } holder.setText(R.id.tv_state, state) } } app/src/main/java/com/dollearn/student/ui/mine/adapter/RechargeAdapter.kt
File was deleted app/src/main/java/com/dollearn/student/ui/shop/GoodsDetailActivity.kt
New file @@ -0,0 +1,132 @@ package com.dollearn.student.ui.shop import android.app.Activity import android.content.Intent import android.graphics.Paint import android.webkit.WebChromeClient import android.webkit.WebViewClient import androidx.core.os.bundleOf import com.dollearn.student.R import com.dollearn.student.dialog.TipDialog import com.dollearn.student.network.HttpManager import com.dollearn.student.network.entity.Banner import com.dollearn.student.network.entity.GoodsDetail import com.dollearn.student.network.request import com.dollearn.student.ui.TransparentStatusBarActivity import com.dollearn.student.ui.home.PayResultActivity import com.dollearn.student.ui.shop.adapter.ShopBannerAdapter import com.dollearn.student.utils.pay.PayListener import com.dollearn.student.utils.pay.PayUtil import com.youth.banner.indicator.CircleIndicator import kotlinx.android.synthetic.main.activity_goods_detail.* import kotlinx.android.synthetic.main.activity_goods_detail.tv_score import org.jetbrains.anko.startActivity import org.jetbrains.anko.startActivityForResult class GoodsDetailActivity : TransparentStatusBarActivity(), PayListener { override fun setContentView() = R.layout.activity_goods_detail private val id by lazy { intent.getStringExtra("id")?:"" } private var goods: GoodsDetail? = null private var score = 0 private val bannerImg = arrayListOf<Banner>() private val bannerAdapter by lazy { ShopBannerAdapter(bannerImg, this) } override fun initClick() { tv_action.setOnClickListener { if (score<goods?.good?.integral?:0){ val tipDialog = TipDialog() tipDialog.arguments = bundleOf("isAlert" to true,"msg" to "兑换失败，当前剩余积分不足！","ok" to "关闭") tipDialog.show(supportFragmentManager,"tip") return@setOnClickListener } tv_action.isEnabled = false showDialog() HttpManager.redeemNow(id).request(this,false, {_,data-> tv_action.isEnabled = true startActivity<ExchangeActivity>("order" to data) }){_,msg-> val tipDialog = TipDialog() tipDialog.arguments = bundleOf("isAlert" to true,"msg" to msg,"ok" to "关闭") tipDialog.show(supportFragmentManager,"tip") tv_action.isEnabled = true } } } override fun initView() { banner.adapter = bannerAdapter banner.indicator = CircleIndicator(this) val settings = webView.settings settings.javaScriptEnabled = true settings.javaScriptCanOpenWindowsAutomatically = true settings.defaultTextEncodingName = "utf-8" settings.domStorageEnabled = true webView.webChromeClient = object : WebChromeClient() {} webView.webViewClient = object : WebViewClient() {} PayUtil.addPayListener(this) getData() getScore() } private fun getScore() { HttpManager.getIntegralStudy().request(this){_,data-> score = data?:0 tv_balance.text = "剩余积分：$score" } } private fun getData() { HttpManager.goodDetail(id).request(this) { _, data -> goods = data goods?.apply { tv_score.text = good.integral.toString() bannerImg.addAll((good.detailImg.split(",")).map { Banner(url = it) }) bannerAdapter.notifyDataSetChanged() banner.currentItem = 1 tv_price.text = good.integral.toString() tv_value.text = if (good.price!=null&&good.price!=0.0) "¥%.2f".format(good.price) else "" tv_value.paintFlags = tv_value.paintFlags or Paint.STRIKE_THRU_TEXT_FLAG tv_name.text = good.name tv_category.text = goodTypes?.joinToString ("|"){ it.name } tv_sold.text = "%s%s%d人已换".format(if (residueNumber == null) "" else "剩余数量：${residueNumber}｜",if (good.userCount == null) "" else "可换数量：${good.userCount}｜", exchangeNumber) val sHead = "<html><head><meta name=\"viewport\" content=\"width=device-width, " + "initial-scale=1.0, minimum-scale=0.5, maximum-scale=2.0, user-scalable=yes\" />" + "<style>img{max-width:100% !important;height:auto !important;}</style>" + "<style>body{max-width:100% !important;}</style>" + "</head><body>" webView!!.loadDataWithBaseURL(null, sHead + good.detail, "text/html", "utf-8", null) } } } override fun onPaySuccess() { startActivityForResult<PayResultActivity>(1, "type" to PayResultActivity.TYPE_EXCHANGE_SUC) } override fun onPayCancel() { } override fun onPayError(msg: String) { startActivityForResult<PayResultActivity>( 1, "type" to PayResultActivity.TYPE_EXCHANGE_FAILED, "msg" to msg ) } override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { super.onActivityResult(requestCode, resultCode, data) if (resultCode == Activity.RESULT_OK) { tv_action.postDelayed({ }, 500) } } override fun onDestroy() { super.onDestroy() PayUtil.removePayListener(this) PayUtil.unregisterApp() } } app/src/main/java/com/dollearn/student/ui/shop/ShopFragment.kt
@@ -2,7 +2,6 @@ import android.content.Context import android.view.inputmethod.InputMethodManager import androidx.core.content.ContextCompat.getSystemService import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager import cn.sinata.xldutils.fragment.BaseFragment @@ -14,7 +13,6 @@ import com.dollearn.student.network.requestByF import com.dollearn.student.ui.shop.adapter.GoodsAdapter import com.dollearn.student.ui.shop.adapter.GoodsTypeAdapter import com.dollearn.student.ui.welfare.GoodsDetailActivity import com.dollearn.student.utils.Const import com.dollearn.student.utils.event.EmptyEvent import kotlinx.android.synthetic.main.fragment_shop.* app/src/main/java/com/dollearn/student/ui/welfare/ExchangeDetailActivity.kt
File was deleted app/src/main/java/com/dollearn/student/ui/welfare/ExchangeRecordActivity.kt
File was deleted app/src/main/java/com/dollearn/student/ui/welfare/GoodsDetailActivity.kt
File was deleted app/src/main/java/com/dollearn/student/ui/welfare/OnlineShopActivity.kt
File was deleted app/src/main/java/com/dollearn/student/ui/welfare/adapter/CoinAdapter.kt
File was deleted app/src/main/java/com/dollearn/student/ui/welfare/adapter/ExchangeRecordAdapter.kt
File was deleted app/src/main/java/com/dollearn/student/ui/welfare/adapter/ShopCheckAdapter.kt
File was deleted app/src/main/java/com/dollearn/student/ui/welfare/adapter/WelfareGoodsAdapter.kt
File was deleted app/src/main/java/com/dollearn/student/utils/AppUtils.kt
File was deleted app/src/main/java/com/dollearn/student/views/CalendarView.java
File was deleted app/src/main/java/com/dollearn/student/views/calendar/SimpleMonthView.java
File was deleted app/src/main/java/com/dollearn/student/views/calendar/SimpleWeekBar.java
File was deleted app/src/main/res/drawable/bg_blue_14dp.xml
File was deleted app/src/main/res/drawable/bg_foreground_avatar.xml
File was deleted app/src/main/res/drawable/bg_grey_19dp.xml
File was deleted app/src/main/res/drawable/bg_grey_1dp.xml
File was deleted app/src/main/res/drawable/bg_grey_2dp.xml
File was deleted app/src/main/res/drawable/bg_grey_6dp.xml
File was deleted app/src/main/res/drawable/bg_grey_9dp.xml
File was deleted app/src/main/res/drawable/bg_grey_line.xml
File was deleted app/src/main/res/drawable/bg_grey_line_11dp.xml
File was deleted app/src/main/res/drawable/bg_grey_line_18dp.xml
File was deleted app/src/main/res/drawable/bg_grey_line_2dp.xml
File was deleted app/src/main/res/drawable/bg_grey_line_5dp.xml
File was deleted app/src/main/res/drawable/bg_orange_12dp.xml
File was deleted app/src/main/res/drawable/bg_orange_1dp.xml
File was deleted app/src/main/res/drawable/bg_orange_2dp.xml
File was deleted app/src/main/res/drawable/bg_orange_30dp.xml
File was deleted app/src/main/res/drawable/bg_orange_4dp.xml
File was deleted app/src/main/res/drawable/bg_orange_line_25dp.xml
File was deleted app/src/main/res/drawable/bg_orange_line_2dp.xml
File was deleted app/src/main/res/drawable/bg_orange_line_4.xml
File was deleted app/src/main/res/drawable/bg_orange_line_4dp.xml
File was deleted app/src/main/res/drawable/bg_orange_line_4dp_manage.xml
File was deleted app/src/main/res/drawable/bg_pink_16dp.xml
File was deleted app/src/main/res/drawable/bg_pink_2dp.xml
File was deleted app/src/main/res/drawable/bg_pink_left_12dp.xml
File was deleted app/src/main/res/drawable/bg_recharge_checked.xml
File was deleted app/src/main/res/drawable/bg_recharge_uncheck.xml
File was deleted app/src/main/res/drawable/bg_red_12dp.xml
File was deleted app/src/main/res/drawable/bg_red_15dp.xml
File was deleted app/src/main/res/drawable/bg_red_2dp.xml
File was deleted app/src/main/res/drawable/bg_red_4dp.xml
File was deleted app/src/main/res/drawable/bg_red_line_15dp.xml
File was deleted app/src/main/res/drawable/bg_red_line_2dp.xml
File was deleted app/src/main/res/drawable/bg_red_line_4dp.xml
File was deleted app/src/main/res/drawable/bg_red_line_6dp.xml
File was deleted app/src/main/res/drawable/bg_schedule_16dp.xml
File was deleted app/src/main/res/drawable/bg_shop_4dp.xml
File was deleted app/src/main/res/drawable/bg_shop_evaluate.xml
File was deleted app/src/main/res/drawable/bg_tag.xml
File was deleted app/src/main/res/drawable/bg_tag_10dp.xml
File was deleted app/src/main/res/drawable/bg_tag_grey.xml
File was deleted app/src/main/res/drawable/bg_un_pay.xml
File was deleted app/src/main/res/drawable/bg_white_top_40dp.xml
File was deleted app/src/main/res/drawable/bg_yellow_12dp.xml
File was deleted app/src/main/res/drawable/black_dot.xml
File was deleted app/src/main/res/drawable/com_form_bg.xml
File was deleted app/src/main/res/drawable/coupon_checked.pngBinary files differ
app/src/main/res/drawable/coupon_checked_d.xml
File was deleted app/src/main/res/drawable/coupon_uncheck.pngBinary files differ
app/src/main/res/drawable/coupon_unchecked_d.xml
File was deleted app/src/main/res/drawable/dark_dot.xml
File was deleted app/src/main/res/drawable/gradient_dot.xml
File was deleted app/src/main/res/drawable/grey_line_dot.xml
File was deleted app/src/main/res/drawable/ic_green.xml
File was deleted app/src/main/res/drawable/ic_keyboard.xml
File was deleted app/src/main/res/drawable/ic_launcher_background.xml
File was deleted app/src/main/res/drawable/ic_pink.xml
File was deleted app/src/main/res/drawable/ic_white.xml
File was deleted app/src/main/res/drawable/orange_dot.xml
File was deleted app/src/main/res/drawable/selector_bg_btn_0dp.xml
File was deleted app/src/main/res/drawable/selector_bg_cb_analysis.xml
File was deleted app/src/main/res/drawable/selector_bg_et_focus.xml
File was deleted app/src/main/res/drawable/selector_bg_filter.xml
File was deleted app/src/main/res/drawable/selector_bg_match_state.xml
File was deleted app/src/main/res/drawable/selector_bg_option.xml
File was deleted app/src/main/res/drawable/selector_bg_red_grey_line_6dp.xml
File was deleted app/src/main/res/drawable/selector_bg_state.xml
File was deleted app/src/main/res/drawable/selector_bg_week.xml
File was deleted app/src/main/res/drawable/selector_check_pay.xml
File was deleted app/src/main/res/drawable/selector_choose_btn.xml
File was deleted app/src/main/res/drawable/selector_enable_2dp.xml
File was deleted app/src/main/res/drawable/selector_filter_check.xml
File was deleted app/src/main/res/drawable/selector_filter_icon.xml
File was deleted app/src/main/res/drawable/selector_lesson_bg.xml
File was deleted app/src/main/res/drawable/selector_open.xml
File was deleted app/src/main/res/drawable/selector_pwd_visible.xml
File was deleted app/src/main/res/drawable/selector_rank_region.xml
File was deleted app/src/main/res/drawable/selector_select_pay.xml
File was deleted app/src/main/res/drawable/shap_tag.xml
File was deleted app/src/main/res/drawable/shape_com.xml
File was deleted app/src/main/res/drawable/shape_com_whit_15r.xml
File was deleted app/src/main/res/drawable/shape_or_20r.xml
File was deleted app/src/main/res/drawable/shape_red_20r.xml
File was deleted app/src/main/res/drawable/shape_tag_bg.xml
File was deleted app/src/main/res/drawable/shape_white_top_20r.xml
File was deleted app/src/main/res/drawable/white_dot.xml
File was deleted app/src/main/res/layout/activity_do_offline.xml
File was deleted app/src/main/res/layout/activity_exchange_detail.xml
File was deleted app/src/main/res/layout/activity_join_world_cup.xml
File was deleted app/src/main/res/layout/activity_joined_course_deatil.xml
File was deleted app/src/main/res/layout/activity_list_filter.xml
File was deleted app/src/main/res/layout/activity_list_search.xml
File was deleted app/src/main/res/layout/activity_match.xml
File was deleted app/src/main/res/layout/activity_my_course_detail.xml
File was deleted app/src/main/res/layout/activity_my_world_cup.xml
File was deleted app/src/main/res/layout/activity_online_shop.xml
File was deleted app/src/main/res/layout/activity_report.xml
File was deleted app/src/main/res/layout/activity_search.xml
File was deleted app/src/main/res/layout/dialog_calendar.xml
File was deleted app/src/main/res/layout/dialog_check_shops.xml
File was deleted app/src/main/res/layout/dialog_confirm_shop.xml
File was deleted app/src/main/res/layout/dialog_confirm_shops.xml
File was deleted app/src/main/res/layout/dialog_getmycourse.xml
File was deleted app/src/main/res/layout/dialog_map_type.xml
File was deleted app/src/main/res/layout/dialog_msg.xml
File was deleted app/src/main/res/layout/dialog_pay.xml
File was deleted app/src/main/res/layout/dialog_pay_by_course.xml
File was deleted app/src/main/res/layout/dialog_wfp_classhour.xml
File was deleted app/src/main/res/layout/item_blank.xml
File was deleted app/src/main/res/layout/item_class_hour.xml
File was deleted app/src/main/res/layout/item_coin.xml
File was deleted app/src/main/res/layout/item_course.xml
File was deleted app/src/main/res/layout/item_course_name.xml
File was deleted app/src/main/res/layout/item_course_record.xml
File was deleted app/src/main/res/layout/item_course_schedule.xml
File was deleted app/src/main/res/layout/item_evaluation.xml
File was deleted app/src/main/res/layout/item_exercise.xml
File was deleted app/src/main/res/layout/item_field.xml
File was deleted app/src/main/res/layout/item_joined_course.xml
File was deleted app/src/main/res/layout/item_lesson.xml
File was deleted app/src/main/res/layout/item_match.xml
File was deleted app/src/main/res/layout/item_medal_grid.xml
File was deleted app/src/main/res/layout/item_mine_menu.xml
File was deleted app/src/main/res/layout/item_msg.xml
File was deleted app/src/main/res/layout/item_my_course_check.xml
File was deleted app/src/main/res/layout/item_my_course_list.xml
File was deleted app/src/main/res/layout/item_my_place.xml
File was deleted app/src/main/res/layout/item_open_city.xml
File was deleted app/src/main/res/layout/item_pay_course.xml
File was deleted app/src/main/res/layout/item_photo.xml
File was deleted app/src/main/res/layout/item_practice_list.xml
File was deleted app/src/main/res/layout/item_question.xml
File was deleted app/src/main/res/layout/item_recharge.xml
File was deleted app/src/main/res/layout/item_shop.xml
File was deleted app/src/main/res/layout/item_shop_check.xml
File was deleted app/src/main/res/layout/item_shop_course.xml
File was deleted app/src/main/res/layout/item_shop_menu.xml
File was deleted app/src/main/res/layout/item_student_switch.xml
File was deleted app/src/main/res/layout/item_video_grid.xml
File was deleted app/src/main/res/layout/item_video_type.xml
File was deleted app/src/main/res/layout/item_week_view.xml
File was deleted app/src/main/res/layout/item_welfare_goods.xml
File was deleted app/src/main/res/layout/item_world_cup.xml
File was deleted app/src/main/res/layout/item_world_rank.xml
File was deleted app/src/main/res/layout/item_world_user.xml
File was deleted app/src/main/res/layout/layout_filter.xml
File was deleted app/src/main/res/layout/layout_filter_coupon.xml
File was deleted app/src/main/res/layout/layout_filter_exchange_record.xml
File was deleted app/src/main/res/layout/layout_filter_time.xml
File was deleted app/src/main/res/layout/layout_marker_icon.xml
File was deleted app/src/main/res/layout/layout_marker_info.xml
File was deleted app/src/main/res/layout/layout_tab.xml
File was deleted app/src/main/res/layout/simple_week_bar.xml
File was deleted app/src/main/res/values/styles.xml
@@ -79,28 +79,6 @@ <item name="android:textStyle">bold</item> </style> <!-- 筛选选项统一样式--> <style name="style_tv_option"> <item name="android:paddingTop">6dp</item> <item name="android:paddingBottom">6dp</item> <item name="android:textSize">14sp</item> <item name="android:textColor">@color/selector_black_red</item> <item name="android:gravity">center</item> <item name="android:textAlignment">center</item> <item name="android:background">@drawable/selector_bg_filter</item> </style> <!-- 解析题筛选CheckBox样式--> <style name="style_rb_analysis"> <item name="android:paddingTop">5dp</item> <item name="android:paddingBottom">5dp</item> <item name="android:textSize">15sp</item> <item name="android:textColor">@color/selector_grey_white</item> <item name="android:gravity">center</item> <item name="android:button">@null</item> <item name="android:background">@drawable/selector_bg_cb_analysis</item> </style> <!-- 通用的simpledraweeView--> <style name="style_common_img"> <item name="placeholderImage">@color/page_bg</item> @@ -108,17 +86,6 @@ <item name="roundedCornerRadius">2dp</item> </style> <style name="style_item_pay"> <item name="android:drawablePadding">14dp</item> <item name="android:paddingTop">20dp</item> <item name="android:paddingBottom">10dp</item> <item name="android:button">@null</item> <item name="android:background">@null</item> <item name="android:textSize">16sp</item> <item name="android:textColor">@color/color_text_price</item> <item name="android:drawableEnd">@drawable/selector_check_pay</item> <item name="android:textStyle">bold</item> </style>
@@ -1,3 +1,3 @@ include ':umeng_sdk' rootProject.name='DophinEnglish' include ':app', ':xldutils-kotlin', ':umeng_sdk',':zxinglibrary' include ':app', ':xldutils-kotlin', ':umeng_sdk' zxinglibrary/.gitignore
File was deleted zxinglibrary/build.gradle
File was deleted zxinglibrary/proguard-rules.pro
File was deleted zxinglibrary/src/androidTest/java/face/live/com/zxinglibrary/ExampleInstrumentedTest.java
File was deleted zxinglibrary/src/main/AndroidManifest.xml
File was deleted zxinglibrary/src/main/java/com/zxing/scanner/BeepManager.java
File was deleted zxinglibrary/src/main/java/com/zxing/scanner/CameraSurfaceView.java
File was deleted zxinglibrary/src/main/java/com/zxing/scanner/OnScannerCompletionListener.java
File was deleted zxinglibrary/src/main/java/com/zxing/scanner/ScannerOptions.java
File was deleted zxinglibrary/src/main/java/com/zxing/scanner/ScannerView.java
File was deleted zxinglibrary/src/main/java/com/zxing/scanner/ScannerViewHandler.java
File was deleted zxinglibrary/src/main/java/com/zxing/scanner/ViewfinderView.java
File was deleted zxinglibrary/src/main/java/com/zxing/scanner/camera/AutoFocusManager.java
File was deleted zxinglibrary/src/main/java/com/zxing/scanner/camera/CameraConfigurationManager.java
File was deleted zxinglibrary/src/main/java/com/zxing/scanner/camera/CameraConfigurationUtils.java
File was deleted zxinglibrary/src/main/java/com/zxing/scanner/camera/CameraManager.java
File was deleted zxinglibrary/src/main/java/com/zxing/scanner/camera/PreviewCallback.java
File was deleted zxinglibrary/src/main/java/com/zxing/scanner/camera/SizeComparator.java
File was deleted zxinglibrary/src/main/java/com/zxing/scanner/camera/open/CameraFacing.java
File was deleted zxinglibrary/src/main/java/com/zxing/scanner/camera/open/OpenCamera.java
File was deleted zxinglibrary/src/main/java/com/zxing/scanner/camera/open/OpenCameraInterface.java
File was deleted zxinglibrary/src/main/java/com/zxing/scanner/common/Scanner.java
File was deleted zxinglibrary/src/main/java/com/zxing/scanner/decode/BitmapLuminanceSource.java
File was deleted zxinglibrary/src/main/java/com/zxing/scanner/decode/DecodeFormatManager.java
File was deleted zxinglibrary/src/main/java/com/zxing/scanner/decode/DecodeHandler.java
File was deleted zxinglibrary/src/main/java/com/zxing/scanner/decode/DecodeImgCallback.java
File was deleted zxinglibrary/src/main/java/com/zxing/scanner/decode/DecodeImgThread.java
File was deleted zxinglibrary/src/main/java/com/zxing/scanner/decode/DecodeThread.java
File was deleted zxinglibrary/src/main/java/com/zxing/scanner/decode/QRDecode.java
File was deleted zxinglibrary/src/main/java/com/zxing/scanner/encode/ContactEncoder.java
File was deleted zxinglibrary/src/main/java/com/zxing/scanner/encode/Formatter.java
File was deleted zxinglibrary/src/main/java/com/zxing/scanner/encode/MECARDContactEncoder.java
File was deleted zxinglibrary/src/main/java/com/zxing/scanner/encode/ParserUriToVCard.java
File was deleted zxinglibrary/src/main/java/com/zxing/scanner/encode/QRCodeEncoder.java
File was deleted zxinglibrary/src/main/java/com/zxing/scanner/encode/QREncode.java
File was deleted zxinglibrary/src/main/java/com/zxing/scanner/encode/VCardContactEncoder.java
File was deleted zxinglibrary/src/main/java/com/zxing/scanner/encode/VCardFieldFormatter.java
File was deleted zxinglibrary/src/main/java/com/zxing/scanner/encode/VCardTelDisplayFormatter.java
File was deleted zxinglibrary/src/main/java/com/zxing/scanner/result/AddressBookResult.java
File was deleted zxinglibrary/src/main/java/com/zxing/scanner/result/GeoResult.java
File was deleted zxinglibrary/src/main/java/com/zxing/scanner/result/ISBNResult.java
File was deleted zxinglibrary/src/main/java/com/zxing/scanner/result/ProductResult.java
File was deleted zxinglibrary/src/main/java/com/zxing/scanner/result/Result.java
File was deleted zxinglibrary/src/main/java/com/zxing/scanner/result/SMSResult.java
File was deleted zxinglibrary/src/main/java/com/zxing/scanner/result/TelResult.java
File was deleted zxinglibrary/src/main/java/com/zxing/scanner/result/TextResult.java
File was deleted zxinglibrary/src/main/java/com/zxing/scanner/result/URIResult.java
File was deleted zxinglibrary/src/test/java/face/live/com/zxinglibrary/ExampleUnitTest.java
File was deleted
