Skip to content

A
android-koreadc-client-aar
Commit 57c4c518 by 郑鹏
Options

新增评论列表，调整页面

parent 314bb27d
Showing with 1291 additions and 76 deletions
app/src/main/AndroidManifest.xml
......@@ -30,6 +30,7 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity android:name=".ui.home.FoodAllEvaluateActivity"></activity>
<activity
android:name=".ui.home.HomeActivity"
android:configChanges="locale"
......
app/src/main/java/cn/dankal/client/adapter/home/FoodAllEvaluateAdapter.kt 0 → 100644
package cn.dankal.client.adapter.home
import android.content.Intent
import android.support.v7.widget.GridLayoutManager
import android.support.v7.widget.RecyclerView
import android.view.View
import cn.dankal.basiclib.base.activity.BigPhotoActivity
import cn.dankal.basiclib.util.PicUtil
import cn.dankal.basiclib.widget.GradeStarView
import cn.dankal.client.R
import cn.dankal.client.adapter.shop.CommentImageAdapter
import cn.dankal.entities.home.EvaluateListEntity
import com.chad.library.adapter.base.BaseQuickAdapter
import com.chad.library.adapter.base.BaseViewHolder
/**
* Author: roczheng
* Date: 2021/1/26
* Time: 21:25
* Description:
*/
class FoodAllEvaluateAdapter(layoutResId: Int, data: List<EvaluateListEntity.DataBean?>?) : BaseQuickAdapter<EvaluateListEntity.DataBean?, BaseViewHolder?>(layoutResId, data) {
override fun convert(holder: BaseViewHolder?, item: EvaluateListEntity.DataBean?) {
item?.apply {
holder?.setText(R.id.tv_comment_name, user_name)
holder?.setText(R.id.tv_comment_content, content)
holder?.setText(R.id.tv_comment_time, create_time)
val starView = holder?.getView<GradeStarView>(R.id.sv_store_star)
starView?.setCurrentChoose(item.star_level)
val recyclerView = holder?.getView<RecyclerView>(R.id.rv_list_image)
if (img_list_temp != null && img_list_temp.size > 0) {
recyclerView?.visibility = View.VISIBLE
val gridLayoutManager = GridLayoutManager(mContext, 3)
recyclerView?.layoutManager = gridLayoutManager
val commentImageAdapter = CommentImageAdapter(R.layout.itme_comment_image, img_list_temp)
recyclerView?.adapter = commentImageAdapter
commentImageAdapter.setOnItemClickListener { adapter, view, position ->
var intent = Intent(mContext, BigPhotoActivity::class.java)
intent.putStringArrayListExtra(BigPhotoActivity.URLS, img_list_temp)
intent.putExtra(BigPhotoActivity.PicIndex, position)
mContext.startActivity(intent)
}
} else {
recyclerView?.visibility = View.GONE
}
}
}
}
\ No newline at end of file
app/src/main/java/cn/dankal/client/ui/home/FoodAllEvaluateActivity.kt 0 → 100644
package cn.dankal.client.ui.home
import android.support.v4.content.ContextCompat
import android.support.v7.widget.LinearLayoutManager
import android.view.View
import api.RestaurantServiceFactory
import cn.dankal.basiclib.DankalApplication
import cn.dankal.basiclib.base.activity.BaseActivity
import cn.dankal.basiclib.rx.AbstractDialogSubscriber
import cn.dankal.client.R
import cn.dankal.client.adapter.home.FoodAllEvaluateAdapter
import cn.dankal.entities.home.EvaluateListEntity
import com.scwang.smartrefresh.layout.api.RefreshLayout
import com.scwang.smartrefresh.layout.footer.ClassicsFooter
import com.scwang.smartrefresh.layout.header.ClassicsHeader
import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener
import io.reactivex.disposables.Disposable
import kotlinx.android.synthetic.main.activity_food_all_evaluate.*
/**
* 餐馆全部评价
*/
class FoodAllEvaluateActivity : BaseActivity(), OnRefreshLoadMoreListener, View.OnClickListener {
private val mParams = HashMap<String, Any?>()
private var mHotelUUID: String? = null
private val mDataList = mutableListOf<EvaluateListEntity.DataBean>()
private var mIsRefreshing = false
private var mPage = 1
private var mAdapter: FoodAllEvaluateAdapter? = null
override fun initComponents() {
addSingleTitleBar(getString(R.string.view_all_comments))
mHotelUUID = intent.getStringExtra("hotel_uuid")
var mStarLevel = intent.getDoubleExtra("level", 0.0)
val currentIndex = mStarLevel.toInt()
sv_store_star.setCurrentChoose(currentIndex)
tv_grade.text = mStarLevel.toString()
mParams.put("create_time_sort", "desc")
initView()
refreshLayout.autoRefresh()
tv_new_order.setOnClickListener(this)
tv_grade_order.setOnClickListener(this)
}
private fun initView() {
rv_list.layoutManager = LinearLayoutManager(this)
mAdapter = FoodAllEvaluateAdapter(R.layout.item_evaluate_food, mDataList)
rv_list.adapter = mAdapter
refreshLayout.setOnRefreshLoadMoreListener(this)
refreshLayout.setRefreshHeader(ClassicsHeader(this).setEnableLastTime(true))
refreshLayout.setRefreshFooter(ClassicsFooter(this))
}
private fun requestListData() {
mParams.put("hotel_uuid", mHotelUUID)
mParams.put("page_index", mPage)
mParams.put("page_size", "20")
RestaurantServiceFactory.commentList(mParams).subscribe(object : AbstractDialogSubscriber<EvaluateListEntity>(this) {
override fun onNext(entity: EvaluateListEntity) {
if (mIsRefreshing) {
mDataList.clear()
mDataList.addAll(entity.data)
} else {
mDataList.addAll(entity.data)
}
mAdapter?.let {
it.notifyDataSetChanged()
}
tv_count.text = "(${entity.total}" + getString(R.string.evaluate) + ")"
}
override fun onSubscribe(d: Disposable) {
addNetworkRequest(d)
}
override fun onComplete() {
super.onComplete()
refreshLayout.finishLoadMore()
refreshLayout.finishRefresh()
}
})
}
override fun getLayoutId(): Int {
return R.layout.activity_food_all_evaluate
}
override fun onLoadMore(refreshLayout: RefreshLayout) {
mIsRefreshing = false
mPage++
requestListData()
}
override fun onRefresh(refreshLayout: RefreshLayout) {
mIsRefreshing = true
mPage = 1
requestListData()
}
override fun onClick(v: View?) {
when (v?.id) {
R.id.tv_new_order -> {
mParams.remove("star_level_sort")
mParams.put("create_time_sort", "desc")
if (DankalApplication.isDarkMode()) {
tv_new_order.setTextColor(ContextCompat.getColor(this, R.color.color_fbbc39))
tv_grade_order.setTextColor(ContextCompat.getColor(this, R.color.color_a6a6a6))
} else {
tv_new_order.setTextColor(ContextCompat.getColor(this, R.color.color00))
tv_grade_order.setTextColor(ContextCompat.getColor(this, R.color.bg_979797))
}
}
R.id.tv_grade_order -> {
mParams.remove("create_time_sort")
mParams.put("star_level_sort", "desc")
if (DankalApplication.isDarkMode()) {
tv_grade_order.setTextColor(ContextCompat.getColor(this, R.color.color_fbbc39))
tv_new_order.setTextColor(ContextCompat.getColor(this, R.color.color_a6a6a6))
} else {
tv_grade_order.setTextColor(ContextCompat.getColor(this, R.color.color00))
tv_new_order.setTextColor(ContextCompat.getColor(this, R.color.bg_979797))
}
}
}
refreshLayout.autoRefresh()
}
}
\ No newline at end of file
app/src/main/java/cn/dankal/client/ui/home/HomeActivity.kt
......@@ -48,6 +48,7 @@ import org.greenrobot.eventbus.Subscribe
import org.greenrobot.eventbus.ThreadMode
import api.HomeServiceFactory
import cn.dankal.basiclib.protocol.MainProtocol
import cn.dankal.client.ui.personal.order.food.FoodOrderActivity
import com.alibaba.android.arouter.facade.annotation.Route
@Route(path = MainProtocol.MAIN)
......@@ -66,9 +67,10 @@ class HomeActivity : BaseActivity(), View.OnClickListener {
when (v?.id) {
R.id.iv_home_search -> startActivity(Intent(this, SearchShopActivity::class.java))
R.id.iv_home_sweep -> {
requestPermission(Permission.CAMERA) {
/* requestPermission(Permission.CAMERA) {
startActivityForResult(Intent(this, CaptureActivity::class.java), ConstantsHomeType.SCAN)
}
}*/
startActivity(Intent(this, FoodOrderActivity::class.java));
}
R.id.iv_home_location -> {
startActivity(Intent(this, GoogleMapsActivity::class.java))
......
app/src/main/java/cn/dankal/client/ui/home/details/DetailsShopFragment.java
......@@ -921,12 +921,12 @@ public class DetailsShopFragment extends BaseFragment implements OnRefreshLoadMo
enabledButton();
} else {
tvBottomShopButton.setBackgroundColor(getResources().getColor(R.color.btn_bg));
tvBottomShopButton.setTextColor(getResources().getColor(R.color.white));
tvBottomShopButton.setTextColor(getResources().getColor(R.color.color_171717));
tvBottomShopButton.setEnabled(true);
tvBottomShopButton.setText(R.string.go_to_settlement);
tvSettlement.setBackgroundColor(getResources().getColor(R.color.btn_bg));
tvSettlement.setTextColor(getResources().getColor(R.color.white));
tvSettlement.setTextColor(getResources().getColor(R.color.color_171717));
tvSettlement.setEnabled(true);
tvSettlement.setText(R.string.go_to_settlement);
}
......
app/src/main/java/cn/dankal/client/ui/home/details/DishesDetailsActivity.kt
......@@ -19,6 +19,7 @@ import cn.dankal.basiclib.util.ToastUtils
import cn.dankal.basiclib.util.WebViewUtil
import cn.dankal.basiclib.util.image.PicUtils
import cn.dankal.basiclib.widget.banner.DkBanner
import cn.dankal.basiclib.widget.banner.DkBannerTow
import cn.dankal.basiclib.widget.banner.IViewHolder
import cn.dankal.basiclib.widget.banner.VH
import cn.dankal.entities.home.*
......@@ -27,6 +28,7 @@ import cn.dankal.client.R
import cn.dankal.client.adapter.home.ShopBottomListAdapter
import cn.dankal.client.adapter.home.ShopSpecListAdapter
import cn.dankal.client.constants.ConstantsRestaurantType
import cn.dankal.client.ui.home.FoodAllEvaluateActivity
import cn.dankal.client.ui.shop.QueueActivity
import cn.dankal.client.ui.shop.QueueResultActivity
import cn.dankal.client.util.FindUtil
......@@ -36,6 +38,7 @@ import com.zhy.view.flowlayout.FlowLayout
import com.zhy.view.flowlayout.TagAdapter
import com.zhy.view.flowlayout.TagFlowLayout
import kotlinx.android.synthetic.main.activity_dishes_details.*
import kotlinx.android.synthetic.main.activity_merchant_details.*
import org.greenrobot.eventbus.EventBus
import org.greenrobot.eventbus.Subscribe
import org.greenrobot.eventbus.ThreadMode
......@@ -46,7 +49,7 @@ import java.util.ArrayList
class DishesDetailsActivity : BaseActivity(), View.OnClickListener {
var mDkBanner: DkBanner<String>? = null
var mDkBanner: DkBannerTow<String>? = null
var popupWindow: PopupWindow? = null
......@@ -626,12 +629,12 @@ class DishesDetailsActivity : BaseActivity(), View.OnClickListener {
enabledButton()
} else {
tv_bottom_shop_button.setBackgroundColor(resources.getColor(R.color.btn_bg))
tv_bottom_shop_button.setTextColor(resources.getColor(R.color.white))
tv_bottom_shop_button.setTextColor(resources.getColor(R.color.color_171717))
tv_bottom_shop_button.isEnabled = true
tv_bottom_shop_button.text = getString(R.string.go_to_settlement)
tvSettlement?.setBackgroundColor(resources.getColor(R.color.btn_bg))
tvSettlement?.setTextColor(resources.getColor(R.color.white))
tvSettlement?.setTextColor(resources.getColor(R.color.color_171717))
tvSettlement?.isEnabled = true
tvSettlement?.text = getString(R.string.go_to_settlement)
}
......
app/src/main/java/cn/dankal/client/ui/home/details/MerchantDetailsActivity.java
......@@ -38,7 +38,9 @@ import cn.dankal.basiclib.base.activity.BaseActivity;
import cn.dankal.basiclib.base.fragmentactivity.FragmentAdapter;
import cn.dankal.basiclib.rx.AbstractDialogSubscriber;
import cn.dankal.basiclib.util.ButtonUtil;
import cn.dankal.basiclib.widget.GradeStarView;
import cn.dankal.basiclib.widget.statubar.QMUIStatusBarHelper;
import cn.dankal.client.ui.home.FoodAllEvaluateActivity;
import cn.dankal.entities.event.UpdateStateEvent;
import cn.dankal.entities.home.BusinessTimeEntity;
import cn.dankal.entities.home.QRCodeEntity;
......@@ -72,6 +74,10 @@ public class MerchantDetailsActivity extends BaseActivity {
TextView tvStampTag;
@BindView(R.id.tv_status_bar)
TextView tvStatusBar;
@BindView(R.id.sv_store_star)
GradeStarView svStoreStar;
@BindView(R.id.tv_grade)
TextView tvGrade;
private int userStampNumber = 0;//用户在当前店铺拥有的邮票数
......@@ -103,6 +109,8 @@ public class MerchantDetailsActivity extends BaseActivity {
private boolean isAgain = false;//是否是再来一单
private double mStarLevel;
@Override
protected int getLayoutId() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
......@@ -112,7 +120,7 @@ public class MerchantDetailsActivity extends BaseActivity {
return R.layout.activity_merchant_details;
}
@OnClick({R.id.iv_merchant_return, R.id.iv_merchant_scan})
@OnClick({R.id.iv_merchant_return, R.id.iv_merchant_scan, R.id.tv_see_evaluation})
public void onClickView(View view) {
if (ButtonUtil.isFastDoubleTowBiClick()) {
return;
......@@ -124,6 +132,12 @@ public class MerchantDetailsActivity extends BaseActivity {
case R.id.iv_merchant_scan:
requestPermission(Permission.CAMERA, () -> startActivityForResult(new Intent(MerchantDetailsActivity.this, CaptureActivity.class), ConstantsHomeType.SCAN));
break;
case R.id.tv_see_evaluation:
Intent intent = new Intent(this, FoodAllEvaluateActivity.class);
intent.putExtra("hotel_uuid", storeUUId);
intent.putExtra("level", mStarLevel);
startActivity(intent);
break;
}
}
......@@ -322,7 +336,7 @@ public class MerchantDetailsActivity extends BaseActivity {
dataList.add(detailsShopFragmentOne);
if (!TextUtils.isEmpty(entity.getStore_uuid())) {//
/* if (!TextUtils.isEmpty(entity.getStore_uuid())) {//
titles.add(getString(R.string.commodity));
MerchantMallFragment merchantMallFragment = new MerchantMallFragment();
Bundle bundle1 = new Bundle();
......@@ -330,7 +344,7 @@ public class MerchantDetailsActivity extends BaseActivity {
merchantMallFragment.setArguments(bundle1);
dataList.add(merchantMallFragment);
}
*/
dataList.add(DetailsInfoFragment.newInstance(entity));
titles.add(getString(R.string.business_profile));
......@@ -366,6 +380,14 @@ public class MerchantDetailsActivity extends BaseActivity {
marqueeView.startWithList(messages);
marqueeView.startWithList(messages, R.anim.anim_bottom_in, R.anim.anim_top_out);
mStarLevel = entity.getStar_level();
int currentIndex = (int) (entity.getStar_level());
svStoreStar.setCurrentChoose(currentIndex);
tvGrade.setText(String.valueOf(entity.getStar_level()));
}
});
}
......
app/src/main/java/cn/dankal/client/ui/home/map/GoogleMapsMerchantActivity.java
......@@ -225,7 +225,8 @@ public class GoogleMapsMerchantActivity extends BaseActivity implements OnMapRea
ImageView ivStore = view.findViewById(R.id.iv_store_name);
GradeStarView gradeStarView = view.findViewById(R.id.sv_shop_case);
gradeStarView.setCurrentChoose(entity.getStar_level());
int level= (int) entity.getStar_level();
gradeStarView.setCurrentChoose(level);
/* RequestOptions requestOptions = new RequestOptions();
requestOptions.disallowHardwareConfig();
......
app/src/main/java/cn/dankal/client/ui/personal/order/food/FoodOrderActivity.kt
......@@ -19,7 +19,7 @@ class FoodOrderActivity : BaseActivity() {
addSingleTitleBar(getString(R.string.food_order))
var dataList = ArrayList<Fragment>()
dataList.add(FoodOrderFragment.newInstance("1"))//1-已支付 / 待上餐/ 待发货)；
dataList.add(FoodOrderFragment.newInstance("0"))//1-已支付 / 待上餐/ 待发货)；
dataList.add(FoodOrderFragment.newInstance("4"))//4-已完成
dataList.add(FoodOrderFragment.newInstance("11"))//8-已取消（退款成功）
dataList.add(FoodOrderFragment.newInstance("2"))//2-售后订单
......
app/src/main/res/layout-night/activity_dishes_details.xml
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout
android:id="@+id/cl_bg"
xmlns:android="http://schemas.android.com/apk/res/android"
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/cl_bg"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_ff2f2f2f"
......@@ -22,14 +21,11 @@
android:layout_height="match_parent"
android:orientation="vertical">
<FrameLayout
<cn.dankal.basiclib.widget.banner.DkBanner
android:id="@+id/banner"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_210">
<cn.dankal.basiclib.widget.banner.DkBanner
android:id="@+id/banner"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</FrameLayout>
android:layout_height="wrap_content" />
<LinearLayout
android:layout_width="match_parent"
......@@ -83,9 +79,9 @@
android:paddingRight="@dimen/dp_9"
android:paddingBottom="@dimen/dp_5"
android:text="@string/selection_of_specifications"
android:visibility="gone"
android:textColor="@color/color_171717"
android:textSize="@dimen/sp_12" />
android:textSize="@dimen/sp_12"
android:visibility="gone" />
</LinearLayout>
......@@ -114,10 +110,10 @@
android:id="@+id/webView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/color_ff2f2f2f"
android:layout_marginLeft="@dimen/dp_12"
android:layout_marginRight="@dimen/dp_12"
android:layout_marginBottom="@dimen/dp_60"/>
android:layout_marginBottom="@dimen/dp_60"
android:background="@color/color_ff2f2f2f" />
</android.support.v7.widget.LinearLayoutCompat>
......
app/src/main/res/layout-night/activity_food_all_evaluate.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<android.support.v7.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="@color/color_191919"
tools:context=".ui.home.FoodAllEvaluateActivity">
<android.support.v7.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="@dimen/dp_53"
android:gravity="center_vertical"
android:orientation="horizontal">
<cn.dankal.basiclib.widget.GradeStarView
android:id="@+id/sv_store_star"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_15"
app:mClickImageId="@mipmap/ic_home_stars_bright"
app:mDefaultImageId="@mipmap/ic_home_stars_ash"
app:mImageHeight="@dimen/dp_20"
app:mImageWidth="@dimen/dp_20"
app:mMargin="@dimen/dp_3" />
<TextView
android:id="@+id/tv_grade"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginRight="@dimen/dp_10"
android:textColor="@color/color_a6a6a6"
android:textSize="@dimen/font_18_sp"
tools:text="4.7" />
<TextView
android:id="@+id/tv_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/color_595959"
android:textSize="@dimen/font_12_sp"
tools:text="(230评价)" />
</android.support.v7.widget.LinearLayoutCompat>
<TextView
android:layout_width="match_parent"
android:layout_height="@dimen/dp_10"
android:background="@color/color_232323" />
<android.support.v7.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="@dimen/dp_50"
android:gravity="right|center_vertical">
<TextView
android:id="@+id/tv_new_order"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="最新顺序"
android:layout_marginRight="@dimen/dp_10"
android:textColor="@color/color_fbbc39"
android:textSize="@dimen/font_16_sp" />
<TextView
android:layout_width="@dimen/dp_1"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/dp_20"
android:layout_marginBottom="@dimen/dp_20"
android:background="@color/bg_979797"/>
<TextView
android:id="@+id/tv_grade_order"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="评分顺序"
android:layout_marginRight="@dimen/dp_16"
android:layout_marginLeft="@dimen/dp_10"
android:textColor="@color/color_a6a6a6"
android:textSize="@dimen/font_16_sp" />
</android.support.v7.widget.LinearLayoutCompat>
<com.scwang.smartrefresh.layout.SmartRefreshLayout
android:id="@+id/refreshLayout"
android:layout_width="match_parent"
android:layout_height="match_parent">
<android.support.v7.widget.RecyclerView
android:id="@+id/rv_list"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</com.scwang.smartrefresh.layout.SmartRefreshLayout>
</android.support.v7.widget.LinearLayoutCompat>
\ No newline at end of file
app/src/main/res/layout-night/activity_food_evaluation.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<android.support.v7.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context="cn.dankal.client.ui.personal.order.food.FoodEvaluationActivity">
<android.support.v4.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:background="@color/color_191919">
<android.support.v7.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_232323"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<ImageView
android:id="@+id/iv_hotel_image"
android:layout_width="@dimen/dp_74"
android:layout_height="@dimen/dp_74"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_15"
android:scaleType="centerCrop"
tools:src="@mipmap/pic_home_business_2" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_74"
android:layout_marginTop="@dimen/dp_15"
android:gravity="center_vertical"
android:orientation="vertical">
<TextView
android:id="@+id/iv_hotel_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/color_a6a6a6"
android:textSize="@dimen/sp_15"
android:layout_marginLeft="@dimen/dp_5"
tools:text="王妃家(明洞总店)" />
<cn.dankal.basiclib.widget.GradeStarView
android:id="@+id/sv_shop_case"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_5"
android:layout_centerInParent="true"
android:layout_marginTop="@dimen/dimen_16_dp"
app:mClickImageId="@mipmap/ic_home_stars_bright"
app:mDefaultImageId="@mipmap/ic_home_stars_ash"
app:mImageHeight="@dimen/dp_15"
app:mImageWidth="@dimen/dp_15"
app:mMargin="@dimen/dp_5"
app:mStarChoose="0" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/ll_input"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:background="@color/color_ff2f2f2f"
android:orientation="vertical"
android:padding="8dp"
app:layout_constraintTop_toBottomOf="@id/iv_evaluation_img">
<EditText
android:id="@+id/et_feedback"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
android:gravity="start"
android:hint="@string/come_and_give_your_product_a_uick_evaluation"
android:lines="4"
android:textColorHint="@color/color_595959"
android:textColor="@color/color_595959"
android:maxLength="500"
android:textSize="@dimen/sp_13" />
<TextView
android:id="@+id/tv_text_size"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:layout_marginTop="8dp"
android:textColor="@color/color_595959"
android:text="0/500" />
</LinearLayout>
<TextView
android:id="@+id/tv_img_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_16"
android:text="@string/upload_image_six"
android:textColor="@color/color_d3d3d3"
android:textSize="@dimen/sp_12" />
<android.support.v7.widget.RecyclerView
android:id="@+id/rv_add_picture"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_16"
android:layout_marginRight="@dimen/dp_16"
android:layout_marginBottom="@dimen/dp_25" />
</android.support.v7.widget.LinearLayoutCompat>
</android.support.v4.widget.NestedScrollView>
<TextView
android:id="@+id/tv_btn_commit"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_46"
android:background="@color/color_ff2f2f2f"
android:enabled="false"
android:gravity="center"
android:text="@string/commit"
android:textColor="@color/colorFF"
android:textSize="@dimen/sp_16" />
</android.support.v7.widget.LinearLayoutCompat>
app/src/main/res/layout-night/activity_merchant_details.xml
......@@ -5,8 +5,8 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="@color/color_191919"
android:orientation="vertical"
tools:context="cn.dankal.client.ui.home.details.MerchantDetailsActivity">
<android.support.constraint.ConstraintLayout
......@@ -50,10 +50,10 @@
android:id="@+id/tv_merchant_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
android:text="@string/business_details"
android:textColor="@color/white"
android:textSize="@dimen/sp_20"
android:layout_marginTop="@dimen/dp_10"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_status_bar" />
......@@ -86,8 +86,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:background="@color/color_ff2f2f2f"
android:orientation="vertical"
android:paddingLeft="@dimen/dp_17"
android:paddingRight="@dimen/dp_17"
android:paddingBottom="@dimen/dp_17">
......@@ -113,9 +113,9 @@
android:background="@drawable/bg_store_stamp_tag"
android:padding="@dimen/dp_2"
android:text="邮票开启"
android:visibility="gone"
android:textColor="@color/white"
android:textSize="@dimen/sp_11" />
android:textSize="@dimen/sp_11"
android:visibility="gone" />
</LinearLayout>
<android.support.v7.widget.LinearLayoutCompat
......@@ -142,6 +142,44 @@
</android.support.v7.widget.LinearLayoutCompat>
<android.support.v7.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<cn.dankal.basiclib.widget.GradeStarView
android:id="@+id/sv_store_star"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:mClickImageId="@mipmap/ic_home_stars_bright"
app:mDefaultImageId="@mipmap/ic_home_stars_ash"
app:mImageHeight="@dimen/dp_14"
app:mImageWidth="@dimen/dp_14"
app:mMargin="@dimen/dp_3" />
<TextView
android:id="@+id/tv_grade"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginRight="@dimen/dp_10"
android:layout_weight="1"
android:textColor="@color/color33"
android:textSize="@dimen/font_18_sp"
tools:text="4.7" />
<TextView
android:id="@+id/tv_see_evaluation"
android:layout_width="@dimen/dp_76"
android:layout_height="@dimen/dp_30"
android:layout_marginRight="@dimen/dp_20"
android:background="@drawable/shop_color_d4d4d4_radius12_stroke"
android:gravity="center"
android:text="@string/view_reviews"
android:textColor="@color/color_999999" />
</android.support.v7.widget.LinearLayoutCompat>
<TextView
android:id="@+id/tv_restaurant_stamp"
android:layout_width="wrap_content"
......@@ -149,19 +187,19 @@
android:layout_marginTop="@dimen/dp_5"
android:drawableLeft="@mipmap/ic_home_mall_stamp"
android:drawablePadding="@dimen/dp_1"
android:visibility="gone"
android:textColor="@color/font_three"
android:textSize="@dimen/sp_12" />
android:textSize="@dimen/sp_12"
android:visibility="gone" />
<TextView
android:id="@+id/tv_restaurant_coupons"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_2"
android:visibility="gone"
android:text="@string/no_activity"
android:textColor="@color/font_orange_tow"
android:textSize="@dimen/dp_11" />
android:textSize="@dimen/dp_11"
android:visibility="gone" />
</LinearLayout>
......@@ -223,9 +261,9 @@
<cn.dankal.basiclib.widget.CustomViewPage
android:id="@+id/vp_pager"
android:background="@color/color_191919"
android:layout_width="match_parent"
android:layout_height="match_parent" />
android:layout_height="match_parent"
android:background="@color/color_191919" />
</LinearLayout>
</android.support.v7.widget.LinearLayoutCompat>
app/src/main/res/layout-night/item_evaluate_food.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<android.support.v7.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/color_191919"
android:orientation="vertical"
android:padding="@dimen/dp_15">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_comment_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/color_d3d3d3"
android:textSize="@dimen/sp_12" />
<cn.dankal.basiclib.widget.GradeStarView
android:id="@+id/sv_store_star"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_10"
app:mClickImageId="@mipmap/ic_home_stars_bright"
app:mDefaultImageId="@mipmap/ic_home_stars_ash"
app:mImageHeight="@dimen/dp_15"
app:mImageWidth="@dimen/dp_15"
app:mMargin="@dimen/dp_3" />
</LinearLayout>
<TextView
android:id="@+id/tv_comment_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_10"
android:text="2018-7-11"
android:textColor="@color/color_a6a6a6"
android:textSize="@dimen/sp_12" />
</LinearLayout>
<TextView
android:id="@+id/tv_comment_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
android:text="东西非常好很实惠，而且物流也很快，点个赞先，下次还来哈哈哈"
android:textColor="@color/color_d3d3d3"
android:textSize="@dimen/sp_13" />
<android.support.v7.widget.RecyclerView
android:id="@+id/rv_list_image"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:layout_margin="@dimen/dp_15"
android:background="@color/color_3d3d3d" />
</android.support.v7.widget.LinearLayoutCompat>
\ No newline at end of file
app/src/main/res/layout/activity_dishes_details.xml
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout
android:id="@+id/cl_bg"
xmlns:android="http://schemas.android.com/apk/res/android"
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/cl_bg"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="cn.dankal.client.ui.home.details.DishesDetailsActivity">
......@@ -21,14 +20,10 @@
android:layout_height="match_parent"
android:orientation="vertical">
<FrameLayout
<cn.dankal.basiclib.widget.banner.DkBannerTow
android:id="@+id/banner"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_210">
<cn.dankal.basiclib.widget.banner.DkBanner
android:id="@+id/banner"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_210" />
</FrameLayout>
android:layout_height="wrap_content" />
<LinearLayout
android:layout_width="match_parent"
......@@ -83,9 +78,9 @@
android:paddingRight="@dimen/dp_9"
android:paddingBottom="@dimen/dp_5"
android:text="@string/selection_of_specifications"
android:visibility="gone"
android:textColor="@color/white"
android:textSize="@dimen/sp_12" />
android:textColor="@color/color_171717"
android:textSize="@dimen/sp_12"
android:visibility="gone" />
</LinearLayout>
......@@ -116,7 +111,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_12"
android:layout_marginRight="@dimen/dp_12"
android:layout_marginBottom="@dimen/dp_60"/>
android:layout_marginBottom="@dimen/dp_60" />
</android.support.v7.widget.LinearLayoutCompat>
......
app/src/main/res/layout/activity_food_all_evaluate.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<android.support.v7.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context=".ui.home.FoodAllEvaluateActivity">
<android.support.v7.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="@dimen/dp_53"
android:gravity="center_vertical"
android:orientation="horizontal">
<cn.dankal.basiclib.widget.GradeStarView
android:id="@+id/sv_store_star"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_15"
app:mClickImageId="@mipmap/ic_home_stars_bright"
app:mDefaultImageId="@mipmap/ic_home_stars_ash"
app:mImageHeight="@dimen/dp_20"
app:mImageWidth="@dimen/dp_20"
app:mMargin="@dimen/dp_3" />
<TextView
android:id="@+id/tv_grade"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginRight="@dimen/dp_10"
android:textColor="@color/color33"
android:textSize="@dimen/font_18_sp"
tools:text="4.7" />
<TextView
android:id="@+id/tv_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/color_999999"
android:textSize="@dimen/font_12_sp"
tools:text="(230评价)" />
</android.support.v7.widget.LinearLayoutCompat>
<TextView
android:layout_width="match_parent"
android:layout_height="@dimen/dp_10"
android:background="@color/bg_fff5f5f5" />
<android.support.v7.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="@dimen/dp_50"
android:gravity="right|center_vertical">
<TextView
android:id="@+id/tv_new_order"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/latest_order"
android:layout_marginRight="@dimen/dp_10"
android:textColor="@color/color00"
android:textSize="@dimen/font_16_sp" />
<TextView
android:layout_width="@dimen/dp_1"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/dp_20"
android:layout_marginBottom="@dimen/dp_20"
android:background="@color/bg_979797"/>
<TextView
android:id="@+id/tv_grade_order"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/grading_order"
android:layout_marginRight="@dimen/dp_16"
android:layout_marginLeft="@dimen/dp_10"
android:textColor="@color/color_686868"
android:textSize="@dimen/font_16_sp" />
</android.support.v7.widget.LinearLayoutCompat>
<com.scwang.smartrefresh.layout.SmartRefreshLayout
android:id="@+id/refreshLayout"
android:layout_width="match_parent"
android:layout_height="match_parent">
<android.support.v7.widget.RecyclerView
android:id="@+id/rv_list"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</com.scwang.smartrefresh.layout.SmartRefreshLayout>
</android.support.v7.widget.LinearLayoutCompat>
\ No newline at end of file
app/src/main/res/layout/activity_food_evaluation.xml
......@@ -31,6 +31,7 @@
android:layout_height="@dimen/dp_74"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_15"
android:scaleType="centerCrop"
tools:src="@mipmap/pic_home_business_2" />
<LinearLayout
......
app/src/main/res/layout/activity_home.xml
......@@ -86,13 +86,15 @@
<com.flyco.tablayout.SlidingTabLayout
android:id="@+id/sliding_tabs"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="@dimen/dp_30"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_17"
tl:tl_indicator_color="@color/color_ff6b5c"
tl:tl_indicator_height="@dimen/dp_2"
tl:tl_indicator_width_equal_title="true"
tl:tl_tab_padding="@dimen/dp_8"
tl:tl_indicator_margin_top="@dimen/dp_8"
tl:tl_indicator_width="@dimen/dp_30"
tl:tl_tab_space_equal="false"
tl:tl_textSelectColor="@color/black"
tl:tl_textUnselectColor="@color/color_666666"
......
app/src/main/res/layout/activity_merchant_details.xml
......@@ -111,6 +111,7 @@
android:layout_height="wrap_content"
android:background="@drawable/bg_store_stamp_tag"
android:padding="@dimen/dp_2"
android:visibility="gone"
android:text="邮票开启"
android:textColor="@color/white"
android:textSize="@dimen/sp_11" />
......@@ -140,6 +141,44 @@
</android.support.v7.widget.LinearLayoutCompat>
<android.support.v7.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<cn.dankal.basiclib.widget.GradeStarView
android:id="@+id/sv_store_star"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:mClickImageId="@mipmap/ic_home_stars_bright"
app:mDefaultImageId="@mipmap/ic_home_stars_ash"
app:mImageHeight="@dimen/dp_14"
app:mImageWidth="@dimen/dp_14"
app:mMargin="@dimen/dp_3" />
<TextView
android:id="@+id/tv_grade"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginRight="@dimen/dp_10"
android:textColor="@color/color33"
android:textSize="@dimen/font_18_sp"
tools:text="4.7" />
<TextView
android:id="@+id/tv_see_evaluation"
android:layout_width="@dimen/dp_76"
android:layout_height="@dimen/dp_30"
android:layout_marginRight="@dimen/dp_20"
android:background="@drawable/shop_color_d4d4d4_radius12_stroke"
android:gravity="center"
android:text="@string/view_reviews"
android:textColor="@color/color_999999" />
</android.support.v7.widget.LinearLayoutCompat>
<TextView
android:id="@+id/tv_restaurant_stamp"
android:layout_width="wrap_content"
......
app/src/main/res/layout/activity_order_details.xml
......@@ -427,7 +427,7 @@
android:background="@drawable/bg_button_order_apply"
android:gravity="center"
android:text="@string/cancellation_of_complaints"
android:textColor="@color/white"
android:textColor="@color/color_171717"
android:visibility="gone" />
</LinearLayout>
......
app/src/main/res/layout/activity_order_result.xml
......@@ -60,7 +60,7 @@
android:paddingRight="@dimen/dp_10"
android:paddingBottom="@dimen/dp_5"
android:text="@string/change_table_number"
android:textColor="@color/white"
android:textColor="@color/color_171717"
android:textSize="@dimen/sp_12" />
</LinearLayout>
......@@ -236,7 +236,7 @@
style="@style/ButtonText"
android:layout_width="@dimen/dp_151"
android:layout_height="@dimen/dp_48"
android:textColor="@color/white"
android:textColor="@color/color_171717"
android:textSize="@dimen/sp_17"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@id/btn_cancel"
......
app/src/main/res/layout/item_evaluate_food.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<android.support.v7.widget.LinearLayoutCompat
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:background="@color/white"
android:padding="@dimen/dp_15">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_comment_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="哔哩哔哩"
android:textColor="@color/font_tow"
android:textSize="@dimen/sp_12" />
<cn.dankal.basiclib.widget.GradeStarView
android:id="@+id/sv_store_star"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_10"
app:mClickImageId="@mipmap/ic_home_stars_bright"
app:mDefaultImageId="@mipmap/ic_home_stars_ash"
app:mImageHeight="@dimen/dp_15"
app:mImageWidth="@dimen/dp_15"
app:mMargin="@dimen/dp_3" />
</LinearLayout>
<TextView
android:id="@+id/tv_comment_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="2018-7-11"
android:layout_marginLeft="@dimen/dp_10"
android:textColor="@color/color99"
android:textSize="@dimen/sp_12" />
</LinearLayout>
<TextView
android:id="@+id/tv_comment_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
android:text="东西非常好很实惠，而且物流也很快，点个赞先，下次还来哈哈哈"
android:textColor="@color/font_tow"
android:textSize="@dimen/sp_13" />
<android.support.v7.widget.RecyclerView
android:id="@+id/rv_list_image"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:layout_margin="@dimen/dp_15"
android:background="@color/color_ebebeb"/>
</android.support.v7.widget.LinearLayoutCompat>
\ No newline at end of file
app/src/main/res/values/colors.xml
......@@ -5,4 +5,5 @@
<color name="colorAccent">#FF5444</color>
</resources>
baselib/src/main/java/cn/dankal/basiclib/api/RestaurantService.java
......@@ -9,6 +9,7 @@ import cn.dankal.entities.home.BusinessTimeEntity;
import cn.dankal.entities.home.CommitHotelEntity;
import cn.dankal.entities.home.CommitQueueEntity;
import cn.dankal.entities.home.CouponEntity;
import cn.dankal.entities.home.EvaluateListEntity;
import cn.dankal.entities.home.HotelGoodsDetailEntity;
import cn.dankal.entities.home.IsOrderStoreEntity;
import cn.dankal.entities.home.RestaurantDetailEntity;
......@@ -141,4 +142,13 @@ public interface RestaurantService {
*/
@GET("app/hotel/check/hotel/{tableUuid}")
Observable<String> checkTableState(@Path("tableUuid") String tableUuid);
/**
* 获取餐馆评论列表
*
* @return
*/
@POST("app/hotel/comment_list")
Observable<EvaluateListEntity> commentList(@Body Map<String, Object> map);
}
baselib/src/main/java/cn/dankal/basiclib/base/activity/BaseActivity.java
......@@ -44,6 +44,7 @@ import cn.dankal.basiclib.util.TitleBarUtils;
import cn.dankal.basiclib.util.ToastUtils;
import cn.dankal.basiclib.util.language.MultiLanguage;
import cn.dankal.basiclib.widget.CommonDialog;
import cn.dankal.basiclib.widget.DebugWatermarkText;
import cn.dankal.basiclib.widget.TipDialog;
import cn.dankal.basiclib.widget.statubar.QMUIStatusBarHelper;
import cn.dankal.basiclib.widget.statubar.StatusBarUtil;
......@@ -462,6 +463,14 @@ public abstract class BaseActivity extends AppCompatActivity implements BaseView
}
}
@Override
public void onWindowFocusChanged(boolean hasFocus) {
super.onWindowFocusChanged(hasFocus);
if (hasFocus) {
DebugWatermarkText.addDebugTextView(this);
}
}
public interface PermissionState {
void onPermissionState();
}
......
baselib/src/main/java/cn/dankal/basiclib/widget/DebugWatermarkText.java 0 → 100644
package cn.dankal.basiclib.widget;
import android.app.Activity;
import android.content.res.Resources;
import android.graphics.Color;
import android.view.Gravity;
import android.view.View;
import android.view.ViewGroup;
import android.view.Window;
import android.widget.FrameLayout;
import android.widget.TextView;
import cn.dankal.basiclib.BuildConfig;
/**
* Created by wuqianrui on 2019/03/09 15:38
* 当前页面调试工具
*/
public class DebugWatermarkText {
public static void addDebugTextView(Activity activity) {
if (BuildConfig.DEBUG) {
//添加一个TextView,用来提示当前的Activity类
View decorView = activity.getWindow().getDecorView();
View rootView = activity.getWindow().findViewById(Window.ID_ANDROID_CONTENT);
final String tag = "addDebugTextView";
View debugTextView = decorView.findViewWithTag(tag);
if (debugTextView != null) {
return;
}
if (decorView instanceof FrameLayout) {
TextView textView = new TextView(activity);
textView.setTag(tag);
textView.setTextSize(9);
textView.setTextColor(Color.WHITE);
float dp2 = 2;
int padding = (int) dp2 * 4;
textView.setPadding(padding, padding, padding, padding);
textView.setShadowLayer(dp2 * 2, dp2, dp2, Color.BLACK);
textView.setText(activity.getClass().getSimpleName());
FrameLayout.LayoutParams layoutParams = new FrameLayout.LayoutParams(-2, -2);
layoutParams.gravity = Gravity.BOTTOM;
if (decorView.getBottom() > rootView.getBottom()) {
//显示了导航栏
Resources resources = activity.getResources();
int resourceId = resources.getIdentifier("navigation_bar_height", "dimen", "android");
int navBarHeight = 0;
if (resourceId > 0) {
navBarHeight = resources.getDimensionPixelSize(resourceId);
}
layoutParams.bottomMargin = navBarHeight;
}
((ViewGroup) decorView).addView(textView, layoutParams);
}
}
}
}
baselib/src/main/java/cn/dankal/entities/home/EvaluateListEntity.java 0 → 100644
package cn.dankal.entities.home;
import java.util.ArrayList;
import java.util.List;
/**
* Author: roczheng
* Date: 2021/1/26
* Time: 21:19
* Description:
*/
public class EvaluateListEntity {
/**
* data : [{"content":"不错哦","create_time":"2021-01-26 21:10:09.0","img_list":"[\"FILE/user/1611666619813526_1611666634992.jpg\"]","img_list_temp":["FILE/user/1611666619813526_1611666634992.jpg"],"order_code":"H20210126183858543","star_level":3,"user_name":"月月鸟","uuid":"d123dfd35fd711eba48d7cd30aeb138e"}]
* total : 1
*/
private Integer total;
private List<DataBean> data;
public Integer getTotal() {
return total;
}
public void setTotal(Integer total) {
this.total = total;
}
public List<DataBean> getData() {
return data;
}
public void setData(List<DataBean> data) {
this.data = data;
}
public static class DataBean {
/**
* content : 不错哦
* create_time : 2021-01-26 21:10:09.0
* img_list : ["FILE/user/1611666619813526_1611666634992.jpg"]
* img_list_temp : ["FILE/user/1611666619813526_1611666634992.jpg"]
* order_code : H20210126183858543
* star_level : 3
* user_name : 月月鸟
* uuid : d123dfd35fd711eba48d7cd30aeb138e
*/
private String content;
private String create_time;
private String img_list;
private String order_code;
private Integer star_level;
private String user_name;
private String uuid;
private ArrayList<String> img_list_temp;
public String getContent() {
return content;
}
public void setContent(String content) {
this.content = content;
}
public String getCreate_time() {
return create_time;
}
public void setCreate_time(String create_time) {
this.create_time = create_time;
}
public String getImg_list() {
return img_list;
}
public void setImg_list(String img_list) {
this.img_list = img_list;
}
public String getOrder_code() {
return order_code;
}
public void setOrder_code(String order_code) {
this.order_code = order_code;
}
public Integer getStar_level() {
return star_level;
}
public void setStar_level(Integer star_level) {
this.star_level = star_level;
}
public String getUser_name() {
return user_name;
}
public void setUser_name(String user_name) {
this.user_name = user_name;
}
public String getUuid() {
return uuid;
}
public void setUuid(String uuid) {
this.uuid = uuid;
}
public ArrayList<String> getImg_list_temp() {
return img_list_temp;
}
public void setImg_list_temp(ArrayList<String> img_list_temp) {
this.img_list_temp = img_list_temp;
}
}
}
baselib/src/main/java/cn/dankal/entities/home/RestaurantDetailEntity.java
......@@ -52,13 +52,13 @@ public class RestaurantDetailEntity implements Serializable {
private List<String> notify_list;
private List<GoodsTypeListBean> goods_type_list;
private int user_stamp_number;
private int star_level;
private double star_level;
public int getStar_level() {
public double getStar_level() {
return star_level;
}
public void setStar_level(int star_level) {
public void setStar_level(double star_level) {
this.star_level = star_level;
}
......
baselib/src/main/res/drawable/bg_button_again.xml
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<stroke android:width="1dp" android:color="#ffff6b5c" />
<stroke android:width="1dp" android:color="@color/color_ff7b836" />
<corners android:radius="2dp" />
</shape>
\ No newline at end of file
baselib/src/main/res/drawable/bg_button_order_apply.xml
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<stroke android:width="1dp" android:color="#ffff6b5c" />
<solid android:color="#ffff6b5c" />
<solid android:color="@color/color_ff7b836" />
<corners android:radius="2dp" />
</shape>
\ No newline at end of file
baselib/src/main/res/drawable/shop_color_d4d4d4_radius12_stroke.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<stroke android:width="1dp" android:color="#999999" />
<corners android:radius="@dimen/dp_12" />
</shape>
\ No newline at end of file
baselib/src/main/res/layout-night/adapter_layout_empty_data_one.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<android.support.v7.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/ic_order_confirmation" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
android:text="@string/no_business_was_found"
android:layout_marginBottom="@dimen/dp_4"
android:textColor="@color/color_a6a6a6"
android:textSize="@dimen/sp_13" />
</android.support.v7.widget.LinearLayoutCompat>
\ No newline at end of file
baselib/src/main/res/layout-night/dialog_select_format.xml
......@@ -135,7 +135,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_10"
android:src="@mipmap/ic_home_mall_order_reduce_copy" />
android:src="@mipmap/ic_home_mall_order_reduce_copy_night" />
</LinearLayout>
<Button
......
baselib/src/main/res/layout-night/gv_filter_image.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto">
<RelativeLayout
android:layout_width="85dp"
android:layout_height="85dp"
android:layout_centerInParent="true">
<android.support.constraint.ConstraintLayout
android:layout_width="wrap_content"
android:layout_alignParentBottom="true"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/fiv"
android:layout_width="80dp"
android:layout_height="80dp"
android:scaleType="centerCrop"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
android:src="@mipmap/ic_evaluation_increase" />
<TextView
android:id="@+id/tv_tip_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/sp_12"
android:visibility="gone"
android:textColor="@color/color99"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginBottom="@dimen/dp_10"
android:text="@string/upload_photos"/>
</android.support.constraint.ConstraintLayout>
<LinearLayout
android:id="@+id/ll_del"
android:layout_width="30dp"
android:layout_height="35dp"
android:layout_alignParentRight="true"
android:gravity="right"
android:orientation="vertical">
<ImageView
android:id="@+id/iv_del"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:scaleType="center"
android:src="@mipmap/ic_mall_order_comment_close" />
</LinearLayout>
<TextView
android:id="@+id/tv_duration"
android:layout_width="80dp"
android:layout_height="30dp"
android:layout_alignParentBottom="true"
android:layout_marginBottom="5dp"
android:drawablePadding="5dp"
android:gravity="center_vertical"
android:paddingLeft="5dp"
android:paddingTop="8dp"
android:text="00:00"
android:textColor="@color/white"
android:textSize="11sp"
android:visibility="gone" />
</RelativeLayout>
</RelativeLayout>
\ No newline at end of file
baselib/src/main/res/layout/adapter_layout_empty_data_one.xml
......@@ -6,9 +6,9 @@
android:orientation="vertical">
<ImageView
android:layout_width="100dp"
android:layout_height="100dp"
android:src="@mipmap/pic_my_home_no_order" />
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/ic_order_confirmation" />
<TextView
android:layout_width="wrap_content"
......
baselib/src/main/res/layout/adapter_layout_empty_order.xml
......@@ -9,7 +9,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="130dp"
android:src="@mipmap/pic_my_home_no_order" />
android:src="@mipmap/ic_order_confirmation" />
<TextView
android:layout_width="wrap_content"
......
baselib/src/main/res/layout/dialog_input_remark.xml
......@@ -27,7 +27,7 @@
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
android:textSize="@dimen/sp_18"
android:textColor="@color/white"/>
android:textColor="@color/color_171717"/>
<ImageView
android:id="@+id/iv_dialog_close"
......@@ -76,7 +76,7 @@
android:layout_height="@dimen/dp_38"
android:background="@color/btn_bg"
android:textSize="@dimen/sp_16"
android:textColor="@color/white"
android:textColor="@color/color_171717"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_15"
android:layout_marginBottom="@dimen/dp_26"
......
baselib/src/main/res/layout/dialog_item_call.xml
......@@ -72,7 +72,7 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/ic_home_mall_dial"
android:src="@mipmap/ic_details_phone"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
......
baselib/src/main/res/layout/dialog_select_format.xml
......@@ -135,7 +135,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_10"
android:src="@mipmap/ic_home_mall_order_reduce_copy" />
android:src="@mipmap/ic_home_mall_order_reduce_copy_night" />
</LinearLayout>
<Button
......@@ -144,7 +144,7 @@
android:layout_height="match_parent"
android:background="@color/btn_bg"
android:text="@string/add_menu"
android:textColor="@color/white"
android:textColor="@color/color_171717"
android:textSize="@dimen/sp_17"
android:visibility="gone" />
</FrameLayout>
......
baselib/src/main/res/layout/gv_filter_image.xml
......@@ -23,13 +23,14 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
android:src="@mipmap/pic_mall_order_comment" />
android:src="@mipmap/ic_evaluation_increase" />
<TextView
android:id="@+id/tv_tip_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/sp_12"
android:visibility="gone"
android:textColor="@color/color99"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
......
baselib/src/main/res/values-en/strings.xml
......@@ -493,5 +493,8 @@
<string name="address_manager">Address management</string>
<string name="login_Invalid">Login invalid</string>
<string name="Please_select_a_star_rating">select star level</string>
<string name="view_all_comments">View all comments</string>
<string name="latest_order">Latest order</string>
<string name="grading_order">Hierarchical sequential</string>
</resources>
\ No newline at end of file
baselib/src/main/res/values-ja-rJP/strings.xml
......@@ -491,5 +491,8 @@
<string name="address_manager">アドレス</string>
<string name="login_Invalid">ログイン情報が無効です</string>
<string name="Please_select_a_star_rating">星を選択し</string>
<string name="view_all_comments">すべての評価を見る</string>
<string name="latest_order">最新の順序</string>
<string name="grading_order">評価の順序</string>
</resources>
\ No newline at end of file
baselib/src/main/res/values-ko-rKR/strings.xml
......@@ -506,4 +506,7 @@
<string name="address_manager">주소 관리 </string>
<string name="login_Invalid">로그인 정보 유효하지 않습니다</string>
<string name="Please_select_a_star_rating">별점을 남겨해주세요</string>
<string name="view_all_comments">查看全部评价</string>
<string name="latest_order">最新顺序</string>
<string name="grading_order">评分顺序</string>
</resources>
baselib/src/main/res/values-ko/strings.xml
......@@ -506,4 +506,7 @@
<string name="address_manager">주소 관리 </string>
<string name="login_Invalid">로그인 정보 유효하지 않습니다</string>
<string name="Please_select_a_star_rating">별점을 남겨해주세요</string>
<string name="view_all_comments">전 평가 보기</string>
<string name="latest_order">최신 순서</string>
<string name="grading_order">채점 순서</string>
</resources>
baselib/src/main/res/values-zh-rCN/strings.xml
......@@ -491,4 +491,7 @@
<string name="address_manager">地址管理</string>
<string name="login_Invalid">登录信息失效</string>
<string name="Please_select_a_star_rating">请选择星级</string>
<string name="view_all_comments">查看全部评价</string>
<string name="latest_order">最新顺序</string>
<string name="grading_order">评分顺序</string>
</resources>
baselib/src/main/res/values/colors.xml
......@@ -95,4 +95,6 @@
<color name="color_fbbc39">#FBBC39</color>
<color name="color_666666">#666666</color>
<color name="color_999999">#999999</color>
<color name="color_686868">#686868</color>
<color name="color_ebebeb">#EBEBEB</color>
</resources>
\ No newline at end of file
baselib/src/main/res/values/strings.xml
......@@ -491,5 +491,8 @@
<string name="address_manager">地址管理</string>
<string name="login_Invalid">登录信息失效</string>
<string name="Please_select_a_star_rating">请选择星级</string>
<string name="view_all_comments">查看全部评价</string>
<string name="latest_order">最新顺序</string>
<string name="grading_order">评分顺序</string>
</resources>
build.gradle
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext.kotlin_version = '1.2.71'
ext.kotlin_version = '1.3.0'
apply from: 'deps.gradle'
repositories {
google()
......
zxinglibrary/src/main/res/layout-night/activity_capture.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="com.yzq.zxinglibrary.android.CaptureActivity">
<!-- 整体透明画布 -->
<SurfaceView
android:id="@+id/preview_view"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<android.support.v7.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_alignParentStart="true"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:orientation="vertical">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<!-- 扫描取景框 -->
<com.yzq.zxinglibrary.view.ViewfinderView
android:id="@+id/viewfinder_view"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="370dp"
android:text="@string/please_put_the_two_dimensional_code_of_Wechat_in_the_box"
android:textColor="#ffffff"
android:textSize="14sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="400dp"
android:text="@string/wechat_two_dimensional_code"
android:textColor="#FF6B5C"
android:textSize="16sp" />
</FrameLayout>
<android.support.v7.widget.LinearLayoutCompat
android:id="@+id/bottomLayout"
android:layout_width="match_parent"
android:layout_height="96dp"
android:layout_gravity="bottom"
android:background="#99000000"
android:orientation="horizontal"
android:visibility="gone">
<android.support.v7.widget.LinearLayoutCompat
android:id="@+id/flashLightLayout"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<android.support.v7.widget.AppCompatImageView
android:id="@+id/flashLightIv"
android:layout_width="36dp"
android:layout_height="36dp"
app:srcCompat="@drawable/ic_close" />
<TextView
android:id="@+id/flashLightTv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:gravity="center"
android:text="@string/open_flash"
android:textColor="#ffffff" />
</android.support.v7.widget.LinearLayoutCompat>
<android.support.v7.widget.LinearLayoutCompat
android:id="@+id/albumLayout"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<android.support.v7.widget.AppCompatImageView
android:id="@+id/albumIv"
android:layout_width="36dp"
android:layout_height="36dp"
android:tint="#ffffffff"
app:srcCompat="@drawable/ic_photo" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:gravity="center"
android:text="@string/gallery"
android:textColor="#ffffff" />
</android.support.v7.widget.LinearLayoutCompat>
</android.support.v7.widget.LinearLayoutCompat>
</android.support.v7.widget.LinearLayoutCompat>
</RelativeLayout>
\ No newline at end of file
zxinglibrary/src/main/res/layout/activity_capture.xml
......@@ -46,7 +46,7 @@
android:layout_gravity="center_horizontal"
android:layout_marginTop="400dp"
android:text="@string/wechat_two_dimensional_code"
android:textColor="#FF6B5C"
android:textColor="#F7B938"
android:textSize="16sp" />
</FrameLayout>
......
zxinglibrary/src/main/res/values/colors.xml
......@@ -11,8 +11,8 @@
<color name="result_view">#000000</color>
<color name="status_text">#ffffff</color>
<color name="viewfinder_mask">#50000000</color>
<color name="react">#FF6B5C</color>
<color name="scanLineColor">#FF6B5C</color>
<color name="react">#F7B938</color>
<color name="scanLineColor">#F7B938</color>
<color name="defaultColor">#ffffff</color>
......
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