功能开发:我的礼包，我的下载，UI调整

app/src/main/AndroidManifest.xml

@@ -869,7 +869,7 @@
         <activity
             android:name="com.sheep.gamegroup.view.activity.ActGiftDetail"
             android:screenOrientation="portrait"
-            android:theme="@style/AppActionTheme" />
+            android:theme="@style/NoActionBar" />
         <activity
             android:name="com.sheep.gamegroup.view.activity.ActModifyThird"
             android:screenOrientation="portrait"

app/src/main/java/com/sheep/gamegroup/absBase/BaseActivity.java

@@ -81,29 +81,23 @@ public abstract class BaseActivity extends RxAppCompatActivity implements BackHa
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-            Window win = getWindow();
-            WindowManager.LayoutParams winParams = win.getAttributes();
-            final int bits = WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS;
-            winParams.flags |= bits;
-            win.setAttributes(winParams);
-        }
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            Window window = getWindow();
-            window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
-            window.getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-                    | View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
-                    | View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR);
-            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+        Window win = getWindow();
+        WindowManager.LayoutParams winParams = win.getAttributes();
+        final int bits = WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS;
+        winParams.flags |= bits;
+        win.setAttributes(winParams);
+
+        Window window = getWindow();
+        window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+        window.getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+                | View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
+                | View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR);
+        window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
 //            window.setStatusBarColor(Color.TRANSPARENT);
-        }
         if (showWhiteStatusBar()) {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                getWindow().addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
-                getWindow().clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
-                getWindow().setStatusBarColor(getResources().getColor(android.R.color.white));
-            }
+            getWindow().addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+            getWindow().clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+            getWindow().setStatusBarColor(getResources().getColor(android.R.color.white));
         }
 
         ActionBar actionBar = getSupportActionBar();

app/src/main/java/com/sheep/gamegroup/module/game/activity/ActDownloadManager.java

@@ -27,15 +27,17 @@ public class ActDownloadManager extends BaseContainerActivity {
                 .setShowOrHide(this, true)
                 .setTitle(this, getString(R.string.label_download_mgr))
                 .setRightBtn(this, "清空记录", 0, view -> {
-                    if(fgtDownloadManager != null){
+                    if (fgtDownloadManager != null) {
                         fgtDownloadManager.removeAll();
                     }
                 })
                 .setTitleFinish(this);
+        TitleBarUtils.getInstance().getRightBtn(this).setTextColor(getResources().getColor(R.color.text66));
     }
 
 
     private FgtDownloadManager fgtDownloadManager;
+
     @Override
     protected Fragment initFragment() {
         fgtDownloadManager = new FgtDownloadManager();

app/src/main/java/com/sheep/gamegroup/module/game/fragment/FgtDownloadManager.java

@@ -1,15 +1,17 @@
 package com.sheep.gamegroup.module.game.fragment;
 
+import static com.sheep.gamegroup.view.adapter.TryMakeMoneyAdp.PUBLIC_TAG_PREFIX_TEXTVIEW_LIST;
+
 import android.app.Activity;
 import android.content.Intent;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
 import android.view.View;
-import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
+import androidx.recyclerview.widget.DividerItemDecoration;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.liulishuo.okdownload.OkDownload;
@@ -33,6 +35,8 @@ import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.gamegroup.view.fragment.BaseListFragment6;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
+import com.sheep.jiuyan.samllsheep.databinding.ItemDownloadManagerBinding;
+import com.sheep.jiuyan.samllsheep.databinding.ItemPlayGameListBinding;
 import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
 
 import org.afinal.simplecache.ApiKey;
@@ -50,8 +54,6 @@ import io.reactivex.ObservableOnSubscribe;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.schedulers.Schedulers;
 
-import static com.sheep.gamegroup.view.adapter.TryMakeMoneyAdp.PUBLIC_TAG_PREFIX_TEXTVIEW_LIST;
-
 /**
  * Created by realicing on 2019/1/21.
  * realicing@sina.com
@@ -131,26 +133,20 @@ public class FgtDownloadManager extends BaseListFragment6<String> {
         downLoadInfoAdapter = new BaseQuickAdapter<DownLoadInfo, BaseViewHolder>(R.layout.item_download_manager, apiRefresh.getList()) {
             @Override
             protected void convert(BaseViewHolder helper, DownLoadInfo item) {
-                ImageView item_dm_icon_iv = helper.getView(R.id.item_dm_icon_iv);
-                TextView item_dm_name_tv = helper.getView(R.id.item_dm_name_tv);
-                TextView item_dm_info_tv = helper.getView(R.id.item_dm_info_tv);
-                ProgressBar item_dm_pb = helper.getView(R.id.item_dm_pb);
-                ImageView item_dm_delete_iv = helper.getView(R.id.item_dm_delete_iv);
-                TextView item_dm_btn_tv = helper.getView(R.id.item_dm_btn_tv);
-
-                ViewUtil.setImage(item_dm_icon_iv, item.getMIconUrl());
-                ViewUtil.setText(item_dm_name_tv, item.getMGameName());
+                ItemDownloadManagerBinding binding = ItemDownloadManagerBinding.bind(helper.itemView);
+                ViewUtil.setImage(binding.itemDmIconIv, item.getMIconUrl());
+                ViewUtil.setText(binding.itemDmNameTv, item.getMGameName());
                 if (item.getMPercent() != null && item.getMPercent() == 100) {
                     if (item.getMTotalSize() == null) {
-                        ViewUtil.setText(item_dm_info_tv, "全部下载完成");
+                        ViewUtil.setText(binding.itemDmInfoTv, "全部下载完成");
                     } else {
-                        ViewUtil.setText(item_dm_info_tv, String.format(Locale.CHINA, "%dMB 下载完成", (item.getMTotalSize().intValue() / (1024 * 1024))));
+                        ViewUtil.setText(binding.itemDmInfoTv, String.format(Locale.CHINA, "%dMB 下载完成", (item.getMTotalSize().intValue() / (1024 * 1024))));
                     }
                 } else {
-                    ViewUtil.setText(item_dm_info_tv, strFormat(item.getMDownloadedSize(), item.getMTotalSize()));
+                    ViewUtil.setText(binding.itemDmInfoTv, strFormat(item.getMDownloadedSize(), item.getMTotalSize()));
                 }
-                item_dm_pb.setProgress(item.getMPercent() != null ? item.getMPercent() : 0);
-                item_dm_delete_iv.setOnClickListener(view -> {
+                binding.itemDmPb.setProgress(item.getMPercent() != null ? item.getMPercent() : 0);
+                binding.itemDmDeleteIv.setOnClickListener(view -> {
                     if (apiRefresh != null && apiRefresh.getList() != null)
                         apiRefresh.getList().remove(item);
                     if (baseQuickAdapter != null)
@@ -165,7 +161,7 @@ public class FgtDownloadManager extends BaseListFragment6<String> {
                                 }
                             });
                 });
-                updateView(getActivity(), item, item_dm_btn_tv, item_dm_pb, item_dm_info_tv);
+                updateView(getActivity(), item, binding.itemDmBtnTv, binding.itemDmPb, binding.itemDmInfoTv);
 
             }
         };
@@ -174,24 +170,25 @@ public class FgtDownloadManager extends BaseListFragment6<String> {
 
             @Override
             protected void convert(BaseViewHolder holder, String item) {
-                View item_play_game_list_rl = holder.itemView.findViewById(R.id.item_play_game_list_rl);
-                View item_play_game_list_top = holder.itemView.findViewById(R.id.item_play_game_list_top);
-                ViewUtil.setVisibility(item_play_game_list_top, false);
-                TextView item_play_game_list_tv = holder.itemView.findViewById(R.id.item_play_game_list_tv);
-                ViewUtil.setText(item_play_game_list_tv, item);
-                TextView item_play_game_list_more_tv = holder.itemView.findViewById(R.id.item_play_game_list_more_tv);
-                ViewUtil.setVisibility(item_play_game_list_more_tv, false);
-                RecyclerView recyclerView = holder.itemView.findViewById(R.id.item_play_game_list_rv);
+                ItemPlayGameListBinding binding = ItemPlayGameListBinding.bind(holder.itemView);
+                ViewUtil.setVisibility(binding.itemPlayGameListTop, false);
+                ViewUtil.setText(binding.itemPlayGameListTv, item);
+                ViewUtil.setVisibility(binding.itemPlayGameListMoreTv, false);
+                RecyclerView recyclerView = binding.itemPlayGameListRv;
                 recyclerView.setHasFixedSize(true);
                 recyclerView.setNestedScrollingEnabled(false);
                 int position = holder.getAdapterPosition();
                 switch (position) {
                     case 0:
-                        ViewUtil.setVisibility(item_play_game_list_rl, !apiRefresh.getList().isEmpty());
+                        binding.itemPlayGameListRl.setVisibility(View.GONE);
                         recyclerView.setLayoutManager(new LinearLayoutManager(SheepApp.getInstance()));
+                        DividerItemDecoration itemDecoration = new DividerItemDecoration(getContext(), RecyclerView.VERTICAL);
+                        itemDecoration.setDrawable(getResources().getDrawable(R.drawable.divider_12dp));
+                        recyclerView.addItemDecoration(itemDecoration);
                         recyclerView.setAdapter(downLoadInfoAdapter);
                         break;
                     case 1:
+                        binding.itemPlayGameListRl.setVisibility(View.VISIBLE);
                         recyclerView.setLayoutManager(new LinearLayoutManager(SheepApp.getInstance(), LinearLayoutManager.HORIZONTAL, false));
                         recyclerView.setAdapter(appFormGameCenterAdapter);
                         break;
@@ -206,23 +203,23 @@ public class FgtDownloadManager extends BaseListFragment6<String> {
             return;
         }
         Observable.just(1).map(integer -> {
-            try {
-                downloadUtil.deleteAllDownloadTask();
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-            try {
-                OkDownload.with().downloadDispatcher().cancelAll();
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-            try {
-                ClassFileHelper.getInstance().clearDir();
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-            return integer;
-        }).subscribeOn(Schedulers.io())
+                    try {
+                        downloadUtil.deleteAllDownloadTask();
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    try {
+                        OkDownload.with().downloadDispatcher().cancelAll();
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    try {
+                        ClassFileHelper.getInstance().clearDir();
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    return integer;
+                }).subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new AbsObserver<Integer>() {
                     @Override
@@ -280,10 +277,10 @@ public class FgtDownloadManager extends BaseListFragment6<String> {
             downloadInfoHelperMap.put(item.getMPackageName(), downloadInfoHelper);
         }
         downloadInfoHelper.updateDownloadTaskView(activity, textView);
-        downloadInfoHelper.getDownloadStatus(downloadUtil, (o)->{
+        downloadInfoHelper.getDownloadStatus(downloadUtil, (o) -> {
             if (o instanceof Integer) {
                 int st = (int) o;
-                if(st == DownloadUtil.STATUS_FINISH){
+                if (st == DownloadUtil.STATUS_FINISH) {
                     progressBar.setProgress(100);
                     ViewUtil.setText(completeView, "全部下载完成");
                 }
@@ -328,6 +325,7 @@ public class FgtDownloadManager extends BaseListFragment6<String> {
     @Override
     public void initView() {
         super.initView();
+        findViewById(R.id.swipeRefreshLayout).setBackgroundColor(getResources().getColor(R.color.ver4Bg));
         absGetDownloadListener.addDownloadListener(new AbsDownloadListener() {
             @Override
             public void removedApk(String packageName) {

app/src/main/java/com/sheep/gamegroup/module/search/GiftHolder.java

@@ -25,7 +25,9 @@ public class GiftHolder extends SearchResultHolder<GiftBagApp> {
         binding.btn.setVisibility(View.VISIBLE);
         GlideImageLoader.setGameImage(binding.icon, item.getApp().getIcon());
         ViewUtil.setText(binding.tvTitle, item.getGift_bag().getGiftName());
-        binding.btn.setText("领取");
+        ViewUtil.setText(binding.tvContent, item.getGift_bag().getGiftContent());
+        binding.btn.setText("立即领取");
+
     }
 
 }

app/src/main/java/com/sheep/gamegroup/util/Jump2View.java

@@ -841,7 +841,6 @@ public class Jump2View {
      * 跳转到个人中心界面
      *
      * @param context
-     * @param o
      */
     public void goPersionInfo(Context context) {
         Intent i = new Intent(context, PersonalInfoAct.class);
@@ -1280,7 +1279,6 @@ public class Jump2View {
      * 跳到我的资产界面
      *
      * @param context
-     * @param o
      */
     public void goMyMoney(Context context) {
         Intent intent = new Intent(context, ActMyMoney.class);

app/src/main/java/com/sheep/gamegroup/view/activity/ActGiftDetail.java

@@ -1,14 +1,27 @@
 package com.sheep.gamegroup.view.activity;
 
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.GIFT_BAG_COPY_CODE;
+
+import android.graphics.PorterDuff;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
+import android.view.MenuItem;
+import android.view.View;
 
 import androidx.viewbinding.ViewBinding;
 
+import com.google.android.material.appbar.AppBarLayout;
 import com.sheep.gamegroup.absBase.BaseActivity;
+import com.sheep.gamegroup.model.entity.GiftBag;
 import com.sheep.gamegroup.model.entity.GiftBagApp;
 import com.sheep.gamegroup.util.DataUtil;
+import com.sheep.gamegroup.util.GlideImageLoader;
+import com.sheep.gamegroup.util.StringUtils;
+import com.sheep.gamegroup.util.ViewUtil;
+import com.sheep.gamegroup.view.adapter.GiftCenterAdapter;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.databinding.ActGiftDetailBinding;
+import com.sheep.jiuyan.samllsheep.utils.G;
 
 /**
  * Created by realicing on 2018/9/14.
@@ -36,18 +49,45 @@ public class ActGiftDetail extends BaseActivity {
 
     @Override
     public void initView() {
-//        TitleBarUtils.getInstance()
-//                .setTitleFinish(this)
-//                .setShowOrHide(this, true)
-//                .setTitle(this, "礼包详情")
-//                .setRightBtn(this, "分享", 0, new View.OnClickListener() {
-//                    @Override
-//                    public void onClick(View view) {
-//                        new ShareLinkConfig().toShare(ActGiftDetail.this);
-//                    }
-//                })
-//                .setTitleBackgroud(this, getResources().getColor(R.color.translate));
+        setSupportActionBar(binding.toolbar);
+
+        // 启用返回按钮
+        if (getSupportActionBar() != null) {
+            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+            getSupportActionBar().setHomeAsUpIndicator(R.drawable.arrow_back_ios_new_24);
+        }
+        binding.collapsingToolbar.setTitleEnabled(false);
+        // 监听 AppBarLayout 的偏移量变化
+        binding.appBarLayout.addOnOffsetChangedListener(new AppBarLayout.OnOffsetChangedListener() {
+            @Override
+            public void onOffsetChanged(AppBarLayout appBarLayout, int verticalOffset) {
+                // 计算折叠比例
+                float ratio = (float) Math.abs(verticalOffset) / appBarLayout.getTotalScrollRange();
 
+                // 根据折叠比例设置返回图标的颜色
+                if (ratio > 0.7f) {
+                    // 折叠状态：黑色返回图标
+                    binding.tvToolbarTitle.setTextColor(getResources().getColor(R.color.text33));
+                    binding.toolbar.getNavigationIcon().setColorFilter(
+                            getResources().getColor(R.color.text33), PorterDuff.Mode.SRC_ATOP);
+                } else {
+                    // 展开状态：白色返回图标
+                    binding.tvToolbarTitle.setTextColor(getResources().getColor(android.R.color.white));
+                    binding.toolbar.getNavigationIcon().setColorFilter(
+                            getResources().getColor(android.R.color.white), PorterDuff.Mode.SRC_ATOP);
+                }
+            }
+        });
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
+            // Handle the back arrow click here
+            onBackPressed();
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
     }
 
     private GiftBagApp data;
@@ -57,40 +97,40 @@ public class ActGiftDetail extends BaseActivity {
         data = DataUtil.getObject(getIntent(), GiftBagApp.class);
         if (data.getApp() != null) {
             //这个是图标
-//            GlideImageLoader.setGameImage(item_download_welfare_iv, data.getApp().getIcon());
+            GlideImageLoader.setGameImage(binding.imageView4, data.getApp().getIcon());
+            ViewUtil.setText(binding.tvGameName, data.getApp().getName());
         }
-        if (data.getGift_bag() != null) {
+        GiftBag giftBag = data.getGift_bag();
+        if (giftBag != null) {
             //这个是游戏包的内容
-//            ViewUtil.setText(item_download_welfare_name_tv, data.getGift_bag().getGiftName());
-//            ViewUtil.setText(gift_detail_time, data.getGift_bag().getDateText2());
-//            ViewUtil.setText(gift_detail_content, data.getGift_bag().getGiftContent());
-//            ViewUtil.setText(gift_detail_tip, data.getGift_bag().getUseMethod());
-//            ViewUtil.setVisibility(item_download_welfare_vip_flag, data.getGift_bag().getIsVip() == 1);
-//            if (TextUtils.isEmpty(data.getCode())) {//没有code，就视为没有领取礼包
-//                item_download_welfare_btn_center.setText("领取");
-//                item_download_welfare_btn_center.setOnClickListener(new View.OnClickListener() {
-//                    @Override
-//                    public void onClick(View view) {
-//                        GiftCenterAdapter.receiveGiftBag(ActGiftDetail.this, data, null);
-//                    }
-//                });
-//            } else {
-//                item_download_welfare_btn_center.setText("复制");
-//                item_download_welfare_btn_center.setOnClickListener(new View.OnClickListener() {
-//                    @Override
-//                    public void onClick(View view) {
-//                        GIFT_BAG_COPY_CODE.onEvent("gift_bag_id", data.getGift_bag().getId(), "gift_bag_code", data.getCode());
-//                        StringUtils.CopyText(data.getCode());
-//                        G.showToast("复制成功");
-//                    }
-//                });
-//            }
-        } else {
-//            ViewUtil.setDefaultText(item_download_welfare_name_tv);
-//            ViewUtil.setDefaultText(gift_detail_time);
-//            ViewUtil.setDefaultText(gift_detail_content);
-//            ViewUtil.setDefaultText(gift_detail_tip);
+
+            ViewUtil.setText(binding.tvTitle, giftBag.getGiftName());
+            ViewUtil.setText(binding.giftDetailContent, giftBag.getGiftContent());
+            ViewUtil.setText(binding.giftDetailTime, giftBag.getDateText2());
+            ViewUtil.setText(binding.giftDetailTip, giftBag.getUseMethod());
+            if (TextUtils.isEmpty(data.getCode())) {//没有code，就视为没有领取礼包
+                binding.btnGet.setVisibility(View.VISIBLE);
+                binding.llCode.setVisibility(View.GONE);
+                binding.btnGet.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        GiftCenterAdapter.receiveGiftBag(ActGiftDetail.this, data, null);
+                    }
+                });
+            } else {
+                binding.llCode.setVisibility(View.VISIBLE);
+                binding.btnGet.setVisibility(View.GONE);
+                binding.tvCode.setText(data.getCode());
+                binding.btnCopy.setText("复制");
+                binding.btnCopy.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        GIFT_BAG_COPY_CODE.onEvent("gift_bag_id", data.getGift_bag().getId(), "gift_bag_code", data.getCode());
+                        StringUtils.CopyText(data.getCode());
+                        G.showToast("复制成功");
+                    }
+                });
+            }
         }
     }
-
 }

app/src/main/java/com/sheep/gamegroup/view/activity/ActMyMoney.java

@@ -1,18 +1,23 @@
 package com.sheep.gamegroup.view.activity;
 
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.MY_MONEY_TAB;
+
 import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import com.google.android.material.tabs.TabLayout;
-import androidx.fragment.app.Fragment;
-import androidx.viewpager.widget.ViewPager;
-import androidx.core.widget.NestedScrollView;
 import android.text.Html;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.core.widget.NestedScrollView;
+import androidx.fragment.app.Fragment;
+import androidx.viewpager.widget.ViewPager;
+
+import com.google.android.material.tabs.TabLayout;
 import com.kfzs.duanduan.utils.NumberFormatUtils;
 import com.kfzs.duanduan.utils.StatusBarUtils;
 import com.scwang.smartrefresh.layout.SmartRefreshLayout;
@@ -42,16 +47,16 @@ import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
+
 import org.afinal.simplecache.ApiKey;
+
 import butterknife.BindView;
 import butterknife.OnClick;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.schedulers.Schedulers;
-import static com.sheep.gamegroup.util.UMConfigUtils.Event.MY_MONEY_TAB;
 
 /**
  * 我的资产
- * Created by realicing on 2018/5/8.
  */
 
 public class ActMyMoney extends BaseActivity {
@@ -107,6 +112,8 @@ public class ActMyMoney extends BaseActivity {
 
     @Override
     public void initView() {
+        ConstraintLayout.LayoutParams params = (ConstraintLayout.LayoutParams) img_baseactivity_title.getLayoutParams();
+        params.setMargins(0, StatusBarUtils.getStatusBarHeight(this), 0, 0);
         TitleBarUtils.getInstance()
                 .setTitle(this, "我的资产")
                 .setTitleFinish(this);

app/src/main/java/com/sheep/gamegroup/view/activity/ActMyWelfare.java

@@ -1,14 +1,15 @@
 package com.sheep.gamegroup.view.activity;
 
 import android.app.Activity;
-import com.google.android.material.tabs.TabLayout;
-import androidx.viewpager.widget.ViewPager;
 import android.view.View;
 
-import com.sheep.gamegroup.util.Jump2View;
-import com.sheep.gamegroup.view.adapter.TitleFragmentListAdapter;
+import androidx.viewpager.widget.ViewPager;
+
+import com.google.android.material.tabs.TabLayout;
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.util.CommonUtil;
+import com.sheep.gamegroup.util.Jump2View;
+import com.sheep.gamegroup.view.adapter.TitleFragmentListAdapter;
 import com.sheep.gamegroup.view.fragment.FgtMyGift;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
@@ -17,8 +18,8 @@ import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 import butterknife.BindView;
 
 /**
- * Created by realicing on 2018/8/28.
- * realicing@sina.com
+ * 更新于2025年02月06日 郑阳
+ * 我的礼包页面
  */
 public class ActMyWelfare extends BaseActivity {
     @BindView(R.id.indicator)

app/src/main/java/com/sheep/gamegroup/view/fragment/BaseListFragment6.java

@@ -1,10 +1,11 @@
 package com.sheep.gamegroup.view.fragment;
 
 import android.app.Activity;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import android.view.View;
+
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
-import android.view.View;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
@@ -200,7 +201,6 @@ public abstract class BaseListFragment6<T> extends BaseFragment implements IRefr
             recyclerView = null;
         }
     }
-
     protected abstract BaseQuickAdapter<T, BaseViewHolder> getAdapter();
 
 }

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtMyGift.java

@@ -1,13 +1,16 @@
 package com.sheep.gamegroup.view.fragment;
 
-import androidx.recyclerview.widget.RecyclerView;
+import android.graphics.drawable.Drawable;
 import android.text.TextUtils;
 
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.sheep.gamegroup.model.api.ApiService;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.GiftBagApp;
 import com.sheep.gamegroup.view.adapter.GiftCenterAdapter;
 import com.sheep.gamegroup.view.adapter.WelfareAdapter;
+import com.sheep.jiuyan.samllsheep.R;
 
 import java.util.Locale;
 
@@ -15,7 +18,7 @@ import io.reactivex.Observable;
 import rx.functions.Action1;
 
 /**
- * 我的福利--我的礼包
+ * 我的福利--我的礼包，实际的fragment
  * Created by realicing on 2018/8/28.
  * realicing@sina.com
  */
@@ -30,7 +33,7 @@ public class FgtMyGift extends BaseListFragment2<GiftBagApp> implements Action1<
 
     @Override
     public void call(Integer integer) {
-        switch (integer){
+        switch (integer) {
             case WelfareAdapter.TO_REFRESH:
                 refreshData();
                 break;
@@ -54,7 +57,7 @@ public class FgtMyGift extends BaseListFragment2<GiftBagApp> implements Action1<
 
     @Override
     protected Observable<BaseMessage> getApi(ApiService apiService) {
-        if(TextUtils.isEmpty(token)){
+        if (TextUtils.isEmpty(token)) {
             return apiService.getMyGiftBagList(page, per_page);
         } else {
             return apiService.getMyGiftBagList(token, page, per_page);
@@ -66,4 +69,8 @@ public class FgtMyGift extends BaseListFragment2<GiftBagApp> implements Action1<
         return GiftBagApp.class;
     }
 
+    @Override
+    protected Drawable getItemDecorationDrawable() {
+        return getResources().getDrawable(R.drawable.divider_12dp);
+    }
 }

app/src/main/java/com/sheep/jiuyan/samllsheep/utils/TitleBarUtils.java

@@ -4,13 +4,6 @@ import android.app.Activity;
 import android.graphics.Color;
 import android.graphics.Typeface;
 import android.graphics.drawable.ColorDrawable;
-import androidx.annotation.DrawableRes;
-import com.google.android.material.tabs.TabLayout;
-import androidx.fragment.app.Fragment;
-import androidx.viewpager.widget.ViewPager;
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.AppCompatAutoCompleteTextView;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.KeyEvent;
@@ -20,6 +13,14 @@ import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.annotation.DrawableRes;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.AppCompatAutoCompleteTextView;
+import androidx.fragment.app.Fragment;
+import androidx.viewpager.widget.ViewPager;
+
+import com.google.android.material.tabs.TabLayout;
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.util.KeyEventUtil;
 import com.sheep.gamegroup.util.ViewUtil;
@@ -58,7 +59,7 @@ public class TitleBarUtils {
      */
     public TitleBarUtils setTitle(Activity activity, String title) {
         TextView titleView = activity.getWindow().getDecorView().findViewById(R.id.txt_baseactivity_title);
-        if(titleView != null) {
+        if (titleView != null) {
             titleView.setVisibility(View.VISIBLE);
             titleView.setText(title == null ? "" : title);
         }
@@ -442,7 +443,7 @@ public class TitleBarUtils {
                 ViewUtil.setVisibility(activity.getWindow().getDecorView().findViewById(R.id.layout_navigationBar), isShow);
             }
         } else {
-                ViewUtil.setVisibility(activity.getWindow().getDecorView().findViewById(R.id.layout_navigationBar), isShow);
+            ViewUtil.setVisibility(activity.getWindow().getDecorView().findViewById(R.id.layout_navigationBar), isShow);
         }
         return this;
     }
@@ -627,6 +628,12 @@ public class TitleBarUtils {
         return this;
     }
 
+    public TitleBarUtils setRightBtnColor(Activity activity, int colorId) {
+        Button button = activity.getWindow().getDecorView().findViewById(R.id.btn_baseactivity_right);
+        button.setTextColor(activity.getResources().getColor(colorId));
+        return this;
+    }
+
     public interface TextChangedListener {
         void onTextChanged(String text);
     }

app/src/main/res/drawable/arrow_back_ios_new_24.xml

@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M17.77,3.77l-1.77,-1.77l-10,10l10,10l1.77,-1.77l-8.23,-8.23z"/>
+    
+</vector>

app/src/main/res/drawable/lay_list_progress_green.xml

@@ -4,9 +4,7 @@
     <item android:id="@android:id/background">
         <shape>
             <corners android:radius="5dip" />
-            <stroke
-                android:width="1dp"
-                android:color="#F6F6F6"/>
+            <solid android:color="#F2F2F2" />
         </shape>
     </item>
 
@@ -14,12 +12,7 @@
         <clip>
             <shape>
                 <corners android:radius="5dip" />
-                <gradient
-                    android:angle="270"
-                    android:centerColor="#8000ae7c"
-                    android:centerY="0.75"
-                    android:endColor="#a000be7c"
-                    android:startColor="#8000ce7c" />
+                <solid android:color="#08B6F9" />
             </shape>
         </clip>
     </item>
@@ -27,13 +20,8 @@
     <item android:id="@android:id/progress">
         <clip>
             <shape>
-                <corners android:radius="5dip" />
-                <gradient
-                    android:angle="270"
-                    android:centerColor="#02A640"
-                    android:centerY="0.75"
-                    android:endColor="#03A640"
-                    android:startColor="#01A640" />
+                <corners android:radius="5dp" />
+                <solid android:color="#08B6F9" />
             </shape>
         </clip>
     </item>

app/src/main/res/drawable/round_main_r8.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="8dp" />
+    <solid android:color="@color/btn_color_main_stroke" />
+</shape>

app/src/main/res/drawable/title_icon.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#00AAED" />
+    <size
+        android:width="12dp"
+        android:height="22dp" />
+</shape>

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

@@ -13,21 +13,24 @@
         android:layout_height="match_parent">
 
         <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/appBarLayout"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:fitsSystemWindows="true"
+            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+            app:elevation="0dp">
 
             <com.google.android.material.appbar.CollapsingToolbarLayout
+                android:id="@+id/collapsing_toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:fitsSystemWindows="true"
+                app:collapsedTitleTextAppearance="@style/CollapsedTitleTextAppearance"
                 app:contentScrim="@android:color/white"
+                app:expandedTitleGravity="top"
+                app:expandedTitleTextAppearance="@style/ExpandedTitleTextAppearance"
                 app:layout_scrollFlags="scroll|exitUntilCollapsed"
-                app:title="礼包详情"
-                app:titleEnabled="true">
-
-                <androidx.appcompat.widget.Toolbar
-                    android:id="@+id/toolbar"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                app:toolbarId="@+id/toolbar">
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
@@ -66,6 +69,28 @@
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toBottomOf="@+id/tvGameName" />
                 </androidx.constraintlayout.widget.ConstraintLayout>
+
+                <androidx.appcompat.widget.Toolbar
+                    android:id="@+id/toolbar"
+                    android:layout_width="match_parent"
+                    android:layout_height="?attr/actionBarSize"
+                    android:gravity="center_horizontal"
+                    app:layout_collapseMode="pin">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="56dp"
+                        android:gravity="center">
+
+                        <TextView
+                            android:id="@+id/tvToolbarTitle"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="礼包详情"
+                            android:textAppearance="@style/ExpandedTitleTextAppearance" />
+                    </LinearLayout>
+                </androidx.appcompat.widget.Toolbar>
             </com.google.android.material.appbar.CollapsingToolbarLayout>
         </com.google.android.material.appbar.AppBarLayout>
 
@@ -163,44 +188,55 @@
                     app:layout_constraintTop_toTopOf="parent"
                     tools:text="在兑换码界面输入即可领取" />
 
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="24dp"
-                    android:gravity="center"
-                    android:text="兑换码"
-                    android:textColor="@color/black"
-                    android:textSize="14sp"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-                <!--                兑换码-->
                 <LinearLayout
                     android:id="@+id/llCode"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="4dp"
-                    android:gravity="center_vertical">
+                    android:orientation="vertical">
 
                     <TextView
-                        android:id="@+id/tvCode"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:textColor="@color/text66"
+                        android:layout_marginTop="24dp"
+                        android:gravity="center"
+                        android:text="兑换码"
+                        android:textColor="@color/black"
                         android:textSize="14sp"
                         app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent"
-                        tools:text="在兑换码界面输入即可领取" />
-
-                    <TextView
-                        android:id="@+id/btnCopy"
-                        android:layout_width="wrap_content"
+                        app:layout_constraintTop_toTopOf="parent" />
+                    <!--                兑换码-->
+                    <LinearLayout
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginStart="12dp"
-                        android:text="复制" />
+                        android:layout_marginTop="4dp"
+                        android:gravity="center_vertical">
+
+                        <TextView
+                            android:id="@+id/tvCode"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textColor="@color/text66"
+                            android:textSize="14sp"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent"
+                            tools:text="在兑换码界面输入即可领取" />
+
+                        <TextView
+                            android:id="@+id/btnCopy"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="12dp"
+                            android:background="@drawable/button_bg"
+                            android:gravity="center"
+                            android:text="复制"
+                            android:textColor="@color/white"
+                            android:textSize="14sp" />
+                    </LinearLayout>
                 </LinearLayout>
 
                 <Button
-                    style="@style/login_theme_round_button"
+                    android:id="@+id/btnGet"
+                    style="@style/round_button_8_radius"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="60dp"

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

@@ -68,17 +68,17 @@
                             app:layout_constraintTop_toTopOf="@+id/img_baseactivity_title"/>
 
                     <ImageView
-                            android:id="@+id/ico_baseactivity_title"
-                            android:layout_width="wrap_content"
-                            android:layout_height="?attr/actionBarSize"
-                            android:layout_marginTop="@dimen/status_bar_height"
-                            android:gravity="center_vertical"
-                            android:paddingStart="@dimen/content_padding_20"
-                            android:paddingEnd="@dimen/content_padding_20"
-                            android:scaleType="centerInside"
-                            android:src="@mipmap/question"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintTop_toTopOf="parent"/>
+                        android:id="@+id/ico_baseactivity_title"
+                        android:layout_width="wrap_content"
+                        android:layout_height="?attr/actionBarSize"
+                        android:gravity="center_vertical"
+                        android:paddingStart="@dimen/content_padding_20"
+                        android:paddingEnd="@dimen/content_padding_20"
+                        android:scaleType="centerInside"
+                        android:src="@mipmap/question"
+                        app:layout_constraintBottom_toBottomOf="@+id/img_baseactivity_title"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toTopOf="@+id/img_baseactivity_title" />
 
                     <androidx.cardview.widget.CardView
                             android:id="@+id/my_money_card_layout"

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

@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="94dp"
-    android:paddingStart="16dp"
-    android:paddingTop="16dp"
-    android:paddingEnd="16dp">
+    android:layout_height="wrap_content"
+    android:layout_marginStart="16dp"
+    android:layout_marginEnd="16dp"
+    android:background="@drawable/round_rect_12dp"
+    android:padding="12dp">
 
     <ImageView
         android:id="@+id/item_dm_icon_iv"
-        android:layout_width="62dp"
-        android:layout_height="62dp"
-        android:src="@drawable/loading_01"
+        android:layout_width="64dp"
+        android:layout_height="64dp"
         android:layout_marginBottom="16dp"
+        android:src="@drawable/loading_01"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -33,15 +35,15 @@
         android:id="@+id/item_dm_info_tv"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:gravity="center_vertical"
-        android:text="1.28G"
-        android:textColor="#ff8e8e8e"
-        android:textSize="10sp"
         android:layout_marginBottom="16dp"
+        android:gravity="center_vertical"
+        android:textColor="@color/text99"
+        android:textSize="12sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@id/item_dm_name_tv"
-        app:layout_constraintTop_toBottomOf="@id/item_dm_name_tv" />
+        app:layout_constraintTop_toBottomOf="@id/item_dm_name_tv"
+        tools:text="1.28G" />
 
     <ProgressBar
         android:id="@+id/item_dm_pb"
@@ -69,20 +71,12 @@
 
     <TextView
         android:id="@+id/item_dm_btn_tv"
-        style="@style/style_button_find"
-        android:text="开始下载"
+        style="@style/newButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
+        android:text="开始下载"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
-
-    <View
-        android:layout_width="0dp"
-        android:layout_height="1dp"
-        android:layout_marginStart="10dp"
-        android:layout_marginEnd="8dp"
-        android:background="#F2F2F2"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -60,7 +60,9 @@
 
     <TextView
         android:id="@+id/btn"
-        style="@style/style_button_find"
+        style="@style/newButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:text="@string/task_cancel"
         app:layout_constraintBottom_toBottomOf="@+id/icon"
         app:layout_constraintEnd_toEndOf="parent"

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

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical">
@@ -12,7 +13,8 @@
 
     <RelativeLayout
         android:id="@+id/item_play_game_list_rl"
-        style="@style/style_wc_rl">
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
 
         <TextView
             android:id="@+id/item_play_game_list_tv"
@@ -22,7 +24,14 @@
         <TextView
             android:id="@+id/item_play_game_list_more_tv"
             style="@style/style_wc_more"
-            android:text="更多" />
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="更多"
+            android:textColor="@color/text66"
+            android:textSize="12sp"
+            app:layout_constraintBottom_toBottomOf="@+id/item_play_game_list_tv"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/item_play_game_list_tv" />
     </RelativeLayout>
 
     <androidx.recyclerview.widget.RecyclerView

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

@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/home"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
-    android:background="@color/bg">
+    android:background="@color/ver4Bg"
+    android:fitsSystemWindows="true">
 
     <include
         android:id="@+id/check_net_ll"
         layout="@layout/check_net_view"
-        android:visibility="gone"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content"
+        android:visibility="gone" />
 
     <include
         android:id="@+id/empty_view"
@@ -24,5 +25,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_below="@+id/check_net_ll"
-        android:descendantFocusability="blocksDescendants"/>
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        android:descendantFocusability="blocksDescendants" />
 </RelativeLayout>

app/src/main/res/values-v19/style_theme.xml

@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="AppTheme" parent="Base.Theme.AppCompat.Light.DarkActionBar">
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="android:textColorPrimary">@color/black_text_deep</item>
-        <item name="colorAccent">@color/colorAccent</item>
-        <item name="colorControlHighlight">@color/black</item>
-
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-        <item name="main_color">@color/theme_app_main</item>
-        <item name="main_color_dark">@color/theme_app_dark</item>
-        <item name="main_color_mid">@color/theme_app_mid</item>
-        <item name="main_color_accent">@color/theme_app_highlight</item>
-        <item name="main_color_light">@color/theme_app_highlight_more</item>
-        <item name="star_unselect">@drawable/xina</item>
-        <item name="star_select">@drawable/xinb</item>
-        <!--下面的属性全是为了兼容安卓4.0！多了好多文件啊-->
-        <item name="line_short">@drawable/sp_line_vertical</item>
-        <item name="star_style">@style/ratingbar_main</item>
-        <item name="radio_btn">@drawable/sel_circle_dot</item>
-        <item name="button_full_normal">@drawable/selector_button_full_main</item>
-        <item name="full.button">@style/full.button_main</item>
-        <item name="small.button">@style/small.button_main</item>
-        <item name="sp_dot_rota">@drawable/sp_dot_rota_main</item>
-        <item name="theme_bg_btn_corner">@drawable/theme_bg_btn_corner_main</item>
-        <item name="sp_search_edt">@drawable/sp_search_edt_main</item>
-        <item name="btn_color">@color/btn_color_main</item>
-
-        <item name="android:windowTranslucentStatus">true</item>
-    </style>
-
-    <style name="AppThemeMain" parent="AppTheme">
-        <item name="android:windowIsTranslucent">false</item>
-    </style>
-
-    <style name="AppThemeTransparent" parent="AppTheme">
-        <item name="android:windowBackground">@android:color/transparent</item>
-        <item name="android:windowAnimationStyle">@null</item>
-        <item name="android:windowIsTranslucent">true</item>
-        <item name="android:colorBackgroundCacheHint">@null</item>
-    </style>
-
-    <style name="AppActionTheme" parent="Base.Theme.AppCompat.Light.DarkActionBar">
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="android:textColorPrimary">@color/black_text_deep</item>
-        <item name="colorAccent">@color/colorAccent</item>
-        <item name="colorControlHighlight">@color/black</item>
-
-        <item name="main_color">@color/theme_app_main</item>
-        <item name="main_color_dark">@color/theme_app_dark</item>
-        <item name="main_color_mid">@color/theme_app_mid</item>
-        <item name="main_color_accent">@color/theme_app_highlight</item>
-        <item name="main_color_light">@color/theme_app_highlight_more</item>
-        <item name="star_unselect">@drawable/xina</item>
-        <item name="star_select">@drawable/xinb</item>
-        <!--下面的属性全是为了兼容安卓4.0！多了好多文件啊-->
-        <item name="line_short">@drawable/sp_line_vertical</item>
-        <item name="star_style">@style/ratingbar_main</item>
-        <item name="radio_btn">@drawable/sel_circle_dot</item>
-        <item name="button_full_normal">@drawable/selector_button_full_main</item>
-        <item name="full.button">@style/full.button_main</item>
-        <item name="small.button">@style/small.button_main</item>
-        <item name="sp_dot_rota">@drawable/sp_dot_rota_main</item>
-        <item name="theme_bg_btn_corner">@drawable/theme_bg_btn_corner_main</item>
-        <item name="sp_search_edt">@drawable/sp_search_edt_main</item>
-        <item name="btn_color">@color/btn_color_main</item>
-
-        <item name="android:windowTranslucentStatus">true</item>
-        <item name="android:windowIsTranslucent">true</item>
-        <item name="android:windowBackground">@android:color/transparent</item>
-    </style>
-</resources>

app/src/main/res/values-v27/style_theme.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
     <style name="AppTheme" parent="Base.Theme.AppCompat.Light.DarkActionBar">
         <item name="android:windowContentOverlay">@null</item>
         <item name="android:windowLightStatusBar">true</item>

app/src/main/res/values/colors.xml

@@ -29,4 +29,5 @@
     <color name="foreground">#FF00C1F7</color>
     <color name="text33">#333333</color>
     <color name="text99">#999999</color>
+    <color name="ver4Bg">#F2F2F4</color>
 </resources>

app/src/main/res/values/dd_styles.xml

@@ -23,6 +23,7 @@
         <item name="android:layout_margin">@dimen/dp_10</item>
         <item name="android:textSize">@dimen/text_size_15</item>
     </style>
+
     <style name="style_new_year_button_purple">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">40dp</item>
@@ -348,8 +349,7 @@
         <item name="android:textSize">14sp</item>
     </style>
 
-    <style name="style_item_label"
-           parent="style_item_label_parent">
+    <style name="style_item_label" parent="style_item_label_parent">
         <item name="android:layout_width">0dp</item>
         <item name="android:layout_weight">1</item>
     </style>
@@ -470,10 +470,9 @@
     <style name="style_wc_line_title">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:drawablePadding">@dimen/content_padding_default</item>
-        <item name="android:paddingStart">15dp</item>
+        <item name="android:drawablePadding">8dp</item>
         <item name="android:paddingTop">18dp</item>
-        <item name="android:drawableStart">@drawable/sp_line_vertical</item>
+        <item name="android:drawableStart">@drawable/title_icon</item>
         <item name="android:gravity">center_vertical</item>
         <item name="android:textColor">#2c2c2c</item>
         <item name="android:textSize">15sp</item>
@@ -555,6 +554,7 @@
         <item name="android:textColor">@android:color/white</item>
         <item name="android:textSize">13sp</item>
     </style>
+
     <style name="style_vip_td_tv">
         <item name="android:layout_width">80dp</item>
         <item name="android:layout_height">30dp</item>
@@ -564,6 +564,7 @@
         <item name="android:textColor">#714E36</item>
         <item name="android:textSize">13sp</item>
     </style>
+
     <style name="style_vip_td_tv3">
         <item name="android:layout_width">70dp</item>
         <item name="android:layout_height">22dp</item>
@@ -600,6 +601,7 @@
         <item name="android:textColor">#ffffffff</item>
         <item name="android:textSize">10sp</item>
     </style>
+
     <style name="style_agm_act_code_tv">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">24dp</item>
@@ -613,6 +615,7 @@
         <item name="android:textColor">#ffffffff</item>
         <item name="android:textSize">10sp</item>
     </style>
+
     <style name="style_agm_act_code_copy_tv">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">24dp</item>

app/src/main/res/values/str_appstore_strings.xml

@@ -26,7 +26,7 @@
     <string name="download_completed">下载完成</string>
 
 
-    <string name="label_download_mgr">下载管理</string>
+    <string name="label_download_mgr">我的下载</string>
     <string name="empty"></string>
 
 </resources>

app/src/main/res/values/styles.xml

@@ -92,6 +92,16 @@
         <item name="android:textColor">@android:color/white</item>
     </style>
 
+    <style name="round_button_8_radius">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:paddingTop">@dimen/content_padding_16</item>
+        <item name="android:paddingBottom">@dimen/content_padding_16</item>
+        <item name="android:background">@drawable/round_main_r8</item>
+        <item name="android:textSize">18dp</item>
+        <item name="android:textColor">@android:color/white</item>
+    </style>
+
     <style name="login_type_btn">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
@@ -130,4 +140,18 @@
         <item name="android:color">@color/foreground</item>
         <item name="android:textSize">10sp</item>
     </style>
+
+    <style name="NoActionBar" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="android:windowTranslucentStatus">true</item>
+        <item name="android:windowIsTranslucent">true</item>
+    </style>
+    <!-- 免登录版本新增的按钮样式，以前的样式不用了 -->
+    <style name="newButton">
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:background">@drawable/button_bg</item>
+        <item name="android:gravity">center</item>
+        <item name="android:textColor">@color/white</item>
+        <item name="android:textSize">14sp</item>
+    </style>
 </resources>

app/src/main/res/values/theme_appbar.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="ExpandedTitleTextAppearance" parent="TextAppearance.Widget.AppCompat.Toolbar.Title">
+        <item name="android:textSize">18sp</item>
+        <item name="android:textColor">@android:color/white</item>
+    </style>
+
+    <style name="CollapsedTitleTextAppearance" parent="TextAppearance.Widget.AppCompat.Toolbar.Title">
+        <item name="android:textSize">18sp</item>
+        <item name="android:textColor">@android:color/black</item>
+    </style>
+</resources>