Explorar o código

fixbug:UI走查

Sora hai 1 ano
pai
achega
67c9113d26
Modificáronse 41 ficheiros con 193 adicións e 140 borrados
  1. 3 0
      app/src/main/java/com/sheep/gamegroup/module/game/activity/ActGameGroupOrGameDetail.java
  2. 1 1
      app/src/main/java/com/sheep/gamegroup/module/game/fragment/FgtGameComment.java
  3. 13 7
      app/src/main/java/com/sheep/gamegroup/module/game/fragment/FgtGameGift.java
  4. 4 4
      app/src/main/java/com/sheep/gamegroup/module/game/fragment/FgtGiftBagList.java
  5. 4 4
      app/src/main/java/com/sheep/gamegroup/module/login/LoginAct.java
  6. 6 3
      app/src/main/java/com/sheep/gamegroup/util/CertificationUtil.java
  7. 5 5
      app/src/main/java/com/sheep/gamegroup/util/DataUtil.java
  8. 11 1
      app/src/main/java/com/sheep/gamegroup/view/activity/ActMain.java
  9. 4 0
      app/src/main/java/com/sheep/gamegroup/view/activity/ActMyWelfare.java
  10. 1 1
      app/src/main/java/com/sheep/gamegroup/view/activity/ActPlayGameList.java
  11. 1 1
      app/src/main/java/com/sheep/gamegroup/view/activity/ActPlayGameRecommendList.java
  12. 1 1
      app/src/main/java/com/sheep/gamegroup/view/activity/ActPlayGameUserLikeList.java
  13. 4 4
      app/src/main/java/com/sheep/gamegroup/view/activity/ChangeTelAct.java
  14. 11 2
      app/src/main/java/com/sheep/gamegroup/view/activity/RealNameAuthenAct.java
  15. 5 2
      app/src/main/java/com/sheep/gamegroup/view/adapter/AdpGcGameAppGiftBagAdapter.java
  16. 1 1
      app/src/main/java/com/sheep/gamegroup/view/fragment/FgtArticleComment.java
  17. 1 1
      app/src/main/java/com/sheep/gamegroup/view/fragment/FgtDownloadWelfareList.java
  18. 1 1
      app/src/main/java/com/sheep/gamegroup/view/fragment/FgtGcGameAppComment.java
  19. 1 1
      app/src/main/java/com/sheep/gamegroup/view/fragment/FgtGiftCenter.java
  20. 1 1
      app/src/main/java/com/sheep/gamegroup/view/fragment/FgtMsgReply.java
  21. 1 1
      app/src/main/java/com/sheep/gamegroup/view/fragment/FgtMyGift.java
  22. 1 1
      app/src/main/java/com/sheep/gamegroup/view/fragment/FgtPlayGameSon.java
  23. 1 1
      app/src/main/java/com/sheep/gamegroup/view/fragment/FgtSearchApp.java
  24. 1 1
      app/src/main/java/com/sheep/gamegroup/view/fragment/FgtSignCardRecord.java
  25. 1 1
      app/src/main/java/com/sheep/gamegroup/view/fragment/FgtUserAppHomeCommentList.java
  26. 1 1
      app/src/main/java/com/sheep/gamegroup/view/fragment/FgtUserAppHomeReplyList.java
  27. 1 1
      app/src/main/java/com/sheep/gamegroup/view/fragment/FgtUserCommentDetail.java
  28. 1 1
      app/src/main/java/com/sheep/gamegroup/view/fragment/FgtVideoComment.java
  29. 61 61
      app/src/main/java/org/afinal/simplecache/ApiKey.java
  30. 12 4
      app/src/main/res/drawable/round_arrow_forward_ios_24.xml
  31. 3 1
      app/src/main/res/layout/act_gc_game_app_detail.xml
  32. 2 2
      app/src/main/res/layout/bottom_sheet_fragment.xml
  33. 2 1
      app/src/main/res/layout/fragment_find_account.xml
  34. 15 16
      app/src/main/res/layout/item_download_manager.xml
  35. 1 1
      app/src/main/res/layout/item_download_welfare.xml
  36. 3 2
      app/src/main/res/layout/title.xml
  37. 2 1
      app/src/main/res/layout/title_search.xml
  38. 2 1
      app/src/main/res/layout/title_yf.xml
  39. 1 0
      app/src/main/res/layout/x_real_name_auther_layout.xml
  40. 1 1
      app/src/main/res/values/dd_styles.xml
  41. 1 0
      app/src/main/res/values/styles.xml

+ 3 - 0
app/src/main/java/com/sheep/gamegroup/module/game/activity/ActGameGroupOrGameDetail.java

@@ -314,6 +314,9 @@ public class ActGameGroupOrGameDetail extends BaseActivity {
             fgtGameGift = FgtGameGift.newInstance(id, gameEntity);
             fgtGameGift.setSmartRefreshLayout(binding.refresh);
             mAdapter.add(fgtGameGift, "礼包");
+            binding.tabLayout.setVisibility(View.VISIBLE);
+        } else {
+            binding.tabLayout.setVisibility(View.GONE);
         }
         mAdapter.notifyDataSetChanged();
         CommonUtil.getInstance().reflex(binding.tabLayout, this);

+ 1 - 1
app/src/main/java/com/sheep/gamegroup/module/game/fragment/FgtGameComment.java

@@ -99,7 +99,7 @@ public class FgtGameComment extends BaseListFragment3<UserComment> {
 
     @Override
     protected String getKey(int page, int per_page) {
-        return String.format(Locale.CHINA, "app/game_user/app_comment_list?page_no=%d&page_size=%d&app_id=%d&comment_type=%d", page, per_page, app_id, type);
+        return String.format(Locale.CHINA, "v1/appgame_user/app_comment_list?page_no=%d&page_size=%d&app_id=%d&comment_type=%d", page, per_page, app_id, type);
     }
 
     @Override

+ 13 - 7
app/src/main/java/com/sheep/gamegroup/module/game/fragment/FgtGameGift.java

@@ -4,6 +4,8 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.sheep.gamegroup.absBase.BaseRefreshLoadMoreFragment;
+import com.sheep.gamegroup.event.BigEvent;
+import com.sheep.gamegroup.event.EventTypes;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.GameEntity;
 import com.sheep.gamegroup.model.entity.GiftBagApp;
@@ -34,10 +36,10 @@ public class FgtGameGift extends BaseRefreshLoadMoreFragment implements Action1<
     @BindView(R.id.recyclerView)
     RecyclerView recyclerView;
 
-    public static FgtGameGift newInstance(int appId,GameEntity gameEntity) {
+    public static FgtGameGift newInstance(int appId, GameEntity gameEntity) {
         FgtGameGift fgt = new FgtGameGift();
         fgt.appId = appId;
-        fgt.gameEntity=gameEntity;
+        fgt.gameEntity = gameEntity;
         return fgt;
     }
 
@@ -54,12 +56,13 @@ public class FgtGameGift extends BaseRefreshLoadMoreFragment implements Action1<
         recyclerView.setHasFixedSize(true);
         recyclerView.setNestedScrollingEnabled(false);
         recyclerView.setLayoutManager(new LinearLayoutManager(SheepApp.getInstance()));
-        if (gameEntity != null) {
-            list.addAll(gameEntity.getHas_gift_bag());
-        }
+//        if (gameEntity != null) {
+//            list.addAll(gameEntity.getHas_gift_bag());
+//        }
         adapter = new AdpGcGameAppGiftBagAdapter(list, gameEntity, this);
         adapter.bindToRecyclerView(recyclerView);
         adapter.setEmptyView(R.layout.include_empty_view);
+        refreshData();
 
     }
 
@@ -68,8 +71,11 @@ public class FgtGameGift extends BaseRefreshLoadMoreFragment implements Action1<
 
     private GameEntity gameEntity;
 
-
-    @Override
+    public void onEventMainThread(BigEvent event) {
+       if(event.getEventTypes()== EventTypes.REFRESH_LIBAO_LIST){
+           refreshData();
+       }
+    }
     public void refreshData() {
         SheepApp.getInstance().getNetComponent().getApiService().getGiftBagListByAppId(1, 20, appId)
                 .subscribeOn(Schedulers.io())

+ 4 - 4
app/src/main/java/com/sheep/gamegroup/module/game/fragment/FgtGiftBagList.java

@@ -114,18 +114,18 @@ public class FgtGiftBagList extends BaseListFragment2<GiftBagApp> implements Act
         super.initView();
         binding.getRoot().setBackground(getActivity().getDrawable(android.R.color.transparent));
         int dp12 = WidgetUtil.Dp2Px(getContext(), 12);
-        binding.viewList.setPadding(dp12, 0, dp12, 0);
+        binding.viewList.setPadding(0, 0, 0, 0);
     }
 
     @Override
     protected String getKey(int page, int per_page) {
         if (app_id > 0) {
-            return String.format(Locale.CHINA, "app/gift_bag?page=%d&per_page=%d&app_id=%d", page, per_page, app_id);
+            return String.format(Locale.CHINA, "v1/appgift_bag?page=%d&per_page=%d&app_id=%d", page, per_page, app_id);
         }
         if (tag_id > 0) {
-            return String.format(Locale.CHINA, "app/gift_bag?page=%d&per_page=%d&tag_id=%d", page, per_page, tag_id);
+            return String.format(Locale.CHINA, "v1/appgift_bag?page=%d&per_page=%d&tag_id=%d", page, per_page, tag_id);
         }
-        return String.format(Locale.CHINA, "app/gift_bag?page=%d&per_page=%d", page, per_page);
+        return String.format(Locale.CHINA, "v1/appgift_bag?page=%d&per_page=%d", page, per_page);
     }
 
     @Override

+ 4 - 4
app/src/main/java/com/sheep/gamegroup/module/login/LoginAct.java

@@ -36,7 +36,6 @@ import com.sheep.gamegroup.util.ChannelContent;
 import com.sheep.gamegroup.util.Constant;
 import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.FastJsonUtils;
-import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.PreferenceUtils;
 import com.sheep.gamegroup.util.TestUtil;
 import com.sheep.gamegroup.util.UMConfigUtils;
@@ -177,9 +176,8 @@ public class LoginAct extends BaseUMActivity implements LoginController {
         }
         //登录成功记录设备信息
         ApiJSONUtil.postUserDeviceLog();
-        EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.USER_LOGIN));
         goMain(loginResult);
-        finish();
+//        finish();
     }
 
     private void getUserInfoFromUM(int platform, final LoginEntity entity) {
@@ -242,7 +240,9 @@ public class LoginAct extends BaseUMActivity implements LoginController {
     private void goMain(LoginEntity entity) {
         CertificationUtil.newInstance().addCurUserToSdkLoginUser(entity.getToken(), entity.getUser());
         if (TextUtils.isEmpty(SheepApp.getInstance().getGameCode())) {
-            Jump2View.getInstance().checkOrGoHomePage(this);
+//            Jump2View.getInstance().checkOrGoHomePage(this);
+            EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.USER_LOGIN));
+            finish();
         } else {
             CertificationUtil.newInstance().authCertificationCode(this, entity.getToken(), null);
         }

+ 6 - 3
app/src/main/java/com/sheep/gamegroup/util/CertificationUtil.java

@@ -1,13 +1,14 @@
 package com.sheep.gamegroup.util;
 
 import android.app.Activity;
-import android.content.Context;
 import android.content.Intent;
 import android.os.Handler;
 import android.os.Looper;
 import android.text.TextUtils;
 import android.util.Log;
 
+import com.sheep.gamegroup.event.BigEvent;
+import com.sheep.gamegroup.event.EventTypes;
 import com.sheep.gamegroup.greendao.DDProviderHelper;
 import com.sheep.gamegroup.greendao.download.SdkLoginUser;
 import com.sheep.gamegroup.model.entity.BaseMessage;
@@ -16,11 +17,12 @@ import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
-import com.sheep.jiuyan.samllsheep.utils.SpUtils;
+
+import org.greenrobot.eventbus.EventBus;
 
 import io.reactivex.android.schedulers.AndroidSchedulers;
-import rx.functions.Action1;
 import io.reactivex.schedulers.Schedulers;
+import rx.functions.Action1;
 
 /**
  * 游戏认证
@@ -84,6 +86,7 @@ public class CertificationUtil {
                 intent.putExtra(activity.getString(R.string.kfzs_duanduan_datashare_package_extras), ext);
                 intent.putExtra(activity.getString(R.string.kfzs_duanduan_datashare_certification_token), token);
             }
+            EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.USER_LOGIN));
             activity.startActivity(intent);
             showCertificationErrorAndExitApp(activity, "", 100);
         } catch (Exception e) {

+ 5 - 5
app/src/main/java/com/sheep/gamegroup/util/DataUtil.java

@@ -215,7 +215,7 @@ public class DataUtil {
 
     //-----------------------------------------缓存数据部分-----------------------------------------------------开始
     public <T> T getCacheResult(String key, Class<T> classT) {
-        String cacheData = aCache.getAsString(SheepApp.getInstance().getConnectAddress().getAppUrl() + "v1/" + key);
+        String cacheData = aCache.getAsString(SheepApp.getInstance().getConnectAddress().getAppUrl() +  key);
         if (!TextUtils.isEmpty(cacheData)) {
             if (BuildConfig.XXTEA_ENCRYPT) {
                 cacheData = BaseMessageConverter.decrypt(cacheData);
@@ -236,7 +236,7 @@ public class DataUtil {
      * @param saveTime 单位秒
      */
     public void resetCacheTime(String key, int saveTime) {
-        String realKey = SheepApp.getInstance().getConnectAddress().getAppUrl() + "v1/" + key;
+        String realKey = SheepApp.getInstance().getConnectAddress().getAppUrl() +  key;
         String cacheData = aCache.getAsString(realKey);
         if (!TextUtils.isEmpty(cacheData)) {
             aCache.put(realKey, cacheData, saveTime);
@@ -254,7 +254,7 @@ public class DataUtil {
      * @return
      */
     public <T> List<T> getCacheList(String key, Class<T> classT) {
-        String cacheData = aCache.getAsString(SheepApp.getInstance().getConnectAddress().getAppUrl() + "v1/" + key);
+        String cacheData = aCache.getAsString(SheepApp.getInstance().getConnectAddress().getAppUrl() +  key);
         if (cacheData == null) {
             return ListUtil.emptyList();
         }
@@ -278,7 +278,7 @@ public class DataUtil {
      * @return
      */
     public <T> List<T> getCacheList(String key, Class<T> classT, Conversion<BaseMessage, List<T>> conversion, int page) {
-        String cacheData = aCache.getAsString(SheepApp.getInstance().getConnectAddress().getAppUrl() + "v1/" + key);
+        String cacheData = aCache.getAsString(SheepApp.getInstance().getConnectAddress().getAppUrl() +  key);
         if (cacheData == null) {
             return null;
         } else if (cacheData.isEmpty()) {
@@ -314,7 +314,7 @@ public class DataUtil {
     }
 
     public boolean isNewData(String key) {
-        return !TextUtils.equals(aCache.getAsString(ApiKey.oldEqualsNew(SheepApp.getInstance().getConnectAddress().getAppUrl() + "v1/" + key)), "yes");//新老数据不同,说明是新数据
+        return !TextUtils.equals(aCache.getAsString(ApiKey.oldEqualsNew(SheepApp.getInstance().getConnectAddress().getAppUrl() +  key)), "yes");//新老数据不同,说明是新数据
     }
 
     //-----------------------------------------缓存数据部分-----------------------------------------------------结束

+ 11 - 1
app/src/main/java/com/sheep/gamegroup/view/activity/ActMain.java

@@ -304,7 +304,17 @@ public class ActMain extends BaseActYmPermissionCheck implements QQMiniGameLogin
         super.onWindowFocusChanged(hasFocus);
         setSystemUiVisibility(false);
     }
-
+    @Override
+    public void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+        if ("LOGOUT".equals(intent.getStringExtra("INTENT_ACTION"))) {
+//            Jump2View.getInstance().goLoginView(this, "home");
+        } else if (intent.hasExtra("SWITCH_TAB")) {
+//            switchFragment(intent.getIntExtra("SWITCH_TAB", 0));
+        } else if ("EXIT".equals(intent.getStringExtra("INTENT_ACTION"))) {
+            exit(false);
+        }
+    }
     private void setSystemUiVisibility(boolean isDark) {
         int flag = View.SYSTEM_UI_FLAG_LAYOUT_STABLE;
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT && G.checkDeviceHasNavigationBar(this)) {

+ 4 - 0
app/src/main/java/com/sheep/gamegroup/view/activity/ActMyWelfare.java

@@ -47,6 +47,10 @@ public class ActMyWelfare extends BaseActivity {
 
     private Activity activity;
 
+    @Override
+    protected boolean showWhiteStatusBar() {
+        return true;
+    }
 
     private TitleFragmentListAdapter mAdapter;
 

+ 1 - 1
app/src/main/java/com/sheep/gamegroup/view/activity/ActPlayGameList.java

@@ -46,7 +46,7 @@ public class ActPlayGameList extends BaseListActivity2<GameEntity> {
 
     @Override
     protected String getKey(int page, int per_page) {
-        return String.format(Locale.CHINA, "app/find?page=%d&per_page=%d&%s", page, per_page, StringUtils.addParams(gameListType.getMap()));
+        return String.format(Locale.CHINA, "v1/appfind?page=%d&per_page=%d&%s", page, per_page, StringUtils.addParams(gameListType.getMap()));
     }
 
     @Override

+ 1 - 1
app/src/main/java/com/sheep/gamegroup/view/activity/ActPlayGameRecommendList.java

@@ -39,7 +39,7 @@ public class ActPlayGameRecommendList extends BaseListActivity2<GameEntity> {
 
     @Override
     protected String getKey(int page, int per_page) {
-        return String.format(Locale.CHINA, "app/find/recommend/list?display_type=%d", gameListType.getDisplay_type());
+        return String.format(Locale.CHINA, "v1/appfind/recommend/list?display_type=%d", gameListType.getDisplay_type());
     }
 
     @Override

+ 1 - 1
app/src/main/java/com/sheep/gamegroup/view/activity/ActPlayGameUserLikeList.java

@@ -36,7 +36,7 @@ public class ActPlayGameUserLikeList extends BaseListActivity2<GameEntity> {
 
     @Override
     protected String getKey(int page, int per_page) {
-        return "app/find/recommend/user_like";
+        return "appfind/recommend/user_like";
     }
 
     @Override

+ 4 - 4
app/src/main/java/com/sheep/gamegroup/view/activity/ChangeTelAct.java

@@ -2,13 +2,15 @@ package com.sheep.gamegroup.view.activity;
 
 import android.app.Activity;
 import android.content.Intent;
-import androidx.appcompat.widget.AppCompatEditText;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+
+import androidx.appcompat.widget.AppCompatEditText;
+
 import com.alibaba.fastjson.JSONObject;
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.di.components.DaggerChangePhoneComponent;
@@ -440,7 +442,7 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View {
                 return;
             }
             if (o.getData() == null || o.getData().equals("")) {
-                G.showToast("网络错误,请稍候重试");
+                G.showToast(TextUtils.isEmpty(o.getMsg()) ? "网络错误,请稍候重试" : o.getMsg());
                 return;
             }
             G.showToast(TextUtils.isEmpty(o.getMsg()) ? "提交成功" : o.getMsg());
@@ -498,8 +500,6 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View {
     @Override
     public void bindTelSmsFail(BaseMessage o) {
         if (TestUtil.isDev()) {
-            mobile = "13880742867";
-            step = 4;
             changeTelSuccess(o);
             return;
         }

+ 11 - 2
app/src/main/java/com/sheep/gamegroup/view/activity/RealNameAuthenAct.java

@@ -1,7 +1,6 @@
 package com.sheep.gamegroup.view.activity;
 
 import android.content.Intent;
-import androidx.annotation.IntDef;
 import android.text.TextUtils;
 import android.view.Gravity;
 import android.view.View;
@@ -9,6 +8,8 @@ import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.annotation.IntDef;
+
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.di.components.DaggerRealNameAutherComponent;
 import com.sheep.gamegroup.di.modules.RealNameAutherModule;
@@ -87,7 +88,7 @@ public class RealNameAuthenAct extends BaseActivity implements RealNameAutherCon
     }
 
     @Override
-    public void onBackPressed(){
+    public void onBackPressed() {
         setResult(RESULT_CANCELED);
         super.onBackPressed();
     }
@@ -103,11 +104,19 @@ public class RealNameAuthenAct extends BaseActivity implements RealNameAutherCon
             ViewUtil.setText(loginname_view, gameUser.getLoginname());
             ViewUtil.setText(number_view, gameUser.getInvitation_code());
             ViewUtil.setAvatar(face_view, gameUser.getAvatar());
+//            findViewById(R.id.tvTips).setOnClickListener(this::testBack);
         } else {
             ViewUtil.setVisibility(game_account_layout, false);
         }
     }
 
+    private void testBack(View view) {
+        Intent result = new Intent();
+        result.putExtra("token", "ceshidetoken12345");
+        setResult(RESULT_OK, result);
+        finish();
+    }
+
     @Override
     protected boolean showWhiteStatusBar() {
         return true;

+ 5 - 2
app/src/main/java/com/sheep/gamegroup/view/adapter/AdpGcGameAppGiftBagAdapter.java

@@ -6,6 +6,7 @@ import static com.sheep.gamegroup.view.adapter.WelfareAdapter.RECEIVE_FAILED;
 import static com.sheep.gamegroup.view.adapter.WelfareAdapter.TO_REFRESH;
 
 import android.app.Activity;
+import android.text.TextUtils;
 import android.view.View;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
@@ -91,7 +92,8 @@ public class AdpGcGameAppGiftBagAdapter extends BaseQuickAdapter<GiftBagApp, Bas
         GlideImageLoader.setGameImage(binding.icon, gameEntity.getApp().getIcon());
         ViewUtil.setText(binding.tvTitle, itemGiftBag.getGiftName());
         ViewUtil.setText(binding.tvContent, itemGiftBag.getGiftContent());
-        if (!item.isReceived()) {//没有code,就视为没有领取礼包
+        if (TextUtils.isEmpty(item.getCode())) {//没有code,就视为没有领取礼包
+            binding.btn.setBackground(binding.getRoot().getContext().getResources().getDrawable(R.drawable.button_bg));
             binding.btn.setText("领取");
             binding.btn.setOnClickListener(new View.OnClickListener() {
                 @Override
@@ -100,6 +102,7 @@ public class AdpGcGameAppGiftBagAdapter extends BaseQuickAdapter<GiftBagApp, Bas
                 }
             });
         } else {
+            binding.btn.setBackground(binding.getRoot().getContext().getResources().getDrawable(R.drawable.button_bg_gray));
             binding.btn.setText("复制");
             binding.btn.setOnClickListener(new View.OnClickListener() {
                 @Override
@@ -113,7 +116,7 @@ public class AdpGcGameAppGiftBagAdapter extends BaseQuickAdapter<GiftBagApp, Bas
         holder.itemView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                item.setApp(gameEntity.getApp());
+//                item.setApp(gameEntity.getApp());
                 //点击礼包项
                 Jump2View.getInstance().goGiftDetail(holder.itemView.getContext(), item);
             }

+ 1 - 1
app/src/main/java/com/sheep/gamegroup/view/fragment/FgtArticleComment.java

@@ -218,7 +218,7 @@ public class FgtArticleComment extends BaseListFragment3<UserComment> implements
 
     @Override
     protected String getKey(int page, int per_page) {
-        return String.format(Locale.CHINA, "app/game_user/app_comment_list?page_no=%d&page_size=%d&app_id=%d&comment_type=%d", page, per_page, article_id, type);
+        return String.format(Locale.CHINA, "v1/appgame_user/app_comment_list?page_no=%d&page_size=%d&app_id=%d&comment_type=%d", page, per_page, article_id, type);
     }
 
     @Override

+ 1 - 1
app/src/main/java/com/sheep/gamegroup/view/fragment/FgtDownloadWelfareList.java

@@ -72,7 +72,7 @@ public class FgtDownloadWelfareList extends BaseListFragment2<Release_task> impl
 
     @Override
     protected String getKey(int page, int per_page) {
-        return String.format(Locale.CHINA, "app/release_task/down_welfare?page=%d&per_page=%d", page, per_page);
+        return String.format(Locale.CHINA, "v1/apprelease_task/down_welfare?page=%d&per_page=%d", page, per_page);
     }
 
     @Override

+ 1 - 1
app/src/main/java/com/sheep/gamegroup/view/fragment/FgtGcGameAppComment.java

@@ -96,7 +96,7 @@ public class FgtGcGameAppComment extends BaseListFragment3<UserComment> {
 
     @Override
     protected String getKey(int page, int per_page) {
-        return String.format(Locale.CHINA, "app/game_user/app_comment_list?page_no=%d&page_size=%d&app_id=%d&comment_type=%d", page, per_page, app_id, type);
+        return String.format(Locale.CHINA, "v1/appgame_user/app_comment_list?page_no=%d&page_size=%d&app_id=%d&comment_type=%d", page, per_page, app_id, type);
     }
 
     @Override

+ 1 - 1
app/src/main/java/com/sheep/gamegroup/view/fragment/FgtGiftCenter.java

@@ -91,7 +91,7 @@ public class FgtGiftCenter extends BaseListFragment2<GiftBagApp> implements Acti
 
     @Override
     protected String getKey(int page, int per_page) {
-        return String.format(Locale.CHINA, "app/gift_bag?page=%d&per_page=%d", page, per_page);
+        return String.format(Locale.CHINA, "v1/appgift_bag?page=%d&per_page=%d", page, per_page);
     }
 
     @Override

+ 1 - 1
app/src/main/java/com/sheep/gamegroup/view/fragment/FgtMsgReply.java

@@ -47,7 +47,7 @@ public class FgtMsgReply extends BaseListFragment2<MessageReplyEntity> implement
 
     @Override
     protected String getKey(int page, int per_page) {
-        return String.format(Locale.CHINA, "app/message/system_message?page=%d&per_page=%d&user_id=%s", page, per_page, DataUtil.getInstance().getUserId());
+        return String.format(Locale.CHINA, "v1/appmessage/system_message?page=%d&per_page=%d&user_id=%s", page, per_page, DataUtil.getInstance().getUserId());
     }
 
     @Override

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

@@ -52,7 +52,7 @@ public class FgtMyGift extends BaseListFragment2<GiftBagApp> implements Action1<
 
     @Override
     protected String getKey(int page, int per_page) {
-        return String.format(Locale.CHINA, "app/gift_bag/my_gift_bag?page=%d&per_page=%d", page, per_page);
+        return String.format(Locale.CHINA, "v1/appgift_bag/my_gift_bag?page=%d&per_page=%d", page, per_page);
     }
 
     @Override

+ 1 - 1
app/src/main/java/com/sheep/gamegroup/view/fragment/FgtPlayGameSon.java

@@ -82,7 +82,7 @@
 //
 //    @Override
 //    protected String getKey(int page, int per_page) {
-//        return String.format(Locale.CHINA, "app/find?page=%d&per_page=%d&is_hot=%d&daily_play=%d&type=%d", page, per_page, 0, 0, type);
+//        return String.format(Locale.CHINA, "v1/appfind?page=%d&per_page=%d&is_hot=%d&daily_play=%d&type=%d", page, per_page, 0, 0, type);
 //    }
 //
 //    @Override

+ 1 - 1
app/src/main/java/com/sheep/gamegroup/view/fragment/FgtSearchApp.java

@@ -37,7 +37,7 @@ public class FgtSearchApp extends BaseListFragment2<GameEntity> {
 
     @Override
     protected String getKey(int page, int per_page) {
-        return String.format(Locale.CHINA, "app/find?page=%d&per_page=%d&name=%s&type=%d", page, per_page, name, type);
+        return String.format(Locale.CHINA, "v1/appfind?page=%d&per_page=%d&name=%s&type=%d", page, per_page, name, type);
     }
 
     @Override

+ 1 - 1
app/src/main/java/com/sheep/gamegroup/view/fragment/FgtSignCardRecord.java

@@ -101,7 +101,7 @@ public class FgtSignCardRecord extends BaseListFragment2<PunchLog> {
 
     @Override
     protected String getKey(int page, int per_page) {
-        return String.format(Locale.CHINA, "app/punch/all_punch_log?page=%d&per_page=%d", page, per_page);
+        return String.format(Locale.CHINA, "v1/apppunch/all_punch_log?page=%d&per_page=%d", page, per_page);
     }
 
     @Override

+ 1 - 1
app/src/main/java/com/sheep/gamegroup/view/fragment/FgtUserAppHomeCommentList.java

@@ -48,7 +48,7 @@ public class FgtUserAppHomeCommentList extends BaseListFragment3<UserComment>{
 
     @Override
     protected String getKey(int page, int per_page) {
-        return String.format(Locale.CHINA, "app/game_user/comment_list?page_no=%d&page_size=%d&focus_user_id=%d", page, per_page, focus_user_id);
+        return String.format(Locale.CHINA, "v1/appgame_user/comment_list?page_no=%d&page_size=%d&focus_user_id=%d", page, per_page, focus_user_id);
     }
 
     @Override

+ 1 - 1
app/src/main/java/com/sheep/gamegroup/view/fragment/FgtUserAppHomeReplyList.java

@@ -49,7 +49,7 @@ public class FgtUserAppHomeReplyList extends BaseListFragment3<UserCommentWithRe
 
     @Override
     protected String getKey(int page, int per_page) {
-        return String.format(Locale.CHINA, "app/game_user/reply_list?page_no=%d&page_size=%d&focus_user_id=%d", page, per_page, focus_user_id);
+        return String.format(Locale.CHINA, "v1/appgame_user/reply_list?page_no=%d&page_size=%d&focus_user_id=%d", page, per_page, focus_user_id);
     }
 
     @Override

+ 1 - 1
app/src/main/java/com/sheep/gamegroup/view/fragment/FgtUserCommentDetail.java

@@ -198,7 +198,7 @@ public class FgtUserCommentDetail extends BaseListFragment3<UserCommentReply> im
 
     @Override
     protected String getKey(int page, int per_page) {
-        return String.format(Locale.CHINA, "app/game_user/user_comment_detail?page_no=%d&page_size=%d&user_comment_id=%d", page, per_page, user_comment_id);
+        return String.format(Locale.CHINA, "v1/appgame_user/user_comment_detail?page_no=%d&page_size=%d&user_comment_id=%d", page, per_page, user_comment_id);
     }
 
     @Override

+ 1 - 1
app/src/main/java/com/sheep/gamegroup/view/fragment/FgtVideoComment.java

@@ -121,7 +121,7 @@ public class FgtVideoComment extends BaseListFragment4<UserComment> {
 
     @Override
     protected String getKey(int page, int per_page) {
-        return String.format(Locale.CHINA, "app/game_user/app_comment_list?page_no=%d&page_size=%d&app_id=%d&comment_type=%d", page, per_page, video_id, type);
+        return String.format(Locale.CHINA, "v1/appgame_user/app_comment_list?page_no=%d&page_size=%d&app_id=%d&comment_type=%d", page, per_page, video_id, type);
     }
 
     @Override

+ 61 - 61
app/src/main/java/org/afinal/simplecache/ApiKey.java

@@ -27,82 +27,82 @@ import java.util.Locale;
  */
 public class ApiKey {
     //搜索热门推荐
-    public static final String top_search_statistics = "app/top_search_statistics?platform=1";
+    public static final String top_search_statistics = "v1/apptop_search_statistics?platform=1";
     //搜索热门
-    public static final String hot_search_keywords = "app/search/keywords";
+    public static final String hot_search_keywords = "v1/appsearch/keywords";
     //关于我们
-    public static final String new_about_us = "app/about_us/new_about_us";
+    public static final String new_about_us = "v1/appabout_us/new_about_us";
     //公告
-    public static final String bulletin = "app/bulletin?page=1&per_page=10";
+    public static final String bulletin = "v1/appbulletin?page=1&per_page=10";
     //轮播
-    public static final String slideshow = "app/slideshow?platform=1";
+    public static final String slideshow = "v1/appslideshow?platform=1";
     //home_list
-    public static final String home_list = "app/home_list";
+    public static final String home_list = "v1/apphome_list";
     //各种url配置
-    public static final String url = "app/url/";
+    public static final String url = "v1/appurl/";
     //用户信息
-    public static final String get_info = "app/user/get_info/";
+    public static final String get_info = "v1/app/user/get_info/";
     //award_detail
-    public static final String award_detail = "app/user/award_detail?page=0&per_page=100";
+    public static final String award_detail = "v1/app/user/award_detail?page=0&per_page=100";
     //游戏任务中的正在进行的任务
-    public static final String run_game_task = "app/accepted_task/run_game_task";
+    public static final String run_game_task = "v1/app/accepted_task/run_game_task";
     //游戏任务中的我的游戏
-    public static final String my_games = "app/game_consumption/my_games?page=1&per_page=100";
+    public static final String my_games = "v1/app/game_consumption/my_games?page=1&per_page=100";
     //首页获取所有发布的热门任务(试玩任务、游戏任务、连续任务)
-    public static final String release_task = "app/release_task?page=1&per_page=100&platform=1&is_hot=1&is_recommend=0&about_to_begin=0&task_type=-1&is_succession=3";
+    public static final String release_task = "v1/app/release_task?page=1&per_page=100&platform=1&is_hot=1&is_recommend=0&about_to_begin=0&task_type=-1&is_succession=3";
     //新手引导
-    public static final String novice_guidance = "app/user/novice_guidance";
+    public static final String novice_guidance = "v1/app/user/novice_guidance";
     //用户中心模块
-    public static final String user_module = "app/user_module";
+    public static final String user_module = "v1/app/user_module";
     //热门用户列表
-    public static final String getGameUserUserFocusHotUser = "app/game_user/user_focus/hot_user";
+    public static final String getGameUserUserFocusHotUser = "v1/app/game_user/user_focus/hot_user";
     //关注的用户列表
-    public static final String getGameUserUserFocusList = "app/game_user/user_focus/list";
+    public static final String getGameUserUserFocusList = "v1/app/game_user/user_focus/list";
     //关注的游戏列表
-    public static final String getGameUserGameFocusList = "app/game_user/game_focus/list";
+    public static final String getGameUserGameFocusList = "v1/app/game_user/game_focus/list";
     //足迹
-    public static final String getUserFootPrintList = "app/user/footprint/list";
-    public static final String getUserFootPrintDateCount = "app/user/footprint/date_count";
+    public static final String getUserFootPrintList = "v1/app/user/footprint/list";
+    public static final String getUserFootPrintDateCount = "v1/app/user/footprint/date_count";
     //每日分享
-    public static final String getShareList = "app/share/shares";
-    public static final String sendShareResult = "app/share/share";
+    public static final String getShareList = "v1/app/share/shares";
+    public static final String sendShareResult = "v1/app/share/share";
     //获取发布中视频列表
-    public static final String getVideoList = "app/video/list";
+    public static final String getVideoList = "v1/app/video/list";
     //查询音乐列表
-    public static final String getVideoMusic = "app/video/music";
+    public static final String getVideoMusic = "v1/app/video/music";
     //查询贴纸列表
-    public static final String getVideoSticker = "app/video/sticker";
+    public static final String getVideoSticker = "v1/app/video/sticker";
     //查询话题列表
-    public static final String getVideoTopic = "app/video/topic";
+    public static final String getVideoTopic = "v1/app/video/topic";
     //客户端插件更新/插件获取
-    public static final String getPackageVersion = "app/version/package_version";
+    public static final String getPackageVersion = "v1/app/version/package_version";
     //充值记录
-    public static final String recharge_balance_log = "app/recharge/recharge_balance_log";
+    public static final String recharge_balance_log = "v1/app/recharge/recharge_balance_log";
     //提现记录
-    public static final String recharge_log = "app/user/recharge_log";
+    public static final String recharge_log = "v1/app/user/recharge_log";
     //收支明细、消费记录
-    public static final String withdraw = "app/withdraw";
+    public static final String withdraw = "v1/app/withdraw";
     //消息中心列表
-    public static final String system_notification = "app/message/system_notification/";
+    public static final String system_notification = "v1/app/message/system_notification/";
     //获取我安装的游戏列表 3.4.9新增
-    public static final String getMyGmeList = "app/game_consumption/my_games_v2";
+    public static final String getMyGmeList = "v1/app/game_consumption/my_games_v2";
     //获取下载管理界面中的猜你喜欢 3.4.10新增
-    public static final String getFindUserLike = "app/find/user_like";
+    public static final String getFindUserLike = "v1/app/find/user_like";
     //获取 游戏排行榜列表 3.4.10新增
-    public static final String getFindRank = "app/find/rank";
+    public static final String getFindRank = "v1/app/find/rank";
     //获取 获取游戏组列表 3.4.10新增
-    public static final String getGameGroup = "app/game_group";
+    public static final String getGameGroup = "v1/pp/game_group";
     //获取 搜索游戏组列表 3.4.10新增
-    public static final String getGameGroupSearch = "app/game_group/search";
+    public static final String getGameGroupSearch = "v1/app/game_group/search";
     //获取限时抢购列表
-    public static final String PROMOTE_GOODS = "app/yf_shop/promote_goods";
+    public static final String PROMOTE_GOODS = "v1/app/yf_shop/promote_goods";
     //获取游戏列表
-    public static final String FIND = "app/find";
+    public static final String FIND = "v1/app/find";
     //获取全部福利
-    public static final String GET_ALL_WELFARE = "app/release_task?platform=1&task_type=1019";
-    public static final String GET_ALL_WELFARE_AND_MONEY_REWARD = "app/release_task?platform=1&task_type=1019,1020";
+    public static final String GET_ALL_WELFARE = "v1/app/release_task?platform=1&task_type=1019";
+    public static final String GET_ALL_WELFARE_AND_MONEY_REWARD = "v1/app/release_task?platform=1&task_type=1019,1020";
     //获取我的福利
-    public static final String GET_MY_WELFARE = "app/accepted_task?status=0&task_type=1019";
+    public static final String GET_MY_WELFARE = "v1/app/accepted_task?status=0&task_type=1019";
 
     public static final String getPackageVersion(String package_name, String type, int version){
         return String.format(Locale.CHINA, "%s?package_name=%s&type=%s&version=%d", getPackageVersion, package_name, type, version);
@@ -116,50 +116,50 @@ public class ApiKey {
 
     public static String release_task(int page, int per_page, int about_to_begin, String task_type, int is_succession) {
         task_type = task_type.replaceAll(",", "%2C");
-        return String.format(Locale.CHINA, "app/release_task?page=%d&per_page=%d&platform=1&is_hot=0&is_recommend=0&about_to_begin=%d&task_type=%s&is_succession=%d", page, per_page, about_to_begin, task_type, is_succession);
+        return String.format(Locale.CHINA, "v1/app/release_task?page=%d&per_page=%d&platform=1&is_hot=0&is_recommend=0&about_to_begin=%d&task_type=%s&is_succession=%d", page, per_page, about_to_begin, task_type, is_succession);
     }
 
     //获取正在运行的任务(试玩任务、游戏任务、连续任务)
     public static String new_run_task(int is_succession, int show_game_task) {
-        return String.format(Locale.CHINA, "app/accepted_task/new_run_task/?is_succession=%d&show_game_task=%d", is_succession, show_game_task);
+        return String.format(Locale.CHINA, "v1/app/accepted_task/new_run_task/?is_succession=%d&show_game_task=%d", is_succession, show_game_task);
     }
 
     //发现模块标签列表
-    public static final String articles_tags = "app/find/articles_tags/list";
+    public static final String articles_tags = "v1/app/find/articles_tags/list";
 
     //发现模块发现列表
     public static String articles(int page, int per_page, int tag_id) {
-        return String.format(Locale.CHINA, "app/find/articles/list?page=%d&per_page=%d&tag_id=%d", page, per_page, tag_id);
+        return String.format(Locale.CHINA, "v1/appfind/articles/list?page=%d&per_page=%d&tag_id=%d", page, per_page, tag_id);
     }
 
     //发现模块资讯
     public static String articlesItem(int id) {
-        return "app/find/articles?id=" + id;
+        return "v1/app/find/articles?id=" + id;
     }
 
     //发现模块游戏或应用详情
     public static String applications(int id) {
-        return "app/find/applications?id=" + id;
+        return "v1/app/find/applications?id=" + id;
     }
 
     //发现模块游戏或应用详情中的分数
     public static String score_num(int id) {
-        return "app/find/applications/score_num?id=" + id;
+        return "v1/app/find/applications/score_num?id=" + id;
     }
 
     //发现模块游戏或应用详情中我的评分
     public static String my_score(int id) {
-        return "app/find/applications/my_score?id=" + id;
+        return "v1/app/find/applications/my_score?id=" + id;
     }
 
     //广告
     public static String advertisements(int type) {
-        return "app/advertising/advertisements?type=" + type;
+        return "v1/app/advertising/advertisements?type=" + type;
     }
 
     //获取任务详情
     public static String releaseTaskDesc(int releaseTaskId) {
-        return String.format(Locale.CHINA, "app/release_task/%d/desc", releaseTaskId);
+        return String.format(Locale.CHINA, "v1/app/release_task/%d/desc", releaseTaskId);
     }
 
     //获取任务详情
@@ -169,33 +169,33 @@ public class ApiKey {
 
     //看点
     public static String awakenApp() {
-        return "app/awaken/article";
+        return "v1/app/awaken/article";
     }
 
     //看点
     public static String awakenArticle(int page, int per_page) {
-        return String.format(Locale.CHINA, "app/awaken/article?page=%d&per_page=%d", page, per_page);
+        return String.format(Locale.CHINA, "v1/app/awaken/article?page=%d&per_page=%d", page, per_page);
     }
 
     //发现模块游戏或应用详情
     public static String playGameDetail(int id) {
-        return "app/find/" + id;
+        return "v1/app/find/" + id;
     }
 
-    public static final String slideshowGame = "app/game_banner?platform=1";
-    public static final String friend_count_and_award = "app/user/friend_count_and_award";
-    public static final String MY_ASSETS = "app/user/my_assets";
-    public static final String FRIEND_COUNT_AND_AWARD = "app/user/friend_count_and_award";
-    public static final String CAN_RECEIVE_AWARD = "app/user/can_receive_award";
+    public static final String slideshowGame = "v1/app/game_banner?platform=1";
+    public static final String friend_count_and_award = "v1/app/user/friend_count_and_award";
+    public static final String MY_ASSETS = "v1/app/user/my_assets";
+    public static final String FRIEND_COUNT_AND_AWARD = "v1/app/user/friend_count_and_award";
+    public static final String CAN_RECEIVE_AWARD = "v1/app/user/can_receive_award";
 
     public static String getGameUserDetail(int focus_user_id) {
-        return "app/game_user/detail?focus_user_id=" + focus_user_id;
+        return "v1/app/game_user/detail?focus_user_id=" + focus_user_id;
     }
     public static String getGameUserLatelyGame(int focus_user_id) {
-        return "app/game_user/lately_game?focus_user_id=" + focus_user_id;
+        return "v1/app/game_user/lately_game?focus_user_id=" + focus_user_id;
     }
     //根据任务名(游戏名)模糊搜索
     public static String getTopSearchStatisticsHomePageSearch(String search_content){
-      return String.format(Locale.CHINA, "app/top_search_statistics/home_page_search?search_content=%s", search_content);
+      return String.format(Locale.CHINA, "v1/app/top_search_statistics/home_page_search?search_content=%s", search_content);
     }
 }

+ 12 - 4
app/src/main/res/drawable/round_arrow_forward_ios_24.xml

@@ -1,5 +1,13 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="24dp" android:tint="#999999" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
-      
-    <path android:fillColor="@android:color/white" android:pathData="M7.38,21.01c0.49,0.49 1.28,0.49 1.77,0l8.31,-8.31c0.39,-0.39 0.39,-1.02 0,-1.41L9.15,2.98c-0.49,-0.49 -1.28,-0.49 -1.77,0s-0.49,1.28 0,1.77L14.62,12l-7.25,7.25c-0.48,0.48 -0.48,1.28 0.01,1.76z"/>
-    
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:autoMirrored="true"
+    android:tint="#999999"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M7.38,21.01c0.49,0.49 1.28,0.49 1.77,0l8.31,-8.31c0.39,-0.39 0.39,-1.02 0,-1.41L9.15,2.98c-0.49,-0.49 -1.28,-0.49 -1.77,0s-0.49,1.28 0,1.77L14.62,12l-7.25,7.25c-0.48,0.48 -0.48,1.28 0.01,1.76z" />
+
 </vector>

+ 3 - 1
app/src/main/res/layout/act_gc_game_app_detail.xml

@@ -53,7 +53,9 @@
                         android:gravity="center_vertical"
                         android:onClick="onClickBackImg"
                         android:scaleType="centerInside"
-                        android:src="@drawable/narrow_back_black" />
+                        android:tint="@color/text33"
+                        android:src="@drawable/arrow_back_ios_new_24"
+                        />
 
                     <ImageView
                         android:layout_width="?attr/actionBarSize"

+ 2 - 2
app/src/main/res/layout/bottom_sheet_fragment.xml

@@ -20,8 +20,8 @@
 
     <ImageView
         android:id="@+id/ivClose"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="16dp"
+        android:layout_height="16dp"
         android:layout_marginEnd="20dp"
         android:src="@mipmap/icon_titlebar_close_p"
         app:layout_constraintBottom_toBottomOf="@id/tvTitle"

+ 2 - 1
app/src/main/res/layout/fragment_find_account.xml

@@ -32,7 +32,8 @@
             android:layout_height="24dp"
             android:layout_marginStart="24dp"
             android:scaleType="center"
-            android:src="@drawable/narrow_back_black"
+            android:tint="@color/text33"
+            android:src="@drawable/arrow_back_ios_new_24"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />

+ 15 - 16
app/src/main/res/layout/item_download_manager.xml

@@ -13,7 +13,6 @@
         android:id="@+id/item_dm_icon_iv"
         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"
@@ -22,25 +21,26 @@
     <TextView
         android:id="@+id/item_dm_name_tv"
         android:layout_width="0dp"
+        android:layout_marginTop="6dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="11dp"
+        android:layout_marginEnd="16dp"
         android:text="永恒仙域"
         android:textColor="#ff333333"
         android:textSize="14sp"
-        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/item_dm_btn_tv"
         app:layout_constraintStart_toEndOf="@id/item_dm_icon_iv"
         app:layout_constraintTop_toTopOf="@id/item_dm_icon_iv" />
 
     <TextView
         android:id="@+id/item_dm_info_tv"
         android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:layout_marginBottom="16dp"
+        android:layout_height="wrap_content"
         android:gravity="center_vertical"
         android:textColor="@color/text99"
         android:textSize="12sp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
+        android:layout_marginTop="2dp"
+        app:layout_constraintEnd_toEndOf="@+id/item_dm_name_tv"
         app:layout_constraintStart_toStartOf="@id/item_dm_name_tv"
         app:layout_constraintTop_toBottomOf="@id/item_dm_name_tv"
         tools:text="1.28G" />
@@ -51,32 +51,31 @@
         android:layout_width="0dp"
         android:layout_height="7dp"
         android:layout_marginEnd="10dp"
-        android:layout_marginBottom="3dp"
         android:max="100"
+        android:layout_marginTop="6dp"
         android:progress="50"
         android:progressDrawable="@drawable/lay_list_progress_green"
-        app:layout_constraintBottom_toBottomOf="@id/item_dm_icon_iv"
         app:layout_constraintEnd_toStartOf="@id/item_dm_delete_iv"
-        app:layout_constraintStart_toStartOf="@id/item_dm_name_tv" />
+        app:layout_constraintStart_toStartOf="@id/item_dm_name_tv"
+        app:layout_constraintTop_toBottomOf="@+id/item_dm_info_tv" />
 
     <ImageView
         android:id="@+id/item_dm_delete_iv"
         android:layout_width="13dp"
         android:layout_height="13dp"
-        android:layout_marginEnd="28dp"
         android:src="@mipmap/delete_x_red_img"
-        app:layout_constraintBottom_toBottomOf="@id/item_dm_icon_iv"
-        app:layout_constraintEnd_toStartOf="@id/item_dm_btn_tv"
-        app:layout_constraintStart_toEndOf="@id/item_dm_pb" />
+        app:layout_constraintBottom_toBottomOf="@+id/item_dm_pb"
+        app:layout_constraintEnd_toEndOf="@+id/item_dm_name_tv"
+        app:layout_constraintStart_toEndOf="@id/item_dm_pb"
+        app:layout_constraintTop_toTopOf="@+id/item_dm_pb" />
 
     <TextView
         android:id="@+id/item_dm_btn_tv"
         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_constraintBottom_toBottomOf="@+id/item_dm_icon_iv"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="@+id/item_dm_icon_iv" />
 </androidx.constraintlayout.widget.ConstraintLayout>

+ 1 - 1
app/src/main/res/layout/item_download_welfare.xml

@@ -43,7 +43,7 @@
         app:layout_constraintEnd_toStartOf="@+id/btn"
         app:layout_constraintStart_toStartOf="@+id/tvTitle"
         app:layout_constraintTop_toBottomOf="@+id/tvTitle"
-        tools:text="首充500送500" />
+        tools:text="首充500送500\n首充500送500\n首充500送500\n首充500送500" />
 
     <TextView
         android:id="@+id/btn"

+ 3 - 2
app/src/main/res/layout/title.xml

@@ -15,7 +15,8 @@
         android:gravity="center_vertical"
         android:minWidth="?attr/actionBarSize"
         android:scaleType="centerInside"
-        android:src="@drawable/narrow_back_black"
+        android:tint="@color/text33"
+        android:src="@drawable/arrow_back_ios_new_24"
         tools:ignore="UnusedAttribute" />
 
     <com.google.android.material.tabs.TabLayout
@@ -90,7 +91,7 @@
             android:paddingEnd="17dp"
             tools:text="文字按钮"
             android:textColor="@color/black_text_deep"
-            android:textSize="12sp"
+            android:textSize="14sp"
             tools:ignore="UnusedAttribute" />
 
         <ImageView

+ 2 - 1
app/src/main/res/layout/title_search.xml

@@ -12,7 +12,8 @@
         android:gravity="center_vertical"
         android:minWidth="?attr/actionBarSize"
         android:scaleType="centerInside"
-        android:src="@drawable/narrow_back_black" />
+        android:tint="@color/text33"
+        android:src="@drawable/arrow_back_ios_new_24" />
 
     <androidx.appcompat.widget.AppCompatAutoCompleteTextView
         android:id="@+id/title_search_input"

+ 2 - 1
app/src/main/res/layout/title_yf.xml

@@ -13,7 +13,8 @@
         android:gravity="center_vertical"
         android:minWidth="?attr/actionBarSize"
         android:scaleType="centerInside"
-        android:src="@drawable/narrow_back_black" />
+        android:tint="@color/text33"
+        android:src="@drawable/arrow_back_ios_new_24" />
 
     <TextView
         android:id="@+id/txt_baseactivity_title"

+ 1 - 0
app/src/main/res/layout/x_real_name_auther_layout.xml

@@ -17,6 +17,7 @@
         android:paddingBottom="@dimen/content_padding_18">
 
         <TextView
+            android:id="@+id/tvTips"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="请完善个人信息,第一次实名认证免费,若提交错误,再次提交需要扣除0.5绵羊币/次!实名信息一旦认证成功不可更改!当前姓名必须与提现支付宝姓名保持一致,否则无法提现。"

+ 1 - 1
app/src/main/res/values/dd_styles.xml

@@ -359,7 +359,7 @@
     </style>
     <style name="style_item_content_person_info" parent="style_item_end_next">
         <item name="android:textSize">16sp</item>
-        <item name="textColor">@color/text99</item>
+        <item name="textColor">@color/text66</item>
     </style>
     <style name="style_item_line">
         <item name="android:layout_width">match_parent</item>

+ 1 - 0
app/src/main/res/values/styles.xml

@@ -99,6 +99,7 @@
         <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="elevation">0dp</item>
         <item name="android:textColor">@android:color/white</item>
     </style>