Skip to content

M
magicbox
Commit 0d555ba6 authored by 王雪伟's avatar 王雪伟
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents d7726323 f7d8da80
Hide whitespace changes
Inline Side-by-side
Showing with 273 additions and 226 deletions
app/build.gradle
View file @ 0d555ba6
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'com.mob.sdk'
apply plugin: 'kotlin-android-extensions'
android {
......@@ -61,8 +61,38 @@ android {
//签名配置
signingConfig signingConfigs.release
}
}
}
MobSDK {
appKey "357874b62b4c7"
appSecret "c4d82ff12e0cde832960ddbb8d2d7250"
ShareSDK {
loopShare true
devInfo {
Facebook {
id 8
sortId 8
appKey "1412473428822331"
appSecret "a42f4f3f867dc947b9ed6020c2e93558"
callbackUri "https://www.baidu.com"
officialVersion "default"
faceBookLoginProtocolScheme "fb1412473428822331"
shareByAppClient true
enable true
}
GooglePlus {
id 21
sortId 21
appId "236300675100-am5pm8km7md1memjevq8rl9pg5c4s4b8.apps.googleusercontent.com"
callbackUri "http://localhost"
officialVersion "default"
shareByAppClient true
enable true
}
}
}
}
productFlavors {
guanwang {}
......
app/src/main/java/com/zhangxin/magicbox/Appli.kt
View file @ 0d555ba6
......@@ -2,6 +2,7 @@ package com.zhangxin.magicbox
import android.app.Application
import android.text.TextUtils
import com.mob.MobSDK
import com.umeng.commonsdk.UMConfigure
import com.umeng.socialize.PlatformConfig
import com.zxhl.cms.AppContext
......@@ -32,7 +33,7 @@ class Appli : Application() {
Config.init(this)
getOaid()
initByteDance()
MobSDK.init(this)
}
private fun getOaid() {
......
build.gradle
View file @ 0d555ba6
......@@ -10,6 +10,7 @@ buildscript {
classpath 'com.android.tools.build:gradle:4.0.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'me.tatarka:gradle-retrolambda:3.7.0'
classpath "com.mob.sdk:MobSDK:2018.0319.1724"
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
......
cms/src/main/java/com/zxhl/cms/utils/WeChatUtils.kt
View file @ 0d555ba6
......@@ -4,21 +4,18 @@ import android.app.Activity
import android.content.Context
import android.util.Log
import android.widget.Toast
import com.umeng.socialize.ShareAction
import com.umeng.socialize.UMAuthListener
import com.umeng.socialize.UMShareAPI
import com.umeng.socialize.UMShareListener
import com.umeng.socialize.bean.SHARE_MEDIA
import com.umeng.socialize.media.UMWeb
import com.zxhl.cms.AppContext
import com.zxhl.cms.R
import com.zxhl.cms.common.Constant
import com.zxhl.cms.net.ApiClient
import com.zxhl.cms.net.RxSchedulers
import com.zxhl.cms.net.SettingPreference
import com.zxhl.cms.net.callback.BaseObserver
import com.zxhl.cms.net.model.other.IsWeChatLoginEntity
import com.zxhl.cms.net.model.other.WxBindEntity
import okhttp3.internal.platform.Platform
class WeChatUtils {
......@@ -52,7 +49,7 @@ class WeChatUtils {
fun wechatLogin(activity: Activity, str: String) {
Log.e("MXL","微信登录")
Log.e("MXL", "微信登录")
lottery=str
UMShareAPI.get(activity)
......@@ -74,7 +71,11 @@ class WeChatUtils {
override fun onError(share_media: SHARE_MEDIA, i: Int, throwable: Throwable) {
Log.e("MXL", "i" + i + throwable.message)
callBack.loginSuccess(lottery)
Toast.makeText(AppContext.get(), "登录出错，请稍后重试"+i+throwable.message, Toast.LENGTH_SHORT).show()
Toast.makeText(
AppContext.get(),
"登录出错，请稍后重试" + i + throwable.message,
Toast.LENGTH_SHORT
).show()
}
override fun onCancel(share_media: SHARE_MEDIA, i: Int) {
......
cms/src/main/res/values/strings.xml
View file @ 0d555ba6
......@@ -25,11 +25,15 @@
<string name="permission_soarse_location_str">访问范围性的定位权限\n</string>
<string name="permission_fine_location_str">访问精良的定位权限\n</string>
<string name="customer_service">customer service</string>
//首页
<string name="open_nums">opened %1$s times</string>
<string name="get_value">100% get value</string>
//仓库
<string name="time_limit">Limited time offer</string>
<string name="immediate_recycling">Recycle</string>
<string name="take_delivery">Deliver</string>
<string name="to_be_picked_up">待提货</string>
<string name="to_be_received">待收货</string>
<string name="recycled">Recycled</string>
<string name="to_be_recycled">My Goods</string>
<string name="finished">已完成</string>
......@@ -38,13 +42,25 @@
<string name="recycle_desc2">You can exchange high-value goods</string>
<!--订单-->
<string name="shop_order">商城订单</string>
<string name="my_order">我的订单</string>
<string name="magic_box_order">魔盒订单</string>
<!--底部-->
<string name="shop">Mall</string>
<string name="box">Boxes</string>
<string name="recycle_center">Recycle</string>
<string name="recycle_center">Reclaim</string>
<string name="mine">Account</string>
<string name="ware_house">Warehouse</string>
<string name="orderno">OrderNo: </string>
<string name="paytime">PayTime: </string>
<string name="total">Total </string>
<string name="discount">Discount </string>
<string name="trackingno">TrackingNo: </string>
<string name="shipped">Shipped </string>
<string name="unshipped">Unshipped </string>
<string name="paid">Paid: </string>
<string name="express_fee">Express fee</string>
<string name="copy">Copy</string>
<!--魔盒商品详情-->
<string name="box_detail_open_box_money_unit">$</string>
<string name="box_detail_open_box_num">opened %1$s times</string>
......
gradle.properties
View file @ 0d555ba6
......@@ -20,3 +20,4 @@ android.enableJetifier=true
# Kotlin code style for this project: "official" or "obsolete":
kotlin.code.style=official
android.injected.testOnly=false
MobSDK.spEdition=FP
\ No newline at end of file
moduleMain/src/main/java/com/zxhl/main/page/activity/OrderDetailActivity.kt
View file @ 0d555ba6
......@@ -216,7 +216,7 @@ class OrderDetailActivity : BaseActivity(), OrderDetailContract.View, PayContrac
mLoading?.dismiss()
}
RxBus.get().post(Constant.order_data_update, 1)
JumpUtils.ShipmentSuccessJump()
JumpUtils.OrderSuccessJump()
finish()
}
......
moduleMain/src/main/java/com/zxhl/main/page/activity/OrderSuccessActivity.kt
View file @ 0d555ba6
package com.zxhl.main.page.activity
import android.animation.Animator
import android.animation.AnimatorSet
import android.animation.ObjectAnimator
import android.animation.ValueAnimator
import android.annotation.SuppressLint
import android.content.Intent
import android.graphics.Color
import android.graphics.Paint
import android.text.Html
import android.text.TextUtils
import android.util.Log
import android.view.View
import android.widget.ImageView
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import androidx.viewpager.widget.ViewPager
import com.bumptech.glide.Glide
import com.bumptech.glide.load.resource.bitmap.CircleCrop
import com.bumptech.glide.request.RequestOptions
import com.umeng.socialize.UMShareAPI
import com.zxhl.cms.AppContext
import com.zxhl.cms.common.Constant
import com.zxhl.cms.common.NetConfig
import com.zxhl.cms.common.base.BaseActivity
import com.zxhl.cms.net.SettingPreference
import com.zxhl.cms.net.model.box.*
import com.zxhl.cms.net.model.video.MemberEntity
import com.zxhl.cms.pay.PayActivity
import com.zxhl.cms.pay.PayContract
import com.zxhl.cms.pay.PayPresenter
import com.zxhl.cms.utils.*
import com.zxhl.cms.widget.LoadingDialog
import com.zxhl.cms.utils.JumpUtils
import com.zxhl.main.R
import com.zxhl.main.page.adapter.AutoPollAdapter
import com.zxhl.main.page.adapter.BoxAdapter
import com.zxhl.main.page.adapter.DetailMiddleAdapter
import com.zxhl.main.page.adapter.TopPagerAdapter
import com.zxhl.main.page.contract.GoodsDetailContract
import com.zxhl.main.page.presenter.GoodsDetailPresenter
import com.zxhl.main.page.view.DialogUtils
import com.zxhl.main.page.view.ProtectionPoolPopupWindow
import com.zxhl.novel.utils.server.PayResultEntity
import io.reactivex.Observable
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.functions.Consumer
import kotlinx.android.synthetic.main.activity_layout_goods_detail.*
import kotlinx.android.synthetic.main.layout_detail_content.*
import kotlinx.android.synthetic.main.layout_detail_title.*
import kotlinx.android.synthetic.main.layout_detail_title.id_img_back
import kotlinx.android.synthetic.main.layout_detail_top.*
import kotlinx.android.synthetic.main.activity_layout_order_success.*
class OrderSuccessActivity : BaseActivity() {
......@@ -57,7 +13,10 @@ class OrderSuccessActivity : BaseActivity() {
}
override fun before() {
super.before()
setStatusBarBackground(AppContext.get().resources.getColor(R.color.transparent))
}
override fun layoutID(): Int {
return R.layout.activity_layout_order_success
}
......@@ -66,6 +25,10 @@ class OrderSuccessActivity : BaseActivity() {
id_img_back.setOnClickListener {
finish()
}
id_order_detail_btn?.setOnClickListener {
JumpUtils.MyOrderJump()
finish()
}
}
......
moduleMain/src/main/java/com/zxhl/main/page/activity/WareHouseActivity.kt
View file @ 0d555ba6
......@@ -6,18 +6,18 @@ import com.zxhl.cms.common.FragmentAdapter
import com.zxhl.cms.common.base.BaseActivity
import com.zxhl.cms.common.base.BaseFragment
import com.zxhl.main.R
import com.zxhl.main.page.fragment.RecoveryFragment
import com.zxhl.main.page.fragment.TobePickUpFragment
import kotlinx.android.synthetic.main.activity_layout_warehouse.*
class WareHouseActivity:BaseActivity() {
val createTitles = ArrayList<String>().apply {
add(AppContext.get().getString(R.string.to_be_picked_up))
add(AppContext.get().getString(R.string.finished))
// add(AppContext.get().getString(R.string.to_be_received))
}
val createFragments: Array<BaseFragment> = arrayOf(
TobePickUpFragment.newInstance(),
RecoveryFragment.newInstance()
// ReceivingFragment.newInstance()
)
override fun onClick(v: View?) {
......
moduleMain/src/main/java/com/zxhl/main/page/adapter/BoxAdapter.kt
View file @ 0d555ba6
package com.zxhl.main.page.adapter
import android.annotation.SuppressLint
import android.content.Context
import android.graphics.Paint
import android.text.TextUtils
......@@ -74,9 +75,9 @@ class BoxAdapter : BaseRecyclerAdapter<HomeBoxListEntity, RecyclerView.ViewHolde
} else {
holder.id_rl_new_people?.visibility = View.VISIBLE
holder.id_tv_new_people_price?.visibility = View.VISIBLE
holder.id_tv_new_people_price?.text = "¥${bean.newUserPrice}"
holder.id_tv_new_people_price?.text = "$${bean.newUserPrice}"
holder.id_tv_new_people_price?.getPaint()?.setFlags(Paint.STRIKE_THRU_TEXT_FLAG)
holder.id_new_user_box_tips?.text = "新人已减${bean.discount}元"
holder.id_new_user_box_tips?.text = "New user$ ${bean.discount} discount"
}
holder.item_img_goos?.setLoadImageUrl(bean.mainImage, false)
// holder.item_img_1?.setLoadImageUrl(bean.imageList2?.get(0), false)
......@@ -86,8 +87,10 @@ class BoxAdapter : BaseRecyclerAdapter<HomeBoxListEntity, RecyclerView.ViewHolde
// holder.item_img_5?.setLoadImageUrl(bean.imageList2?.get(4), false)
holder.item_tv_price?.text = bean.onePriceStr
holder.item_tv_sales_volume?.text = "已开袋${bean.numbersStr}次"
holder.item_tv_min_max_price?.text = "${bean.minPriceStr}～${bean.maxPriceStr}元商品"
holder.item_tv_sales_volume?.text =
AppContext.get().getString(R.string.open_nums, bean.numbersStr)
// holder.item_tv_min_max_price?.text = "${bean.minPriceStr}～${bean.maxPriceStr}元商品"
holder.item_tv_min_max_price?.text = AppContext.get().getString(R.string.get_value)+"$${bean.minPrice}-${bean.maxPrice}"
holder.item_ll?.setOnClickListener {
listener.onItemClick(it, position, bean)
}
......
moduleMain/src/main/java/com/zxhl/main/page/adapter/BoxOrderAdapter.kt
View file @ 0d555ba6
......@@ -34,7 +34,10 @@ class BoxOrderAdapter : BaseRecyclerAdapter<ShopOrderEntity, BoxOrderAdapter.Vie
}
holder.id_tv_total_price?.text = "¥${bean.cash}"
var mPrice = bean.cash?.toDouble()?.plus(bean.discount?.toDouble())
holder.id_tv_pricedesc?.text = "总价:¥${bean.totalPrice}｜优惠:¥${bean.discount}｜运费:¥${bean.freight}｜"
var total=AppContext.get().getString(R.string.total)
var discount=AppContext.get().getString(R.string.discount)
var express_fee=AppContext.get().getString(R.string.express_fee)
holder.id_tv_pricedesc?.text = "${total}:$${bean.totalPrice}｜${discount}:$${bean.discount}｜${express_fee}:$${bean.freight}｜"
holder.id_tv_order_no?.text = bean.orderNo
holder.id_tv_pay_time?.text = bean.payTime
var mAdapter: ItemOrderAdapter? = ItemOrderAdapter(mContext)
......
moduleMain/src/main/java/com/zxhl/main/page/adapter/ItemOrderAdapter.kt
View file @ 0d555ba6
......@@ -39,19 +39,15 @@ class ItemOrderAdapter : BaseRecyclerAdapter<GoodList, ItemOrderAdapter.ViewHold
copy(holder.id_tv_courier_no?.text.toString())
}
if (bean.orderStatus == 0) {
holder.id_tv_status?.text = "待发货"
holder.id_tv_status?.text = AppContext.get().getString(R.string.unshipped)
} else if (bean.orderStatus == 1) {
holder.id_tv_status?.text = "已发货"
} else {
holder.id_tv_status?.text = "已签收"
holder.id_tv_status?.text = AppContext.get().getString(R.string.shipped)
}
holder.id_tv_goods_name?.text = bean.productName
holder.id_img_goods?.setLoadImageUrl(bean.mainImage, false)
holder.id_tv_nums?.text = "x ${bean.amount}"
holder.id_tv_sale_price?.text = "¥ ${bean.salePriceStr}"
holder.id_tv_sale_price?.text = "$ ${bean.salePriceStr}"
}
......
moduleMain/src/main/java/com/zxhl/main/page/adapter/ShopOrderAdapter.kt
View file @ 0d555ba6
......@@ -32,7 +32,7 @@ class ShopOrderAdapter : BaseRecyclerAdapter<ShopOrderEntity, ShopOrderAdapter.V
holder.id_tv_courier_no?.text = bean.goodsList?.get(0)?.trackingNo
holder.id_img_copy?.visibility = View.VISIBLE
} else {
holder.id_tv_courier_no?.text = "生成中…"
//holder.id_tv_courier_no?.text = "生成中…"
holder.id_img_copy?.visibility = View.GONE
}
holder.id_img_copy?.setOnClickListener {
......@@ -41,20 +41,24 @@ class ShopOrderAdapter : BaseRecyclerAdapter<ShopOrderEntity, ShopOrderAdapter.V
holder.img_order_no_copy?.setOnClickListener {
copy(holder.id_tv_order_no?.text.toString())
}
holder.id_tv_total_price?.text = "¥${bean.cash}"
holder.id_tv_total_price?.text = "$${bean.cash}"
var mPrice = bean.cash?.toDouble()?.plus(bean.discount?.toDouble())
holder.id_tv_pricedesc?.text = "总价:¥${mPrice}｜优惠:¥${bean.discount}｜运费:¥${bean.freight}｜"
//holder.id_tv_pricedesc?.text = "总价:¥${mPrice}｜优惠:¥${bean.discount}｜运费:¥${bean.freight}｜"
var total=AppContext.get().getString(R.string.total)
var discount=AppContext.get().getString(R.string.discount)
var express_fee=AppContext.get().getString(R.string.express_fee)
holder.id_tv_pricedesc?.text = "${total}:$${mPrice}｜${discount}:$${bean.discount}｜${express_fee}:$${bean.freight}｜"
if (bean.orderStatus == 0) {
holder.id_tv_status?.text = "待发货"
holder.id_tv_status?.text = AppContext.get().getString(R.string.unshipped)
} else if (bean.orderStatus == 1) {
holder.id_tv_status?.text = "已发货"
holder.id_tv_status?.text = AppContext.get().getString(R.string.shipped)
} else {
holder.id_tv_status?.text = "已签收"
//holder.id_tv_status?.text = "已签收"
}
holder.id_tv_goods_name?.text = bean.goodsList?.get(0)?.productName
holder.id_img_goods?.setLoadImageUrl(bean.goodsList?.get(0)?.mainImage, false)
holder.id_tv_nums?.text = "x ${bean.goodsList?.get(0)?.amount}"
holder.id_tv_sale_price?.text = "¥ ${bean.goodsList?.get(0)?.salePriceStr}"
holder.id_tv_sale_price?.text = "$ ${bean.goodsList?.get(0)?.salePriceStr}"
holder.id_tv_order_no?.text = bean.orderNo
holder.id_tv_pay_time?.text = bean.payTime
}
......
moduleMain/src/main/java/com/zxhl/main/page/fragment/FinishedFragment.kt
View file @ 0d555ba6
......@@ -30,22 +30,22 @@ class FinishedFragment : BaseFragment(), WareHouseContract.View,
}
override fun init(view: View?) {
id_tv_warehouse_pick_up_goods?.setOnClickListener {
id_tv_warehouse_pick_up_goods?.setBackgroundResource(R.drawable.shape_ff2e31_r12_bg)
id_tv_warehouse_pick_up_goods.setTextColor(getResources().getColor(R.color.color_ff2e31))
id_tv_warehouse_card?.setBackgroundResource(R.drawable.shape_ffffff_r12_bg)
id_tv_warehouse_card.setTextColor(getResources().getColor(R.color.color_666666))
type = 0
mPresenter?.getDepot(status, type, true)
}
id_tv_warehouse_card?.setOnClickListener {
id_tv_warehouse_pick_up_goods?.setBackgroundResource(R.drawable.shape_ffffff_r12_bg)
id_tv_warehouse_pick_up_goods.setTextColor(getResources().getColor(R.color.color_666666))
id_tv_warehouse_card?.setBackgroundResource(R.drawable.shape_ff2e31_r12_bg)
id_tv_warehouse_card.setTextColor(getResources().getColor(R.color.color_ff2e31))
type = 1
mPresenter?.getDepot(status, type, true)
}
// id_tv_warehouse_pick_up_goods?.setOnClickListener {
// id_tv_warehouse_pick_up_goods?.setBackgroundResource(R.drawable.shape_ff2e31_r12_bg)
// id_tv_warehouse_pick_up_goods.setTextColor(getResources().getColor(R.color.color_ff2e31))
// id_tv_warehouse_card?.setBackgroundResource(R.drawable.shape_ffffff_r12_bg)
// id_tv_warehouse_card.setTextColor(getResources().getColor(R.color.color_666666))
// type = 0
// mPresenter?.getDepot(status, type, true)
// }
// id_tv_warehouse_card?.setOnClickListener {
// id_tv_warehouse_pick_up_goods?.setBackgroundResource(R.drawable.shape_ffffff_r12_bg)
// id_tv_warehouse_pick_up_goods.setTextColor(getResources().getColor(R.color.color_666666))
// id_tv_warehouse_card?.setBackgroundResource(R.drawable.shape_ff2e31_r12_bg)
// id_tv_warehouse_card.setTextColor(getResources().getColor(R.color.color_ff2e31))
// type = 1
// mPresenter?.getDepot(status, type, true)
// }
id_tv_huishou?.setOnClickListener {
}
......
moduleMain/src/main/java/com/zxhl/main/page/fragment/ReceivingFragment.kt
View file @ 0d555ba6
......@@ -31,22 +31,22 @@ class ReceivingFragment : BaseFragment(), WareHouseContract.View,
}
override fun init(view: View?) {
id_tv_warehouse_pick_up_goods?.setOnClickListener {
id_tv_warehouse_pick_up_goods?.setBackgroundResource(R.drawable.shape_ff2e31_r12_bg)
id_tv_warehouse_pick_up_goods.setTextColor(getResources().getColor(R.color.color_ff2e31))
id_tv_warehouse_card?.setBackgroundResource(R.drawable.shape_ffffff_r12_bg)
id_tv_warehouse_card.setTextColor(getResources().getColor(R.color.color_666666))
type = 0
mPresenter?.getDepot(status, type, true)
}
id_tv_warehouse_card?.setOnClickListener {
id_tv_warehouse_pick_up_goods?.setBackgroundResource(R.drawable.shape_ffffff_r12_bg)
id_tv_warehouse_pick_up_goods.setTextColor(getResources().getColor(R.color.color_666666))
id_tv_warehouse_card?.setBackgroundResource(R.drawable.shape_ff2e31_r12_bg)
id_tv_warehouse_card.setTextColor(getResources().getColor(R.color.color_ff2e31))
type = 1
mPresenter?.getDepot(status, type, true)
}
// id_tv_warehouse_pick_up_goods?.setOnClickListener {
// id_tv_warehouse_pick_up_goods?.setBackgroundResource(R.drawable.shape_ff2e31_r12_bg)
// id_tv_warehouse_pick_up_goods.setTextColor(getResources().getColor(R.color.color_ff2e31))
// id_tv_warehouse_card?.setBackgroundResource(R.drawable.shape_ffffff_r12_bg)
// id_tv_warehouse_card.setTextColor(getResources().getColor(R.color.color_666666))
// type = 0
// mPresenter?.getDepot(status, type, true)
// }
// id_tv_warehouse_card?.setOnClickListener {
// id_tv_warehouse_pick_up_goods?.setBackgroundResource(R.drawable.shape_ffffff_r12_bg)
// id_tv_warehouse_pick_up_goods.setTextColor(getResources().getColor(R.color.color_666666))
// id_tv_warehouse_card?.setBackgroundResource(R.drawable.shape_ff2e31_r12_bg)
// id_tv_warehouse_card.setTextColor(getResources().getColor(R.color.color_ff2e31))
// type = 1
// mPresenter?.getDepot(status, type, true)
// }
id_tv_huishou?.setOnClickListener {
}
......
moduleMain/src/main/java/com/zxhl/main/page/fragment/RecoveryFragment.kt
View file @ 0d555ba6
......@@ -31,22 +31,22 @@ class RecoveryFragment : BaseFragment(), WareHouseContract.View,
override fun init(view: View?) {
id_tv_warehouse_pick_up_goods?.setOnClickListener {
id_tv_warehouse_pick_up_goods?.setBackgroundResource(R.drawable.shape_ff2e31_r12_bg)
id_tv_warehouse_pick_up_goods.setTextColor(getResources().getColor(R.color.color_ff2e31))
id_tv_warehouse_card?.setBackgroundResource(R.drawable.shape_ffffff_r12_bg)
id_tv_warehouse_card.setTextColor(getResources().getColor(R.color.color_666666))
type = 0
mPresenter?.getDepot(status, type, true)
}
id_tv_warehouse_card?.setOnClickListener {
id_tv_warehouse_pick_up_goods?.setBackgroundResource(R.drawable.shape_ffffff_r12_bg)
id_tv_warehouse_pick_up_goods.setTextColor(getResources().getColor(R.color.color_666666))
id_tv_warehouse_card?.setBackgroundResource(R.drawable.shape_ff2e31_r12_bg)
id_tv_warehouse_card.setTextColor(getResources().getColor(R.color.color_ff2e31))
type = 1
mPresenter?.getDepot(status, type, true)
}
// id_tv_warehouse_pick_up_goods?.setOnClickListener {
// id_tv_warehouse_pick_up_goods?.setBackgroundResource(R.drawable.shape_ff2e31_r12_bg)
// id_tv_warehouse_pick_up_goods.setTextColor(getResources().getColor(R.color.color_ff2e31))
// id_tv_warehouse_card?.setBackgroundResource(R.drawable.shape_ffffff_r12_bg)
// id_tv_warehouse_card.setTextColor(getResources().getColor(R.color.color_666666))
// type = 0
// mPresenter?.getDepot(status, type, true)
// }
// id_tv_warehouse_card?.setOnClickListener {
// id_tv_warehouse_pick_up_goods?.setBackgroundResource(R.drawable.shape_ffffff_r12_bg)
// id_tv_warehouse_pick_up_goods.setTextColor(getResources().getColor(R.color.color_666666))
// id_tv_warehouse_card?.setBackgroundResource(R.drawable.shape_ff2e31_r12_bg)
// id_tv_warehouse_card.setTextColor(getResources().getColor(R.color.color_ff2e31))
// type = 1
// mPresenter?.getDepot(status, type, true)
// }
id_tv_huishou?.setOnClickListener {
}
......
moduleMain/src/main/java/com/zxhl/main/page/fragment/TobePickUpFragment.kt
View file @ 0d555ba6
......@@ -27,8 +27,9 @@ import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.functions.Consumer
import kotlinx.android.synthetic.main.fragment_warehouse_layout.*
import kotlinx.android.synthetic.main.layout_empty.*
//待提货
class TobePickUpFragment: BaseFragment(), WareHouseContract.View,
class TobePickUpFragment : BaseFragment(), WareHouseContract.View,
OnRecycleItemClickListener<Boolean>, AdCallback<String>, PopupWidowCloseCallBack,
WeChatLoginSuccessCallBall {
private var mPresenter: WareHousePresenter? = null
......@@ -47,36 +48,36 @@ class TobePickUpFragment: BaseFragment(), WareHouseContract.View,
override fun init(view: View?) {
wechatutil = WeChatUtils(mActivity, this)
id_ll_tihuo_bottom?.visibility = View.VISIBLE
id_rl_xianshi?.visibility = View.VISIBLE
id_rl_xianshi?.visibility = View.VISIBLE
id_tv_fahuo?.visibility = View.VISIBLE
id_img_xianshi?.setOnClickListener {
id_rl_xianshi?.visibility = View.GONE
}
id_tv_warehouse_pick_up_goods?.setOnClickListener {
id_tv_fahuo?.visibility = View.VISIBLE
id_tv_warehouse_pick_up_goods?.setBackgroundResource(R.drawable.shape_ff2e31_r12_bg)
id_tv_warehouse_pick_up_goods.setTextColor(getResources().getColor(R.color.color_ff2e31))
id_tv_warehouse_card?.setBackgroundResource(R.drawable.shape_ffffff_r12_bg)
id_tv_warehouse_card.setTextColor(getResources().getColor(R.color.color_666666))
type = 0
mChoosList?.clear()
mAdapter?.setCancelAllSelect(true)
mAdapter?.setTihuo(type)
mPresenter?.getDepot(status, type, true)
}
id_tv_warehouse_card?.setOnClickListener {
id_tv_fahuo?.visibility = View.GONE
id_tv_warehouse_pick_up_goods?.setBackgroundResource(R.drawable.shape_ffffff_r12_bg)
id_tv_warehouse_pick_up_goods.setTextColor(getResources().getColor(R.color.color_666666))
id_tv_warehouse_card?.setBackgroundResource(R.drawable.shape_ff2e31_r12_bg)
id_tv_warehouse_card.setTextColor(getResources().getColor(R.color.color_ff2e31))
type = 1
mChoosList?.clear()
mAdapter?.setCancelAllSelect(true)
mAdapter?.setTihuo(type)
mPresenter?.getDepot(status, type, true)
}
// id_tv_warehouse_pick_up_goods?.setOnClickListener {
// id_tv_fahuo?.visibility = View.VISIBLE
// id_tv_warehouse_pick_up_goods?.setBackgroundResource(R.drawable.shape_ff2e31_r12_bg)
// id_tv_warehouse_pick_up_goods.setTextColor(getResources().getColor(R.color.color_ff2e31))
// id_tv_warehouse_card?.setBackgroundResource(R.drawable.shape_ffffff_r12_bg)
// id_tv_warehouse_card.setTextColor(getResources().getColor(R.color.color_666666))
// type = 0
// mChoosList?.clear()
// mAdapter?.setCancelAllSelect(true)
// mAdapter?.setTihuo(type)
// mPresenter?.getDepot(status, type, true)
// }
// id_tv_warehouse_card?.setOnClickListener {
// id_tv_fahuo?.visibility = View.GONE
// id_tv_warehouse_pick_up_goods?.setBackgroundResource(R.drawable.shape_ffffff_r12_bg)
// id_tv_warehouse_pick_up_goods.setTextColor(getResources().getColor(R.color.color_666666))
// id_tv_warehouse_card?.setBackgroundResource(R.drawable.shape_ff2e31_r12_bg)
// id_tv_warehouse_card.setTextColor(getResources().getColor(R.color.color_ff2e31))
// type = 1
// mChoosList?.clear()
// mAdapter?.setCancelAllSelect(true)
// mAdapter?.setTihuo(type)
// mPresenter?.getDepot(status, type, true)
// }
id_tv_huishou?.setOnClickListener {
if (mChoosList.isEmpty()) {
Utils.showToast(mActivity, "请选择要回收的物品")
......@@ -117,7 +118,14 @@ class TobePickUpFragment: BaseFragment(), WareHouseContract.View,
recoverprice = recovertList.sum()
}
RecycleDialog.showRecycleDialog(mActivity,sb.toString(),"3", recoverprice.toString(), recoveType,this)
RecycleDialog.showRecycleDialog(
mActivity,
sb.toString(),
"3",
recoverprice.toString(),
recoveType,
this
)
// RecoverPopupWindow().init(
// mActivity,
// sb.toString(),
......
moduleMain/src/main/res/layout/activity_layout_my_order.xml
View file @ 0d555ba6
......@@ -24,7 +24,7 @@
android:layout_centerHorizontal="true"
android:layout_marginBottom="12dp"
android:includeFontPadding="false"
android:text="我的订单"
android:text="@string/my_order"
android:textColor="@color/color_333333"
android:textSize="18sp" />
</RelativeLayout>
......
moduleMain/src/main/res/layout/activity_layout_order_success.xml
View file @ 0d555ba6
......@@ -56,7 +56,7 @@
android:layout_width="220dp"
android:layout_height="45dp"
android:layout_marginTop="40dp"
android:visibility="gone"
android:visibility="visible"
android:background="@drawable/shape_ff2e31_r25"
android:gravity="center"
android:text="查看订单"
......
moduleMain/src/main/res/layout/activity_layout_warehouse.xml
View file @ 0d555ba6
......@@ -45,7 +45,8 @@
app:indicatorInterpolation="smart"
app:indicatorMarginTop="41dp"
app:indicatorThickness="3dp"
app:titleOffset="auto_center" />
app:titleOffset="auto_center"
android:visibility="gone"/>
<androidx.viewpager.widget.ViewPager
android:id="@+id/viewPager"
......
moduleMain/src/main/res/layout/fragment_recycled_layout.xml
View file @ 0d555ba6
......@@ -19,7 +19,8 @@
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingTop="10.5dp"
android:paddingBottom="10.5dp">
android:paddingBottom="10.5dp"
android:visibility="gone">
<ImageView
android:layout_width="wrap_content"
......@@ -40,7 +41,8 @@
android:id="@+id/refreshLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/id_ll_notice">
android:layout_below="@+id/id_ll_notice"
android:layout_above="@+id/id_ll_tihuo_bottom">
<RelativeLayout
......@@ -51,8 +53,7 @@
android:id="@+id/recyclerView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:paddingBottom="10dp" />
android:layout_marginTop="10dp" />
<TextView
android:id="@+id/id_tv_dixian"
......
moduleMain/src/main/res/layout/fragment_warehouse_layout.xml
View file @ 0d555ba6
......@@ -4,45 +4,6 @@
android:layout_height="match_parent"
android:background="#F6F6F6">
<LinearLayout
android:id="@+id/id_ll_top"
android:layout_width="match_parent"
android:layout_height="44dp"
android:background="@color/white"
android:gravity="center_vertical"
android:orientation="horizontal"
android:visibility="gone">
<TextView
android:id="@+id/id_tv_warehouse_pick_up_goods"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="15dp"
android:layout_marginRight="10dp"
android:background="@drawable/shape_ff2e31_r12_bg"
android:gravity="center"
android:includeFontPadding="false"
android:paddingLeft="10dp"
android:paddingTop="5dp"
android:paddingRight="10dp"
android:paddingBottom="5dp"
android:text="实物商品"
android:textColor="#FF2E31"
android:textSize="14sp" />
<TextView
android:id="@+id/id_tv_warehouse_card"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/shape_ffffff_r12_bg"
android:gravity="center"
android:includeFontPadding="false"
android:paddingLeft="10dp"
android:paddingTop="5dp"
android:paddingRight="10dp"
android:paddingBottom="5dp"
android:text="话费/卡券" />
</LinearLayout>
<include layout="@layout/layout_empty" />
......@@ -78,6 +39,7 @@
android:id="@+id/refreshLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_above="@+id/id_ll_tihuo_bottom"
android:layout_below="@+id/id_ll_notice">
......@@ -156,7 +118,7 @@
android:textColor="@color/white"
android:textSize="14sp"
android:textStyle="bold"
android:visibility="gone"/>
android:visibility="gone" />
<TextView
android:id="@+id/id_tv_fahuo"
......@@ -169,7 +131,7 @@
android:textColor="@color/white"
android:textSize="14sp"
android:textStyle="bold"
android:visibility="visible"/>
android:visibility="visible" />
</LinearLayout>
<RelativeLayout
......
moduleMain/src/main/res/layout/item_layout_new_box.xml
View file @ 0d555ba6
......@@ -107,7 +107,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="¥"
android:text="$"
android:textColor="@color/color_4c84ff"
android:textSize="14sp"
android:textStyle="bold" />
......@@ -159,13 +159,13 @@
android:includeFontPadding="false"
android:text="100%必中"
android:textColor="@color/color_4c84ff"
android:textSize="12sp" />
android:textSize="12sp"
android:visibility="gone"/>
<TextView
android:id="@+id/id_tv_min_max_price"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:includeFontPadding="false"
android:text="30～10499元"
android:textColor="@color/color_4c84ff"
android:textSize="12sp" />
......@@ -182,7 +182,7 @@
android:layout_gravity="center_vertical"
android:background="@drawable/item_button_yifaruhun"
android:gravity="center"
android:text="一发入魂"
android:text="@string/box_detail_open_box_result_btn_one_again"
android:textColor="@color/white"
android:textSize="15sp" />
......
moduleMain/src/main/res/layout/item_layout_pick_up.xml
View file @ 0d555ba6
......@@ -39,10 +39,12 @@
android:id="@+id/id_goods_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="5dp"
android:layout_marginTop="8dp"
android:lines="2"
android:ellipsize="end"
android:layout_toRightOf="@+id/id_goods_img"
android:includeFontPadding="false"
android:text="29元的高端数码你敢信？"
android:textColor="@color/color_333333"
android:textSize="14sp"
android:textStyle="bold" />
......@@ -70,7 +72,6 @@
android:drawableLeft="@drawable/icon_jinbi"
android:drawablePadding="5dp"
android:includeFontPadding="false"
android:text="20"
android:textColor="@color/color_4c84ff"
android:textSize="18sp"
android:textStyle="bold" />
......@@ -88,5 +89,6 @@
android:textColor="@color/white"
android:textSize="15sp"
android:layout_marginRight="15dp"
android:layout_marginBottom="5dp"/>
android:layout_marginBottom="5dp"
android:visibility="gone"/>
</RelativeLayout>
moduleMain/src/main/res/layout/item_layout_recover.xml
View file @ 0d555ba6
......@@ -28,7 +28,6 @@
android:paddingTop="2dp"
android:paddingRight="4dp"
android:paddingBottom="2dp"
android:text="稀有款"
android:textColor="@color/white"
android:textSize="12sp" />
......@@ -38,8 +37,7 @@
android:layout_height="44dp"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="6dp"
android:src="@drawable/icon_jinbi" />
android:layout_marginBottom="6dp" />
</RelativeLayout>
......@@ -49,9 +47,11 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginRight="5dp"
android:lines="2"
android:ellipsize="end"
android:layout_toRightOf="@+id/id_rl_bg"
android:includeFontPadding="false"
android:text="29元的高端数码你敢信？"
android:textColor="@color/color_333333"
android:textSize="14sp"
android:textStyle="bold" />
......@@ -79,7 +79,6 @@
android:drawableLeft="@drawable/icon_jinbi"
android:drawablePadding="5dp"
android:includeFontPadding="false"
android:text="20"
android:textColor="#FF2E31"
android:textSize="18sp"
android:textStyle="bold" />
......
moduleMain/src/main/res/layout/item_layout_shop_order.xml
View file @ 0d555ba6
......@@ -16,7 +16,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="快递单号："
android:text="@string/trackingno"
android:textColor="@color/color_999999"
android:textSize="12sp" />
......@@ -78,8 +78,6 @@
android:layout_weight="1"
android:ellipsize="end"
android:lines="2"
android:text="iPhone13手机iPhone13手机
iPhone13手机iPhone13…"
android:textColor="@color/color_333333"
android:textSize="14sp" />
......@@ -122,14 +120,13 @@ iPhone13手机iPhone13…"
android:id="@+id/id_tv_pricedesc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="总价:¥2999｜优惠:¥20｜运费:¥25｜"
android:textColor="@color/color_999999"
android:textSize="12sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="实付:"
android:text="@string/paid"
android:textColor="@color/color_333333"
android:textSize="12sp" />
......@@ -137,7 +134,6 @@ iPhone13手机iPhone13…"
android:id="@+id/id_tv_total_price"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="¥79"
android:textColor="@color/color_4c84ff"
android:textSize="12sp" />
</LinearLayout>
......@@ -152,7 +148,7 @@ iPhone13手机iPhone13…"
android:layout_width="70dp"
android:layout_height="wrap_content"
android:layout_marginRight="5dp"
android:text="订单号："
android:text="@string/orderno"
android:textColor="@color/color_999999"
android:textSize="12sp" />
......@@ -182,7 +178,7 @@ iPhone13手机iPhone13…"
android:layout_width="70dp"
android:layout_height="wrap_content"
android:layout_marginRight="5dp"
android:text="付款时间："
android:text="@string/paytime"
android:textColor="@color/color_999999"
android:textSize="12sp" />
......
moduleMain/src/main/res/layout/layout_empty.xml
View file @ 0d555ba6
......@@ -4,10 +4,10 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:layout_below="@+id/id_ll_top"
android:layout_gravity="center_horizontal"
android:layout_marginTop="160dp"
android:orientation="vertical">
android:orientation="vertical"
android:visibility="gone">
<ImageView
android:layout_width="wrap_content"
......
moduleMain/src/main/res/layout/layout_new_people.xml
View file @ 0d555ba6
......@@ -161,7 +161,8 @@
android:padding="3dp"
android:text="100%保底必中"
android:textColor="@color/white"
android:textSize="11sp" />
android:textSize="11sp"
android:visibility="gone"/>
</RelativeLayout>
......
tmpmob/ShareSDK/assets/ShareSDK.xml 0 → 100644
View file @ 0d555ba6
<?xml version="1.0" encoding="utf-8"?>
<DevInfor>
<SinaWeibo Enable="false" />
<TencentWeibo Enable="false" />
<Douban Enable="false" />
<QZone Enable="false" />
<Renren Enable="false" />
<KaiXin Enable="false" />
<Facebook Id="8" SortId="8" OfficialVersion="default" FaceBookLoginProtocolScheme="fb1412473428822331" ShareByAppClient="true" Enable="true" ConsumerKey="1412473428822331" ConsumerSecret="a42f4f3f867dc947b9ed6020c2e93558" RedirectUrl="https://www.baidu.com" />
<Twitter Enable="false" />
<Evernote Enable="false" />
<FourSquare Enable="false" />
<GooglePlus Id="21" SortId="21" OfficialVersion="default" ShareByAppClient="true" Enable="true" ClientID="236300675100-am5pm8km7md1memjevq8rl9pg5c4s4b8.apps.googleusercontent.com" RedirectUrl="http://localhost" />
<Instagram Enable="false" />
<LinkedIn Enable="false" />
<Tumblr Enable="false" />
<Email Enable="false" />
<ShortMessage Enable="false" />
<Wechat Enable="false" />
<WechatMoments Enable="false" />
<QQ Enable="false" />
<Instapaper Enable="false" />
<Pocket Enable="false" />
<YouDao Enable="false" />
<Pinterest Enable="false" />
<Flickr Enable="false" />
<Dropbox Enable="false" />
<VKontakte Enable="false" />
<WechatFavorite Enable="false" />
<Yixin Enable="false" />
<YixinMoments Enable="false" />
<Mingdao Enable="false" />
<Line Enable="false" />
<WhatsApp Enable="false" />
<KakaoTalk Enable="false" />
<KakaoStory Enable="false" />
<FacebookMessenger Enable="false" />
<Alipay Enable="false" />
<AlipayMoments Enable="false" />
<Dingding Enable="false" />
<Youtube Enable="false" />
<Meipai Enable="false" />
<Telegram Enable="false" />
<Cmcc Enable="false" />
<Reddit Enable="false" />
<Telecom Enable="false" />
<Accountkit Enable="false" />
<Douyin Enable="false" />
<Wework Enable="false" />
<HWAccount Enable="false" />
<Oasis Enable="false" />
<XMAccount Enable="false" />
<SnapChat Enable="false" />
<Kuaishou Enable="false" />
<Littleredbook Enable="false" />
<Watermelonvideo Enable="false" />
<Tiktok Enable="false" />
</DevInfor>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment