Selaa lähdekoodia

1.修改排行榜显示自己的逻辑
2.修改活动模板的部分位置
3.增加没有列表时显示的图片

FailedToRead 2 vuotta sitten
vanhempi
commit
7e30e10be9

+ 5 - 5
.idea/misc.xml

@@ -129,7 +129,7 @@
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/exception/layout/popupwindow_webs_events.xml" value="0.2572992700729927" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/fragmentRecommend/drawable/activity_comment_quick_item_one_bg.xml" value="0.2165" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/fragmentRecommend/drawable/slidevideo_switch_track_selector.xml" value="0.2005" />
-        <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/fragmentRecommend/layout/adapter_item_cusview_model_view_f.xml" value="1.1" />
+        <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/fragmentRecommend/layout/adapter_item_cusview_model_view_f.xml" value="1.25" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/fragmentRecommend/layout/cusview_model_view_f.xml" value="0.24939172749391728" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/fragmentRecommend/layout/cusview_model_view_g.xml" value="0.28284671532846717" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/fragmentRecommend/layout/fragment_main_recommend.xml" value="0.5" />
@@ -154,7 +154,7 @@
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/activity_main.xml" value="0.16" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/activity_misound_pay.xml" value="0.25669099756691" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/activity_otherrecord.xml" value="0.30900243309002434" />
-        <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/activity_pay.xml" value="0.22" />
+        <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/activity_pay.xml" value="0.5" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/activity_pay_item.xml" value="0.21897810218978103" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/activity_pay_tmail.xml" value="0.25" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/activity_pay_tmail_item.xml" value="0.67" />
@@ -168,13 +168,13 @@
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/adapter_item_cusview_model_view_c.xml" value="0.75" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/adapter_item_cusview_model_view_g.xml" value="0.9" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/adapter_item_popupwindow_myorder.xml" value="0.5" />
-        <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/adapter_item_popupwindow_ranklist.xml" value="0.33" />
+        <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/adapter_item_popupwindow_ranklist.xml" value="0.5" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/adapter_item_record_user.xml" value="1.0" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/adapter_item_safflower_v2.xml" value="0.19829683698296838" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/adapter_item_slidevideo.xml" value="0.2975260416666667" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/cusview_model_view_b.xml" value="0.2" />
-        <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/cusview_model_view_c.xml" value="0.5" />
-        <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/cusview_model_view_e.xml" value="0.75" />
+        <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/cusview_model_view_c.xml" value="0.67" />
+        <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/cusview_model_view_e.xml" value="0.67" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/cusview_model_view_f.xml" value="0.5" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/cusview_model_view_g.xml" value="0.28284671532846717" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/fragment_main_character.xml" value="0.2615571776155718" />

+ 19 - 11
app/src/fragmentRecommend/layout/adapter_item_cusview_model_view_f.xml

@@ -4,9 +4,13 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="381dp"
     android:layout_height="120dp"
-    android:layout_gravity="center"
-    android:background="@drawable/cusview_model_view_f_item_bg">
+    android:layout_gravity="center">
 
+    <ImageView
+        android:id="@+id/imageView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@drawable/cusview_model_view_f_item_bg"></ImageView>
 
     <ImageView
         android:id="@+id/cusview_model_view_f_layout_item_icon"
@@ -24,23 +28,25 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="15dp"
+        android:layout_marginBottom="10dp"
         android:text="春夏秋冬"
         android:textColor="#314051"
         android:textSize="18dp"
-        app:layout_constraintBottom_toBottomOf="@+id/cusview_model_view_f_layout_item_icon"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toEndOf="@+id/cusview_model_view_f_layout_item_icon"
-        app:layout_constraintTop_toTopOf="@+id/cusview_model_view_f_layout_item_icon"
-        app:layout_constraintVertical_bias="0.0"></TextView>
+        app:layout_constraintTop_toTopOf="@+id/imageView"
+        app:layout_constraintVertical_bias="0.3"></TextView>
 
     <TextView
         android:id="@+id/cusview_model_view_f_layout_item_enter_num"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginEnd="70dp"
         android:text="248587"
         android:textColor="#77CE6A"
         android:textSize="18dp"
         app:layout_constraintBottom_toBottomOf="@+id/cusview_model_view_f_layout_item_icon"
-        app:layout_constraintEnd_toStartOf="@+id/textView6"
+        app:layout_constraintEnd_toEndOf="@+id/imageView"
         app:layout_constraintTop_toTopOf="@+id/cusview_model_view_f_layout_item_name"
         app:layout_constraintVertical_bias="0.0"></TextView>
 
@@ -54,6 +60,8 @@
         android:textSize="18dp"
         app:layout_constraintBottom_toBottomOf="@+id/cusview_model_view_f_layout_item_enter_num"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toEndOf="@+id/cusview_model_view_f_layout_item_enter_num"
         app:layout_constraintTop_toTopOf="@+id/cusview_model_view_f_layout_item_enter_num"
         app:layout_constraintVertical_bias="0.87"></TextView>
 
@@ -63,13 +71,14 @@
         android:layout_width="96dp"
         android:layout_height="25dp"
         android:layout_marginStart="15dp"
+        android:layout_marginTop="10dp"
         android:background="@drawable/btn_blue_bg"
-        app:layout_constraintBottom_toBottomOf="@+id/cusview_model_view_f_layout_item_icon"
+        app:layout_constraintBottom_toBottomOf="@+id/imageView"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toEndOf="@+id/cusview_model_view_f_layout_item_icon"
-        app:layout_constraintTop_toBottomOf="@+id/cusview_model_view_f_layout_item_name"
-        app:layout_constraintVertical_bias="1.0">
+        app:layout_constraintTop_toTopOf="@+id/imageView"
+        app:layout_constraintVertical_bias="0.6">
 
         <TextView
             android:layout_width="91dp"
@@ -87,10 +96,9 @@
         android:id="@+id/cusview_model_view_f_layout_item_enter_btn"
         android:layout_width="96dp"
         android:layout_height="25dp"
-        android:layout_marginEnd="20dp"
         android:background="@drawable/btn_green_bg"
         app:layout_constraintBottom_toBottomOf="@+id/cusview_model_view_f_layout_item_ranklist"
-        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintEnd_toEndOf="@+id/textView6"
         app:layout_constraintHorizontal_bias="1.0"
         app:layout_constraintStart_toEndOf="@+id/cusview_model_view_f_layout_item_ranklist"
         app:layout_constraintTop_toTopOf="@+id/cusview_model_view_f_layout_item_ranklist"

+ 2 - 0
app/src/main/java/com/edufound/reader/adapter/FragmentEventAdapter.java

@@ -26,6 +26,7 @@ import com.edufound.reader.cusview.ModelViewG;
 import com.edufound.reader.cusview.ModelViewWidthA;
 import com.edufound.reader.util.EfunboxUtil;
 import com.google.gson.Gson;
+import com.orhanobut.logger.Logger;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -106,6 +107,7 @@ public class FragmentEventAdapter extends RecyclerView.Adapter<RecyclerView.View
                         //点击item
                         jsonBeanList.clear();
                         jsonBeanList.add(bean);
+                        Logger.e("mGson.toJson(jsonBeanList):" + mGson.toJson(jsonBeanList));
                         toSmallFullVideoActivity(mGson.toJson(jsonBeanList));
                     }
                 }

+ 1 - 17
app/src/main/java/com/edufound/reader/adapter/RankListItemAdapter.java

@@ -23,8 +23,6 @@ public class RankListItemAdapter extends RecyclerView.Adapter<RankListViewHoler>
     Context mContext;
     LayoutInflater mLayoutInflater;
     List<UserRecordBean> mListData;
-    CallbackUserNum mCallBack;
-    boolean getMyRank = false;
 
     public RankListItemAdapter(Context context, List<UserRecordBean> listData) {
         mContext = context;
@@ -33,10 +31,6 @@ public class RankListItemAdapter extends RecyclerView.Adapter<RankListViewHoler>
     }
 
 
-    public void setCallBack(CallbackUserNum listener) {
-        mCallBack = listener;
-    }
-
     @NonNull
     @Override
     public RankListViewHoler onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
@@ -74,14 +68,7 @@ public class RankListItemAdapter extends RecyclerView.Adapter<RankListViewHoler>
         holder.mThumb.setText(mListData.get(position).getUserRead().getLikeAmount());
         holder.mCollection.setText(mListData.get(position).getUserRead().getFavoritesAmount());
         holder.mScore.setText(mListData.get(position).getUserRead().getScore());
-        if (getMyRank == false && mListData.get(position).getUser().getUid().equals(Consts.getUID())) {
-            //获取到自己的uid了。看看在第几名
-            if (mCallBack != null) {
-                getMyRank = true;
-                Logger.e("position:" + position);
-                mCallBack.CallBack(mListData.get(position).getUserRead(), position);
-            }
-        }
+
     }
 
     @Override
@@ -94,9 +81,6 @@ public class RankListItemAdapter extends RecyclerView.Adapter<RankListViewHoler>
         return position;
     }
 
-    public interface CallbackUserNum {
-        void CallBack(UserRecordBean.UserRead bean, int position);
-    }
 }
 
 class RankListViewHoler extends RecyclerView.ViewHolder {

+ 3 - 10
app/src/main/java/com/edufound/reader/cusview/ModelViewC.java

@@ -2,9 +2,7 @@ package com.edufound.reader.cusview;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
-import android.content.Intent;
 import android.graphics.Color;
-import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
@@ -21,20 +19,13 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.edufound.reader.R;
-import com.edufound.reader.activity.RecordActivity;
-import com.edufound.reader.bean.ExampleBean;
-import com.edufound.reader.bean.ExcellentBean;
 import com.edufound.reader.bean.ModelBean;
 import com.edufound.reader.bean.UserRecordBean;
-import com.edufound.reader.popwindow.PopWindowUtil;
 import com.edufound.reader.util.EfunboxUtil;
 import com.edufound.reader.util.GlideUtils;
 import com.edufound.reader.util.SizeUtils;
 import com.jakewharton.rxbinding4.view.RxView;
 
-import org.w3c.dom.Text;
-
-import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
@@ -107,7 +98,9 @@ public class ModelViewC extends FrameLayout {
         } else {
             mExamName.setText(bean.getReadUserList().get(0).getExample().getTitle());
         }
-        mAllCount.setText(EfunboxUtil.checkNum10000(String.valueOf(bean.getReadUserList().get(0).getExample().getCommentAmount())));
+        if (!TextUtils.isEmpty(bean.getReadUserList().get(0).getExample().getReadAmount())) {
+            mAllCount.setText(EfunboxUtil.checkNum10000(String.valueOf(bean.getReadUserList().get(0).getExample().getReadAmount())));
+        }
         mThumbNum.setText(EfunboxUtil.checkNum10000(bean.getReadUserList().get(0).getExample().getLikeAmount()));
         mStartNum.setText(EfunboxUtil.checkNum10000(bean.getReadUserList().get(0).getExample().getFavoritesAmount()));
 

+ 0 - 1
app/src/main/java/com/edufound/reader/cusview/ModelViewF.java

@@ -88,7 +88,6 @@ public class ModelViewF extends FrameLayout {
             TextView enterNum = item.findViewById(R.id.cusview_model_view_f_layout_item_enter_num);
             enterNum.setText(bean.getReadUserList().get(i).getCount());
             FrameLayout openRankList = item.findViewById(R.id.cusview_model_view_f_layout_item_ranklist);
-
             item.setLayoutParams(itemParams);
             int finalI = i;
             RxView.clicks(item).throttleFirst(2, TimeUnit.SECONDS).subscribe(o -> {

+ 6 - 1
app/src/main/java/com/edufound/reader/fragment/EventFragment.java

@@ -86,19 +86,24 @@ public class EventFragment extends BaseMvpFragment<EventFragmentPresenter> imple
 
     @Override
     public void getAllEventSuccess(FragmentEventAdapter adapter) {
+        Logger.e("走了getAllEventSuccess");
         mRecyclerView.setAdapter(adapter);
         LinearLayoutManager linearLayoutManager = new LinearLayoutManager(getActivity());
         linearLayoutManager.setOrientation(LinearLayoutManager.HORIZONTAL);
         mRecyclerView.addItemDecoration(new HorizontalItemDecoration(getActivity(), 20));
         mRecyclerView.setLayoutManager(linearLayoutManager);
         if (ThroughUtil.mThroughTypeBean != null && ThroughUtil.mThroughTypeBean.getmThroughType().equals(ThroughType.TYPED.getTypeCode())) {
-            //如果是typeD。获取eventPosition
             int position = Integer.valueOf(ThroughUtil.mThroughTypeBean.getEventPosition());
+            Logger.e("设置了getEventPosition:" + position);
+            //如果是typeD。获取eventPosition
+
             if (position < adapter.getItemCount()) {
                 //position不超过总活动个数,跳转。
                 mPresenter.scrollItemToTop(linearLayoutManager, Integer.valueOf(ThroughUtil.mThroughTypeBean.getEventPosition()));
+                ThroughUtil.mThroughTypeBean = null;
             }
         } else {
+            Logger.e("走了else:" + Consts.getEventPosition());
             mPresenter.scrollItemToTop(linearLayoutManager, Consts.getEventPosition());
             Consts.setEventPosition(0);
         }

+ 11 - 11
app/src/main/java/com/edufound/reader/presenter/PopWindowPresneter.java

@@ -432,19 +432,19 @@ public class PopWindowPresneter {
                     TextView myCollection = dialog_view.findViewById(R.id.popupwindow_show_ranklist_my_collection);
                     TextView myScore = dialog_view.findViewById(R.id.popupwindow_show_ranklist_my_score);
                     myInfoLayout.setVisibility(View.GONE);
-
-                    adapter.setCallBack(new RankListItemAdapter.CallbackUserNum() {
-                        @Override
-                        public void CallBack(UserRecordBean.UserRead bean, int position) {
-                            myInfoLayout.setVisibility(View.VISIBLE);
+                    boolean getMyRank = false;
+                    for (int i = 0; i < bean.getData().getActivityUserReadList().size(); i++) {
+                        if (getMyRank == false && bean.getData().getActivityUserReadList().get(i).getUser().getUid().equals(Consts.getUID())) {
+                            //获取到数据了,并且只获取第一次得到的
+                            getMyRank = true;
                             myName.setText("我自己");
-                            myNum.setText((position + 1) + "");
-                            myThumb.setText(bean.getLikeAmount());
-                            myCollection.setText(bean.getFavoritesAmount());
-                            myScore.setText(bean.getScore());
+                            myNum.setText((i + 1) + "");
+                            myThumb.setText(bean.getData().getActivityUserReadList().get(i).getUserRead().getLikeAmount());
+                            myCollection.setText(bean.getData().getActivityUserReadList().get(i).getUserRead().getFavoritesAmount());
+                            myScore.setText(bean.getData().getActivityUserReadList().get(i).getUserRead().getScore());
+                            myInfoLayout.setVisibility(View.VISIBLE);
                         }
-
-                    });
+                    }
                 } else {
                     LinearLayout recyParent = dialog_view.findViewById(R.id.popupwindow_ranklist_recyclerview_layout);
                     recyParent.setVisibility(View.GONE);

+ 0 - 2
app/src/main/java/com/edufound/reader/presenter/SplashPresenter.java

@@ -115,10 +115,8 @@ public class SplashPresenter extends BasePresenter implements SplashContract.Pre
                     ThroughUtil.mThroughTypeBean.setBackModel(getIntentUri.getQueryParameter("backModel"));
                     ((BaseActivity) mView.getActivity()).toNextActivity(SmallFullVideoActivity.class);
                 } else if (type.equals(ThroughType.TYPED.getTypeCode())) {
-                    Logger.e("");
                     ThroughUtil.mThroughTypeBean.setmThroughType(ThroughType.TYPED.getTypeCode());
                     ThroughUtil.mThroughTypeBean.setEventPosition(getIntentUri.getQueryParameter("eventPosition"));
-                    Logger.e("获取了eventPosition:" + ThroughUtil.mThroughTypeBean.getEventPosition());
                     ((BaseActivity) mView.getActivity()).toNextActivity(MainActivity.class);
                 }
             }

+ 10 - 0
app/src/main/res/layout/activity_pay.xml

@@ -95,6 +95,16 @@
                                 android:layout_gravity="center"
                                 android:layout_marginBottom="20dp"
                                 android:scaleType="fitXY"></ImageView>
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:text="微信/支付宝扫码支付"
+                            android:layout_gravity="center|bottom"
+                            android:layout_marginBottom="20dp"
+                            android:textStyle="bold"
+                            android:textColor="@color/black"
+                            android:textSize="30dp"
+                            android:layout_height="wrap_content"></TextView>
                     </FrameLayout>
                 </FrameLayout>
             </LinearLayout>

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

@@ -2,7 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="381dp"
-    android:layout_height="50dp"
+    android:layout_height="59.5dp"
     android:layout_gravity="center">
 
 

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

@@ -9,7 +9,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/white"
-        app:radio="20"></com.edufound.reader.cusview.RoundFrameLayout>
+        app:radio="10"></com.edufound.reader.cusview.RoundFrameLayout>
 
     <ImageView
         android:id="@+id/cusview_model_view_g_layout_item_icon"

+ 6 - 2
app/src/main/res/layout/adapter_item_popupwindow_ranklist.xml

@@ -46,12 +46,16 @@
             android:id="@+id/adapter_item_ranklist_name"
             android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:layout_weight="3"
+            android:layout_weight="4.2"
             android:gravity="center|left"
             android:text="昵称"
             android:textColor="#333333"
             android:textSize="22dp"></TextView>
 
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"></Space>
 
         <TextView
             android:id="@+id/adapter_item_ranklist_thumb"
@@ -86,7 +90,7 @@
         <Space
             android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:layout_weight="0.5"></Space>
+            android:layout_weight="0.2"></Space>
 
     </LinearLayout>
 </FrameLayout>

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

@@ -201,8 +201,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:scaleX="0.6"
-            android:scaleY="0.6"
+            android:scaleX="0.7"
+            android:scaleY="0.7"
             android:src="@drawable/ranklist_no_list"></ImageView>
 
     </FrameLayout>

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

@@ -8,6 +8,7 @@
     <ImageView
         android:id="@+id/cusview_model_view_f_background"
         android:layout_width="match_parent"
+        android:scaleType="fitXY"
         android:layout_height="match_parent"></ImageView>
 
     <LinearLayout

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

@@ -8,7 +8,8 @@
     <ImageView
         android:id="@+id/cusview_model_view_g_background"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"></ImageView>
+        android:layout_height="match_parent"
+        android:scaleType="fitXY"></ImageView>
 
     <LinearLayout
         android:layout_width="match_parent"

+ 16 - 5
app/src/main/res/layout/popupwindow_show_ranklist.xml

@@ -54,7 +54,7 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="2"
-                        android:paddingLeft="30dp"
+                        android:paddingLeft="20dp"
                         android:text="排名"
                         android:textColor="#8D4C05"
                         android:textSize="26dp"></TextView>
@@ -62,11 +62,16 @@
                     <TextView
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_weight="3"
+                        android:layout_weight="4.2"
                         android:text="昵称"
                         android:textColor="#8D4C05"
                         android:textSize="26dp"></TextView>
 
+                    <Space
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"></Space>
+
                     <TextView
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
@@ -98,7 +103,7 @@
                     <Space
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
-                        android:layout_weight="0.5"></Space>
+                        android:layout_weight="0.2"></Space>
 
                 </LinearLayout>
 
@@ -171,12 +176,16 @@
                                     android:id="@+id/popupwindow_show_ranklist_my_name"
                                     android:layout_width="0dp"
                                     android:layout_height="match_parent"
-                                    android:layout_weight="3"
+                                    android:layout_weight="4.2"
                                     android:gravity="center|left"
                                     android:text="昵称"
                                     android:textColor="#8D4C05"
                                     android:textSize="22dp"></TextView>
 
+                                <Space
+                                    android:layout_width="0dp"
+                                    android:layout_height="match_parent"
+                                    android:layout_weight="1"></Space>
 
                                 <TextView
                                     android:id="@+id/popupwindow_show_ranklist_my_thumb"
@@ -211,7 +220,7 @@
                                 <Space
                                     android:layout_width="0dp"
                                     android:layout_height="match_parent"
-                                    android:layout_weight="0.5"></Space>
+                                    android:layout_weight="0.2"></Space>
 
                             </LinearLayout>
 
@@ -224,6 +233,8 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
+                        android:scaleX="0.7"
+                        android:scaleY="0.7"
                         android:src="@drawable/ranklist_no_list"
                         android:visibility="gone"></ImageView>
                 </com.edufound.reader.cusview.RoundFrameLayout>