diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d4dc355ab5..5deff26d98 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -605,11 +605,11 @@ android:screenOrientation="portrait" /> diff --git a/app/src/main/java/com/gh/common/DefaultJsApi.kt b/app/src/main/java/com/gh/common/DefaultJsApi.kt index 752aebe96c..cbb3abb20a 100644 --- a/app/src/main/java/com/gh/common/DefaultJsApi.kt +++ b/app/src/main/java/com/gh/common/DefaultJsApi.kt @@ -17,7 +17,7 @@ import com.gh.gamecenter.WebActivity import com.gh.gamecenter.entity.Badge import com.gh.gamecenter.entity.MtaEvent import com.gh.gamecenter.entity.NotificationUgc -import com.gh.gamecenter.guangneng.GuangnengCenterActivity +import com.gh.gamecenter.energy.EnergyCenterActivity import com.gh.gamecenter.manager.UserManager import com.gh.gamecenter.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager @@ -267,7 +267,7 @@ class DefaultJsApi(var context: Context) { @JavascriptInterface fun startEnergyCenter(msg: Any) { - context.startActivity(GuangnengCenterActivity.getIntent(context)) + context.startActivity(EnergyCenterActivity.getIntent(context)) } @Keep diff --git a/app/src/main/java/com/gh/common/util/EnergyTaskHelper.kt b/app/src/main/java/com/gh/common/util/EnergyTaskHelper.kt index cb125f15e2..1ed3c9345b 100644 --- a/app/src/main/java/com/gh/common/util/EnergyTaskHelper.kt +++ b/app/src/main/java/com/gh/common/util/EnergyTaskHelper.kt @@ -1,7 +1,6 @@ package com.gh.common.util import android.annotation.SuppressLint -import android.content.Context import android.view.Gravity import android.view.View import android.widget.LinearLayout @@ -10,7 +9,7 @@ import android.widget.TextView import com.facebook.drawee.view.SimpleDraweeView import com.gh.gamecenter.R import com.gh.gamecenter.entity.EnergyTaskCompleteEntity -import com.gh.gamecenter.guangneng.GuangnengCenterActivity +import com.gh.gamecenter.energy.EnergyCenterActivity import com.gh.gamecenter.manager.UserManager import com.gh.gamecenter.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager @@ -44,7 +43,7 @@ object EnergyTaskHelper { } @JvmStatic - fun postGnTaskForWeb(action: String, url: String) { + fun postEnergyTaskForWeb(action: String, url: String) { postEnergyTask(action, null, null, url) } @@ -68,7 +67,7 @@ object EnergyTaskHelper { actionParam.put("url", url) } - debugOnly { Utils.log("GnTaskHelper -> $jsonObject") } + debugOnly { Utils.log("EnergyTaskHelper -> $jsonObject") } val body = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString()) RetrofitManager.getInstance(HaloApp.getInstance().application) @@ -96,7 +95,7 @@ object EnergyTaskHelper { isFocusable = true isFocusableInTouchMode = true setOnClickListener { - currentActivity.startActivity(GuangnengCenterActivity.getIntent(currentActivity)) + currentActivity.startActivity(EnergyCenterActivity.getIntent(currentActivity)) } } val popWindow = PopupWindow(contentView, LinearLayout.LayoutParams.MATCH_PARENT, diff --git a/app/src/main/java/com/gh/common/util/ShareUtils.java b/app/src/main/java/com/gh/common/util/ShareUtils.java index bc5c046b60..3b14f7b740 100644 --- a/app/src/main/java/com/gh/common/util/ShareUtils.java +++ b/app/src/main/java/com/gh/common/util/ShareUtils.java @@ -703,7 +703,7 @@ public class ShareUtils { EnergyTaskHelper.postEnergyTask("share_toolkit", resourceId); break; case web: - EnergyTaskHelper.postGnTaskForWeb("share_web", shareUrl); + EnergyTaskHelper.postEnergyTaskForWeb("share_web", shareUrl); break; } diff --git a/app/src/main/java/com/gh/gamecenter/guangneng/CommodityListAdapter.kt b/app/src/main/java/com/gh/gamecenter/energy/CommodityListAdapter.kt similarity index 99% rename from app/src/main/java/com/gh/gamecenter/guangneng/CommodityListAdapter.kt rename to app/src/main/java/com/gh/gamecenter/energy/CommodityListAdapter.kt index f59f7eb24c..0f0eb5d654 100644 --- a/app/src/main/java/com/gh/gamecenter/guangneng/CommodityListAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/energy/CommodityListAdapter.kt @@ -1,4 +1,4 @@ -package com.gh.gamecenter.guangneng +package com.gh.gamecenter.energy import android.content.Context import android.graphics.Color diff --git a/app/src/main/java/com/gh/gamecenter/guangneng/CommodityListFragment.kt b/app/src/main/java/com/gh/gamecenter/energy/CommodityListFragment.kt similarity index 96% rename from app/src/main/java/com/gh/gamecenter/guangneng/CommodityListFragment.kt rename to app/src/main/java/com/gh/gamecenter/energy/CommodityListFragment.kt index 657137376e..e1a1d69969 100644 --- a/app/src/main/java/com/gh/gamecenter/guangneng/CommodityListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/energy/CommodityListFragment.kt @@ -1,4 +1,4 @@ -package com.gh.gamecenter.guangneng +package com.gh.gamecenter.energy import android.os.Bundle import android.view.View @@ -57,7 +57,7 @@ class CommodityListFragment : ListFragment(EntranceUtils.KEY_CATEGORY_LIST)?.run { mCategoryList = this mBinding.header.visibility = View.VISIBLE - mBinding.more.setOnClickListener { requireContext().startActivity(GuangnengHouseActivity.getIntent(requireContext())) } + mBinding.more.setOnClickListener { requireContext().startActivity(EnergyHouseActivity.getIntent(requireContext())) } this.forEachIndexed { index, entity -> val item = layoutInflater.inflate(R.layout.item_filter_commodity_size, mBinding.categoryContainer, false) mBinding.categoryContainer.addView(item) @@ -78,7 +78,7 @@ class CommodityListFragment : ListFragment() private var mCategoryList = ArrayList() override fun getLayoutId() = 0 - override fun getInflatedLayout() = FragmentGuangnengCenterBinding.inflate(layoutInflater).apply { mBinding = this }.root + override fun getInflatedLayout() = FragmentEnergyCenterBinding.inflate(layoutInflater).apply { mBinding = this }.root override fun onFragmentResume() { super.onFragmentResume() @@ -42,9 +42,9 @@ class GuangnengCenterFragment : BaseLazyFragment() { // 6:00-18:59 展示白天背景，否则展示夜晚背景 if (System.currentTimeMillis() >= TimeUtils.getTimeOfToday(6) && System.currentTimeMillis() < TimeUtils.getTimeOfToday(19) ) { - mBinding.background.setImageResource(R.drawable.bg_gncenter_day) + mBinding.background.setImageResource(R.drawable.bg_energy_center_day) } else { - mBinding.background.setImageResource(R.drawable.bg_gncenter_night) + mBinding.background.setImageResource(R.drawable.bg_energy_center_night) } if (NetworkUtils.isNetworkConnected(requireContext())) { @@ -60,7 +60,7 @@ class GuangnengCenterFragment : BaseLazyFragment() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - mGnCenterViewModel = viewModelProvider() + mEnergyCenterViewModel = viewModelProvider() mUserViewModel = viewModelProvider(UserViewModel.Factory(HaloApp.getInstance().application)) mUserHomeViewModel = viewModelProvider(UserHomeViewModel.Factory(HaloApp.getInstance().application, UserManager.getInstance().userId)) } @@ -68,7 +68,7 @@ class GuangnengCenterFragment : BaseLazyFragment() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - mGnCenterViewModel.categories.observe(viewLifecycleOwner, Observer { + mEnergyCenterViewModel.categories.observe(viewLifecycleOwner, Observer { mCategoryList.clear() mCategoryList.addAll(it) initViewpager() @@ -167,7 +167,7 @@ class GuangnengCenterFragment : BaseLazyFragment() { } private fun getTabView(title: String): View { - val view = LayoutInflater.from(HaloApp.getInstance().application.baseContext).inflate(R.layout.tab_item_gn_house, null) + val view = LayoutInflater.from(HaloApp.getInstance().application.baseContext).inflate(R.layout.tab_item_energy_house, null) val tabTitle = view.findViewById(R.id.tab_title) if (tabTitle is CheckedTextView) { tabTitle.text = title @@ -183,13 +183,13 @@ class GuangnengCenterFragment : BaseLazyFragment() { } } - @OnClick(R.id.backIv, R.id.gnRecord, R.id.lotteryCenter, R.id.signSwitch, R.id.signBubble, + @OnClick(R.id.backIv, R.id.EnergyRecord, R.id.lotteryCenter, R.id.signSwitch, R.id.signBubble, R.id.oneDay, R.id.twoDay, R.id.threeDay, R.id.fourDay, R.id.fiveDay, R.id.sixDay, R.id.sevenDay) fun onViewClicked(v: View) { when (v.id) { R.id.backIv -> requireActivity().finish() - R.id.gnRecord -> { + R.id.EnergyRecord -> { ifLogin("光能中心-光能记录") { DirectUtils.directToEnergyRecord(requireContext()) } diff --git a/app/src/main/java/com/gh/gamecenter/guangneng/GuangnengCenterViewModel.kt b/app/src/main/java/com/gh/gamecenter/energy/EnergyCenterViewModel.kt similarity index 90% rename from app/src/main/java/com/gh/gamecenter/guangneng/GuangnengCenterViewModel.kt rename to app/src/main/java/com/gh/gamecenter/energy/EnergyCenterViewModel.kt index d3850572e6..4f995c9671 100644 --- a/app/src/main/java/com/gh/gamecenter/guangneng/GuangnengCenterViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/energy/EnergyCenterViewModel.kt @@ -1,4 +1,4 @@ -package com.gh.gamecenter.guangneng +package com.gh.gamecenter.energy import android.annotation.SuppressLint import android.app.Application @@ -10,7 +10,7 @@ import com.gh.gamecenter.retrofit.RetrofitManager import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers -class GuangnengCenterViewModel(application: Application) : AndroidViewModel(application) { +class EnergyCenterViewModel(application: Application) : AndroidViewModel(application) { private val api = RetrofitManager.getInstance(getApplication()).api var categories = MutableLiveData>() diff --git a/app/src/main/java/com/gh/gamecenter/guangneng/GuangnengCenterActivity.kt b/app/src/main/java/com/gh/gamecenter/energy/EnergyHouseActivity.kt similarity index 68% rename from app/src/main/java/com/gh/gamecenter/guangneng/GuangnengCenterActivity.kt rename to app/src/main/java/com/gh/gamecenter/energy/EnergyHouseActivity.kt index ac5843ccc7..a98c09b408 100644 --- a/app/src/main/java/com/gh/gamecenter/guangneng/GuangnengCenterActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/energy/EnergyHouseActivity.kt @@ -1,4 +1,4 @@ -package com.gh.gamecenter.guangneng +package com.gh.gamecenter.energy import android.content.Context import android.content.Intent @@ -6,7 +6,7 @@ import android.os.Bundle import com.gh.common.util.DisplayUtils import com.gh.gamecenter.NormalActivity -class GuangnengCenterActivity : NormalActivity() { +class EnergyHouseActivity : NormalActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -16,7 +16,7 @@ class GuangnengCenterActivity : NormalActivity() { companion object { fun getIntent(context: Context?): Intent? { - return getTargetIntent(context, GuangnengCenterActivity::class.java, GuangnengCenterFragment::class.java) + return getTargetIntent(context, EnergyHouseActivity::class.java, EnergyHouseFragment::class.java) } } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/guangneng/GuangnengHouseFragment.kt b/app/src/main/java/com/gh/gamecenter/energy/EnergyHouseFragment.kt similarity index 83% rename from app/src/main/java/com/gh/gamecenter/guangneng/GuangnengHouseFragment.kt rename to app/src/main/java/com/gh/gamecenter/energy/EnergyHouseFragment.kt index abb7490c92..74e10032fe 100644 --- a/app/src/main/java/com/gh/gamecenter/guangneng/GuangnengHouseFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/energy/EnergyHouseFragment.kt @@ -1,4 +1,4 @@ -package com.gh.gamecenter.guangneng +package com.gh.gamecenter.energy import android.os.Bundle import android.view.LayoutInflater @@ -16,7 +16,7 @@ import com.gh.base.adapter.FragmentAdapter import com.gh.base.fragment.BaseLazyFragment import com.gh.common.util.* import com.gh.gamecenter.R -import com.gh.gamecenter.databinding.FragmentGuangnengHouseBinding +import com.gh.gamecenter.databinding.FragmentEnergyHouseBinding import com.gh.gamecenter.entity.CommodityCategoryEntity import com.gh.gamecenter.entity.SubjectSettingEntity import com.gh.gamecenter.entity.TaskEntity @@ -28,12 +28,12 @@ import com.google.android.material.tabs.TabLayout import com.halo.assistant.HaloApp import kotlin.math.abs -class GuangnengHouseFragment: BaseLazyFragment() { +class EnergyHouseFragment: BaseLazyFragment() { - private lateinit var mBinding: FragmentGuangnengHouseBinding + private lateinit var mBinding: FragmentEnergyHouseBinding private lateinit var mUserViewModel: UserViewModel private lateinit var mUserHomeViewModel: UserHomeViewModel - private lateinit var mGnHouseViewModel: GuangnengHouseViewModel + private lateinit var mEnergyHouseViewModel: EnergyHouseViewModel private lateinit var mCommodityCategories: List private val mTitleList = ArrayList() private val mFragments = ArrayList() @@ -44,7 +44,7 @@ class GuangnengHouseFragment: BaseLazyFragment() { override fun getLayoutId() = 0 - override fun getInflatedLayout() = FragmentGuangnengHouseBinding.inflate(layoutInflater).apply { mBinding = this }.root + override fun getInflatedLayout() = FragmentEnergyHouseBinding.inflate(layoutInflater).apply { mBinding = this }.root override fun onFragmentResume() { super.onFragmentResume() @@ -52,7 +52,7 @@ class GuangnengHouseFragment: BaseLazyFragment() { if (NetworkUtils.isNetworkConnected(requireContext())) { if (CheckLoginUtils.isLogin()) { mUserHomeViewModel.getUserEnergy() - mGnHouseViewModel.getNoviceTasks() + mEnergyHouseViewModel.getNoviceTasks() } } } @@ -60,7 +60,7 @@ class GuangnengHouseFragment: BaseLazyFragment() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - mGnHouseViewModel = viewModelProvider() + mEnergyHouseViewModel = viewModelProvider() mUserViewModel = viewModelProvider(UserViewModel.Factory(HaloApp.getInstance().application)) mUserHomeViewModel = viewModelProvider(UserHomeViewModel.Factory(HaloApp.getInstance().application, UserManager.getInstance().userId)) } @@ -89,7 +89,7 @@ class GuangnengHouseFragment: BaseLazyFragment() { mBinding.userEnergy.text = "${it}光能" }) - mGnHouseViewModel.rollNotices.observe(viewLifecycleOwner, Observer { list -> + mEnergyHouseViewModel.rollNotices.observe(viewLifecycleOwner, Observer { list -> if (list.isEmpty()) return@Observer mRollUserNames.clear() mRollCommodityNames.clear() @@ -100,18 +100,18 @@ class GuangnengHouseFragment: BaseLazyFragment() { initRollNotice() }) - mGnHouseViewModel.noviceTasks.observe(viewLifecycleOwner, Observer { + mEnergyHouseViewModel.noviceTasks.observe(viewLifecycleOwner, Observer { mTasks.clear() mTasks.addAll(it) - mGnHouseViewModel.getDailyTasks() + mEnergyHouseViewModel.getDailyTasks() }) - mGnHouseViewModel.dailyTasks.observe(viewLifecycleOwner, Observer { + mEnergyHouseViewModel.dailyTasks.observe(viewLifecycleOwner, Observer { mTasks.addAll(it) initTaskView() }) - mGnHouseViewModel.commodityCategories.observe(viewLifecycleOwner, Observer { + mEnergyHouseViewModel.commodityCategories.observe(viewLifecycleOwner, Observer { if (it.isEmpty()) return@Observer mCommodityCategories = it initViewPager() @@ -123,8 +123,8 @@ class GuangnengHouseFragment: BaseLazyFragment() { toolbar.setBackgroundColor(R.color.white.toColor()) backIv.setImageResource(R.drawable.ic_back_gamedetail) title.setTextColor(R.color.text_333333.toColor()) - gnRuleTv.setTextColor(R.color.text_333333.toColor()) - gnRuleIv.setImageResource(R.drawable.icon_doubt_black) + EnergyRuleTv.setTextColor(R.color.text_333333.toColor()) + EnergyRuleIv.setImageResource(R.drawable.icon_doubt_black) tabLayout.setBackgroundColor(R.color.white.toColor()) sizeContainer.setBackgroundColor(R.color.white.toColor()) DisplayUtils.setStatusBarColor(requireActivity(), R.color.white, true) @@ -132,8 +132,8 @@ class GuangnengHouseFragment: BaseLazyFragment() { toolbar.setBackgroundColor(R.color.transparent.toColor()) backIv.setImageResource(R.drawable.ic_toolbar_back_white) title.setTextColor(R.color.white.toColor()) - gnRuleTv.setTextColor(R.color.white.toColor()) - gnRuleIv.setImageResource(R.drawable.icon_doubt_white) + EnergyRuleTv.setTextColor(R.color.white.toColor()) + EnergyRuleIv.setImageResource(R.drawable.icon_doubt_white) tabLayout.setBackgroundColor(R.color.transparent.toColor()) sizeContainer.setBackgroundColor(R.color.transparent.toColor()) DisplayUtils.setStatusBarColor(requireActivity(), R.color.transparent, true) @@ -153,14 +153,14 @@ class GuangnengHouseFragment: BaseLazyFragment() { private fun initTaskView() { mBinding.run { if (mTasks.isEmpty()) { - GnTaskTitle.visibility = View.GONE - GnTaskContainer.visibility = View.GONE + EnergyTaskTitle.visibility = View.GONE + EnergyTaskContainer.visibility = View.GONE } else { - GnTaskTitle.visibility = View.VISIBLE - GnTaskContainer.visibility = View.VISIBLE - GnTaskMore.setOnClickListener { requireContext().startActivity(GuangnengCenterActivity.getIntent(requireContext())) } - GnTaskContainer.layoutManager = LinearLayoutManager(requireContext(), RecyclerView.HORIZONTAL, false) - GnTaskContainer.adapter = HorizontalGnTaskAdapter(requireContext(), "光能屋", mTasks) + EnergyTaskTitle.visibility = View.VISIBLE + EnergyTaskContainer.visibility = View.VISIBLE + EnergyTaskMore.setOnClickListener { requireContext().startActivity(EnergyCenterActivity.getIntent(requireContext())) } + EnergyTaskContainer.layoutManager = LinearLayoutManager(requireContext(), RecyclerView.HORIZONTAL, false) + EnergyTaskContainer.adapter = HorizontalTaskAdapter(requireContext(), "光能屋", mTasks) } } } @@ -211,7 +211,7 @@ class GuangnengHouseFragment: BaseLazyFragment() { private fun getTabView(title: String): View { - val view = LayoutInflater.from(HaloApp.getInstance().application.baseContext).inflate(R.layout.tab_item_gn_house, null) + val view = LayoutInflater.from(HaloApp.getInstance().application.baseContext).inflate(R.layout.tab_item_energy_house, null) val tabTitle = view.findViewById(R.id.tab_title) if (tabTitle is CheckedTextView) { tabTitle.text = title @@ -270,18 +270,18 @@ class GuangnengHouseFragment: BaseLazyFragment() { } - @OnClick(R.id.backIv, R.id.gnRecord, R.id.gnOrder) + @OnClick(R.id.backIv, R.id.EnergyRecord, R.id.energyOrder) fun onViewClicked(v: View) { when (v.id) { R.id.backIv -> requireActivity().finish() - R.id.gnRecord -> { + R.id.EnergyRecord -> { ifLogin("光能屋-光能记录") { DirectUtils.directToEnergyRecord(requireContext(), 1) } } - R.id.gnOrder -> { + R.id.energyOrder -> { ifLogin("光能屋-订单中心") { DirectUtils.directToOrderCenter(requireContext()) } diff --git a/app/src/main/java/com/gh/gamecenter/guangneng/GuangnengHouseViewModel.kt b/app/src/main/java/com/gh/gamecenter/energy/EnergyHouseViewModel.kt similarity index 96% rename from app/src/main/java/com/gh/gamecenter/guangneng/GuangnengHouseViewModel.kt rename to app/src/main/java/com/gh/gamecenter/energy/EnergyHouseViewModel.kt index f42d45447f..a82ae0f4a9 100644 --- a/app/src/main/java/com/gh/gamecenter/guangneng/GuangnengHouseViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/energy/EnergyHouseViewModel.kt @@ -1,4 +1,4 @@ -package com.gh.gamecenter.guangneng +package com.gh.gamecenter.energy import android.annotation.SuppressLint import android.app.Application @@ -12,7 +12,7 @@ import com.gh.gamecenter.retrofit.RetrofitManager import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers -class GuangnengHouseViewModel(application: Application) +class EnergyHouseViewModel(application: Application) : AndroidViewModel(application) { private val api = RetrofitManager.getInstance(getApplication()).api diff --git a/app/src/main/java/com/gh/gamecenter/guangneng/HorizontalGnTaskAdapter.kt b/app/src/main/java/com/gh/gamecenter/energy/HorizontalTaskAdapter.kt similarity index 75% rename from app/src/main/java/com/gh/gamecenter/guangneng/HorizontalGnTaskAdapter.kt rename to app/src/main/java/com/gh/gamecenter/energy/HorizontalTaskAdapter.kt index fd36864272..eaf65f1663 100644 --- a/app/src/main/java/com/gh/gamecenter/guangneng/HorizontalGnTaskAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/energy/HorizontalTaskAdapter.kt @@ -1,4 +1,4 @@ -package com.gh.gamecenter.guangneng +package com.gh.gamecenter.energy import android.content.Context import android.view.ViewGroup @@ -10,19 +10,19 @@ import com.gh.gamecenter.databinding.NoviceTaskItemBinding import com.gh.gamecenter.entity.TaskEntity import com.lightgame.adapter.BaseRecyclerAdapter -class HorizontalGnTaskAdapter(context: Context, - private val entrance: String, - private var mList: List) - : BaseRecyclerAdapter(context) { +class HorizontalTaskAdapter(context: Context, + private val entrance: String, + private var mList: List) + : BaseRecyclerAdapter(context) { override fun getItemCount() = mList.size override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) - = GnTaskViewHolder(DataBindingUtil.inflate(mLayoutInflater, R.layout.novice_task_item, parent, false)) + = EnergyTaskViewHolder(DataBindingUtil.inflate(mLayoutInflater, R.layout.novice_task_item, parent, false)) - override fun onBindViewHolder(holder: GnTaskViewHolder, position: Int) { + override fun onBindViewHolder(holder: EnergyTaskViewHolder, position: Int) { holder.binding.run { root.layoutParams = (root.layoutParams as ViewGroup.MarginLayoutParams).apply { leftMargin = if (position == 0) 16F.dip2px() else 0 @@ -60,5 +60,5 @@ class HorizontalGnTaskAdapter(context: Context, } } - class GnTaskViewHolder(val binding: NoviceTaskItemBinding) : BaseRecyclerViewHolder(binding.root) + class EnergyTaskViewHolder(val binding: NoviceTaskItemBinding) : BaseRecyclerViewHolder(binding.root) } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/guangneng/TaskAdapter.kt b/app/src/main/java/com/gh/gamecenter/energy/TaskAdapter.kt similarity index 97% rename from app/src/main/java/com/gh/gamecenter/guangneng/TaskAdapter.kt rename to app/src/main/java/com/gh/gamecenter/energy/TaskAdapter.kt index c7a1330ac3..276e82f3f4 100644 --- a/app/src/main/java/com/gh/gamecenter/guangneng/TaskAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/energy/TaskAdapter.kt @@ -1,4 +1,4 @@ -package com.gh.gamecenter.guangneng +package com.gh.gamecenter.energy import android.content.Context import android.view.View @@ -92,7 +92,7 @@ class TaskAdapter(context: Context) : ListAdapter(context) { val list = mEntityList[position].noviceTasks!! holder.binding.taskContainer.run { layoutManager = LinearLayoutManager(context, RecyclerView.HORIZONTAL, false) - adapter = HorizontalGnTaskAdapter(context, "光能中心", list) + adapter = HorizontalTaskAdapter(context, "光能中心", list) } } diff --git a/app/src/main/java/com/gh/gamecenter/guangneng/TaskFragment.kt b/app/src/main/java/com/gh/gamecenter/energy/TaskFragment.kt similarity index 95% rename from app/src/main/java/com/gh/gamecenter/guangneng/TaskFragment.kt rename to app/src/main/java/com/gh/gamecenter/energy/TaskFragment.kt index 445649be18..9ccba731b2 100644 --- a/app/src/main/java/com/gh/gamecenter/guangneng/TaskFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/energy/TaskFragment.kt @@ -1,4 +1,4 @@ -package com.gh.gamecenter.guangneng +package com.gh.gamecenter.energy import android.os.Bundle import com.gh.common.util.viewModelProvider diff --git a/app/src/main/java/com/gh/gamecenter/guangneng/TaskItemData.kt b/app/src/main/java/com/gh/gamecenter/energy/TaskItemData.kt similarity index 86% rename from app/src/main/java/com/gh/gamecenter/guangneng/TaskItemData.kt rename to app/src/main/java/com/gh/gamecenter/energy/TaskItemData.kt index d328edf859..642d79516c 100644 --- a/app/src/main/java/com/gh/gamecenter/guangneng/TaskItemData.kt +++ b/app/src/main/java/com/gh/gamecenter/energy/TaskItemData.kt @@ -1,4 +1,4 @@ -package com.gh.gamecenter.guangneng +package com.gh.gamecenter.energy import com.gh.gamecenter.entity.TaskEntity diff --git a/app/src/main/java/com/gh/gamecenter/guangneng/TaskViewModel.kt b/app/src/main/java/com/gh/gamecenter/energy/TaskViewModel.kt similarity index 97% rename from app/src/main/java/com/gh/gamecenter/guangneng/TaskViewModel.kt rename to app/src/main/java/com/gh/gamecenter/energy/TaskViewModel.kt index a458a315e4..4fd8fceff2 100644 --- a/app/src/main/java/com/gh/gamecenter/guangneng/TaskViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/energy/TaskViewModel.kt @@ -1,4 +1,4 @@ -package com.gh.gamecenter.guangneng +package com.gh.gamecenter.energy import android.app.Application import com.gh.gamecenter.baselist.ListViewModel diff --git a/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java b/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java index ee908e04f1..ecac7726f5 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java +++ b/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java @@ -64,8 +64,8 @@ import com.gh.gamecenter.eventbus.EBNetworkState; import com.gh.gamecenter.eventbus.EBReuse; import com.gh.gamecenter.eventbus.EBSkip; import com.gh.gamecenter.fragment.MainWrapperFragment; -import com.gh.gamecenter.guangneng.GuangnengCenterActivity; -import com.gh.gamecenter.guangneng.GuangnengHouseActivity; +import com.gh.gamecenter.energy.EnergyCenterActivity; +import com.gh.gamecenter.energy.EnergyHouseActivity; import com.gh.gamecenter.manager.UserManager; import com.gh.gamecenter.message.MessageUnreadRepository; import com.gh.gamecenter.message.MessageUnreadViewModel; @@ -146,7 +146,7 @@ public class PersonalFragment extends BaseLazyFragment { RecyclerView mFuncRecyclerView; @BindView(R.id.personal_new_fans_tips) View personalNewFansTips; - @BindView(R.id.personal_guangneng_tv) + @BindView(R.id.personal_energy_tv) TextView mPersonalEnergy; public final static String LOGIN_TAG = "login_tag"; //登入标识 @@ -505,7 +505,7 @@ public class PersonalFragment extends BaseLazyFragment { @OnClick({R.id.toolbar, R.id.collapsingToolbar, R.id.iv_arrow, R.id.personal_info, R.id.personal_login, R.id.personal_user_small_icon, R.id.personal_user_icon, R.id.personal_msg, R.id.personal_user_name_small, R.id.personal_user_name, R.id.personal_badge, R.id.personal_home, - R.id.personal_guangneng, R.id.personal_guangneng_center, R.id.personal_guangneng_house, R.id.personal_guangneng_record}) + R.id.personal_energy, R.id.personal_energy_center, R.id.personal_energy_house, R.id.personal_energy_record}) public void onViewClicked(View view) { switch (view.getId()) { case R.id.collapsingToolbar: @@ -566,7 +566,7 @@ public class PersonalFragment extends BaseLazyFragment { MtaHelper.onEvent("我的光环_新", "徽章中心", "进入徽章中心"); DirectUtils.directToBadgeWall(requireContext(), mUserInfoEntity.getUserId(), mUserInfoEntity.getName(), mUserInfoEntity.getIcon()); break; - case R.id.personal_guangneng: + case R.id.personal_energy: if (mUserInfoEntity != null) { MtaHelper.onEvent("我的光环_新", "光能值", "点击光能值"); DialogUtils.showEnergyDialog(requireContext(), mUserInfoEntity.getName(), mPersonalEnergy.getText().toString()); @@ -574,15 +574,15 @@ public class PersonalFragment extends BaseLazyFragment { CheckLoginUtils.checkLogin(getContext(), "我的光环-光能值", null); } break; - case R.id.personal_guangneng_center: + case R.id.personal_energy_center: MtaHelper.onEvent("我的光环_新", "光能中心", "进入光能中心"); - requireContext().startActivity(GuangnengCenterActivity.Companion.getIntent(requireContext())); + requireContext().startActivity(EnergyCenterActivity.Companion.getIntent(requireContext())); break; - case R.id.personal_guangneng_house: + case R.id.personal_energy_house: MtaHelper.onEvent("我的光环_新", "光能屋", "进入光能屋"); - requireContext().startActivity(GuangnengHouseActivity.Companion.getIntent(requireContext())); + requireContext().startActivity(EnergyHouseActivity.Companion.getIntent(requireContext())); break; - case R.id.personal_guangneng_record: + case R.id.personal_energy_record: if (mUserInfoEntity != null) { MtaHelper.onEvent("我的光环_新", "光能记录", "进入光能记录"); DirectUtils.directToEnergyRecord(requireContext()); diff --git a/app/src/main/res/drawable-xxhdpi/bg_gncenter_card.webp b/app/src/main/res/drawable-xxhdpi/bg_energy_center_card.webp similarity index 100% rename from app/src/main/res/drawable-xxhdpi/bg_gncenter_card.webp rename to app/src/main/res/drawable-xxhdpi/bg_energy_center_card.webp diff --git a/app/src/main/res/drawable-xxhdpi/bg_gncenter_day.webp b/app/src/main/res/drawable-xxhdpi/bg_energy_center_day.webp similarity index 100% rename from app/src/main/res/drawable-xxhdpi/bg_gncenter_day.webp rename to app/src/main/res/drawable-xxhdpi/bg_energy_center_day.webp diff --git a/app/src/main/res/drawable-xxhdpi/bg_gncenter_night.webp b/app/src/main/res/drawable-xxhdpi/bg_energy_center_night.webp similarity index 100% rename from app/src/main/res/drawable-xxhdpi/bg_gncenter_night.webp rename to app/src/main/res/drawable-xxhdpi/bg_energy_center_night.webp diff --git a/app/src/main/res/drawable-xxhdpi/bg_gn_house.webp b/app/src/main/res/drawable-xxhdpi/bg_energy_house.webp similarity index 100% rename from app/src/main/res/drawable-xxhdpi/bg_gn_house.webp rename to app/src/main/res/drawable-xxhdpi/bg_energy_house.webp diff --git a/app/src/main/res/drawable-xxhdpi/ic_guangneng.png b/app/src/main/res/drawable-xxhdpi/ic_energy.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_guangneng.png rename to app/src/main/res/drawable-xxhdpi/ic_energy.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_guangneng_center.png b/app/src/main/res/drawable-xxhdpi/ic_energy_center.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_guangneng_center.png rename to app/src/main/res/drawable-xxhdpi/ic_energy_center.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_gncenter_done.png b/app/src/main/res/drawable-xxhdpi/ic_energy_center_done.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_gncenter_done.png rename to app/src/main/res/drawable-xxhdpi/ic_energy_center_done.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_gn_center_lottery.png b/app/src/main/res/drawable-xxhdpi/ic_energy_center_lottery.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_gn_center_lottery.png rename to app/src/main/res/drawable-xxhdpi/ic_energy_center_lottery.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_gncenter_more.png b/app/src/main/res/drawable-xxhdpi/ic_energy_center_more.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_gncenter_more.png rename to app/src/main/res/drawable-xxhdpi/ic_energy_center_more.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_gncenter_notice.png b/app/src/main/res/drawable-xxhdpi/ic_energy_center_notice.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_gncenter_notice.png rename to app/src/main/res/drawable-xxhdpi/ic_energy_center_notice.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_gn_center_record.png b/app/src/main/res/drawable-xxhdpi/ic_energy_center_record.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_gn_center_record.png rename to app/src/main/res/drawable-xxhdpi/ic_energy_center_record.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_gncenter_sign.png b/app/src/main/res/drawable-xxhdpi/ic_energy_center_sign.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_gncenter_sign.png rename to app/src/main/res/drawable-xxhdpi/ic_energy_center_sign.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_gncenter_switch_on.png b/app/src/main/res/drawable-xxhdpi/ic_energy_center_switch_on.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_gncenter_switch_on.png rename to app/src/main/res/drawable-xxhdpi/ic_energy_center_switch_on.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_gn_center_top_gn.png b/app/src/main/res/drawable-xxhdpi/ic_energy_center_top_energy.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_gn_center_top_gn.png rename to app/src/main/res/drawable-xxhdpi/ic_energy_center_top_energy.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_guangneng_house.png b/app/src/main/res/drawable-xxhdpi/ic_energy_house.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_guangneng_house.png rename to app/src/main/res/drawable-xxhdpi/ic_energy_house.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_gnhouse_gn.png b/app/src/main/res/drawable-xxhdpi/ic_energy_house_energy.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_gnhouse_gn.png rename to app/src/main/res/drawable-xxhdpi/ic_energy_house_energy.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_gn_order_center.png b/app/src/main/res/drawable-xxhdpi/ic_energy_order_center.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_gn_order_center.png rename to app/src/main/res/drawable-xxhdpi/ic_energy_order_center.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_guangneng_record.png b/app/src/main/res/drawable-xxhdpi/ic_energy_record.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_guangneng_record.png rename to app/src/main/res/drawable-xxhdpi/ic_energy_record.png diff --git a/app/src/main/res/drawable-xxxhdpi/bg_gncenter_card.webp b/app/src/main/res/drawable-xxxhdpi/bg_energy_center_card.webp similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/bg_gncenter_card.webp rename to app/src/main/res/drawable-xxxhdpi/bg_energy_center_card.webp diff --git a/app/src/main/res/drawable-xxxhdpi/bg_gncenter_day.webp b/app/src/main/res/drawable-xxxhdpi/bg_energy_center_day.webp similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/bg_gncenter_day.webp rename to app/src/main/res/drawable-xxxhdpi/bg_energy_center_day.webp diff --git a/app/src/main/res/drawable-xxxhdpi/bg_gncenter_night.webp b/app/src/main/res/drawable-xxxhdpi/bg_energy_center_night.webp similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/bg_gncenter_night.webp rename to app/src/main/res/drawable-xxxhdpi/bg_energy_center_night.webp diff --git a/app/src/main/res/drawable-xxxhdpi/bg_gn_house.webp b/app/src/main/res/drawable-xxxhdpi/bg_energy_house.webp similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/bg_gn_house.webp rename to app/src/main/res/drawable-xxxhdpi/bg_energy_house.webp diff --git a/app/src/main/res/drawable-xxxhdpi/ic_guangneng.png b/app/src/main/res/drawable-xxxhdpi/ic_energy.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/ic_guangneng.png rename to app/src/main/res/drawable-xxxhdpi/ic_energy.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_guangneng_center.png b/app/src/main/res/drawable-xxxhdpi/ic_energy_center.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/ic_guangneng_center.png rename to app/src/main/res/drawable-xxxhdpi/ic_energy_center.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_gncenter_done.png b/app/src/main/res/drawable-xxxhdpi/ic_energy_center_done.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/ic_gncenter_done.png rename to app/src/main/res/drawable-xxxhdpi/ic_energy_center_done.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_gn_center_lottery.png b/app/src/main/res/drawable-xxxhdpi/ic_energy_center_lottery.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/ic_gn_center_lottery.png rename to app/src/main/res/drawable-xxxhdpi/ic_energy_center_lottery.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_energy_center_more.png b/app/src/main/res/drawable-xxxhdpi/ic_energy_center_more.png new file mode 100755 index 0000000000..60bf040bbe Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_energy_center_more.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_gncenter_notice.png b/app/src/main/res/drawable-xxxhdpi/ic_energy_center_notice.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/ic_gncenter_notice.png rename to app/src/main/res/drawable-xxxhdpi/ic_energy_center_notice.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_gn_center_record.png b/app/src/main/res/drawable-xxxhdpi/ic_energy_center_record.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/ic_gn_center_record.png rename to app/src/main/res/drawable-xxxhdpi/ic_energy_center_record.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_gncenter_sign.png b/app/src/main/res/drawable-xxxhdpi/ic_energy_center_sign.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/ic_gncenter_sign.png rename to app/src/main/res/drawable-xxxhdpi/ic_energy_center_sign.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_gncenter_switch_on.png b/app/src/main/res/drawable-xxxhdpi/ic_energy_center_switch_on.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/ic_gncenter_switch_on.png rename to app/src/main/res/drawable-xxxhdpi/ic_energy_center_switch_on.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_gn_center_top_gn.png b/app/src/main/res/drawable-xxxhdpi/ic_energy_center_top_energy.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/ic_gn_center_top_gn.png rename to app/src/main/res/drawable-xxxhdpi/ic_energy_center_top_energy.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_guangneng_house.png b/app/src/main/res/drawable-xxxhdpi/ic_energy_house.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/ic_guangneng_house.png rename to app/src/main/res/drawable-xxxhdpi/ic_energy_house.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_gnhouse_gn.png b/app/src/main/res/drawable-xxxhdpi/ic_energy_house_energy.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/ic_gnhouse_gn.png rename to app/src/main/res/drawable-xxxhdpi/ic_energy_house_energy.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_gn_order_center.png b/app/src/main/res/drawable-xxxhdpi/ic_energy_order_center.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/ic_gn_order_center.png rename to app/src/main/res/drawable-xxxhdpi/ic_energy_order_center.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_guangneng_record.png b/app/src/main/res/drawable-xxxhdpi/ic_energy_record.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/ic_guangneng_record.png rename to app/src/main/res/drawable-xxxhdpi/ic_energy_record.png diff --git a/app/src/main/res/drawable/shape_gncenter_card_rectangle.xml b/app/src/main/res/drawable/shape_energy_center_card_rectangle.xml similarity index 100% rename from app/src/main/res/drawable/shape_gncenter_card_rectangle.xml rename to app/src/main/res/drawable/shape_energy_center_card_rectangle.xml diff --git a/app/src/main/res/layout/daily_task_item.xml b/app/src/main/res/layout/daily_task_item.xml index 73221a38ab..28436b4268 100644 --- a/app/src/main/res/layout/daily_task_item.xml +++ b/app/src/main/res/layout/daily_task_item.xml @@ -35,7 +35,7 @@ android:layout_marginLeft="12dp" app:layout_constraintLeft_toRightOf="@+id/taskIcon" app:layout_constraintTop_toTopOf="@+id/taskIcon" - app:layout_constraintBottom_toTopOf="@+id/taskGn" + app:layout_constraintBottom_toTopOf="@+id/taskEnergy" android:includeFontPadding="false" android:textColor="@color/text_333333" android:textSize="14sp" @@ -48,13 +48,13 @@ android:layout_width="12dp" android:layout_height="12dp" android:layout_marginLeft="4dp" - android:src="@drawable/ic_gncenter_notice" + android:src="@drawable/ic_energy_center_notice" app:layout_constraintLeft_toRightOf="@+id/taskName" app:layout_constraintTop_toTopOf="@+id/taskName" app:layout_constraintBottom_toBottomOf="@+id/taskName" /> diff --git a/app/src/main/res/layout/fragment_guangneng_center.xml b/app/src/main/res/layout/fragment_energy_center.xml similarity index 96% rename from app/src/main/res/layout/fragment_guangneng_center.xml rename to app/src/main/res/layout/fragment_energy_center.xml index 875c4dd9c0..d24454d1b5 100644 --- a/app/src/main/res/layout/fragment_guangneng_center.xml +++ b/app/src/main/res/layout/fragment_energy_center.xml @@ -14,7 +14,7 @@ android:layout_width="match_parent" android:layout_height="344dp" android:scaleType="centerCrop" - android:src="@drawable/bg_gncenter_day" /> + android:src="@drawable/bg_energy_center_day" /> + android:text="@string/energy_rule" /> + android:src="@drawable/ic_energy_center_record" /> + android:src="@drawable/ic_energy_center_lottery" /> + android:src="@drawable/ic_energy_center_sign" /> + android:src="@drawable/ic_energy_center_switch_on" /> + android:background="@drawable/bg_energy_center_card" /> + android:background="@drawable/shape_energy_center_card_rectangle" /> @@ -74,7 +74,7 @@ android:layout_width="wrap_content" android:layout_height="20dp" android:background="@drawable/button_round_7ce7f8" - android:drawableLeft="@drawable/ic_gnhouse_gn" + android:drawableLeft="@drawable/ic_energy_house_energy" android:drawablePadding="4dp" android:layout_marginTop="12dp" android:paddingLeft="8dp" @@ -145,28 +145,28 @@ + app:layout_constraintTop_toBottomOf="@+id/EnergyRecord" /> + android:text="@string/earn_energy" /> + app:layout_constraintTop_toBottomOf="@+id/EnergyTaskTitle" /> + android:text="@string/energy_house"/> diff --git a/app/src/main/res/layout/fragment_personal.xml b/app/src/main/res/layout/fragment_personal.xml index 014d3883c4..30c20c5831 100644 --- a/app/src/main/res/layout/fragment_personal.xml +++ b/app/src/main/res/layout/fragment_personal.xml @@ -173,7 +173,7 @@ + android:text="@string/energy" /> + android:src="@drawable/ic_energy_center" /> + android:text="@string/energy_center" /> + android:src="@drawable/ic_energy_house" /> + android:text="@string/energy_house" /> + android:src="@drawable/ic_energy_record" /> + android:text="@string/energy_record" /> diff --git a/app/src/main/res/layout/novice_task_item.xml b/app/src/main/res/layout/novice_task_item.xml index b4f1b84be9..c5d6006326 100644 --- a/app/src/main/res/layout/novice_task_item.xml +++ b/app/src/main/res/layout/novice_task_item.xml @@ -47,7 +47,7 @@ android:layout_width="12dp" android:layout_height="12dp" android:layout_marginLeft="2dp" - android:src="@drawable/ic_gncenter_notice" /> + android:src="@drawable/ic_energy_center_notice" /> 已尝试添加到桌面 如桌面未出现图标，请开启桌面快捷方式权限 - 光能 - 光能中心 - 光能屋 - 光能记录 - 光能规则 - 赚光能 + 光能 + 光能中心 + 光能屋 + 光能记录 + 光能规则 + 赚光能 兑换规则 你来晚啦，任务已经被人做完喇~ 前往光能屋查看更多