From 47bd6e9c1d00fb1ac65c96a144f377f2ff31edb9 Mon Sep 17 00:00:00 2001 From: liup <1454939542@qq.com> Date: Sat, 11 May 2024 17:52:40 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=88=86=E7=B1=BB=E8=8F=9C?= =?UTF-8?q?=E8=B0=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BottomNavigationNewActivity.java | 28 ++++- .../FragmentViewModel/Home4Fragment.java | 4 +- .../business/ExecuteTheRecipe.java | 27 +---- .../common/utils/DisplayManager.java | 4 +- .../ui/activity/EditClassifyActivity.java | 13 ++- .../ui/adapter/ClassifyAdapter.java | 7 +- .../ui/adapter/CloudGoodsAdapter.java | 4 +- .../ui/adapter/LocalGoodsAdapter.java | 6 +- .../ui/fragment/CloudGoodsFragment.java | 18 +-- .../ui/fragment/HomeFoodsFragment.java | 12 ++ .../ui/fragment/LocalGoodsFragment.java | 15 ++- app/src/main/res/anim/slide_left_in.xml | 6 + app/src/main/res/anim/slide_left_out.xml | 6 + app/src/main/res/anim/slide_right_in.xml | 20 ++++ app/src/main/res/anim/slide_right_out.xml | 20 ++++ .../dialog/layout/dialog_add_classify.xml | 4 +- .../main/res/layout/fragment_cloud_goods.xml | 71 ++++++------ .../main/res/layout/fragment_home_foods.xml | 15 ++- .../main/res/layout/fragment_local_goods.xml | 104 ++++++++++-------- .../res/layout/item/layout/item_classify.xml | 14 +-- .../layout/item/layout/item_cloud_goods.xml | 14 +-- .../layout/item/layout/item_local_goods.xml | 29 +++-- app/src/main/res/values/styles.xml | 9 ++ 23 files changed, 287 insertions(+), 163 deletions(-) create mode 100644 app/src/main/res/anim/slide_left_in.xml create mode 100644 app/src/main/res/anim/slide_left_out.xml create mode 100644 app/src/main/res/anim/slide_right_in.xml create mode 100644 app/src/main/res/anim/slide_right_out.xml diff --git a/app/src/main/java/com/bonait/bnframework/ViewModel/ActivityViewModel/BottomNavigationNewActivity.java b/app/src/main/java/com/bonait/bnframework/ViewModel/ActivityViewModel/BottomNavigationNewActivity.java index c3297dbf..23858bbe 100644 --- a/app/src/main/java/com/bonait/bnframework/ViewModel/ActivityViewModel/BottomNavigationNewActivity.java +++ b/app/src/main/java/com/bonait/bnframework/ViewModel/ActivityViewModel/BottomNavigationNewActivity.java @@ -1,12 +1,14 @@ package com.bonait.bnframework.ViewModel.ActivityViewModel; import android.app.Activity; +import android.content.Intent; import android.os.Bundle; import android.view.KeyEvent; import android.view.View; import android.widget.LinearLayout; import android.widget.TextView; +import androidx.annotation.Nullable; import androidx.viewpager.widget.ViewPager; import com.apkfuns.logutils.LogUtils; @@ -34,6 +36,7 @@ import com.bonait.bnframework.common.utils.NetworkUtils; import com.bonait.bnframework.common.utils.ToastUtils; import com.bonait.bnframework.common.view.BottomNavigationBar; import com.bonait.bnframework.manager.ActivityLifecycleManager; +import com.bonait.bnframework.ui.activity.EditClassifyActivity; import com.bonait.bnframework.ui.fragment.HomeFoodsFragment; import com.lzy.okgo.OkGo; import com.qmuiteam.qmui.widget.QMUIViewPager; @@ -45,7 +48,7 @@ import butterknife.ButterKnife; import butterknife.OnClick; public class BottomNavigationNewActivity extends BaseActivity { - + private static final String TAG= "BottomNavigationNewActivity ==>"; //region 变量 @BindView(R.id.navigation) BottomNavigationBar bottomNavigationView; @@ -65,6 +68,7 @@ public class BottomNavigationNewActivity extends BaseActivity { //region 界面私立 public Activity activity; + private HomeFoodsFragment homeFoodsFragment; @Override protected void onCreate(Bundle savedInstanceState) { @@ -123,8 +127,9 @@ public class BottomNavigationNewActivity extends BaseActivity { * viewPager里添加fragment */ private void initFragment() { + homeFoodsFragment = new HomeFoodsFragment(); FragmentAdapter fragmentAdapter = new FragmentAdapter(getSupportFragmentManager()); - fragmentAdapter.addFragment(new HomeFoodsFragment()); + fragmentAdapter.addFragment(homeFoodsFragment); // fragmentAdapter.addFragment(new HomeFragmentPR()); fragmentAdapter.addFragment(new Home4Fragment()); // fragmentAdapter.addFragment(new HomeFragmentSBKZ()); @@ -632,4 +637,23 @@ public class BottomNavigationNewActivity extends BaseActivity { } } //endregion + + + public static final int REQUEST_CLASSIFY_ACTIVITY = 1000; + @Override + protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { + super.onActivityResult(requestCode, resultCode, data); + LogUtils.d(TAG+" onActivityResult requestCode="+requestCode+" resultCode="+resultCode+" data="+data); + if (requestCode == REQUEST_CLASSIFY_ACTIVITY&& resultCode==RESULT_OK) { + if(homeFoodsFragment!=null){ + homeFoodsFragment.updateLocalData(); + } + } + } + + public void jumpClassifyActivity(){ + Intent intent = new Intent(BottomNavigationNewActivity.this, EditClassifyActivity.class); + intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); + startActivityForResult(intent,REQUEST_CLASSIFY_ACTIVITY); + } } \ No newline at end of file diff --git a/app/src/main/java/com/bonait/bnframework/ViewModel/FragmentViewModel/Home4Fragment.java b/app/src/main/java/com/bonait/bnframework/ViewModel/FragmentViewModel/Home4Fragment.java index 89b140e2..8423c065 100644 --- a/app/src/main/java/com/bonait/bnframework/ViewModel/FragmentViewModel/Home4Fragment.java +++ b/app/src/main/java/com/bonait/bnframework/ViewModel/FragmentViewModel/Home4Fragment.java @@ -14,6 +14,7 @@ import androidx.appcompat.app.AppCompatActivity; import com.apkfuns.logutils.LogUtils; import com.bonait.bnframework.R; +import com.bonait.bnframework.ViewModel.ActivityViewModel.BottomNavigationNewActivity; import com.bonait.bnframework.ViewModel.ActivityViewModel.DishTestActivity; import com.bonait.bnframework.ViewModel.ActivityViewModel.LoginActivity; import com.bonait.bnframework.ViewModel.CustomView.XComDialog; @@ -24,7 +25,6 @@ import com.bonait.bnframework.common.message.MessageManager; import com.bonait.bnframework.common.utils.AlertDialogUtils; import com.bonait.bnframework.common.utils.DisplayManager; import com.bonait.bnframework.manager.ActivityLifecycleManager; -import com.bonait.bnframework.ui.activity.EditClassifyActivity; import com.bonait.bnframework.ui.activity.SetSeasoningActivity; import com.orhanobut.logger.Logger; @@ -72,7 +72,7 @@ public class Home4Fragment extends BaseFragment { switch (view.getId()) { case R.id.kaishipengren: // MessageManager.getInstance().sendMessage(MessageName.SelectZY, 0); - OpenActivity(EditClassifyActivity.class); + ((BottomNavigationNewActivity)getActivity()).jumpClassifyActivity(); break; case R.id.shebeikongzhi: MessageManager.getInstance().sendMessage(MessageName.SelectZY, 2); diff --git a/app/src/main/java/com/bonait/bnframework/business/ExecuteTheRecipe.java b/app/src/main/java/com/bonait/bnframework/business/ExecuteTheRecipe.java index a5f91d77..00440564 100644 --- a/app/src/main/java/com/bonait/bnframework/business/ExecuteTheRecipe.java +++ b/app/src/main/java/com/bonait/bnframework/business/ExecuteTheRecipe.java @@ -14,16 +14,14 @@ import com.bonait.bnframework.HBL.Interface.IRun; import com.bonait.bnframework.HBL.Interface.IRunT; import com.bonait.bnframework.HBL.Thread.IThread; import com.bonait.bnframework.HBL.Thread.ThreadManager; -import com.bonait.bnframework.Service.AnalogConvert; import com.bonait.bnframework.Service.ModbusHelper; +import com.bonait.bnframework.ViewModel.CustomView.MyStatus; import com.bonait.bnframework.common.constant.ConfigName; import com.bonait.bnframework.common.db.QueryDB; import com.bonait.bnframework.common.db.mode.BPA_GOODSRECIPE; import com.bonait.bnframework.common.db.mode.BPA_PLCADDRESS; import com.bonait.bnframework.common.db.mode.BPA_SILOS; -import com.bonait.bnframework.common.db.mode.BPA_SILOS_CALIBRATE; import com.bonait.bnframework.common.utils.ToastUtils; -import com.bonait.bnframework.ViewModel.CustomView.MyStatus; import java.util.ArrayList; import java.util.HashMap; @@ -1095,27 +1093,6 @@ public class ExecuteTheRecipe { } } - new Thread(new Runnable() { - @Override - public void run() { - try { - WritePLC("初始化", true, null); - Thread.sleep(500); - WritePLC("初始化", false, null); - - ExecuteTheRecipe.WritePLC("温控开关", false, null);//开关闭合 - ExecuteTheRecipe.WritePLC("暂停开关", false, null);//开关闭合 - - ExecuteTheRecipe.WritePLC("校准时间", 50, null);//默认校准时间5秒 - ExecuteTheRecipe.WritePLC("料仓1校准开关", false, null);//默认校准时间5秒 - ExecuteTheRecipe.WritePLC("料仓2校准开关", false, null);//默认校准时间5秒 - ExecuteTheRecipe.WritePLC("料仓3校准开关", false, null);//默认校准时间5秒 - } catch (InterruptedException e) { - ToastUtils.info("异常信息:" + e.getMessage()); - } - } - }).start(); - ThreadManager.get().StartLong("PLC设备数据监听", true, new IThread() { @Override @@ -1140,7 +1117,7 @@ public class ExecuteTheRecipe { LogUtils.d("异常信息:" + ex.getMessage()); ToastUtils.error("异常信息:" + ex.getMessage()); } - Thread.sleep(100); + Thread.sleep(50); } }); } diff --git a/app/src/main/java/com/bonait/bnframework/common/utils/DisplayManager.java b/app/src/main/java/com/bonait/bnframework/common/utils/DisplayManager.java index 1bfe33b6..1805d6bc 100644 --- a/app/src/main/java/com/bonait/bnframework/common/utils/DisplayManager.java +++ b/app/src/main/java/com/bonait/bnframework/common/utils/DisplayManager.java @@ -38,9 +38,9 @@ public class DisplayManager /******************************参考的屏幕数据***************************/ /** 参照分辨率 */ - private static int miReferencedMaxWidth = 1024; + private static int miReferencedMaxWidth = 800; /** 参照分辨率 */ - private static int miReferencedMaxHeight = 768; + private static int miReferencedMaxHeight = 1208; /** 参照屏幕密度，基于160dpi */ private static float mfReferencedScreenDensity = 1.0f; diff --git a/app/src/main/java/com/bonait/bnframework/ui/activity/EditClassifyActivity.java b/app/src/main/java/com/bonait/bnframework/ui/activity/EditClassifyActivity.java index 11c3f25a..a4a884d3 100644 --- a/app/src/main/java/com/bonait/bnframework/ui/activity/EditClassifyActivity.java +++ b/app/src/main/java/com/bonait/bnframework/ui/activity/EditClassifyActivity.java @@ -354,11 +354,22 @@ public class EditClassifyActivity extends BaseActivity { viewBinding.topbar.addLeftImageButton(R.mipmap.fanhui,R.id.topbar).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - finish(); + finishActivity(); } }); } + @Override + protected void doOnBackPressed() { + super.doOnBackPressed(); + finishActivity(); + } + + private void finishActivity(){ + setResult(RESULT_OK, null); + finish(); + } + @Override protected String getClassName() { return TAG; diff --git a/app/src/main/java/com/bonait/bnframework/ui/adapter/ClassifyAdapter.java b/app/src/main/java/com/bonait/bnframework/ui/adapter/ClassifyAdapter.java index ae54ee2a..3b9fc001 100644 --- a/app/src/main/java/com/bonait/bnframework/ui/adapter/ClassifyAdapter.java +++ b/app/src/main/java/com/bonait/bnframework/ui/adapter/ClassifyAdapter.java @@ -30,7 +30,9 @@ public abstract class ClassifyAdapter extends BaseAdapter34||holder.binding.name.getTextSize()<30){ + DisplayManager.scaleViewGroup(holder.binding.getRoot()); + } holder.binding.name.setText(mData.get(position).name+""); if(mCurrentPosition==position){ holder.binding.name.setTextColor(Color.parseColor("#ffffff")); @@ -42,8 +44,8 @@ public abstract class ClassifyAdapter extends BaseAdapter28||holder.binding.name.getTextSize()<24){ + DisplayManager.scaleViewGroup(holder.binding.getRoot()); + } holder.binding.add.setVisibility(View.GONE); BPA_GOODS goods = mData.get(position); diff --git a/app/src/main/java/com/bonait/bnframework/ui/adapter/LocalGoodsAdapter.java b/app/src/main/java/com/bonait/bnframework/ui/adapter/LocalGoodsAdapter.java index deb12dad..4641193d 100644 --- a/app/src/main/java/com/bonait/bnframework/ui/adapter/LocalGoodsAdapter.java +++ b/app/src/main/java/com/bonait/bnframework/ui/adapter/LocalGoodsAdapter.java @@ -32,7 +32,9 @@ public abstract class LocalGoodsAdapter extends BaseAdapter28||holder.binding.name.getTextSize()<24){ + DisplayManager.scaleViewGroup(holder.binding.getRoot()); + } holder.binding.add.setVisibility(View.GONE); if(!ConfigName.getInstance().user.name.equals("一般用户")){ holder.binding.edit.setVisibility(View.VISIBLE); @@ -40,7 +42,7 @@ public abstract class LocalGoodsAdapter extends BaseAdapter goodsList = new ArrayList<>(); @@ -69,24 +68,25 @@ public class CloudGoodsFragment extends BaseFragment { @Override protected View onCreateView() { View root = LayoutInflater.from(getActivity()).inflate(R.layout.fragment_cloud_goods, null); - viewBinding = FragmentLocalGoodsBinding.bind(root); + viewBinding = FragmentCloudGoodsBinding.bind(root); return root; } @Override public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); - context = getContext(); initView(); updateData(); } + @Override + protected int backViewInitOffset() { + return 0; + } + @SuppressLint("NotifyDataSetChanged") private void initView(){ DisplayManager.scaleViewGroup(viewBinding.getRoot()); - viewBinding.addClassify.setOnClickListener(view -> { - OpenActivity(EditClassifyActivity.class); - }); goodsAdapter = new CloudGoodsAdapter(){ @@ -148,7 +148,7 @@ public class CloudGoodsFragment extends BaseFragment { } } } - goodsAdapter.notifyDataSetChanged(); + goodsAdapter.setNewData(goodsList); } @Override diff --git a/app/src/main/java/com/bonait/bnframework/ui/fragment/HomeFoodsFragment.java b/app/src/main/java/com/bonait/bnframework/ui/fragment/HomeFoodsFragment.java index 01188402..0f86fec9 100644 --- a/app/src/main/java/com/bonait/bnframework/ui/fragment/HomeFoodsFragment.java +++ b/app/src/main/java/com/bonait/bnframework/ui/fragment/HomeFoodsFragment.java @@ -107,6 +107,18 @@ public class HomeFoodsFragment extends BaseFragment { } + /** + * 刷新本地商品 + */ + public void updateLocalData(){ + LogUtils.d("updateLocalData"); + if(fragment!=null){ + if(fragment instanceof LocalGoodsFragment){ + ((LocalGoodsFragment) fragment).updateData(); + } + } + } + private void requestData(){ if (NetworkUtils.checkNetworkAvailable(context)) { if(ConfigName.getInstance().cloudGoodsList.isEmpty()){ diff --git a/app/src/main/java/com/bonait/bnframework/ui/fragment/LocalGoodsFragment.java b/app/src/main/java/com/bonait/bnframework/ui/fragment/LocalGoodsFragment.java index a3356592..ca34f2df 100644 --- a/app/src/main/java/com/bonait/bnframework/ui/fragment/LocalGoodsFragment.java +++ b/app/src/main/java/com/bonait/bnframework/ui/fragment/LocalGoodsFragment.java @@ -15,7 +15,9 @@ import androidx.appcompat.app.AppCompatActivity; import com.apkfuns.logutils.LogUtils; import com.bonait.bnframework.R; +import com.bonait.bnframework.ViewModel.ActivityViewModel.BottomNavigationNewActivity; import com.bonait.bnframework.common.base.BaseFragment; +import com.bonait.bnframework.common.constant.ConfigName; import com.bonait.bnframework.common.db.mode.BPA_GOODS; import com.bonait.bnframework.common.db.mode.BPA_GOODS_CLASSIFY; import com.bonait.bnframework.common.db.util.GoodsClassifyDBUtil; @@ -27,7 +29,6 @@ import com.bonait.bnframework.common.utils.DisplayManager; import com.bonait.bnframework.common.utils.ToastUtils; import com.bonait.bnframework.databinding.DialogDeleteClassifyBinding; import com.bonait.bnframework.databinding.FragmentLocalGoodsBinding; -import com.bonait.bnframework.ui.activity.EditClassifyActivity; import com.bonait.bnframework.ui.adapter.ClassifyAdapter; import com.bonait.bnframework.ui.adapter.LocalGoodsAdapter; @@ -61,6 +62,7 @@ public class LocalGoodsFragment extends BaseFragment { } }; + @Override protected View onCreateView() { View root = LayoutInflater.from(getActivity()).inflate(R.layout.fragment_local_goods, null); @@ -79,8 +81,10 @@ public class LocalGoodsFragment extends BaseFragment { @SuppressLint("NotifyDataSetChanged") private void initView(){ DisplayManager.scaleViewGroup(viewBinding.getRoot()); + viewBinding.addClassify.setVisibility(!ConfigName.getInstance().user.name.equals("一般用户")?View.VISIBLE:View.GONE); + viewBinding.addClassify.setOnClickListener(view -> { - OpenActivity(EditClassifyActivity.class); + ((BottomNavigationNewActivity)getActivity()).jumpClassifyActivity(); }); goodsAdapter = new LocalGoodsAdapter(){ @@ -119,6 +123,7 @@ public class LocalGoodsFragment extends BaseFragment { @Override protected void addGoods() { + } }; viewBinding.recyclerGoods.setAdapter(goodsAdapter); @@ -139,6 +144,7 @@ public class LocalGoodsFragment extends BaseFragment { */ @SuppressLint("NotifyDataSetChanged") public void updateData() { + LogUtils.d("updateData"); goodsList.clear(); classifyList.clear(); @@ -147,8 +153,10 @@ public class LocalGoodsFragment extends BaseFragment { goodsList.addAll(GoodsDBUtil.getByClassifyId(classifyList.get(0).id)); } + goodsAdapter.setNewData(goodsList); + classifyAdapter.setCurrentPosition(0); classifyAdapter.setNewData(classifyList); - goodsAdapter.notifyDataSetChanged(); + } @Override @@ -161,6 +169,7 @@ public class LocalGoodsFragment extends BaseFragment { public void onResume() { super.onResume(); LogUtils.d("LocalGoodsFragment onResume"); + } @Override diff --git a/app/src/main/res/anim/slide_left_in.xml b/app/src/main/res/anim/slide_left_in.xml new file mode 100644 index 00000000..19d9ca09 --- /dev/null +++ b/app/src/main/res/anim/slide_left_in.xml @@ -0,0 +1,6 @@ + + + + + diff --git a/app/src/main/res/anim/slide_left_out.xml b/app/src/main/res/anim/slide_left_out.xml new file mode 100644 index 00000000..0b0362ec --- /dev/null +++ b/app/src/main/res/anim/slide_left_out.xml @@ -0,0 +1,6 @@ + + + + + diff --git a/app/src/main/res/anim/slide_right_in.xml b/app/src/main/res/anim/slide_right_in.xml new file mode 100644 index 00000000..4ba1fada --- /dev/null +++ b/app/src/main/res/anim/slide_right_in.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/anim/slide_right_out.xml b/app/src/main/res/anim/slide_right_out.xml new file mode 100644 index 00000000..0ff4dd60 --- /dev/null +++ b/app/src/main/res/anim/slide_right_out.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/dialog/layout/dialog_add_classify.xml b/app/src/main/res/layout/dialog/layout/dialog_add_classify.xml index 8e5d7fca..1c3ffa2e 100644 --- a/app/src/main/res/layout/dialog/layout/dialog_add_classify.xml +++ b/app/src/main/res/layout/dialog/layout/dialog_add_classify.xml @@ -48,9 +48,9 @@ android:textColor="@color/white" android:text="确认" android:background="@drawable/bg_round25_yellow_btn" - android:layout_gravity="bottom|right" + android:layout_gravity="bottom" android:layout_marginBottom="@dimen/dp_20" - android:layout_marginRight="@dimen/dp_40" + android:layout_marginLeft="@dimen/dp_500" /> diff --git a/app/src/main/res/layout/fragment_cloud_goods.xml b/app/src/main/res/layout/fragment_cloud_goods.xml index 9a63067d..3ba4f9d8 100644 --- a/app/src/main/res/layout/fragment_cloud_goods.xml +++ b/app/src/main/res/layout/fragment_cloud_goods.xml @@ -1,43 +1,48 @@ - - - - + + - + - + - - - \ No newline at end of file + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home_foods.xml b/app/src/main/res/layout/fragment_home_foods.xml index df06401c..c3f14e55 100644 --- a/app/src/main/res/layout/fragment_home_foods.xml +++ b/app/src/main/res/layout/fragment_home_foods.xml @@ -6,9 +6,10 @@ + android:layout_height="?attr/qmui_topbar_height" /> @@ -18,24 +19,28 @@ android:layout_height="@dimen/dp_70"> diff --git a/app/src/main/res/layout/fragment_local_goods.xml b/app/src/main/res/layout/fragment_local_goods.xml index 9e5b188e..387360bc 100644 --- a/app/src/main/res/layout/fragment_local_goods.xml +++ b/app/src/main/res/layout/fragment_local_goods.xml @@ -1,57 +1,67 @@ - - - - + - + + - + - - - \ No newline at end of file + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item/layout/item_classify.xml b/app/src/main/res/layout/item/layout/item_classify.xml index 49fec472..a90dc274 100644 --- a/app/src/main/res/layout/item/layout/item_classify.xml +++ b/app/src/main/res/layout/item/layout/item_classify.xml @@ -1,23 +1,21 @@ + android:layout_height="@dimen/dp_60"> + android:gravity="center" + android:layout_height="match_parent"> @@ -67,7 +67,7 @@ android:layout_toRightOf="@id/img3" android:layout_centerVertical="true" android:textColor="@color/black" - android:textSize="@dimen/sp_18" /> + android:textSize="@dimen/sp_24" /> diff --git a/app/src/main/res/layout/item/layout/item_local_goods.xml b/app/src/main/res/layout/item/layout/item_local_goods.xml index beaf23ad..43d40750 100644 --- a/app/src/main/res/layout/item/layout/item_local_goods.xml +++ b/app/src/main/res/layout/item/layout/item_local_goods.xml @@ -29,7 +29,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:maxLines="1" - android:text="三月瓜" + tools:text="三月瓜" android:textAlignment="center" android:textColor="@color/black" android:textSize="@dimen/sp_26" @@ -45,20 +45,20 @@ app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintBottom_toBottomOf="parent" android:background="#ddFFFFFF" - android:layout_height="@dimen/dp_40"> + android:layout_height="@dimen/dp_60"> @@ -69,21 +69,26 @@ android:layout_toRightOf="@id/img1" android:layout_centerVertical="true" android:textColor="@color/black" - android:textSize="@dimen/sp_18" /> + android:textSize="@dimen/sp_24" /> + @@ -94,7 +99,7 @@ android:layout_toRightOf="@id/img2" android:layout_centerVertical="true" android:textColor="@color/black" - android:textSize="@dimen/sp_18" /> + android:textSize="@dimen/sp_24" /> diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index e9009ba2..c5a08dd3 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -46,7 +46,16 @@ @dimen/dp_400 @dimen/dp_600 @style/DialogTheme2ContentStyle + @style/activityanim + + + +