新增英语和日语，调整UI

app/src/main/java/cn/dankal/client/MainActivity.kt

@@ -49,7 +49,7 @@ import kotlinx.android.synthetic.main.activity_main.*
 import okhttp3.ResponseBody
 import java.lang.reflect.Field
 
-@Route(path = MAIN)
+
 class MainActivity : BaseActivity(), OnMapReadyCallback {
     override fun onMapReady(p0: GoogleMap?) {
         mMap = p0

app/src/main/java/cn/dankal/client/adapter/MenuItemAdapter.java

@@ -4,6 +4,9 @@ import android.support.annotation.Nullable;
 import android.text.TextUtils;
 import android.widget.ImageView;
 
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
+import com.bumptech.glide.request.RequestOptions;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 
@@ -25,7 +28,7 @@ public class MenuItemAdapter extends BaseQuickAdapter<RestaurantEntity.DataBean,
     @Override
     protected void convert(BaseViewHolder helper, RestaurantEntity.DataBean item) {
         helper.setText(R.id.tv_menu_text, item.getHotel_name() + "(" + item.getAddress() + ")");
-        if (!TextUtils.isEmpty(item.getDistance())){
+        if (!TextUtils.isEmpty(item.getDistance())) {
             helper.setText(R.id.tv_menu_distance, mContext.getString(R.string.distance) + item.getDistance());
         }
         ImageView imageView = helper.getView(R.id.iv_menu_image);

app/src/main/java/cn/dankal/client/adapter/shop/ShopTypeTitleAdapter.java

@@ -10,6 +10,7 @@ import com.chad.library.adapter.base.BaseViewHolder;
 
 import java.util.List;
 
+import cn.dankal.basiclib.DankalApplication;
 import cn.dankal.entities.home.RestaurantDetailEntity;
 import cn.dankal.client.R;
 
@@ -31,14 +32,21 @@ public class ShopTypeTitleAdapter extends BaseQuickAdapter<RestaurantDetailEntit
     protected void convert(BaseViewHolder helper, RestaurantDetailEntity.GoodsTypeListBean item) {
 
         helper.setText(R.id.tv_menu_type, item.getName());
-
         LinearLayoutCompat linearLayoutCompat = helper.getView(R.id.ll_item_title);
         if (sparseBooleanArray.get(helper.getAdapterPosition())) {
             helper.setVisible(R.id.tv_item_title_tag, true);
-            linearLayoutCompat.setBackgroundColor(context.getResources().getColor(R.color.white));
+            if (DankalApplication.isDarkMode()){
+                linearLayoutCompat.setBackgroundColor(context.getResources().getColor(R.color.color_191919));
+            }else {
+                linearLayoutCompat.setBackgroundColor(context.getResources().getColor(R.color.white));
+            }
         } else {
             helper.setVisible(R.id.tv_item_title_tag, false);
-            linearLayoutCompat.setBackgroundColor(context.getResources().getColor(R.color.btn_bg_tow));
+            if (DankalApplication.isDarkMode()) {
+                linearLayoutCompat.setBackgroundColor(context.getResources().getColor(R.color.color_ff2f2f2f));
+            }else {
+                linearLayoutCompat.setBackgroundColor(context.getResources().getColor(R.color.btn_bg_tow));
+            }
         }
     }
 }

app/src/main/java/cn/dankal/client/ui/home/HomeActivity.kt

+package cn.dankal.client.ui.home
+
+import android.Manifest
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.location.Location
+import android.location.LocationManager
+import android.os.Build
+import android.support.v7.app.AppCompatActivity
+import android.os.Bundle
+import android.support.constraint.ConstraintLayout
+import android.support.v4.app.ActivityCompat
+import android.support.v4.app.Fragment
+import android.support.v7.widget.LinearLayoutCompat
+import android.view.View
+import android.view.ViewGroup
+import android.view.WindowManager
+import cn.dankal.basiclib.DankalApplication
+import cn.dankal.basiclib.base.activity.BaseActivity
+import cn.dankal.basiclib.base.fragmentactivity.FragmentAdapter
+import cn.dankal.basiclib.constant.Constant
+import cn.dankal.basiclib.rx.AbstractDialogSubscriber
+import cn.dankal.basiclib.util.AppUtils
+import cn.dankal.basiclib.util.DisplayHelper
+import cn.dankal.basiclib.util.SPUtils
+import cn.dankal.basiclib.util.ToastUtils
+import cn.dankal.basiclib.widget.banner.DkBannerTow
+import cn.dankal.basiclib.widget.banner.IViewHolder
+import cn.dankal.basiclib.widget.banner.VH
+import cn.dankal.client.R
+import cn.dankal.client.constants.ConstantsHomeType
+import cn.dankal.client.constants.ConstantsShopType
+import cn.dankal.client.ui.home.details.DishesDetailsTowActivity
+import cn.dankal.client.ui.home.holder.BannerItemView
+import cn.dankal.client.ui.home.map.GoogleMapsActivity
+import cn.dankal.client.ui.shop.ShopDetailActivity
+import cn.dankal.client.ui.shop.WebViewContentActivity
+import cn.dankal.entities.event.LocationChangeEvent
+import cn.dankal.entities.home.TopHomeInfoEntity
+import com.scwang.smartrefresh.layout.header.ClassicsHeader
+import com.yanzhenjie.permission.Permission
+import com.yzq.zxinglibrary.android.CaptureActivity
+import io.reactivex.disposables.Disposable
+import kotlinx.android.synthetic.main.fragment_home.*
+import org.greenrobot.eventbus.EventBus
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
+import api.HomeServiceFactory
+import cn.dankal.basiclib.protocol.MainProtocol
+import com.alibaba.android.arouter.facade.annotation.Route
+
+@Route(path = MainProtocol.MAIN)
+class HomeActivity : BaseActivity(), View.OnClickListener {
+
+    private var dataList: MutableList<Fragment>? = null
+    private var titles: MutableList<String>? = null
+
+    private var stringList = mutableListOf<String>()//轮播图地址
+    private var fragmentAdapter: FragmentAdapter? = null
+    private var bannerListBean: MutableList<TopHomeInfoEntity.BannerListBean>? = null//轮播图内容
+
+    private var lm: LocationManager? = null
+
+    override fun onClick(v: View?) {
+        when (v?.id) {
+            R.id.iv_home_search -> startActivity(Intent(this, SearchShopActivity::class.java))
+            R.id.iv_home_sweep -> {
+                requestPermission(Permission.CAMERA) {
+                    startActivityForResult(Intent(this, CaptureActivity::class.java), ConstantsHomeType.SCAN)
+                }
+            }
+            R.id.iv_home_location -> {
+                startActivity(Intent(this, GoogleMapsActivity::class.java))
+            }
+        }
+    }
+
+    override fun initComponents() {
+        EventBus.getDefault().register(this)
+        //初始化轮播图控件
+        //初始化TabLayout和ViewPage
+        dataList = ArrayList()
+        titles = ArrayList()
+
+        fragmentAdapter = FragmentAdapter(supportFragmentManager, dataList, titles)
+        vp_pager.adapter = fragmentAdapter
+        sliding_tabs.setViewPager(vp_pager)
+
+        refreshLayout.setRefreshHeader(ClassicsHeader(this).setEnableLastTime(false))
+        refreshLayout.setOnRefreshListener {
+            initLocation()
+            requestTopInfoList()
+        }
+        requestTopInfoList()
+        initLocation()
+
+        getStateBar()
+    }
+
+    //获取状态栏高度
+    private fun getStateBar() {
+        var result = 0
+        var resourceId = this.resources.getIdentifier("status_bar_height", "dimen", "android")
+        if (resourceId > 0) {
+            result = this.resources.getDimensionPixelSize(resourceId);
+            var layoutParams = ConstraintLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, result)
+            tv_state_bar.layoutParams = layoutParams
+        }
+    }
+
+    private fun judgeProvider(locationManager: LocationManager): String {
+        var podiatrist = locationManager?.getProviders(true)
+        if (podiatrist.contains(LocationManager.NETWORK_PROVIDER)) {
+            tv_location_tip.text = ""
+            return LocationManager.NETWORK_PROVIDER//网络定位
+        } else if (podiatrist.contains(LocationManager.GPS_PROVIDER)) {
+            tv_location_tip.text = ""
+            return LocationManager.GPS_PROVIDER//GPS定位
+        } else {
+            tv_location_tip.text = getString(R.string.unopened_positioning)
+            ToastUtils.showShort(getString(R.string.please_turn_on_positioning))
+            SPUtils.put(ConstantsHomeType.LATITUDE, "")
+            SPUtils.put(ConstantsHomeType.LONGITUDE, "")
+        }
+        return ""
+    }
+
+
+    private fun beginLocation(): Location? {
+        //获得位置服务
+        lm = getSystemService(Context.LOCATION_SERVICE) as LocationManager
+        lm?.let {
+            var provider = judgeProvider(it)
+            //有位置提供器的情况
+            if (provider != null) {
+                if (ActivityCompat.checkSelfPermission(DankalApplication.getContext(), Manifest.permission.ACCESS_FINE_LOCATION)
+                        != PackageManager.PERMISSION_GRANTED
+                        && ActivityCompat.checkSelfPermission(DankalApplication.getContext(), Manifest.permission.ACCESS_COARSE_LOCATION)
+                        != PackageManager.PERMISSION_GRANTED) {
+                    return null
+                }
+                return it.getLastKnownLocation(provider)
+            }
+        }
+        return null
+    }
+
+
+    //请求头部数据
+    private fun requestTopInfoList() {
+        HomeServiceFactory.getHomeListInfo(1, 20).subscribe(object : AbstractDialogSubscriber<TopHomeInfoEntity>(this) {
+            override fun onSubscribe(d: Disposable) {
+                addNetworkRequest(d)
+            }
+
+            override fun onNext(t: TopHomeInfoEntity) {
+                addTopData(t)
+                fragmentAdapter?.let {
+                    it.notifyDataSetChanged()
+                }
+            }
+
+            override fun onError(e: Throwable) {
+                refreshLayout.finishRefresh(true)
+            }
+
+            override fun onComplete() {
+                super.onComplete()
+                refreshLayout.finishRefresh(true)
+            }
+        })
+    }
+
+    override fun obtainData() {
+        //iv_home_search.setOnClickListener(this)
+        iv_home_sweep.setOnClickListener(this)
+        //iv_home_location.setOnClickListener(this)
+    }
+
+    //设置顶部数据
+    private fun addTopData(topHomeInfoEntity: TopHomeInfoEntity) {
+        bannerListBean = topHomeInfoEntity.banner_list
+        stringList?.clear()
+        for (i in bannerListBean?.indices!!) {
+            stringList?.add(bannerListBean!![i].img_url)
+        }
+
+        val listBeans = topHomeInfoEntity.hotel_type_list
+        dataList?.clear()
+        titles?.clear()
+        for (i in listBeans.indices) {
+            val hotelTypeListBeans = listBeans[i]
+            dataList?.add(getFragment(hotelTypeListBeans.uuid))
+            titles?.add(hotelTypeListBeans.name)
+        }
+        fragmentAdapter?.notifyDataSetChanged()
+        sliding_tabs.notifyDataSetChanged()
+    }
+
+    override fun getLayoutId(): Int {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            //透明状态栏
+            window.addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS)
+        }
+        return R.layout.activity_home
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        EventBus.getDefault().unregister(this)
+    }
+
+    private fun getFragment(type: String): Fragment {
+        val menuItemFragment = MenuItemFragment()
+        val bundle = Bundle()
+        bundle.putString("uuid", type)
+        menuItemFragment.arguments = bundle
+        return menuItemFragment
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public fun onLocationEventMessage(ocationChangeEvent: LocationChangeEvent) {
+        initLocation()
+        fragmentAdapter?.let {
+            it.notifyDataSetChanged()
+        }
+    }
+}
\ No newline at end of file

app/src/main/java/cn/dankal/client/ui/home/MenuItemFragment.java

@@ -352,7 +352,12 @@ public class MenuItemFragment extends BaseFragment {
         popupWindow = new MyPopupWindow(view, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT, true);
         popupWindow.setBackgroundDrawable(new ColorDrawable(0x00000000));
         popupWindow.setAnimationStyle(R.style.take_pop_window_anim_top);
-        popupWindow.showAtLocation(getActivity().getWindow().getDecorView(), Gravity.CENTER, 0, 0);
+        if (DankalApplication.isDarkMode()) {
+            popupWindow.showAtLocation(getActivity().getWindow().getDecorView(), Gravity.BOTTOM, 0, 0);
+        } else {
+            popupWindow.showAtLocation(getActivity().getWindow().getDecorView(), Gravity.CENTER, 0, 0);
+
+        }
         setBackgroundAlpha(0.5f);
         popupWindow.update();
         popupWindow.setOnDismissListener(() -> {

app/src/main/java/cn/dankal/client/ui/home/details/OrderResultActivity.kt

@@ -227,7 +227,7 @@ class OrderResultActivity : BaseActivity(), View.OnClickListener {
             override fun onNext(t: CommitHotelEntity) {
                 foodEntity = t
                 t.apply {
-                    var adapter = OrderResultAdapter(R.layout.item_order_child, this.pay_settle_goods_list,isStamp)
+                    var adapter = OrderResultAdapter(R.layout.item_order_child, this.pay_settle_goods_list, isStamp)
                     rv_order_result.layoutManager = LinearLayoutManager(this@OrderResultActivity)
                     rv_order_result.adapter = adapter
 

app/src/main/java/cn/dankal/client/ui/personal/QueueDetailsActivity.kt

@@ -2,24 +2,27 @@ package cn.dankal.client.ui.personal
 
 import android.app.Activity
 import android.content.Intent
+import android.support.v7.widget.LinearLayoutCompat
 import android.text.TextUtils
 import android.view.View
 import api.RestaurantServiceFactory
 import api.UserServiceFactory
+import cn.dankal.basiclib.DankalApplication
 import cn.dankal.basiclib.base.activity.BaseActivity
 import cn.dankal.basiclib.base.callback.DKCallBackBoolean
 import cn.dankal.basiclib.constant.ConstantsHomeType
 import cn.dankal.basiclib.rx.AbstractDialogSubscriber
 import cn.dankal.basiclib.util.ActivityManager
 import cn.dankal.basiclib.util.ToastUtils
-import cn.dankal.entities.home.QRCodeEntity
-import cn.dankal.entities.personal.QueueDetailsEntity
 import cn.dankal.client.MainActivity
 import cn.dankal.client.R
 import cn.dankal.client.constants.ConstantsRestaurantType
+import cn.dankal.client.ui.home.HomeActivity
 import cn.dankal.client.ui.home.ScanResultActivity
 import cn.dankal.client.ui.home.details.MerchantDetailsActivity
 import cn.dankal.client.ui.shop.QueueActivity
+import cn.dankal.entities.home.QRCodeEntity
+import cn.dankal.entities.personal.QueueDetailsEntity
 import com.google.gson.Gson
 import com.yzq.zxinglibrary.android.CaptureActivity
 import com.yzq.zxinglibrary.common.Constant
@@ -75,7 +78,12 @@ class QueueDetailsActivity : BaseActivity() {
                         ll_layout.visibility = View.GONE
                         //llBackGround.setBackgroundResource(R.mipmap.pic_home_queuing_bg_3);
                         iv_start_image.setImageResource(R.mipmap.ic_home_queuing)
-                        ll_background.background = resources.getDrawable(R.mipmap.pic_home_queuing_bg_3)
+                        if (DankalApplication.isDarkMode()) {
+                            val linearLayoutCompat = findViewById<LinearLayoutCompat>(R.id.ll_top_layout)
+                            linearLayoutCompat.background = resources.getDrawable(R.mipmap.ic_line_background_pass)
+                        } else {
+                            ll_background.background = resources.getDrawable(R.mipmap.pic_home_queuing_bg_3)
+                        }
                     }
                 }
             }
@@ -95,7 +103,7 @@ class QueueDetailsActivity : BaseActivity() {
                     }
                 }, true, true)
             } else {//返回首页
-                startActivity(Intent(this@QueueDetailsActivity, MainActivity::class.java))
+                startActivity(Intent(this@QueueDetailsActivity, HomeActivity::class.java))
             }
         }
 

app/src/main/java/cn/dankal/client/ui/personal/SettingActivity.kt

@@ -21,6 +21,7 @@ import cn.dankal.basiclib.util.*
 import cn.dankal.basiclib.util.language.LocalManageUtil
 import cn.dankal.basiclib.widget.CommonDialog
 import cn.dankal.basiclib.widget.dialog.SignOutDialog
+import cn.dankal.client.ui.home.HomeActivity
 import cn.dankal.client.ui.shop.AddressManagerActivity
 import cn.dankal.entities.personal.AboutDetailsEntity
 import cn.dankal.user.login.LoginActivity
@@ -177,7 +178,7 @@ class SettingActivity : BaseActivity(), CallDialog.OnCenterItemClickListener, Vi
             LanguageUtil.changeAppLanguage(DankalApplication.getContext(), language)
         }
         SPUtils.put(Constant.EVENT_REFRESH_LANGUAGE, language)
-        val intent = Intent(this, MainActivity::class.java)
+        val intent = Intent(this, HomeActivity::class.java)
         intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK
         startActivity(intent)
         finish()
@@ -189,7 +190,7 @@ class SettingActivity : BaseActivity(), CallDialog.OnCenterItemClickListener, Vi
 
         LocalManageUtil.saveSelectLanguage(this, select)
 
-        val intent = Intent(this, MainActivity::class.java)
+        val intent = Intent(this, HomeActivity::class.java)
         intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK
         startActivity(intent)
         finish()

app/src/main/java/cn/dankal/client/ui/service/MyFirebaseMessagingService.java

@@ -23,6 +23,7 @@ import cn.dankal.basiclib.rx.AbstractDialogSubscriber;
 import cn.dankal.client.MainActivity;
 import cn.dankal.client.R;
 import cn.dankal.client.constants.ConstantsRestaurantType;
+import cn.dankal.client.ui.home.HomeActivity;
 import cn.dankal.client.ui.home.details.MerchantDetailsActivity;
 import cn.dankal.client.ui.personal.order.food.OrderDetailsActivity;
 import cn.dankal.client.ui.personal.order.mall.MallOrderDetailsActivity;
@@ -139,7 +140,7 @@ public class MyFirebaseMessagingService extends FirebaseMessagingService {
                     intent = new Intent(this, MallOrderDetailsActivity.class).putExtra(ConstantsRestaurantType.UUID, orderHotelUuid);
                     break;
                 default:
-                    intent = new Intent(this, MainActivity.class);
+                    intent = new Intent(this, HomeActivity.class);
                     break;
             }
 

app/src/main/java/cn/dankal/client/ui/shop/MallPayResultActivity.kt

@@ -18,6 +18,7 @@ import cn.dankal.client.R
 import cn.dankal.client.MainActivity
 import cn.dankal.client.adapter.shop.ShopResultAdapter
 import cn.dankal.client.constants.ConstantsShopType
+import cn.dankal.client.ui.home.HomeActivity
 import cn.dankal.client.ui.personal.order.mall.EvaluationActivity
 import cn.dankal.client.ui.personal.order.mall.MallOrderActivity
 import com.chad.library.adapter.base.BaseQuickAdapter
@@ -37,7 +38,7 @@ class MallPayResultActivity : BaseActivity(), View.OnClickListener {
             }
             R.id.tv_result_home -> {//回到首页
                 if (type == 1) {
-                    startActivity(Intent(this@MallPayResultActivity, MainActivity::class.java))
+                    startActivity(Intent(this@MallPayResultActivity, HomeActivity::class.java))
                 }
                 if (type == 2) {//立即评价
                     var intent = Intent(this@MallPayResultActivity, EvaluationActivity::class.java)

app/src/main/java/cn/dankal/client/ui/shop/QueueResultActivity.java

@@ -20,11 +20,13 @@ import api.RestaurantServiceFactory;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
+import cn.dankal.basiclib.DankalApplication;
 import cn.dankal.basiclib.base.activity.BaseActivity;
 import cn.dankal.basiclib.constant.ConstantsHomeType;
 import cn.dankal.basiclib.rx.AbstractDialogSubscriber;
 import cn.dankal.basiclib.util.ActivityManager;
 import cn.dankal.basiclib.util.ToastUtils;
+import cn.dankal.client.ui.home.HomeActivity;
 import cn.dankal.entities.event.UpdateStateEvent;
 import cn.dankal.entities.home.CommitQueueEntity;
 import cn.dankal.entities.home.QRCodeEntity;
@@ -125,7 +127,12 @@ public class QueueResultActivity extends BaseActivity {
                 tvYouQueue.setText(getString(R.string.please_queue_again));
                 llLayout.setVisibility(View.GONE);
                 ivStartImage.setImageResource(R.mipmap.ic_home_queuing);
-                llBackground.setBackground(getResources().getDrawable(R.mipmap.pic_home_queuing_bg_3));
+                if (DankalApplication.isDarkMode()){
+                    LinearLayoutCompat linearLayoutCompat=findViewById(R.id.ll_top_layout);
+                    linearLayoutCompat.setBackground(getResources().getDrawable(R.mipmap.ic_line_background_pass));
+                }else {
+                    llBackground.setBackground(getResources().getDrawable(R.mipmap.pic_home_queuing_bg_3));
+                }
                 break;
         }
     }
@@ -158,7 +165,7 @@ public class QueueResultActivity extends BaseActivity {
                         }
                     }, true, true);
                 } else {//返回首页
-                    startActivity(new Intent(QueueResultActivity.this, MainActivity.class));
+                    startActivity(new Intent(QueueResultActivity.this, HomeActivity.class));
                 }
                 break;
             case R.id.btn_order:

app/src/main/java/cn/dankal/client/ui/shop/ShopDetailActivity.kt

@@ -33,6 +33,7 @@ import cn.dankal.client.MainActivity
 import cn.dankal.client.R
 import cn.dankal.client.adapter.shop.CommentImageAdapter
 import cn.dankal.client.constants.ConstantsShopType
+import cn.dankal.client.ui.home.HomeActivity
 import cn.dankal.client.util.UIUtile
 import com.zhy.view.flowlayout.FlowLayout
 import com.zhy.view.flowlayout.TagAdapter
@@ -92,7 +93,7 @@ class ShopDetailActivity : BaseActivity(), View.OnClickListener {
                     finish()
                 }
             }
-            R.id.tv_button_shopping_cart -> startActivity(Intent(this, MainActivity::class.java).putExtra("car", 2))
+            R.id.tv_button_shopping_cart -> startActivity(Intent(this, HomeActivity::class.java).putExtra("car", 2))
             R.id.tv_mall_detail_pay -> {
                 operateType = 1
                 //settleAccounts()

app/src/main/res/drawable/shop_home_bottom_itme_bg_light.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="@color/color_ff2f2f2f" />
+    <solid android:color="@color/color_ff2f2f2f" />
+    <corners android:radius="2dp" />
+</shape>
\ No newline at end of file

app/src/main/res/layout-night/activity_appeal_result.xml

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout 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="cn.dankal.client.ui.personal.order.food.AppealResultActivity">
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="@dimen/dp_80"
+        android:src="@mipmap/ic_complaint_successful"/>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/successful_order_appeal"
+        android:textSize="@dimen/sp_18"
+        android:textColor="@color/color_d3d3d3"
+        android:layout_marginTop="@dimen/dp_21"
+        android:layout_gravity="center_horizontal"/>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="@color/color_a6a6a6"
+        android:textSize="@dimen/sp_15"
+        android:layout_marginTop="@dimen/dp_10"
+        android:layout_gravity="center_horizontal"
+        android:text="@string/please_wait_patiently_for_background_processing"/>
+    
+    <TextView
+        android:id="@+id/tv_return"
+        android:background="@drawable/bg_button_return_night"
+        android:layout_width="@dimen/dp_124"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="@dimen/dp_35"
+        android:text="@string/come_back"
+        android:textSize="@dimen/sp_14"
+        android:textColor="@color/color_171717"
+        android:gravity="center"
+        android:layout_height="@dimen/dp_34" />
+
+</LinearLayout>

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"
+    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:background="@color/color_ff2f2f2f"
+    tools:context="cn.dankal.client.ui.home.details.DishesDetailsActivity">
+
+    <android.support.v4.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <android.support.v7.widget.LinearLayoutCompat
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+            <FrameLayout
+                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>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/tv_mall_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/dp_15"
+                    android:layout_marginTop="@dimen/dp_7"
+                    android:layout_marginRight="@dimen/dp_15"
+                    android:textColor="@color/color_d3d3d3"
+                    android:textSize="@dimen/sp_17"
+                    tools:text="蔓越莓1盒125g12个装 单果重约150g~180g 新鲜水果xxx" />
+
+                <TextView
+                    android:id="@+id/tv_mall_sales"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/dp_15"
+                    android:layout_marginTop="@dimen/dp_7"
+                    android:layout_marginRight="@dimen/dp_15"
+                    android:textColor="@color/color_a6a6a6"
+                    tools:text="月售100 赞18" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:id="@+id/tv_mall_unit_price"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/dp_15"
+                        android:layout_weight="1"
+                        android:textColor="@color/font_FF3B30"
+                        android:textSize="@dimen/sp_22" />
+
+                    <TextView
+                        android:id="@+id/tv_select_spec"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="@dimen/dp_16"
+                        android:background="@drawable/bg_button_specification_night"
+                        android:paddingLeft="@dimen/dp_9"
+                        android:paddingTop="@dimen/dp_5"
+                        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" />
+
+                </LinearLayout>
+
+
+            </LinearLayout>
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_1"
+                android:layout_marginLeft="@dimen/dp_15"
+                android:layout_marginTop="@dimen/dp_16"
+                android:layout_marginRight="@dimen/dp_15"
+                android:background="@color/color_3d3d3d" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/dp_12"
+                android:layout_marginTop="@dimen/dp_10"
+                android:layout_marginBottom="@dimen/dp_10"
+                android:text="@string/commodity_details"
+                android:textColor="@color/color_d3d3d3"
+                android:textSize="@dimen/sp_14" />
+
+            <WebView
+                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.support.v7.widget.LinearLayoutCompat>
+
+    </android.support.v4.widget.NestedScrollView>
+
+    <android.support.constraint.ConstraintLayout
+        android:id="@+id/cl_shop_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_55"
+            android:background="@color/color_232323"
+            android:orientation="horizontal"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent">
+
+            <cn.dankal.basiclib.widget.AdaptTextView
+                android:id="@+id/tv_bottom_shop_tip_text"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="@dimen/dp_84"
+                android:layout_marginRight="@dimen/dp_10"
+                android:layout_weight="1"
+                android:gravity="center_vertical"
+                android:text="@string/you_have_not_added_any_items_yet"
+                android:textColor="@color/color_595959"
+                android:textSize="@dimen/sp_16" />
+
+            <TextView
+                android:id="@+id/tv_bottom_shop_button"
+                android:layout_width="@dimen/dp_134"
+                android:layout_height="@dimen/dp_55"
+                android:background="@color/bg_fff5f5f5"
+                android:gravity="center"
+                android:text="@string/selected"
+                android:textColor="@color/color_a6a6a6"
+                android:textSize="@dimen/sp_17" />
+
+        </LinearLayout>
+
+        <ImageView
+            android:id="@+id/iv_menu_picture"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/dp_15"
+            android:layout_marginBottom="@dimen/dp_10"
+            android:src="@mipmap/ic_home_mall_order"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent" />
+
+        <TextView
+            android:id="@+id/tv_bottom_shop_count"
+            android:layout_width="@dimen/dp_20"
+            android:layout_height="@dimen/dp_20"
+            android:background="@drawable/bg_count_yellow_circle"
+            android:gravity="center"
+            android:text="0"
+            android:textColor="@color/white"
+            app:layout_constraintRight_toRightOf="@id/iv_menu_picture"
+            app:layout_constraintTop_toTopOf="@id/iv_menu_picture" />
+
+
+    </android.support.constraint.ConstraintLayout>
+
+    <Button
+        android:id="@+id/btn_details_queue"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_50"
+        android:background="@color/btn_bg"
+        android:text="@string/reserved_queue"
+        android:textColor="@color/white"
+        android:textSize="@dimen/sp_20"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent" />
+
+    <TextView
+        android:id="@+id/tv_shop_tip"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_44"
+        android:background="#b3000000"
+        android:gravity="center"
+        android:text="@string/businessmen_are_not_in_business_for_the_time_being"
+        android:textColor="@color/white"
+        android:textSize="@dimen/sp_16"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent" />
+</android.support.constraint.ConstraintLayout>

app/src/main/res/layout-night/activity_food_order.xml

+<?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.FoodOrderActivity">
+
+    <android.support.design.widget.TabLayout
+        android:id="@+id/sliding_tabs"
+        style="@style/MyCustomTabLayoutNight"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/color_232323"
+        app:tabGravity="fill"
+        app:tabMode="scrollable" />
+
+    <android.support.v4.view.ViewPager
+        android:id="@+id/vp_pager"
+        android:background="@color/color_191919"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1" />
+</android.support.v7.widget.LinearLayoutCompat>

app/src/main/res/layout-night/activity_home.xml

+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tl="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:background="@color/color_191919"
+    android:descendantFocusability="beforeDescendants"
+    android:focusable="true"
+    android:focusableInTouchMode="true"
+    android:orientation="vertical"
+    tools:context="cn.dankal.client.ui.home.HomeFragment">
+
+    <TextView
+        android:id="@+id/tv_state_bar"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_25"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:scaleType="centerCrop"
+        app:layout_constraintTop_toTopOf="parent"
+        android:src="@mipmap/pic_home_01"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent" />
+
+
+    <android.support.v7.widget.LinearLayoutCompat
+        android:id="@+id/ll_home_layout"
+        android:layout_width="match_parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tv_state_bar"
+        android:layout_height="0dp">
+
+
+        <RelativeLayout
+            android:id="@+id/cl_title"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_45"
+            android:orientation="horizontal">
+
+
+            <ImageView
+                android:id="@+id/tv_title"
+                android:layout_width="@dimen/dp_152"
+                android:layout_height="@dimen/dp_16"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="@dimen/dp_16"
+                android:src="@mipmap/ic_combined_shape" />
+
+            <ImageView
+                android:id="@+id/iv_home_sweep"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_marginRight="@dimen/dp_12"
+                android:src="@mipmap/ic_home_scanning_light" />
+
+        </RelativeLayout>
+
+        <com.scwang.smartrefresh.layout.SmartRefreshLayout
+            android:id="@+id/refreshLayout"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <cn.dankal.basiclib.widget.VerticalScrollView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:overScrollMode="never"
+                android:scrollbars="none">
+
+                <android.support.v7.widget.LinearLayoutCompat
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:orientation="vertical">
+
+                    <com.flyco.tablayout.SlidingTabLayout
+                        android:id="@+id/sliding_tabs"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/dp_10"
+                        android:layout_marginTop="@dimen/dp_17"
+                        tl:tl_indicator_color="@color/color_fffbbc39"
+                        tl:tl_indicator_height="@dimen/dp_2"
+                        tl:tl_indicator_width_equal_title="true"
+                        tl:tl_tab_padding="@dimen/dp_8"
+                        tl:tl_tab_space_equal="false"
+                        tl:tl_textSelectColor="@color/color33"
+                        tl:tl_textUnselectColor="#686868"
+                        tl:tl_textsize="17sp"
+                        tl:tl_underline_color="@color/white"
+                        tl:tl_underline_height="0dp" />
+
+                    <cn.dankal.basiclib.widget.MyViewPager
+                        android:id="@+id/vp_pager"
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/dp_600" />
+
+                </android.support.v7.widget.LinearLayoutCompat>
+            </cn.dankal.basiclib.widget.VerticalScrollView>
+
+
+        </com.scwang.smartrefresh.layout.SmartRefreshLayout>
+
+
+    </android.support.v7.widget.LinearLayoutCompat>
+
+</android.support.constraint.ConstraintLayout>

app/src/main/res/layout-night/activity_my_queue.xml

+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v7.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tl="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.MyQueueActivity">
+
+    <com.flyco.tablayout.SlidingTabLayout
+        android:id="@+id/sliding_tabs"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_55"
+        android:background="@color/color_232323"
+        tl:tl_indicator_color="@color/color_ff7b836"
+        tl:tl_indicator_height="@dimen/dp_2"
+        tl:tl_indicator_width="@dimen/dp_18"
+        tl:tl_tab_padding="@dimen/dp_8"
+        tl:tl_tab_space_equal="true"
+        tl:tl_textSelectColor="@color/color_d3d3d3"
+        tl:tl_textUnselectColor="@color/color_595959"
+        tl:tl_textsize="@dimen/sp_12"
+        tl_indicator_anim_enable="false"
+        tl:tl_underline_color="@color/color_191919"
+        tl:tl_underline_height="@dimen/dp_1" />
+
+    <cn.dankal.basiclib.widget.CustomViewPage
+        android:id="@+id/vp_pager"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</android.support.v7.widget.LinearLayoutCompat>

app/src/main/res/layout-night/activity_nearby_merchant.xml

+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v7.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
+    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="cn.dankal.client.ui.home.NearbyMerchantActivity">
+
+    <LinearLayout
+        android:id="@+id/ll_see_map"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/color_232323"
+        android:gravity="center"
+        android:orientation="horizontal">
+
+        <TextView
+            android:layout_width="0dp" android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/dp_20"
+            android:layout_weight="1"
+            android:text="@string/view_the_map_page_of_nearby_businesses"
+            android:textColor="@color/color_a6a6a6"
+            android:textSize="@dimen/sp_11" />
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dp_10"
+            android:layout_marginRight="@dimen/dp_15"
+            android:layout_marginBottom="@dimen/dp_10"
+            android:src="@mipmap/ic_home_mall_location_again" />
+    </LinearLayout>
+
+    <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>

app/src/main/res/layout-night/activity_queue.xml

+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView 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:background="@color/color_191919"
+    tools:context="cn.dankal.client.ui.shop.QueueActivity">
+
+    <android.support.v7.widget.LinearLayoutCompat
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dp_20"
+            android:layout_marginBottom="@dimen/dp_19"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <FrameLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1">
+
+                <cn.dankal.basiclib.widget.AdaptTextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/dimen_18_dp"
+                    android:drawableLeft="@mipmap/ic_home_take_number"
+                    android:drawablePadding="@dimen/dp_8"
+                    android:text="@string/queue_number"
+                    android:textColor="@color/color_d3d3d3"
+                    android:textSize="@dimen/sp_16" />
+            </FrameLayout>
+
+
+            <cn.dankal.basiclib.widget.AdaptTextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:textColor="@color/color_191919"
+                android:textSize="@dimen/sp_14"
+                android:text="@string/waiting_time" />
+
+            <cn.dankal.basiclib.widget.AdaptTextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:textColor="@color/color_191919"
+                android:textSize="@dimen/sp_14"
+                android:text="@string/number_of_remaining_tables" />
+        </LinearLayout>
+
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/rv_queue_state"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:nestedScrollingEnabled="true"
+            android:overScrollMode="never" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dp_15"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/dp_15"
+                android:src="@mipmap/ic_home_tips" />
+
+            <TextView
+                android:id="@+id/tv_tip"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/dp_4"
+                android:layout_marginRight="@dimen/dp_17"
+                android:text="@string/tip_text_table"
+                android:textColor="@color/color_a6a6a6"
+                android:textSize="@dimen/sp_13" />
+        </LinearLayout>
+
+        <Button
+            android:id="@+id/bt_take_number"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/dp_20"
+            android:layout_marginTop="@dimen/dp_25"
+            android:layout_marginRight="@dimen/dp_20"
+            android:background="@drawable/bg_button_select_language_night"
+            android:text="@string/queue_number"
+            android:textColor="@color/color_171717"
+            android:textSize="16sp"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/divider_passwd" />
+
+    </android.support.v7.widget.LinearLayoutCompat>
+
+
+</ScrollView>

app/src/main/res/layout-night/activity_scan_result.xml

+<?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:gravity="center_horizontal"
+    android:orientation="vertical"
+    android:background="@color/color_232323"
+    tools:context="cn.dankal.client.ui.home.ScanResultActivity">
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp_108"
+        android:src="@mipmap/ic_home_scan_fail" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp_23"
+        android:text="@string/scanning_failure_tow"
+        android:textStyle="bold"
+        android:textColor="@color/font_313131"
+        android:textSize="@dimen/sp_13" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="@dimen/sp_15"
+        android:layout_marginTop="@dimen/dp_11"
+        android:textColor="@color/colorC1"
+        android:text="@string/two_dimensional_accessed"/>
+
+    <TextView
+        android:id="@+id/tv_button_result"
+        android:layout_width="@dimen/dp_124"
+        android:layout_height="@dimen/dp_34"
+        android:layout_marginTop="@dimen/dp_16"
+        android:background="@drawable/bg_button_red_circle_solid"
+        android:gravity="center"
+        android:text="@string/come_back"
+        android:textColor="@color/white" />
+</android.support.v7.widget.LinearLayoutCompat>

app/src/main/res/layout-night/activity_search.xml

+<?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="match_parent"
+    android:background="@color/color_191919"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_52"
+        android:orientation="horizontal">
+
+        <EditText
+            android:id="@+id/et_search"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="@dimen/dp_15"
+            android:layout_marginTop="@dimen/dp_10"
+            android:layout_marginBottom="@dimen/dp_10"
+            android:layout_weight="1"
+            android:imeOptions="actionSearch"
+            android:inputType="text"
+            android:background="@drawable/bg_search_gary"
+            android:drawableLeft="@mipmap/ic_home_search_1"
+            android:drawablePadding="@dimen/dp_10"
+            android:hint="@string/please_enter_the_name_merchant"
+            android:paddingLeft="@dimen/dp_10" />
+
+        <TextView
+            android:id="@+id/tv_search"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:gravity="center_vertical"
+            android:paddingLeft="@dimen/dp_14"
+            android:paddingRight="@dimen/dp_15"
+            android:text="@string/search"
+            android:textColor="@color/color_fffbbc39"
+            android:textSize="@dimen/sp_14" />
+    </LinearLayout>
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dimen_1_dp"
+        android:background="#E5E5E5" />
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <android.support.v4.widget.NestedScrollView
+            android:id="@+id/nv_search"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="@dimen/dp_15"
+                    android:text="@string/hot_search"
+                    android:textColor="@color/color_d3d3d3"
+                    android:textSize="@dimen/sp_18" />
+
+                <com.zhy.view.flowlayout.TagFlowLayout
+                    android:id="@+id/fl_tag_one"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:padding="20dp"
+                    app:layout_constraintTop_toBottomOf="@id/tv_format"
+                    app:max_select="-1" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/dp_15"
+                        android:layout_weight="1"
+                        android:text="@string/search_history"
+                        android:textColor="@color/font_tow"
+                        android:textSize="@dimen/sp_18" />
+
+                    <TextView
+                        android:id="@+id/tv_clean_history"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="@dimen/dp_15"
+                        android:drawableRight="@mipmap/ic_home_search_delete"
+                        android:drawablePadding="@dimen/dp_5"
+                        android:textColor="@color/color_a6a6a6"
+                        android:gravity="right"
+                        android:text="@string/empty_history" />
+                </LinearLayout>
+
+                <cn.dankal.basiclib.widget.NestedListView
+                    android:id="@+id/lv_history"
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_marginLeft="@dimen/dp_15"
+                    android:layout_marginRight="@dimen/dp_15"
+                    android:layout_weight="1" />
+            </LinearLayout>
+        </android.support.v4.widget.NestedScrollView>
+
+        <com.scwang.smartrefresh.layout.SmartRefreshLayout
+            android:id="@+id/refreshLayout"
+            android:visibility="gone"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/rv_search_result"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:overScrollMode="never" />
+        </com.scwang.smartrefresh.layout.SmartRefreshLayout>
+
+    </FrameLayout>
+
+
+</android.support.v7.widget.LinearLayoutCompat>

app/src/main/res/layout-night/activity_select_pay.xml

+<?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="cn.dankal.client.ui.home.details.SelectPayActivity">
+
+    <LinearLayout
+        android:id="@+id/ll_a_pay"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_72"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:visibility="gone">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/dp_15"
+            android:src="@mipmap/ic_home_alipay" />
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/dp_14"
+            android:layout_weight="1"
+            android:text="@string/alipay_payment"
+            android:textColor="@color/font_383A48"
+            android:textSize="@dimen/sp_15" />
+
+    </LinearLayout>
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dimen_1_dp"
+        android:layout_marginLeft="@dimen/dp_15"
+        android:alpha="0.2"
+        android:visibility="gone"
+        android:background="@color/line_one" />
+
+    <LinearLayout
+        android:id="@+id/ll_w_pay"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_72"
+        android:background="@color/color_232323"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/dp_15"
+            android:src="@mipmap/ic_home_alipay_copy" />
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/dp_14"
+            android:layout_weight="1"
+            android:text="@string/WeChat_payment"
+            android:textColor="@color/color_d3d3d3"
+            android:textSize="@dimen/sp_15" />
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="@dimen/dp_16"
+            android:src="@mipmap/ic_home_wechat" />
+    </LinearLayout>
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dimen_1_dp"
+        android:layout_marginLeft="@dimen/dp_15"
+        android:alpha="0.2"
+        android:background="@color/line_one" />
+</android.support.v7.widget.LinearLayoutCompat>

app/src/main/res/layout-night/fragment_details_info.xml

+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/color_191919"
+    tools:context="cn.dankal.client.ui.home.details.DetailsInfoFragment">
+
+    <android.support.v7.widget.LinearLayoutCompat
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <android.support.v7.widget.LinearLayoutCompat
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dp_16"
+            android:layout_marginBottom="@dimen/dp_16"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:id="@+id/iv_location"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/dp_15"
+                android:layout_marginTop="@dimen/dp_4"
+                 android:paddingLeft="@dimen/dp_4"
+                android:paddingRight="@dimen/dp_4"
+                android:visibility="gone"
+                android:src="@mipmap/ic_home_details_location_1" />
+
+            <TextView
+                android:id="@+id/tv_merchant_address"
+                android:layout_width="@dimen/dp_0"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/dp_15"
+                android:layout_weight="1"
+                android:textIsSelectable="true"
+                android:textColor="@color/color_d3d3d3"
+                android:textSize="@dimen/sp_13" />
+
+            <TextView
+                android:layout_width="@dimen/dp_1"
+                android:layout_height="@dimen/dp_10"
+                android:layout_marginTop="@dimen/dp_4"
+                android:layout_marginRight="@dimen/dp_16"
+                android:background="@color/color_a6a6a6" />
+
+            <ImageView
+                android:id="@+id/iv_info_call"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dp_4"
+                android:layout_marginRight="@dimen/dp_19"
+                android:paddingLeft="@dimen/dp_4"
+                android:paddingRight="@dimen/dp_4"
+                android:src="@mipmap/ic_home_details_tel" />
+        </android.support.v7.widget.LinearLayoutCompat>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/dp_15"
+            android:layout_marginTop="@dimen/dp_10"
+            android:layout_marginBottom="@dimen/dp_10"
+            android:text="@string/business_Information"
+            android:textColor="@color/white"
+            android:textSize="@dimen/sp_15" />
+
+        <WebView
+            android:id="@+id/wb_hotel_details"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/dp_15"
+            android:background="@color/white"
+            android:layout_marginRight="@dimen/dp_15" />
+    </android.support.v7.widget.LinearLayoutCompat>
+
+
+</ScrollView>

app/src/main/res/layout-night/fragment_details_shop.xml

+<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="cn.dankal.client.ui.home.details.DetailsShopFragment">
+
+    <android.support.constraint.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1">
+
+        <android.support.v7.widget.LinearLayoutCompat
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:orientation="horizontal"
+            app:layout_constraintBottom_toTopOf="@id/ll_bg"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/rv_details_title"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:overScrollMode="never" />
+
+            <com.scwang.smartrefresh.layout.SmartRefreshLayout
+                android:id="@+id/refreshLayout"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="3"
+                android:background="@color/color_191919">
+
+                <android.support.v7.widget.RecyclerView
+                    android:id="@+id/rv_details_content"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:overScrollMode="never" />
+
+            </com.scwang.smartrefresh.layout.SmartRefreshLayout>
+
+        </android.support.v7.widget.LinearLayoutCompat>
+
+        <LinearLayout
+            android:id="@+id/ll_bg"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_55"
+            android:background="@color/color_232323"
+            android:orientation="horizontal"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent">
+
+            <cn.dankal.basiclib.widget.AdaptTextView
+                android:id="@+id/tv_bottom_shop_tip_text"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="@dimen/dp_84"
+                android:layout_marginRight="@dimen/dp_10"
+                android:layout_weight="1"
+                android:gravity="center_vertical"
+                android:text="@string/you_have_not_added_any_items_yet"
+                android:textColor="@color/color_595959"
+                android:textSize="@dimen/sp_16" />
+
+            <TextView
+                android:id="@+id/tv_bottom_shop_button"
+                android:layout_width="@dimen/dp_134"
+                android:layout_height="@dimen/dp_55"
+                android:background="@color/color_ff2f2f2f"
+                android:gravity="center"
+                android:text="@string/selected"
+                android:textColor="@color/color_a6a6a6"
+                android:textSize="@dimen/sp_17" />
+
+        </LinearLayout>
+
+        <ImageView
+            android:id="@+id/iv_menu_picture"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/dp_15"
+            android:layout_marginBottom="@dimen/dp_10"
+            android:visibility="gone"
+            android:src="@mipmap/ic_home_mall_order"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent" />
+
+        <TextView
+            android:id="@+id/tv_bottom_shop_count"
+            android:layout_width="@dimen/dp_20"
+            android:layout_height="@dimen/dp_20"
+            android:background="@drawable/bg_count_yellow_circle"
+            android:gravity="center"
+            android:text="0"
+            android:visibility="gone"
+            android:textColor="@color/white"
+            app:layout_constraintRight_toRightOf="@id/iv_menu_picture"
+            app:layout_constraintTop_toTopOf="@id/iv_menu_picture" />
+
+
+    </android.support.constraint.ConstraintLayout>
+
+
+    <Button
+        android:id="@+id/btn_details_queue"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_50"
+        android:background="@color/btn_bg"
+        android:text="@string/reserved_queue"
+        android:textColor="@color/white"
+        android:textSize="@dimen/sp_20"
+        android:visibility="gone" />
+
+    <TextView
+        android:id="@+id/tv_shop_tip"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_44"
+        android:background="#b3000000"
+        android:gravity="center"
+        android:text="@string/businessmen_are_not_in_business_for_the_time_being"
+        android:textColor="@color/white"
+        android:textSize="@dimen/sp_16"
+        android:visibility="gone" />
+
+
+</android.support.v7.widget.LinearLayoutCompat>

app/src/main/res/layout-night/fragment_menu_item.xml

+<android.support.v4.widget.NestedScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <android.support.v7.widget.LinearLayoutCompat
+        android:id="@+id/ll_menu_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        android:orientation="vertical">
+
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dp_18"
+            android:visibility="gone"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/dp_15"
+                android:src="@mipmap/ic_home_recommend" />
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/dp_3"
+                android:layout_weight="1"
+                android:text="@string/recommend_businessman"
+                android:textColor="@color/font_tow"
+                android:textSize="@dimen/sp_18"
+                android:textStyle="bold" />
+
+            <TextView
+                android:id="@+id/tv_home_more"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="@dimen/dp_16"
+                android:drawableRight="@mipmap/ic_home_more"
+                android:text="@string/more" />
+        </LinearLayout>
+
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/rl_menu_type"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/dp_14"
+            android:layout_marginTop="@dimen/dp_18"
+            android:focusableInTouchMode="false"
+            android:overScrollMode="never" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dp_18"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/dp_15"
+                android:src="@mipmap/ic_home_location_new" />
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/dp_3"
+                android:layout_weight="1"
+                android:text="@string/nearby_shops"
+                android:textColor="@color/white"
+                android:textSize="@dimen/sp_18"
+                android:textStyle="bold" />
+
+            <TextView
+                android:id="@+id/tv_item_filter"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_marginRight="@dimen/dp_16"
+                android:drawableRight="@mipmap/ic_home_more_bottom"
+                android:gravity="center"
+                android:textColor="@color/color99"
+                android:text="@string/screening" />
+        </LinearLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:descendantFocusability="blocksDescendants">
+
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/rv_bottom_child"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:nestedScrollingEnabled="false"
+                android:overScrollMode="never" />
+        </RelativeLayout>
+
+
+    </android.support.v7.widget.LinearLayoutCompat>
+
+</android.support.v4.widget.NestedScrollView>
+

app/src/main/res/layout-night/fragment_my_queue.xml

+<android.support.v7.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/rv_my_queue"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:overScrollMode="never"
+    android:background="@color/color_191919"
+    tools:context="cn.dankal.client.ui.personal.MyQueueFragment" />

app/src/main/res/layout-night/item_food_list.xml

+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v7.widget.CardView 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:layout_marginLeft="@dimen/dp_10"
+    android:layout_marginTop="@dimen/dp_10"
+    android:layout_marginRight="@dimen/dp_10"
+    app:cardCornerRadius="@dimen/dp_4"
+    app:cardElevation="@dimen/dp_4">
+
+    <android.support.v7.widget.LinearLayoutCompat
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/color_232323"
+        android:orientation="horizontal">
+
+        <ImageView
+            android:id="@+id/iv_image_head"
+            android:layout_width="@dimen/dp_45"
+            android:layout_height="@dimen/dp_45"
+            android:layout_marginLeft="@dimen/dp_13"
+            android:layout_marginTop="@dimen/dp_13"
+            android:src="@mipmap/pic_my_home_head_business" />
+
+        <android.support.v7.widget.LinearLayoutCompat
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dp_17"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/tv_order_food_name"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/dp_9"
+                    android:layout_weight="1"
+                    android:text="王妃家(明洞总店)"
+                    android:textColor="@color/color_d3d3d3"
+                    android:textSize="@dimen/sp_16" />
+
+                <TextView
+                    android:id="@+id/tv_order_food_state"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="@dimen/dp_13"
+                    android:text="已完成"
+                    android:textColor="@color/color_a6a6a6"
+                    android:textSize="@dimen/sp_14" />
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/tv_order_food_time"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/dp_9"
+                android:layout_marginTop="@dimen/dp_9"
+                android:text="下单时间:2018-08-14 17:00:30"
+                android:textColor="@color/color_a6a6a6"
+                android:textSize="@dimen/sp_13" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dimen_1_dp"
+                android:layout_marginLeft="@dimen/dp_9"
+                android:layout_marginTop="@dimen/dp_10"
+                android:layout_marginRight="@dimen/dp_14"
+                android:layout_marginBottom="@dimen/dp_12"
+                android:background="@color/color_3d3d3d" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/dp_15"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/tv_order_food_count"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/dp_9"
+                    android:layout_weight="1"
+                    android:textColor="@color/color_a6a6a6"
+                    android:textSize="@dimen/sp_13" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="@dimen/dp_13"
+                    android:text="@string/actual_payment"
+                    android:textColor="@color/color_a6a6a6"
+                    android:textSize="@dimen/sp_13" />
+
+                <TextView
+                    android:id="@+id/tv_order_food_price"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="@dimen/dp_13"
+                    android:text="¥150"
+                    android:textColor="@color/color_d3d3d3"
+                    android:textSize="@dimen/sp_16" />
+            </LinearLayout>
+        </android.support.v7.widget.LinearLayoutCompat>
+    </android.support.v7.widget.LinearLayoutCompat>
+
+
+</android.support.v7.widget.CardView>
\ No newline at end of file

app/src/main/res/layout-night/item_home_bottom_item.xml

+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout 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:layout_marginLeft="@dimen/dp_16"
+    android:layout_marginRight="@dimen/dp_16"
+    android:background="@drawable/shop_home_bottom_itme_bg_light"
+    android:layout_marginTop="@dimen/dp_17">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/dp_58"
+        android:layout_marginRight="@dimen/dp_15"
+        android:orientation="vertical"
+        android:paddingLeft="@dimen/dp_47"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <TextView
+            android:id="@+id/tv_home_bottom_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dp_13"
+            android:text="王妃家(明洞总店)"
+            android:textColor="@color/white"
+            android:textSize="@dimen/sp_15"
+            android:textStyle="bold" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            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_centerInParent="true"
+                app:mClickImageId="@mipmap/ic_home_stars_bright"
+                app:mDefaultImageId="@mipmap/ic_home_stars_ash"
+                app:mImageHeight="@dimen/dp_13"
+                app:mImageWidth="@dimen/dp_13"
+                app:mIsClick="false"
+                app:mMargin="@dimen/dp_3" />
+
+            <TextView
+                android:id="@+id/tv_home_bottom_distance"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="@dimen/dp_13"
+                android:layout_weight="1"
+                android:gravity="right"
+                android:text="距离1km"
+                android:textColor="@color/color_a6a6a6"
+                android:textSize="@dimen/sp_11" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/dp_8"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <FrameLayout
+                android:id="@+id/fl_tip"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@mipmap/ic_home_line_new" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="right|center_vertical"
+                    android:text="@string/line_up"
+                    android:textColor="@color/color_a6a6a6"
+                    android:textSize="@dimen/sp_6" />
+            </FrameLayout>
+
+
+            <TextView
+                android:id="@+id/tv_tip_queue"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/dp_4"
+                android:text="@string/current_queuing_situation"
+                android:textColor="@color/font_gray"
+                android:textSize="@dimen/sp_13" />
+
+            <TextView
+                android:id="@+id/tv_home_bottom_queue"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="@dimen/dp_20"
+                android:layout_weight="1"
+                android:gravity="right"
+                android:text="0"
+                android:textColor="@color/color_fbbc39"
+                android:textSize="@dimen/sp_16" />
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <android.support.v7.widget.CardView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/dp_22"
+        app:cardCornerRadius="@dimen/dimen_6_dp"
+        app:cardElevation="@dimen/dp_6"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageView
+            android:id="@+id/iv_image"
+            android:layout_width="@dimen/dp_70"
+            android:layout_height="@dimen/dp_70"
+            android:scaleType="centerCrop"
+            android:src="@mipmap/pic_home_business_2" />
+    </android.support.v7.widget.CardView>
+
+
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file

app/src/main/res/layout-night/item_menu_child.xml

+<?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="@dimen/dp_168"
+    android:layout_height="wrap_content"
+    android:layout_marginLeft="@dimen/dp_2"
+    android:layout_marginRight="@dimen/dp_6"
+    android:layout_marginBottom="@dimen/dp_6"
+    android:background="@color/color_191919"
+    android:orientation="vertical"
+    app:cardCornerRadius="@dimen/dp_2"
+    app:cardElevation="@dimen/dp_2">
+
+    <android.support.v7.widget.CardView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:cardCornerRadius="10dp">
+
+        <ImageView
+            android:id="@+id/iv_menu_image"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_105"
+            android:scaleType="centerCrop"
+            android:src="@mipmap/pic_home_banner_2" />
+    </android.support.v7.widget.CardView>
+
+    <TextView
+        android:id="@+id/tv_menu_text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp_6"
+        android:layout_marginRight="@dimen/dp_6"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:text="姜虎东白丁烤肉姜虎东白丁烤肉姜虎东白丁烤肉姜虎东白丁烤肉"
+        android:textColor="@color/color_d3d3d3"
+        android:textSize="@dimen/sp_13" />
+
+    <TextView
+        android:id="@+id/tv_menu_distance"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginRight="@dimen/dp_6"
+        android:layout_marginBottom="@dimen/dp_4"
+        android:paddingTop="@dimen/dp_4"
+        android:textColor="@color/color_d3d3d3"
+        android:textSize="@dimen/sp_11" />
+
+</android.support.v7.widget.LinearLayoutCompat>

app/src/main/res/layout-night/item_merchant.xml

+<?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:layout_marginTop="@dimen/dp_1"
+    android:background="@color/color_191919"
+    android:orientation="horizontal">
+
+    <ImageView
+        android:id="@+id/iv_recommend_picture"
+        android:layout_width="@dimen/dp_72"
+        android:layout_height="@dimen/dp_72"
+        android:layout_marginLeft="@dimen/dp_15"
+        android:layout_marginTop="@dimen/dp_15"
+        android:layout_marginRight="@dimen/dp_15"
+        android:layout_marginBottom="@dimen/dp_12"
+        android:src="@mipmap/pic_home_business_5" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginRight="@dimen/dp_15"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/tv_recommend_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="麻婆豆腐"
+            android:textStyle="bold"
+            android:layout_marginTop="@dimen/dp_15"
+            android:layout_marginBottom="@dimen/dp_4"
+            android:textColor="@color/color_d3d3d3"
+            android:textSize="@dimen/sp_15" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/tv_recommend_sale"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="wrap_content"
+                android:text="月售100"
+                android:textColor="@color/color_595959"
+                android:textSize="@dimen/sp_13" />
+
+            <TextView
+                android:id="@+id/tv_recommend_distance"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="wrap_content"
+                android:gravity="right"
+                android:textColor="@color/color_595959"
+                android:textSize="@dimen/sp_13" />
+
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/tv_recommend_address"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="济州道西归浦市西归洞68-6号"
+            android:textColor="@color/color_a6a6a6"
+            android:textSize="@dimen/sp_13" />
+
+    </LinearLayout>
+
+</android.support.v7.widget.LinearLayoutCompat>
\ No newline at end of file

app/src/main/res/layout-night/item_order_child.xml

+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout 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:orientation="horizontal">
+
+    <android.support.v7.widget.LinearLayoutCompat
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent" >
+
+        <ImageView
+            android:id="@+id/iv_image"
+            android:layout_width="@dimen/dp_61"
+            android:layout_height="@dimen/dp_61"
+            android:layout_marginLeft="@dimen/dp_18"
+            android:layout_marginTop="@dimen/dp_15"
+            android:layout_marginBottom="@dimen/dp_15"
+            android:src="@mipmap/pic_mall_home_classify_1" />
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/dp_14"
+            android:layout_marginTop="@dimen/dp_17"
+            android:layout_weight="1"
+            android:gravity="center_vertical"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/tv_item_shop_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="墨西哥海虾鸡肉卷饼"
+                android:textColor="@color/color_d3d3d3"
+                android:textSize="@dimen/sp_16" />
+
+            <TextView
+                android:id="@+id/tv_item_shop_desc"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dp_6"
+                android:text="微辣"
+                android:textColor="@color/color_a6a6a6"
+                android:textSize="@dimen/sp_13" />
+
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dp_17"
+            android:layout_marginRight="@dimen/dp_19"
+            android:gravity="right"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/tv_item_shop_price"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="¥78.00"
+                android:textColor="@color/color_d3d3d3"
+                android:textSize="@dimen/sp_16" />
+
+            <TextView
+                android:id="@+id/tv_item_shop_count"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dp_4"
+                android:text="x1"
+                android:textColor="@color/color_a6a6a6"
+                android:textSize="@dimen/sp_13" />
+        </LinearLayout>
+
+    </android.support.v7.widget.LinearLayoutCompat>
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dimen_1_dp"
+        android:layout_marginLeft="@dimen/dp_18"
+        android:layout_marginRight="@dimen/dp_18"
+        android:background="@color/line_one"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"/>
+
+
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file

app/src/main/res/layout-night/item_search_string.xml

+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/tv_title"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginLeft="@dimen/dp_5"
+    android:paddingTop="@dimen/dp_10"
+    android:paddingBottom="@dimen/dp_10"
+    android:text="加载中"
+    android:textColor="@color/color_d3d3d3"
+    android:textSize="@dimen/sp_14">
+
+</TextView>
\ No newline at end of file

app/src/main/res/layout-night/item_shop_details.xml

+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v7.widget.LinearLayoutCompat
+    android:id="@+id/ll_shop_bg"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="@dimen/dp_1"
+    android:background="@color/color_191919"
+    android:orientation="horizontal">
+
+    <ImageView
+        android:id="@+id/iv_shop_picture"
+        android:layout_width="@dimen/dp_91"
+        android:layout_height="@dimen/dp_91"
+        android:layout_marginLeft="@dimen/dp_15"
+        android:layout_marginTop="@dimen/dp_15"
+        android:layout_marginRight="@dimen/dp_15"
+        android:layout_marginBottom="@dimen/dp_12"
+        android:src="@mipmap/pic_home_business_5" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginRight="@dimen/dp_15"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/tv_shop_content_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dp_15"
+            android:text="麻婆豆腐"
+            android:textStyle="bold"
+            android:textColor="@color/white"
+            android:textSize="@dimen/sp_15" />
+
+        <TextView
+            android:id="@+id/tv_shop_content_sales"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dp_4"
+            android:text="月售100"
+            android:textColor="@color/color_a6a6a6"
+            android:textSize="@dimen/sp_13" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <cn.dankal.basiclib.widget.AdaptTextView
+                android:id="@+id/tv_shop_content_price"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="¥0"
+                android:textColor="@color/font_orange"
+                android:textSize="@dimen/sp_20" />
+
+            <TextView
+                android:id="@+id/tv_select_format"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@drawable/bg_select_type_available_night"
+                android:paddingLeft="@dimen/dp_9"
+                android:paddingTop="@dimen/dp_5"
+                android:paddingRight="@dimen/dp_9"
+                android:paddingBottom="@dimen/dp_5"
+                android:text="@string/selection_of_specifications"
+                android:textColor="@color/color00"
+                android:textSize="@dimen/sp_12" />
+        </LinearLayout>
+
+
+    </LinearLayout>
+
+</android.support.v7.widget.LinearLayoutCompat>
\ No newline at end of file

app/src/main/res/layout-night/item_shop_type_title.xml

+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v7.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/ll_item_title"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/dp_55"
+    android:background="@color/color_ff2f2f2f"
+    android:orientation="horizontal">
+
+    <TextView
+        android:id="@+id/tv_item_title_tag"
+        android:layout_width="@dimen/dp_4"
+        android:layout_height="match_parent"
+        android:background="@color/color_fffbbc39" />
+
+    <TextView
+        android:id="@+id/tv_menu_type"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_marginLeft="@dimen/dp_16"
+        android:layout_marginRight="@dimen/dp_12"
+        android:text="今日推荐"
+        android:textColor="@color/white"
+        android:textSize="@dimen/sp_14" />
+
+</android.support.v7.widget.LinearLayoutCompat>
\ No newline at end of file

app/src/main/res/layout/activity_dishes_details.xml

@@ -21,10 +21,14 @@
             android:layout_height="match_parent"
             android:orientation="vertical">
 
-            <cn.dankal.basiclib.widget.banner.DkBanner
-                android:id="@+id/banner"
+            <FrameLayout
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/dp_210" />
+                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>
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -167,7 +171,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/dp_15"
             android:layout_marginBottom="@dimen/dp_10"
-            android:src="@mipmap/ic_home_mall_order"
+            android:src="@mipmap/ic_shopp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintLeft_toLeftOf="parent" />
 

app/src/main/res/layout/activity_home.xml

+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tl="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/ll_home_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/white"
+    android:descendantFocusability="beforeDescendants"
+    android:focusable="true"
+    android:focusableInTouchMode="true"
+    android:orientation="vertical"
+    tools:context="cn.dankal.client.ui.home.HomeFragment">
+
+    <TextView
+        android:id="@+id/tv_state_bar"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_25"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:scaleType="centerCrop"
+        app:layout_constraintTop_toTopOf="parent"
+        android:src="@mipmap/pic_home_di"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent" />
+
+    <android.support.v7.widget.LinearLayoutCompat
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tv_state_bar"
+        android:orientation="vertical">
+
+        <RelativeLayout
+            android:id="@+id/cl_title"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_45"
+            android:orientation="horizontal">
+
+
+            <TextView
+                android:id="@+id/tv_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="@dimen/dp_16"
+                android:src="@mipmap/ic_combined_shape"
+                android:text="MODOO ORDER"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_25" />
+
+            <ImageView
+                android:id="@+id/iv_home_sweep"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_marginRight="@dimen/dp_12"
+                android:src="@mipmap/ic_home_scanning_01" />
+
+        </RelativeLayout>
+
+        <com.scwang.smartrefresh.layout.SmartRefreshLayout
+            android:id="@+id/refreshLayout"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <cn.dankal.basiclib.widget.VerticalScrollView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:overScrollMode="never"
+                android:scrollbars="none">
+
+                <android.support.v7.widget.LinearLayoutCompat
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:orientation="vertical">
+
+                    <com.flyco.tablayout.SlidingTabLayout
+                        android:id="@+id/sliding_tabs"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        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_tab_space_equal="false"
+                        tl:tl_textSelectColor="@color/black"
+                        tl:tl_textUnselectColor="@color/color_666666"
+                        tl:tl_textsize="17sp"
+                        tl:tl_underline_color="@color/color_d3d3d3"
+                        tl:tl_underline_height="0dp" />
+
+                    <cn.dankal.basiclib.widget.MyViewPager
+                        android:id="@+id/vp_pager"
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/dp_600" />
+
+                </android.support.v7.widget.LinearLayoutCompat>
+            </cn.dankal.basiclib.widget.VerticalScrollView>
+
+
+        </com.scwang.smartrefresh.layout.SmartRefreshLayout>
+    </android.support.v7.widget.LinearLayoutCompat>
+
+
+</android.support.constraint.ConstraintLayout>

app/src/main/res/layout/activity_merchant_details.xml

@@ -21,7 +21,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:scaleType="centerCrop"
-            android:src="@mipmap/pic_home_mall_bg"
+            android:src="@mipmap/pic_details_background"
+            app:layout_constraintHorizontal_bias="0.0"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -62,7 +63,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginRight="@dimen/dp_15"
-            android:src="@mipmap/ic_home_sweep"
+            android:src="@mipmap/ic_home_scanning_02"
             app:layout_constraintBottom_toBottomOf="@id/tv_merchant_title"
             app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toTopOf="@id/tv_merchant_title" />
@@ -144,6 +145,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/dp_5"
+                    android:visibility="gone"
                     android:drawableLeft="@mipmap/ic_home_mall_stamp"
                     android:drawablePadding="@dimen/dp_1"
                     android:textColor="@color/font_three"
@@ -154,6 +156,7 @@
                     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" />
@@ -202,7 +205,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/dp_55"
                     android:background="@color/white"
-                    tl:tl_indicator_color="@color/btn_bg"
+                    tl:tl_indicator_color="@color/color_fbbc39"
                     tl:tl_indicator_height="@dimen/dp_2"
                     tl:tl_indicator_width="@dimen/dp_18"
                     tl:tl_tab_padding="@dimen/dp_8"

app/src/main/res/layout/activity_order_details.xml

@@ -20,7 +20,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@mipmap/pic_order_bg_1"
+                android:background="@mipmap/ic_order_background"
                 android:orientation="vertical">
 
                 <TextView

app/src/main/res/layout/activity_queue.xml

@@ -94,7 +94,7 @@
             android:layout_marginRight="@dimen/dp_20"
             android:background="@drawable/bg_button_select_language"
             android:text="@string/queue_number"
-            android:textColor="@color/colorFF"
+            android:textColor="@color/color_171717"
             android:textSize="16sp"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"

app/src/main/res/layout/activity_result_page.xml

@@ -26,7 +26,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_24"
-                android:src="@mipmap/ic_home_pay_success" />
+                android:src="@mipmap/ic_successful" />
 
             <TextView
                 android:layout_width="wrap_content"

app/src/main/res/layout/activity_result_page_tow.xml

@@ -25,7 +25,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_24"
-                android:src="@mipmap/ic_home_pay_success" />
+                android:src="@mipmap/ic_successful" />
 
             <TextView
                 android:layout_width="wrap_content"

app/src/main/res/layout/fragment_details_shop.xml

@@ -87,7 +87,7 @@
             android:layout_marginLeft="@dimen/dp_15"
             android:layout_marginBottom="@dimen/dp_10"
             android:visibility="gone"
-            android:src="@mipmap/ic_home_mall_order"
+            android:src="@mipmap/ic_shopp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintLeft_toLeftOf="parent" />
 

app/src/main/res/layout/fragment_menu_item.xml

@@ -16,6 +16,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/dp_18"
+            android:visibility="gone"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
@@ -64,7 +65,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/dp_15"
-                android:src="@mipmap/ic_home_nearby" />
+                android:src="@mipmap/ic_home_placeholder" />
 
             <TextView
                 android:layout_width="0dp"

app/src/main/res/layout/item_menu_child.xml

 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<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="@dimen/dp_168"
-    android:layout_height="@dimen/dp_136"
+    android:layout_height="wrap_content"
+    android:layout_marginLeft="@dimen/dp_2"
     android:layout_marginRight="@dimen/dp_6"
     android:layout_marginBottom="@dimen/dp_6"
-    android:layout_marginLeft="@dimen/dp_2"
-    app:cardCornerRadius="@dimen/dp_2"
-    app:cardElevation="@dimen/dp_2">
+    android:orientation="vertical">
 
-    <android.support.constraint.ConstraintLayout
+    <android.support.v7.widget.CardView
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="wrap_content"
+        app:cardCornerRadius="10dp">
 
         <ImageView
             android:id="@+id/iv_menu_image"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_90"
-            android:src="@mipmap/pic_home_banner_2"
-            app:layout_constraintTop_toTopOf="parent" />
+            android:layout_height="@dimen/dp_105"
+            android:scaleType="centerCrop"
+            android:src="@mipmap/pic_home_banner_2" />
+    </android.support.v7.widget.CardView>
 
-        <TextView
-            android:id="@+id/tv_menu_text"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/dp_7"
-            android:layout_marginTop="@dimen/dp_6"
-            android:layout_marginRight="@dimen/dp_6"
-            android:text="姜虎东白丁烤肉姜虎东白丁烤肉姜虎东白丁烤肉姜虎东白丁烤肉"
-            android:textColor="@color/font_tow"
-            android:maxLines="2"
-            android:textSize="@dimen/sp_13"
-            app:layout_constraintTop_toBottomOf="@id/iv_menu_image" />
 
+    <TextView
+        android:id="@+id/tv_menu_text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp_6"
+        android:layout_marginRight="@dimen/dp_6"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:text="姜虎东白丁烤肉姜虎东白丁烤肉姜虎东白丁烤肉姜虎东白丁烤肉"
+        android:textColor="@color/bg_ff333333"
+        android:textSize="@dimen/sp_13" />
 
-            <TextView
-                android:id="@+id/tv_menu_distance"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginRight="@dimen/dp_6"
-                android:paddingLeft="@dimen/dp_50"
-                android:background="@drawable/bg_text_gradient"
-                android:textSize="@dimen/sp_11"
-                android:layout_marginBottom="@dimen/dp_4"
-                android:paddingTop="@dimen/dp_4"
-                android:textColor="@color/font_gray_tow"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintRight_toRightOf="parent" />
 
-    </android.support.constraint.ConstraintLayout>
+    <TextView
+        android:id="@+id/tv_menu_distance"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginRight="@dimen/dp_6"
+        android:layout_marginBottom="@dimen/dp_4"
+        android:paddingTop="@dimen/dp_4"
+        android:textColor="@color/color_999999"
+        android:textSize="@dimen/sp_11"
+        tools:text="111m" />
 
-</android.support.v7.widget.CardView>
\ No newline at end of file
+</android.support.v7.widget.LinearLayoutCompat>
\ No newline at end of file

app/src/main/res/layout/item_shop_details.xml

@@ -10,8 +10,8 @@
 
     <ImageView
         android:id="@+id/iv_shop_picture"
-        android:layout_width="@dimen/dp_72"
-        android:layout_height="@dimen/dp_72"
+        android:layout_width="@dimen/dp_91"
+        android:layout_height="@dimen/dp_91"
         android:layout_marginLeft="@dimen/dp_15"
         android:layout_marginTop="@dimen/dp_15"
         android:layout_marginRight="@dimen/dp_15"
@@ -62,13 +62,13 @@
                 android:id="@+id/tv_select_format"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:background="@drawable/bg_select_type_available"
+                android:background="@drawable/bg_select_type_available_night"
                 android:paddingLeft="@dimen/dp_9"
                 android:paddingTop="@dimen/dp_5"
                 android:paddingRight="@dimen/dp_9"
                 android:paddingBottom="@dimen/dp_5"
                 android:text="@string/selection_of_specifications"
-                android:textColor="@color/white"
+                android:textColor="@color/color00"
                 android:textSize="@dimen/sp_12" />
         </LinearLayout>
 

app/src/main/res/layout/item_shop_type_title.xml

@@ -10,7 +10,7 @@
         android:id="@+id/tv_item_title_tag"
         android:layout_width="@dimen/dp_4"
         android:layout_height="match_parent"
-        android:background="@color/btn_bg" />
+        android:background="@color/color_fbbc39" />
 
     <TextView
         android:id="@+id/tv_menu_type"

baselib/src/main/java/cn/dankal/basiclib/DankalApplication.java

@@ -4,6 +4,7 @@ import android.app.Application;
 import android.content.Context;
 import android.content.res.Configuration;
 import android.support.multidex.MultiDex;
+import android.support.v7.app.AppCompatDelegate;
 import android.text.TextUtils;
 
 import com.alibaba.android.arouter.launcher.ARouter;
@@ -170,4 +171,22 @@ public class DankalApplication extends Application {
         LocalManageUtil.saveSystemCurrentLanguage(getApplicationContext(), newConfig);
         MultiLanguage.onConfigurationChanged(getApplicationContext());
     }
+
+    /**
+     * 判断App当前是否处于暗黑模式状态
+     *
+     * @param context 上下文
+     * @return 返回
+     */
+    public static boolean isDarkMode() {
+        int nightMode = AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM;
+        if (nightMode == AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM) {
+            int applicationUiMode = context.getResources().getConfiguration().uiMode;
+            int systemMode = applicationUiMode & Configuration.UI_MODE_NIGHT_MASK;
+            return systemMode == Configuration.UI_MODE_NIGHT_YES;
+        } else {
+            return nightMode == AppCompatDelegate.MODE_NIGHT_YES;
+        }
+    }
+
 }

baselib/src/main/java/cn/dankal/basiclib/api/BaseApi.java

@@ -30,8 +30,7 @@ public class BaseApi {
     /*public static final String BASE_URL = isDev ? "https://api-koreadc.dankal.cn/v1/"
             : "https://modoo-api.mhqglobal.com/v1/";*/
 
-    public static final String BASE_URL = "https://modoo-api.mhqglobal.com/v1/";
-
+    public static final String BASE_URL = "https://api-koreadc.dankal.cn/v1/";
 
     public static final String BASE_EXPRESS_URL = "https://info.sweettracker.co.kr/";
 

baselib/src/main/java/cn/dankal/basiclib/base/activity/BaseActivity.java

@@ -7,6 +7,7 @@ import android.app.Application;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.graphics.Color;
 import android.location.Location;
 import android.location.LocationManager;
 import android.net.Uri;
@@ -38,12 +39,14 @@ import cn.dankal.basiclib.util.ActivityManager;
 import cn.dankal.basiclib.util.ActivityUtils;
 import cn.dankal.basiclib.util.DKHandler;
 import cn.dankal.basiclib.util.SPUtils;
+import cn.dankal.basiclib.util.StatusBarHelper;
 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.TipDialog;
 import cn.dankal.basiclib.widget.statubar.QMUIStatusBarHelper;
+import cn.dankal.basiclib.widget.statubar.StatusBarUtil;
 import cn.dankal.basiclib.widget.titlebar.ITitleBar;
 import cn.dankal.basiclib.widget.titlebar.SingleTextTitle;
 import io.reactivex.disposables.CompositeDisposable;
@@ -99,6 +102,14 @@ public abstract class BaseActivity extends AppCompatActivity implements BaseView
             //透明导航栏
             //getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
         }*/
+
+        //改变状态栏颜色
+        if (DankalApplication.isDarkMode()){
+            StatusBarUtil.setColorNoTranslucent(this, Color.parseColor("#00000000"));
+        }else {
+            StatusBarUtil.setColorNoTranslucent(this, Color.parseColor("#ffffffff"));
+        }
+
         if (getLayoutId() != 0) {
             setContentView(getLayoutId());
 

baselib/src/main/java/cn/dankal/basiclib/cos/CosUploadUtil.java

@@ -143,6 +143,7 @@ public class CosUploadUtil {
     }
 
     public interface ImageUpReturnListener {
+
         /**
          * 装换过后需要上传到服务器的key
          *

baselib/src/main/java/cn/dankal/basiclib/util/TitleBarUtils.java

@@ -4,11 +4,13 @@ import android.annotation.TargetApi;
 import android.app.Activity;
 import android.graphics.Color;
 import android.os.Build;
+import android.support.v4.content.ContextCompat;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 
+import cn.dankal.basiclib.R;
 import cn.dankal.basiclib.widget.statubar.QMUIStatusBarHelper;
 
 

baselib/src/main/java/cn/dankal/basiclib/util/UIUtils.java

@@ -19,6 +19,11 @@ public class UIUtils {
         return (int) (px / scale + 0.5f);
     }
 
+    public static int dp2px(Context context, float dipValue) {
+        final float scale = context.getResources().getDisplayMetrics().density;
+        return (int) (dipValue * scale + 0.5f);
+    }
+
 
     /**
      * 拨打电话

baselib/src/main/java/cn/dankal/basiclib/util/image/PicUtils.java

@@ -44,7 +44,7 @@ public class PicUtils {
     /**
      * 默认圆角角度
      */
-    public static final float DEFAULT_ROUND_RADIUS = 2;
+    public static final float DEFAULT_ROUND_RADIUS = 20;
 
     /**
      * 默认通用的加载前占位图

baselib/src/main/res/drawable/bg_button_again_night.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="@color/color_fbbc39" />
+    <corners android:radius="2dp" />
+</shape>
\ No newline at end of file

baselib/src/main/res/drawable/bg_button_order_apply_night.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/color_fbbc39" />
+    <corners android:radius="2dp" />
+</shape>
\ No newline at end of file

baselib/src/main/res/drawable/bg_button_pay_light.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/color_fbbc39" />
+    <corners android:radius="6dp" />
+</shape>
\ No newline at end of file

baselib/src/main/res/drawable/bg_button_red.xml

@@ -3,7 +3,7 @@
     android:shape="rectangle">
     <stroke
         android:width="1dp"
-        android:color="#ffff6b5c" />
+        android:color="@color/btn_bg" />
     <solid android:color="#ffffffff" />
     <corners android:radius="6dp" />
 </shape>
\ No newline at end of file

baselib/src/main/res/drawable/bg_button_red_circle_solid.xml

 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-
     <solid android:color="@color/btn_bg" />
     <corners android:radius="@dimen/dp_15" />
 </shape>
\ No newline at end of file

baselib/src/main/res/drawable/bg_button_red_circle_solid_night.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/color_fffbbc39" />
+    <corners android:radius="@dimen/dp_15" />
+</shape>
\ No newline at end of file

baselib/src/main/res/drawable/bg_button_red_night.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="@color/color_fbbc39" />
+    <corners android:radius="6dp" />
+</shape>
\ No newline at end of file

baselib/src/main/res/drawable/bg_button_return_night.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/color_ff7b836" />
+    <corners android:radius="17dp" />
+
+</shape>
\ No newline at end of file

baselib/src/main/res/drawable/bg_button_select_language_night.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/color_fbbc39" />
+    <corners android:radius="3dp" />
+
+
+
+</shape>
\ No newline at end of file

baselib/src/main/res/drawable/bg_button_specification.xml

 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="#ffff6b5c" />
+    <solid android:color="@color/color_ff7b836" />
     <corners android:radius="12dp" />
 </shape>
\ No newline at end of file

baselib/src/main/res/drawable/bg_button_specification_night.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/color_ff7b836" />
+    <corners android:radius="12dp" />
+</shape>
\ No newline at end of file

baselib/src/main/res/drawable/bg_button_update_night.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/color_fffbbc39" />
+    <corners android:radius="12dp" />
+</shape>
\ No newline at end of file

baselib/src/main/res/drawable/bg_count_yellow_circle.xml

 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="#fff1cd7e"></solid>
+    <solid android:color="#F36A29"></solid>
     <corners android:radius="@dimen/dimen_150_dp"/>
 
 </shape>
\ No newline at end of file

baselib/src/main/res/drawable/bg_dialog_bottom_layout_night.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/color_232323" />
+    <corners
+        android:radius="@dimen/dp_12" />
+</shape>
\ No newline at end of file

baselib/src/main/res/drawable/bg_dialog_btn_one_night.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/color_ff7b836" />
+    <corners android:radius="5dp" />
+</shape>
\ No newline at end of file

baselib/src/main/res/drawable/bg_pw_select_night.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/color_232323" />
+    <corners android:radius="6dp" />
+</shape>
\ No newline at end of file

baselib/src/main/res/drawable/bg_select_type_available_night.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/color_fffbbc39" />
+    <corners android:radius="12dp" />
+</shape>
\ No newline at end of file

baselib/src/main/res/drawable/bg_shop_item_night.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/color_232323" />
+    <corners android:radius="10dp" />
+</shape>
\ No newline at end of file

baselib/src/main/res/drawable/common_color_232323_radius4.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#ff232323" />
+    <corners android:radius="4dp" />
+</shape>
\ No newline at end of file

baselib/src/main/res/drawable/label_selector.xml

 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/white" android:drawable="@drawable/tag_select_textcolor" android:state_checked="true" />
+    <item android:drawable="@drawable/tag_select_textcolor_night" android:state_checked="true" />
     <item android:drawable="@drawable/tag_normal_textcolor" />
 </selector>
\ No newline at end of file

baselib/src/main/res/drawable/label_selector_night.xml

+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item  android:drawable="@drawable/tag_select_textcolor_night" android:state_checked="true" />
+    <item android:drawable="@drawable/tag_normal_textcolor_night" />
+</selector>
\ No newline at end of file

baselib/src/main/res/drawable/label_selector_tow_night.xml

+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/tag_select_textcolor_night" android:state_checked="true" />
+    <item android:drawable="@drawable/tag_normal_textcolor_night" />
+</selector>
\ No newline at end of file

baselib/src/main/res/drawable/label_text_selector.xml

 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/btn_bg" android:state_checked="true" />
+    <item android:color="@color/color_171717" android:state_checked="true" />
     <item android:color="@color/font_313131" />
 </selector>
\ No newline at end of file

baselib/src/main/res/drawable/label_text_selector_night.xml

+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/color_191919" android:state_checked="true" />
+    <item android:color="@color/color_d3d3d3" />
+</selector>
\ No newline at end of file

baselib/src/main/res/drawable/tag_normal_textcolor_night.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#595959" />
+    <corners android:radius="3dp" />
+</shape>
\ No newline at end of file

baselib/src/main/res/drawable/tag_select_textcolor_night.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#FBBC39" />
+    <corners android:radius="3dp" />
+</shape>
\ No newline at end of file

baselib/src/main/res/layout-night/adapter_layout_empty_data.xml

+<?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="@dimen/dp_200"
+    android:gravity="center"
+    android:orientation="vertical">
+
+    <ImageView
+        android:layout_width="100dp"
+        android:layout_height="100dp"
+        android:src="@mipmap/pic_my_home_no_order" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp_13"
+        android:text="@string/no_business_was_found"
+        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/adapter_layout_empty_order.xml

+<?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="match_parent"
+    android:gravity="center_horizontal"
+    android:orientation="vertical">
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="130dp"
+        android:src="@mipmap/ic_order_confirmation" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp_13"
+        android:text="@string/your_order_is_empty"
+        android:textColor="@color/color_d3d3d3"
+        android:textSize="@dimen/sp_13" />
+
+</android.support.v7.widget.LinearLayoutCompat>
\ No newline at end of file