diff --git a/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt b/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt index b8ab0f5..894d5db 100644 --- a/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt +++ b/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt @@ -27,10 +27,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - Glide.with(context) - .load(icons[position]) - .apply(RequestOptions.circleCropTransform()) - .into(holder.imageView) + holder.imageView.setImageResource(icons[position]) holder.textView.text = titles[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) diff --git a/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt b/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt index b8ab0f5..894d5db 100644 --- a/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt +++ b/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt @@ -27,10 +27,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - Glide.with(context) - .load(icons[position]) - .apply(RequestOptions.circleCropTransform()) - .into(holder.imageView) + holder.imageView.setImageResource(icons[position]) holder.textView.text = titles[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) diff --git a/app/src/main/java/com/casic/br/adapter/IconTextGridAdapter.kt b/app/src/main/java/com/casic/br/adapter/IconTextGridAdapter.kt index 3b2dd90..3ca02e4 100644 --- a/app/src/main/java/com/casic/br/adapter/IconTextGridAdapter.kt +++ b/app/src/main/java/com/casic/br/adapter/IconTextGridAdapter.kt @@ -7,8 +7,6 @@ import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.br.R /** @@ -27,10 +25,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - Glide.with(context) - .load(icons[position]) - .apply(RequestOptions.circleCropTransform()) - .into(holder.imageView) + holder.imageView.setImageResource(icons[position]) holder.textView.text = titles[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) diff --git a/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt b/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt index b8ab0f5..894d5db 100644 --- a/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt +++ b/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt @@ -27,10 +27,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - Glide.with(context) - .load(icons[position]) - .apply(RequestOptions.circleCropTransform()) - .into(holder.imageView) + holder.imageView.setImageResource(icons[position]) holder.textView.text = titles[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) diff --git a/app/src/main/java/com/casic/br/adapter/IconTextGridAdapter.kt b/app/src/main/java/com/casic/br/adapter/IconTextGridAdapter.kt index 3b2dd90..3ca02e4 100644 --- a/app/src/main/java/com/casic/br/adapter/IconTextGridAdapter.kt +++ b/app/src/main/java/com/casic/br/adapter/IconTextGridAdapter.kt @@ -7,8 +7,6 @@ import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.br.R /** @@ -27,10 +25,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - Glide.with(context) - .load(icons[position]) - .apply(RequestOptions.circleCropTransform()) - .into(holder.imageView) + holder.imageView.setImageResource(icons[position]) holder.textView.text = titles[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) diff --git a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt index ed28b03..c637fba 100644 --- a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt @@ -17,14 +17,16 @@ Manifest.permission.READ_PHONE_STATE, Manifest.permission.BLUETOOTH, Manifest.permission.BLUETOOTH_ADMIN ) - val SHOP_IMAGE = intArrayOf(R.mipmap.ic_launcher, R.mipmap.ic_launcher, R.mipmap.ic_launcher) + val SHOP_IMAGE = intArrayOf( + R.drawable.ic_gouwuche, R.drawable.ic_dingdan, R.drawable.ic_shouhou + ) val SHOP_OPERATE = arrayOf("购物车", "我的订单", "故障售后") val SHOP_PAGE_OPERATE = arrayOf("推荐", "智能厨房", "智能家居", "配件") val SERVER_IMAGE = intArrayOf( - R.mipmap.ic_launcher, - R.mipmap.ic_launcher, - R.mipmap.ic_launcher, - R.mipmap.ic_launcher + R.drawable.ic_daifukuan, + R.drawable.ic_daifuwu, + R.drawable.ic_fuwuzhong, + R.drawable.ic_pingjia ) val SERVER_OPERATE = arrayOf("待付款", "待服务", "服务中", "评价") val USER_OPERATE = arrayOf("账号安全", "账号绑定", "支付管理", "地址管理", "系统设置") @@ -32,7 +34,7 @@ val SETTINGS_OPERATE = arrayOf("通知设置", "清除缓存", "服务协议", "隐私声明", "关于我们") val HOME_FUNC_OPERATE = arrayOf("户号管理", "燃气缴费", "历史账单", "用气分析", "服务网点", "采暖补贴") val DEVICE_PAGE_TITLE = arrayOf("设备控制", "状态显示", "服务设置") - val CONNECT_IMAGE = intArrayOf(R.mipmap.ic_launcher, R.mipmap.ic_launcher) + val CONNECT_IMAGE = intArrayOf(R.drawable.ic_kefu, R.drawable.ic_weixiu) val CONNECT_ARRAY = arrayOf("客服电话", "抢修电话") /** diff --git a/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt b/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt index b8ab0f5..894d5db 100644 --- a/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt +++ b/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt @@ -27,10 +27,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - Glide.with(context) - .load(icons[position]) - .apply(RequestOptions.circleCropTransform()) - .into(holder.imageView) + holder.imageView.setImageResource(icons[position]) holder.textView.text = titles[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) diff --git a/app/src/main/java/com/casic/br/adapter/IconTextGridAdapter.kt b/app/src/main/java/com/casic/br/adapter/IconTextGridAdapter.kt index 3b2dd90..3ca02e4 100644 --- a/app/src/main/java/com/casic/br/adapter/IconTextGridAdapter.kt +++ b/app/src/main/java/com/casic/br/adapter/IconTextGridAdapter.kt @@ -7,8 +7,6 @@ import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.br.R /** @@ -27,10 +25,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - Glide.with(context) - .load(icons[position]) - .apply(RequestOptions.circleCropTransform()) - .into(holder.imageView) + holder.imageView.setImageResource(icons[position]) holder.textView.text = titles[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) diff --git a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt index ed28b03..c637fba 100644 --- a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt @@ -17,14 +17,16 @@ Manifest.permission.READ_PHONE_STATE, Manifest.permission.BLUETOOTH, Manifest.permission.BLUETOOTH_ADMIN ) - val SHOP_IMAGE = intArrayOf(R.mipmap.ic_launcher, R.mipmap.ic_launcher, R.mipmap.ic_launcher) + val SHOP_IMAGE = intArrayOf( + R.drawable.ic_gouwuche, R.drawable.ic_dingdan, R.drawable.ic_shouhou + ) val SHOP_OPERATE = arrayOf("购物车", "我的订单", "故障售后") val SHOP_PAGE_OPERATE = arrayOf("推荐", "智能厨房", "智能家居", "配件") val SERVER_IMAGE = intArrayOf( - R.mipmap.ic_launcher, - R.mipmap.ic_launcher, - R.mipmap.ic_launcher, - R.mipmap.ic_launcher + R.drawable.ic_daifukuan, + R.drawable.ic_daifuwu, + R.drawable.ic_fuwuzhong, + R.drawable.ic_pingjia ) val SERVER_OPERATE = arrayOf("待付款", "待服务", "服务中", "评价") val USER_OPERATE = arrayOf("账号安全", "账号绑定", "支付管理", "地址管理", "系统设置") @@ -32,7 +34,7 @@ val SETTINGS_OPERATE = arrayOf("通知设置", "清除缓存", "服务协议", "隐私声明", "关于我们") val HOME_FUNC_OPERATE = arrayOf("户号管理", "燃气缴费", "历史账单", "用气分析", "服务网点", "采暖补贴") val DEVICE_PAGE_TITLE = arrayOf("设备控制", "状态显示", "服务设置") - val CONNECT_IMAGE = intArrayOf(R.mipmap.ic_launcher, R.mipmap.ic_launcher) + val CONNECT_IMAGE = intArrayOf(R.drawable.ic_kefu, R.drawable.ic_weixiu) val CONNECT_ARRAY = arrayOf("客服电话", "抢修电话") /** diff --git a/app/src/main/res/drawable/ic_daifukuan.xml b/app/src/main/res/drawable/ic_daifukuan.xml new file mode 100644 index 0000000..b8edbac --- /dev/null +++ b/app/src/main/res/drawable/ic_daifukuan.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt b/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt index b8ab0f5..894d5db 100644 --- a/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt +++ b/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt @@ -27,10 +27,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - Glide.with(context) - .load(icons[position]) - .apply(RequestOptions.circleCropTransform()) - .into(holder.imageView) + holder.imageView.setImageResource(icons[position]) holder.textView.text = titles[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) diff --git a/app/src/main/java/com/casic/br/adapter/IconTextGridAdapter.kt b/app/src/main/java/com/casic/br/adapter/IconTextGridAdapter.kt index 3b2dd90..3ca02e4 100644 --- a/app/src/main/java/com/casic/br/adapter/IconTextGridAdapter.kt +++ b/app/src/main/java/com/casic/br/adapter/IconTextGridAdapter.kt @@ -7,8 +7,6 @@ import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.br.R /** @@ -27,10 +25,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - Glide.with(context) - .load(icons[position]) - .apply(RequestOptions.circleCropTransform()) - .into(holder.imageView) + holder.imageView.setImageResource(icons[position]) holder.textView.text = titles[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) diff --git a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt index ed28b03..c637fba 100644 --- a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt @@ -17,14 +17,16 @@ Manifest.permission.READ_PHONE_STATE, Manifest.permission.BLUETOOTH, Manifest.permission.BLUETOOTH_ADMIN ) - val SHOP_IMAGE = intArrayOf(R.mipmap.ic_launcher, R.mipmap.ic_launcher, R.mipmap.ic_launcher) + val SHOP_IMAGE = intArrayOf( + R.drawable.ic_gouwuche, R.drawable.ic_dingdan, R.drawable.ic_shouhou + ) val SHOP_OPERATE = arrayOf("购物车", "我的订单", "故障售后") val SHOP_PAGE_OPERATE = arrayOf("推荐", "智能厨房", "智能家居", "配件") val SERVER_IMAGE = intArrayOf( - R.mipmap.ic_launcher, - R.mipmap.ic_launcher, - R.mipmap.ic_launcher, - R.mipmap.ic_launcher + R.drawable.ic_daifukuan, + R.drawable.ic_daifuwu, + R.drawable.ic_fuwuzhong, + R.drawable.ic_pingjia ) val SERVER_OPERATE = arrayOf("待付款", "待服务", "服务中", "评价") val USER_OPERATE = arrayOf("账号安全", "账号绑定", "支付管理", "地址管理", "系统设置") @@ -32,7 +34,7 @@ val SETTINGS_OPERATE = arrayOf("通知设置", "清除缓存", "服务协议", "隐私声明", "关于我们") val HOME_FUNC_OPERATE = arrayOf("户号管理", "燃气缴费", "历史账单", "用气分析", "服务网点", "采暖补贴") val DEVICE_PAGE_TITLE = arrayOf("设备控制", "状态显示", "服务设置") - val CONNECT_IMAGE = intArrayOf(R.mipmap.ic_launcher, R.mipmap.ic_launcher) + val CONNECT_IMAGE = intArrayOf(R.drawable.ic_kefu, R.drawable.ic_weixiu) val CONNECT_ARRAY = arrayOf("客服电话", "抢修电话") /** diff --git a/app/src/main/res/drawable/ic_daifukuan.xml b/app/src/main/res/drawable/ic_daifukuan.xml new file mode 100644 index 0000000..b8edbac --- /dev/null +++ b/app/src/main/res/drawable/ic_daifukuan.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_daifuwu.xml b/app/src/main/res/drawable/ic_daifuwu.xml new file mode 100644 index 0000000..4440dc1 --- /dev/null +++ b/app/src/main/res/drawable/ic_daifuwu.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt b/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt index b8ab0f5..894d5db 100644 --- a/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt +++ b/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt @@ -27,10 +27,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - Glide.with(context) - .load(icons[position]) - .apply(RequestOptions.circleCropTransform()) - .into(holder.imageView) + holder.imageView.setImageResource(icons[position]) holder.textView.text = titles[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) diff --git a/app/src/main/java/com/casic/br/adapter/IconTextGridAdapter.kt b/app/src/main/java/com/casic/br/adapter/IconTextGridAdapter.kt index 3b2dd90..3ca02e4 100644 --- a/app/src/main/java/com/casic/br/adapter/IconTextGridAdapter.kt +++ b/app/src/main/java/com/casic/br/adapter/IconTextGridAdapter.kt @@ -7,8 +7,6 @@ import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.br.R /** @@ -27,10 +25,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - Glide.with(context) - .load(icons[position]) - .apply(RequestOptions.circleCropTransform()) - .into(holder.imageView) + holder.imageView.setImageResource(icons[position]) holder.textView.text = titles[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) diff --git a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt index ed28b03..c637fba 100644 --- a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt @@ -17,14 +17,16 @@ Manifest.permission.READ_PHONE_STATE, Manifest.permission.BLUETOOTH, Manifest.permission.BLUETOOTH_ADMIN ) - val SHOP_IMAGE = intArrayOf(R.mipmap.ic_launcher, R.mipmap.ic_launcher, R.mipmap.ic_launcher) + val SHOP_IMAGE = intArrayOf( + R.drawable.ic_gouwuche, R.drawable.ic_dingdan, R.drawable.ic_shouhou + ) val SHOP_OPERATE = arrayOf("购物车", "我的订单", "故障售后") val SHOP_PAGE_OPERATE = arrayOf("推荐", "智能厨房", "智能家居", "配件") val SERVER_IMAGE = intArrayOf( - R.mipmap.ic_launcher, - R.mipmap.ic_launcher, - R.mipmap.ic_launcher, - R.mipmap.ic_launcher + R.drawable.ic_daifukuan, + R.drawable.ic_daifuwu, + R.drawable.ic_fuwuzhong, + R.drawable.ic_pingjia ) val SERVER_OPERATE = arrayOf("待付款", "待服务", "服务中", "评价") val USER_OPERATE = arrayOf("账号安全", "账号绑定", "支付管理", "地址管理", "系统设置") @@ -32,7 +34,7 @@ val SETTINGS_OPERATE = arrayOf("通知设置", "清除缓存", "服务协议", "隐私声明", "关于我们") val HOME_FUNC_OPERATE = arrayOf("户号管理", "燃气缴费", "历史账单", "用气分析", "服务网点", "采暖补贴") val DEVICE_PAGE_TITLE = arrayOf("设备控制", "状态显示", "服务设置") - val CONNECT_IMAGE = intArrayOf(R.mipmap.ic_launcher, R.mipmap.ic_launcher) + val CONNECT_IMAGE = intArrayOf(R.drawable.ic_kefu, R.drawable.ic_weixiu) val CONNECT_ARRAY = arrayOf("客服电话", "抢修电话") /** diff --git a/app/src/main/res/drawable/ic_daifukuan.xml b/app/src/main/res/drawable/ic_daifukuan.xml new file mode 100644 index 0000000..b8edbac --- /dev/null +++ b/app/src/main/res/drawable/ic_daifukuan.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_daifuwu.xml b/app/src/main/res/drawable/ic_daifuwu.xml new file mode 100644 index 0000000..4440dc1 --- /dev/null +++ b/app/src/main/res/drawable/ic_daifuwu.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_dingdan.xml b/app/src/main/res/drawable/ic_dingdan.xml new file mode 100644 index 0000000..803296c --- /dev/null +++ b/app/src/main/res/drawable/ic_dingdan.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt b/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt index b8ab0f5..894d5db 100644 --- a/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt +++ b/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt @@ -27,10 +27,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - Glide.with(context) - .load(icons[position]) - .apply(RequestOptions.circleCropTransform()) - .into(holder.imageView) + holder.imageView.setImageResource(icons[position]) holder.textView.text = titles[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) diff --git a/app/src/main/java/com/casic/br/adapter/IconTextGridAdapter.kt b/app/src/main/java/com/casic/br/adapter/IconTextGridAdapter.kt index 3b2dd90..3ca02e4 100644 --- a/app/src/main/java/com/casic/br/adapter/IconTextGridAdapter.kt +++ b/app/src/main/java/com/casic/br/adapter/IconTextGridAdapter.kt @@ -7,8 +7,6 @@ import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.br.R /** @@ -27,10 +25,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - Glide.with(context) - .load(icons[position]) - .apply(RequestOptions.circleCropTransform()) - .into(holder.imageView) + holder.imageView.setImageResource(icons[position]) holder.textView.text = titles[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) diff --git a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt index ed28b03..c637fba 100644 --- a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt @@ -17,14 +17,16 @@ Manifest.permission.READ_PHONE_STATE, Manifest.permission.BLUETOOTH, Manifest.permission.BLUETOOTH_ADMIN ) - val SHOP_IMAGE = intArrayOf(R.mipmap.ic_launcher, R.mipmap.ic_launcher, R.mipmap.ic_launcher) + val SHOP_IMAGE = intArrayOf( + R.drawable.ic_gouwuche, R.drawable.ic_dingdan, R.drawable.ic_shouhou + ) val SHOP_OPERATE = arrayOf("购物车", "我的订单", "故障售后") val SHOP_PAGE_OPERATE = arrayOf("推荐", "智能厨房", "智能家居", "配件") val SERVER_IMAGE = intArrayOf( - R.mipmap.ic_launcher, - R.mipmap.ic_launcher, - R.mipmap.ic_launcher, - R.mipmap.ic_launcher + R.drawable.ic_daifukuan, + R.drawable.ic_daifuwu, + R.drawable.ic_fuwuzhong, + R.drawable.ic_pingjia ) val SERVER_OPERATE = arrayOf("待付款", "待服务", "服务中", "评价") val USER_OPERATE = arrayOf("账号安全", "账号绑定", "支付管理", "地址管理", "系统设置") @@ -32,7 +34,7 @@ val SETTINGS_OPERATE = arrayOf("通知设置", "清除缓存", "服务协议", "隐私声明", "关于我们") val HOME_FUNC_OPERATE = arrayOf("户号管理", "燃气缴费", "历史账单", "用气分析", "服务网点", "采暖补贴") val DEVICE_PAGE_TITLE = arrayOf("设备控制", "状态显示", "服务设置") - val CONNECT_IMAGE = intArrayOf(R.mipmap.ic_launcher, R.mipmap.ic_launcher) + val CONNECT_IMAGE = intArrayOf(R.drawable.ic_kefu, R.drawable.ic_weixiu) val CONNECT_ARRAY = arrayOf("客服电话", "抢修电话") /** diff --git a/app/src/main/res/drawable/ic_daifukuan.xml b/app/src/main/res/drawable/ic_daifukuan.xml new file mode 100644 index 0000000..b8edbac --- /dev/null +++ b/app/src/main/res/drawable/ic_daifukuan.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_daifuwu.xml b/app/src/main/res/drawable/ic_daifuwu.xml new file mode 100644 index 0000000..4440dc1 --- /dev/null +++ b/app/src/main/res/drawable/ic_daifuwu.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_dingdan.xml b/app/src/main/res/drawable/ic_dingdan.xml new file mode 100644 index 0000000..803296c --- /dev/null +++ b/app/src/main/res/drawable/ic_dingdan.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_fuwuzhong.xml b/app/src/main/res/drawable/ic_fuwuzhong.xml new file mode 100644 index 0000000..d3f846c --- /dev/null +++ b/app/src/main/res/drawable/ic_fuwuzhong.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt b/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt index b8ab0f5..894d5db 100644 --- a/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt +++ b/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt @@ -27,10 +27,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - Glide.with(context) - .load(icons[position]) - .apply(RequestOptions.circleCropTransform()) - .into(holder.imageView) + holder.imageView.setImageResource(icons[position]) holder.textView.text = titles[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) diff --git a/app/src/main/java/com/casic/br/adapter/IconTextGridAdapter.kt b/app/src/main/java/com/casic/br/adapter/IconTextGridAdapter.kt index 3b2dd90..3ca02e4 100644 --- a/app/src/main/java/com/casic/br/adapter/IconTextGridAdapter.kt +++ b/app/src/main/java/com/casic/br/adapter/IconTextGridAdapter.kt @@ -7,8 +7,6 @@ import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.br.R /** @@ -27,10 +25,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - Glide.with(context) - .load(icons[position]) - .apply(RequestOptions.circleCropTransform()) - .into(holder.imageView) + holder.imageView.setImageResource(icons[position]) holder.textView.text = titles[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) diff --git a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt index ed28b03..c637fba 100644 --- a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt @@ -17,14 +17,16 @@ Manifest.permission.READ_PHONE_STATE, Manifest.permission.BLUETOOTH, Manifest.permission.BLUETOOTH_ADMIN ) - val SHOP_IMAGE = intArrayOf(R.mipmap.ic_launcher, R.mipmap.ic_launcher, R.mipmap.ic_launcher) + val SHOP_IMAGE = intArrayOf( + R.drawable.ic_gouwuche, R.drawable.ic_dingdan, R.drawable.ic_shouhou + ) val SHOP_OPERATE = arrayOf("购物车", "我的订单", "故障售后") val SHOP_PAGE_OPERATE = arrayOf("推荐", "智能厨房", "智能家居", "配件") val SERVER_IMAGE = intArrayOf( - R.mipmap.ic_launcher, - R.mipmap.ic_launcher, - R.mipmap.ic_launcher, - R.mipmap.ic_launcher + R.drawable.ic_daifukuan, + R.drawable.ic_daifuwu, + R.drawable.ic_fuwuzhong, + R.drawable.ic_pingjia ) val SERVER_OPERATE = arrayOf("待付款", "待服务", "服务中", "评价") val USER_OPERATE = arrayOf("账号安全", "账号绑定", "支付管理", "地址管理", "系统设置") @@ -32,7 +34,7 @@ val SETTINGS_OPERATE = arrayOf("通知设置", "清除缓存", "服务协议", "隐私声明", "关于我们") val HOME_FUNC_OPERATE = arrayOf("户号管理", "燃气缴费", "历史账单", "用气分析", "服务网点", "采暖补贴") val DEVICE_PAGE_TITLE = arrayOf("设备控制", "状态显示", "服务设置") - val CONNECT_IMAGE = intArrayOf(R.mipmap.ic_launcher, R.mipmap.ic_launcher) + val CONNECT_IMAGE = intArrayOf(R.drawable.ic_kefu, R.drawable.ic_weixiu) val CONNECT_ARRAY = arrayOf("客服电话", "抢修电话") /** diff --git a/app/src/main/res/drawable/ic_daifukuan.xml b/app/src/main/res/drawable/ic_daifukuan.xml new file mode 100644 index 0000000..b8edbac --- /dev/null +++ b/app/src/main/res/drawable/ic_daifukuan.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_daifuwu.xml b/app/src/main/res/drawable/ic_daifuwu.xml new file mode 100644 index 0000000..4440dc1 --- /dev/null +++ b/app/src/main/res/drawable/ic_daifuwu.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_dingdan.xml b/app/src/main/res/drawable/ic_dingdan.xml new file mode 100644 index 0000000..803296c --- /dev/null +++ b/app/src/main/res/drawable/ic_dingdan.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_fuwuzhong.xml b/app/src/main/res/drawable/ic_fuwuzhong.xml new file mode 100644 index 0000000..d3f846c --- /dev/null +++ b/app/src/main/res/drawable/ic_fuwuzhong.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_gouwuche.xml b/app/src/main/res/drawable/ic_gouwuche.xml new file mode 100644 index 0000000..7634cb3 --- /dev/null +++ b/app/src/main/res/drawable/ic_gouwuche.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt b/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt index b8ab0f5..894d5db 100644 --- a/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt +++ b/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt @@ -27,10 +27,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - Glide.with(context) - .load(icons[position]) - .apply(RequestOptions.circleCropTransform()) - .into(holder.imageView) + holder.imageView.setImageResource(icons[position]) holder.textView.text = titles[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) diff --git a/app/src/main/java/com/casic/br/adapter/IconTextGridAdapter.kt b/app/src/main/java/com/casic/br/adapter/IconTextGridAdapter.kt index 3b2dd90..3ca02e4 100644 --- a/app/src/main/java/com/casic/br/adapter/IconTextGridAdapter.kt +++ b/app/src/main/java/com/casic/br/adapter/IconTextGridAdapter.kt @@ -7,8 +7,6 @@ import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.br.R /** @@ -27,10 +25,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - Glide.with(context) - .load(icons[position]) - .apply(RequestOptions.circleCropTransform()) - .into(holder.imageView) + holder.imageView.setImageResource(icons[position]) holder.textView.text = titles[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) diff --git a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt index ed28b03..c637fba 100644 --- a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt @@ -17,14 +17,16 @@ Manifest.permission.READ_PHONE_STATE, Manifest.permission.BLUETOOTH, Manifest.permission.BLUETOOTH_ADMIN ) - val SHOP_IMAGE = intArrayOf(R.mipmap.ic_launcher, R.mipmap.ic_launcher, R.mipmap.ic_launcher) + val SHOP_IMAGE = intArrayOf( + R.drawable.ic_gouwuche, R.drawable.ic_dingdan, R.drawable.ic_shouhou + ) val SHOP_OPERATE = arrayOf("购物车", "我的订单", "故障售后") val SHOP_PAGE_OPERATE = arrayOf("推荐", "智能厨房", "智能家居", "配件") val SERVER_IMAGE = intArrayOf( - R.mipmap.ic_launcher, - R.mipmap.ic_launcher, - R.mipmap.ic_launcher, - R.mipmap.ic_launcher + R.drawable.ic_daifukuan, + R.drawable.ic_daifuwu, + R.drawable.ic_fuwuzhong, + R.drawable.ic_pingjia ) val SERVER_OPERATE = arrayOf("待付款", "待服务", "服务中", "评价") val USER_OPERATE = arrayOf("账号安全", "账号绑定", "支付管理", "地址管理", "系统设置") @@ -32,7 +34,7 @@ val SETTINGS_OPERATE = arrayOf("通知设置", "清除缓存", "服务协议", "隐私声明", "关于我们") val HOME_FUNC_OPERATE = arrayOf("户号管理", "燃气缴费", "历史账单", "用气分析", "服务网点", "采暖补贴") val DEVICE_PAGE_TITLE = arrayOf("设备控制", "状态显示", "服务设置") - val CONNECT_IMAGE = intArrayOf(R.mipmap.ic_launcher, R.mipmap.ic_launcher) + val CONNECT_IMAGE = intArrayOf(R.drawable.ic_kefu, R.drawable.ic_weixiu) val CONNECT_ARRAY = arrayOf("客服电话", "抢修电话") /** diff --git a/app/src/main/res/drawable/ic_daifukuan.xml b/app/src/main/res/drawable/ic_daifukuan.xml new file mode 100644 index 0000000..b8edbac --- /dev/null +++ b/app/src/main/res/drawable/ic_daifukuan.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_daifuwu.xml b/app/src/main/res/drawable/ic_daifuwu.xml new file mode 100644 index 0000000..4440dc1 --- /dev/null +++ b/app/src/main/res/drawable/ic_daifuwu.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_dingdan.xml b/app/src/main/res/drawable/ic_dingdan.xml new file mode 100644 index 0000000..803296c --- /dev/null +++ b/app/src/main/res/drawable/ic_dingdan.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_fuwuzhong.xml b/app/src/main/res/drawable/ic_fuwuzhong.xml new file mode 100644 index 0000000..d3f846c --- /dev/null +++ b/app/src/main/res/drawable/ic_fuwuzhong.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_gouwuche.xml b/app/src/main/res/drawable/ic_gouwuche.xml new file mode 100644 index 0000000..7634cb3 --- /dev/null +++ b/app/src/main/res/drawable/ic_gouwuche.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_kefu.xml b/app/src/main/res/drawable/ic_kefu.xml new file mode 100644 index 0000000..04c2d5e --- /dev/null +++ b/app/src/main/res/drawable/ic_kefu.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt b/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt index b8ab0f5..894d5db 100644 --- a/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt +++ b/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt @@ -27,10 +27,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - Glide.with(context) - .load(icons[position]) - .apply(RequestOptions.circleCropTransform()) - .into(holder.imageView) + holder.imageView.setImageResource(icons[position]) holder.textView.text = titles[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) diff --git a/app/src/main/java/com/casic/br/adapter/IconTextGridAdapter.kt b/app/src/main/java/com/casic/br/adapter/IconTextGridAdapter.kt index 3b2dd90..3ca02e4 100644 --- a/app/src/main/java/com/casic/br/adapter/IconTextGridAdapter.kt +++ b/app/src/main/java/com/casic/br/adapter/IconTextGridAdapter.kt @@ -7,8 +7,6 @@ import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.br.R /** @@ -27,10 +25,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - Glide.with(context) - .load(icons[position]) - .apply(RequestOptions.circleCropTransform()) - .into(holder.imageView) + holder.imageView.setImageResource(icons[position]) holder.textView.text = titles[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) diff --git a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt index ed28b03..c637fba 100644 --- a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt @@ -17,14 +17,16 @@ Manifest.permission.READ_PHONE_STATE, Manifest.permission.BLUETOOTH, Manifest.permission.BLUETOOTH_ADMIN ) - val SHOP_IMAGE = intArrayOf(R.mipmap.ic_launcher, R.mipmap.ic_launcher, R.mipmap.ic_launcher) + val SHOP_IMAGE = intArrayOf( + R.drawable.ic_gouwuche, R.drawable.ic_dingdan, R.drawable.ic_shouhou + ) val SHOP_OPERATE = arrayOf("购物车", "我的订单", "故障售后") val SHOP_PAGE_OPERATE = arrayOf("推荐", "智能厨房", "智能家居", "配件") val SERVER_IMAGE = intArrayOf( - R.mipmap.ic_launcher, - R.mipmap.ic_launcher, - R.mipmap.ic_launcher, - R.mipmap.ic_launcher + R.drawable.ic_daifukuan, + R.drawable.ic_daifuwu, + R.drawable.ic_fuwuzhong, + R.drawable.ic_pingjia ) val SERVER_OPERATE = arrayOf("待付款", "待服务", "服务中", "评价") val USER_OPERATE = arrayOf("账号安全", "账号绑定", "支付管理", "地址管理", "系统设置") @@ -32,7 +34,7 @@ val SETTINGS_OPERATE = arrayOf("通知设置", "清除缓存", "服务协议", "隐私声明", "关于我们") val HOME_FUNC_OPERATE = arrayOf("户号管理", "燃气缴费", "历史账单", "用气分析", "服务网点", "采暖补贴") val DEVICE_PAGE_TITLE = arrayOf("设备控制", "状态显示", "服务设置") - val CONNECT_IMAGE = intArrayOf(R.mipmap.ic_launcher, R.mipmap.ic_launcher) + val CONNECT_IMAGE = intArrayOf(R.drawable.ic_kefu, R.drawable.ic_weixiu) val CONNECT_ARRAY = arrayOf("客服电话", "抢修电话") /** diff --git a/app/src/main/res/drawable/ic_daifukuan.xml b/app/src/main/res/drawable/ic_daifukuan.xml new file mode 100644 index 0000000..b8edbac --- /dev/null +++ b/app/src/main/res/drawable/ic_daifukuan.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_daifuwu.xml b/app/src/main/res/drawable/ic_daifuwu.xml new file mode 100644 index 0000000..4440dc1 --- /dev/null +++ b/app/src/main/res/drawable/ic_daifuwu.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_dingdan.xml b/app/src/main/res/drawable/ic_dingdan.xml new file mode 100644 index 0000000..803296c --- /dev/null +++ b/app/src/main/res/drawable/ic_dingdan.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_fuwuzhong.xml b/app/src/main/res/drawable/ic_fuwuzhong.xml new file mode 100644 index 0000000..d3f846c --- /dev/null +++ b/app/src/main/res/drawable/ic_fuwuzhong.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_gouwuche.xml b/app/src/main/res/drawable/ic_gouwuche.xml new file mode 100644 index 0000000..7634cb3 --- /dev/null +++ b/app/src/main/res/drawable/ic_gouwuche.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_kefu.xml b/app/src/main/res/drawable/ic_kefu.xml new file mode 100644 index 0000000..04c2d5e --- /dev/null +++ b/app/src/main/res/drawable/ic_kefu.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_pingjia.xml b/app/src/main/res/drawable/ic_pingjia.xml new file mode 100644 index 0000000..992f3a6 --- /dev/null +++ b/app/src/main/res/drawable/ic_pingjia.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt b/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt index b8ab0f5..894d5db 100644 --- a/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt +++ b/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt @@ -27,10 +27,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - Glide.with(context) - .load(icons[position]) - .apply(RequestOptions.circleCropTransform()) - .into(holder.imageView) + holder.imageView.setImageResource(icons[position]) holder.textView.text = titles[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) diff --git a/app/src/main/java/com/casic/br/adapter/IconTextGridAdapter.kt b/app/src/main/java/com/casic/br/adapter/IconTextGridAdapter.kt index 3b2dd90..3ca02e4 100644 --- a/app/src/main/java/com/casic/br/adapter/IconTextGridAdapter.kt +++ b/app/src/main/java/com/casic/br/adapter/IconTextGridAdapter.kt @@ -7,8 +7,6 @@ import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.br.R /** @@ -27,10 +25,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - Glide.with(context) - .load(icons[position]) - .apply(RequestOptions.circleCropTransform()) - .into(holder.imageView) + holder.imageView.setImageResource(icons[position]) holder.textView.text = titles[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) diff --git a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt index ed28b03..c637fba 100644 --- a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt @@ -17,14 +17,16 @@ Manifest.permission.READ_PHONE_STATE, Manifest.permission.BLUETOOTH, Manifest.permission.BLUETOOTH_ADMIN ) - val SHOP_IMAGE = intArrayOf(R.mipmap.ic_launcher, R.mipmap.ic_launcher, R.mipmap.ic_launcher) + val SHOP_IMAGE = intArrayOf( + R.drawable.ic_gouwuche, R.drawable.ic_dingdan, R.drawable.ic_shouhou + ) val SHOP_OPERATE = arrayOf("购物车", "我的订单", "故障售后") val SHOP_PAGE_OPERATE = arrayOf("推荐", "智能厨房", "智能家居", "配件") val SERVER_IMAGE = intArrayOf( - R.mipmap.ic_launcher, - R.mipmap.ic_launcher, - R.mipmap.ic_launcher, - R.mipmap.ic_launcher + R.drawable.ic_daifukuan, + R.drawable.ic_daifuwu, + R.drawable.ic_fuwuzhong, + R.drawable.ic_pingjia ) val SERVER_OPERATE = arrayOf("待付款", "待服务", "服务中", "评价") val USER_OPERATE = arrayOf("账号安全", "账号绑定", "支付管理", "地址管理", "系统设置") @@ -32,7 +34,7 @@ val SETTINGS_OPERATE = arrayOf("通知设置", "清除缓存", "服务协议", "隐私声明", "关于我们") val HOME_FUNC_OPERATE = arrayOf("户号管理", "燃气缴费", "历史账单", "用气分析", "服务网点", "采暖补贴") val DEVICE_PAGE_TITLE = arrayOf("设备控制", "状态显示", "服务设置") - val CONNECT_IMAGE = intArrayOf(R.mipmap.ic_launcher, R.mipmap.ic_launcher) + val CONNECT_IMAGE = intArrayOf(R.drawable.ic_kefu, R.drawable.ic_weixiu) val CONNECT_ARRAY = arrayOf("客服电话", "抢修电话") /** diff --git a/app/src/main/res/drawable/ic_daifukuan.xml b/app/src/main/res/drawable/ic_daifukuan.xml new file mode 100644 index 0000000..b8edbac --- /dev/null +++ b/app/src/main/res/drawable/ic_daifukuan.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_daifuwu.xml b/app/src/main/res/drawable/ic_daifuwu.xml new file mode 100644 index 0000000..4440dc1 --- /dev/null +++ b/app/src/main/res/drawable/ic_daifuwu.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_dingdan.xml b/app/src/main/res/drawable/ic_dingdan.xml new file mode 100644 index 0000000..803296c --- /dev/null +++ b/app/src/main/res/drawable/ic_dingdan.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_fuwuzhong.xml b/app/src/main/res/drawable/ic_fuwuzhong.xml new file mode 100644 index 0000000..d3f846c --- /dev/null +++ b/app/src/main/res/drawable/ic_fuwuzhong.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_gouwuche.xml b/app/src/main/res/drawable/ic_gouwuche.xml new file mode 100644 index 0000000..7634cb3 --- /dev/null +++ b/app/src/main/res/drawable/ic_gouwuche.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_kefu.xml b/app/src/main/res/drawable/ic_kefu.xml new file mode 100644 index 0000000..04c2d5e --- /dev/null +++ b/app/src/main/res/drawable/ic_kefu.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_pingjia.xml b/app/src/main/res/drawable/ic_pingjia.xml new file mode 100644 index 0000000..992f3a6 --- /dev/null +++ b/app/src/main/res/drawable/ic_pingjia.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_shouhou.xml b/app/src/main/res/drawable/ic_shouhou.xml new file mode 100644 index 0000000..54cdf99 --- /dev/null +++ b/app/src/main/res/drawable/ic_shouhou.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt b/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt index b8ab0f5..894d5db 100644 --- a/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt +++ b/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt @@ -27,10 +27,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - Glide.with(context) - .load(icons[position]) - .apply(RequestOptions.circleCropTransform()) - .into(holder.imageView) + holder.imageView.setImageResource(icons[position]) holder.textView.text = titles[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) diff --git a/app/src/main/java/com/casic/br/adapter/IconTextGridAdapter.kt b/app/src/main/java/com/casic/br/adapter/IconTextGridAdapter.kt index 3b2dd90..3ca02e4 100644 --- a/app/src/main/java/com/casic/br/adapter/IconTextGridAdapter.kt +++ b/app/src/main/java/com/casic/br/adapter/IconTextGridAdapter.kt @@ -7,8 +7,6 @@ import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.br.R /** @@ -27,10 +25,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - Glide.with(context) - .load(icons[position]) - .apply(RequestOptions.circleCropTransform()) - .into(holder.imageView) + holder.imageView.setImageResource(icons[position]) holder.textView.text = titles[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) diff --git a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt index ed28b03..c637fba 100644 --- a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt @@ -17,14 +17,16 @@ Manifest.permission.READ_PHONE_STATE, Manifest.permission.BLUETOOTH, Manifest.permission.BLUETOOTH_ADMIN ) - val SHOP_IMAGE = intArrayOf(R.mipmap.ic_launcher, R.mipmap.ic_launcher, R.mipmap.ic_launcher) + val SHOP_IMAGE = intArrayOf( + R.drawable.ic_gouwuche, R.drawable.ic_dingdan, R.drawable.ic_shouhou + ) val SHOP_OPERATE = arrayOf("购物车", "我的订单", "故障售后") val SHOP_PAGE_OPERATE = arrayOf("推荐", "智能厨房", "智能家居", "配件") val SERVER_IMAGE = intArrayOf( - R.mipmap.ic_launcher, - R.mipmap.ic_launcher, - R.mipmap.ic_launcher, - R.mipmap.ic_launcher + R.drawable.ic_daifukuan, + R.drawable.ic_daifuwu, + R.drawable.ic_fuwuzhong, + R.drawable.ic_pingjia ) val SERVER_OPERATE = arrayOf("待付款", "待服务", "服务中", "评价") val USER_OPERATE = arrayOf("账号安全", "账号绑定", "支付管理", "地址管理", "系统设置") @@ -32,7 +34,7 @@ val SETTINGS_OPERATE = arrayOf("通知设置", "清除缓存", "服务协议", "隐私声明", "关于我们") val HOME_FUNC_OPERATE = arrayOf("户号管理", "燃气缴费", "历史账单", "用气分析", "服务网点", "采暖补贴") val DEVICE_PAGE_TITLE = arrayOf("设备控制", "状态显示", "服务设置") - val CONNECT_IMAGE = intArrayOf(R.mipmap.ic_launcher, R.mipmap.ic_launcher) + val CONNECT_IMAGE = intArrayOf(R.drawable.ic_kefu, R.drawable.ic_weixiu) val CONNECT_ARRAY = arrayOf("客服电话", "抢修电话") /** diff --git a/app/src/main/res/drawable/ic_daifukuan.xml b/app/src/main/res/drawable/ic_daifukuan.xml new file mode 100644 index 0000000..b8edbac --- /dev/null +++ b/app/src/main/res/drawable/ic_daifukuan.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_daifuwu.xml b/app/src/main/res/drawable/ic_daifuwu.xml new file mode 100644 index 0000000..4440dc1 --- /dev/null +++ b/app/src/main/res/drawable/ic_daifuwu.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_dingdan.xml b/app/src/main/res/drawable/ic_dingdan.xml new file mode 100644 index 0000000..803296c --- /dev/null +++ b/app/src/main/res/drawable/ic_dingdan.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_fuwuzhong.xml b/app/src/main/res/drawable/ic_fuwuzhong.xml new file mode 100644 index 0000000..d3f846c --- /dev/null +++ b/app/src/main/res/drawable/ic_fuwuzhong.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_gouwuche.xml b/app/src/main/res/drawable/ic_gouwuche.xml new file mode 100644 index 0000000..7634cb3 --- /dev/null +++ b/app/src/main/res/drawable/ic_gouwuche.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_kefu.xml b/app/src/main/res/drawable/ic_kefu.xml new file mode 100644 index 0000000..04c2d5e --- /dev/null +++ b/app/src/main/res/drawable/ic_kefu.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_pingjia.xml b/app/src/main/res/drawable/ic_pingjia.xml new file mode 100644 index 0000000..992f3a6 --- /dev/null +++ b/app/src/main/res/drawable/ic_pingjia.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_shouhou.xml b/app/src/main/res/drawable/ic_shouhou.xml new file mode 100644 index 0000000..54cdf99 --- /dev/null +++ b/app/src/main/res/drawable/ic_shouhou.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_weixiu.xml b/app/src/main/res/drawable/ic_weixiu.xml new file mode 100644 index 0000000..ffe1f9f --- /dev/null +++ b/app/src/main/res/drawable/ic_weixiu.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt b/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt index b8ab0f5..894d5db 100644 --- a/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt +++ b/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt @@ -27,10 +27,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - Glide.with(context) - .load(icons[position]) - .apply(RequestOptions.circleCropTransform()) - .into(holder.imageView) + holder.imageView.setImageResource(icons[position]) holder.textView.text = titles[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) diff --git a/app/src/main/java/com/casic/br/adapter/IconTextGridAdapter.kt b/app/src/main/java/com/casic/br/adapter/IconTextGridAdapter.kt index 3b2dd90..3ca02e4 100644 --- a/app/src/main/java/com/casic/br/adapter/IconTextGridAdapter.kt +++ b/app/src/main/java/com/casic/br/adapter/IconTextGridAdapter.kt @@ -7,8 +7,6 @@ import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.br.R /** @@ -27,10 +25,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - Glide.with(context) - .load(icons[position]) - .apply(RequestOptions.circleCropTransform()) - .into(holder.imageView) + holder.imageView.setImageResource(icons[position]) holder.textView.text = titles[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) diff --git a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt index ed28b03..c637fba 100644 --- a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt @@ -17,14 +17,16 @@ Manifest.permission.READ_PHONE_STATE, Manifest.permission.BLUETOOTH, Manifest.permission.BLUETOOTH_ADMIN ) - val SHOP_IMAGE = intArrayOf(R.mipmap.ic_launcher, R.mipmap.ic_launcher, R.mipmap.ic_launcher) + val SHOP_IMAGE = intArrayOf( + R.drawable.ic_gouwuche, R.drawable.ic_dingdan, R.drawable.ic_shouhou + ) val SHOP_OPERATE = arrayOf("购物车", "我的订单", "故障售后") val SHOP_PAGE_OPERATE = arrayOf("推荐", "智能厨房", "智能家居", "配件") val SERVER_IMAGE = intArrayOf( - R.mipmap.ic_launcher, - R.mipmap.ic_launcher, - R.mipmap.ic_launcher, - R.mipmap.ic_launcher + R.drawable.ic_daifukuan, + R.drawable.ic_daifuwu, + R.drawable.ic_fuwuzhong, + R.drawable.ic_pingjia ) val SERVER_OPERATE = arrayOf("待付款", "待服务", "服务中", "评价") val USER_OPERATE = arrayOf("账号安全", "账号绑定", "支付管理", "地址管理", "系统设置") @@ -32,7 +34,7 @@ val SETTINGS_OPERATE = arrayOf("通知设置", "清除缓存", "服务协议", "隐私声明", "关于我们") val HOME_FUNC_OPERATE = arrayOf("户号管理", "燃气缴费", "历史账单", "用气分析", "服务网点", "采暖补贴") val DEVICE_PAGE_TITLE = arrayOf("设备控制", "状态显示", "服务设置") - val CONNECT_IMAGE = intArrayOf(R.mipmap.ic_launcher, R.mipmap.ic_launcher) + val CONNECT_IMAGE = intArrayOf(R.drawable.ic_kefu, R.drawable.ic_weixiu) val CONNECT_ARRAY = arrayOf("客服电话", "抢修电话") /** diff --git a/app/src/main/res/drawable/ic_daifukuan.xml b/app/src/main/res/drawable/ic_daifukuan.xml new file mode 100644 index 0000000..b8edbac --- /dev/null +++ b/app/src/main/res/drawable/ic_daifukuan.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_daifuwu.xml b/app/src/main/res/drawable/ic_daifuwu.xml new file mode 100644 index 0000000..4440dc1 --- /dev/null +++ b/app/src/main/res/drawable/ic_daifuwu.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_dingdan.xml b/app/src/main/res/drawable/ic_dingdan.xml new file mode 100644 index 0000000..803296c --- /dev/null +++ b/app/src/main/res/drawable/ic_dingdan.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_fuwuzhong.xml b/app/src/main/res/drawable/ic_fuwuzhong.xml new file mode 100644 index 0000000..d3f846c --- /dev/null +++ b/app/src/main/res/drawable/ic_fuwuzhong.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_gouwuche.xml b/app/src/main/res/drawable/ic_gouwuche.xml new file mode 100644 index 0000000..7634cb3 --- /dev/null +++ b/app/src/main/res/drawable/ic_gouwuche.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_kefu.xml b/app/src/main/res/drawable/ic_kefu.xml new file mode 100644 index 0000000..04c2d5e --- /dev/null +++ b/app/src/main/res/drawable/ic_kefu.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_pingjia.xml b/app/src/main/res/drawable/ic_pingjia.xml new file mode 100644 index 0000000..992f3a6 --- /dev/null +++ b/app/src/main/res/drawable/ic_pingjia.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_shouhou.xml b/app/src/main/res/drawable/ic_shouhou.xml new file mode 100644 index 0000000..54cdf99 --- /dev/null +++ b/app/src/main/res/drawable/ic_shouhou.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_weixiu.xml b/app/src/main/res/drawable/ic_weixiu.xml new file mode 100644 index 0000000..ffe1f9f --- /dev/null +++ b/app/src/main/res/drawable/ic_weixiu.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout/item_connect_rv_g.xml b/app/src/main/res/layout/item_connect_rv_g.xml index cf3b023..d100c0f 100644 --- a/app/src/main/res/layout/item_connect_rv_g.xml +++ b/app/src/main/res/layout/item_connect_rv_g.xml @@ -9,9 +9,8 @@ + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> + + diff --git a/app/src/main/res/drawable/ic_daifuwu.xml b/app/src/main/res/drawable/ic_daifuwu.xml new file mode 100644 index 0000000..4440dc1 --- /dev/null +++ b/app/src/main/res/drawable/ic_daifuwu.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_dingdan.xml b/app/src/main/res/drawable/ic_dingdan.xml new file mode 100644 index 0000000..803296c --- /dev/null +++ b/app/src/main/res/drawable/ic_dingdan.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_fuwuzhong.xml b/app/src/main/res/drawable/ic_fuwuzhong.xml new file mode 100644 index 0000000..d3f846c --- /dev/null +++ b/app/src/main/res/drawable/ic_fuwuzhong.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_gouwuche.xml b/app/src/main/res/drawable/ic_gouwuche.xml new file mode 100644 index 0000000..7634cb3 --- /dev/null +++ b/app/src/main/res/drawable/ic_gouwuche.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_kefu.xml b/app/src/main/res/drawable/ic_kefu.xml new file mode 100644 index 0000000..04c2d5e --- /dev/null +++ b/app/src/main/res/drawable/ic_kefu.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_pingjia.xml b/app/src/main/res/drawable/ic_pingjia.xml new file mode 100644 index 0000000..992f3a6 --- /dev/null +++ b/app/src/main/res/drawable/ic_pingjia.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_shouhou.xml b/app/src/main/res/drawable/ic_shouhou.xml new file mode 100644 index 0000000..54cdf99 --- /dev/null +++ b/app/src/main/res/drawable/ic_shouhou.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_weixiu.xml b/app/src/main/res/drawable/ic_weixiu.xml new file mode 100644 index 0000000..ffe1f9f --- /dev/null +++ b/app/src/main/res/drawable/ic_weixiu.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout/item_connect_rv_g.xml b/app/src/main/res/layout/item_connect_rv_g.xml index cf3b023..d100c0f 100644 --- a/app/src/main/res/layout/item_connect_rv_g.xml +++ b/app/src/main/res/layout/item_connect_rv_g.xml @@ -9,9 +9,8 @@ + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> + android:layout_width="wrap_content" + android:layout_height="wrap_content" />