Просмотр исходного кода

我的资产界面可以点击tab,直接滑动到顶部

zengjiebin лет назад: 7
Родитель
Сommit
018db8b6c1

+ 6 - 2
app/src/main/java/com/sheep/gamegroup/util/Jump2View.java

@@ -209,6 +209,7 @@ import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_FEEDBACK;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_FIND_APP_ORDER;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_GAME_ACCOUNT;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_INFO;
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_INFO_ADDR;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_MY_MONEY;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_NEW_VERSION;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_TASK_RECORD;
@@ -1590,14 +1591,17 @@ public class Jump2View {
                     @Override
                     public void onNext(BaseMessage baseMessage) {
                         String content = activity.getString(R.string.yf_shop_ask_tip, mission.getExtra());
-                        ViewUtil.showYfShopAsk(activity, true, content);
+                        ViewUtil.showYfShopAsk(activity, "前\t往", content, dialog -> {
+                            Jump2View.getInstance().goActUserAddrInfo(activity);
+                            USER_INFO_ADDR.onEvent();
+                        });
 
                     }
 
                     @Override
                     public void onError(BaseMessage baseMessage) {
                         String content = activity.getString(R.string.yf_shop_ask_tip_2, mission.getExtra());
-                        ViewUtil.showYfShopAsk(activity, false, content);
+                        ViewUtil.showYfShopAsk(activity, "继续邀请", content, dialog -> Jump2View.getInstance().goActInvitation(activity));
                     }
                 });
     }

+ 1 - 1
app/src/main/java/com/sheep/gamegroup/util/TestUtil.java

@@ -276,7 +276,7 @@ public class TestUtil {
                     public void onClick(DialogInterface dialog, int which) {
                         switch (items[which]) {
                             case "填写收件地址弹窗":
-                                ViewUtil.showYfShopAsk(activity, true, activity.getString(R.string.yf_shop_ask_tip, "987654311"));
+                                ViewUtil.showYfShopAsk(activity, "继续邀请", activity.getString(R.string.yf_shop_ask_tip, "987654311"), dialog1 -> Jump2View.getInstance().goActInvitation(activity));
                                 break;
                             case "朗读文字":
                                 testReadText("小绵羊666", 20);

+ 4 - 7
app/src/main/java/com/sheep/gamegroup/util/ViewUtil.java

@@ -1571,7 +1571,7 @@ public class ViewUtil {
         }
     }
     //3.4.7添加 -- 展示 元旦活动中 提示用户邀请人数到达一定数量时,获得了礼品,需要填写收件地址 对话框
-    public static void showYfShopAsk(final Activity activity, boolean willGo, String content) {
+    public static void showYfShopAsk(final Activity activity, String btnText, String content, Action1<AlertDialog> action1) {
         if (activity != null) {
             View dialog_parent = View.inflate(activity, R.layout.dialog_parent, null);
             final AlertDialog dialog = new AlertDialog.Builder(activity, R.style.MyDialogActivityTheme)
@@ -1594,7 +1594,7 @@ public class ViewUtil {
             LayoutParamsUtil.resetLayoutParams(dialog_yf_shop_ask_title_tv, new Lp(per).setTopMargin(50));
             LayoutParamsUtil.resetLayoutParams(dialog_yf_shop_ask_content_tv, new Lp(per).setHeight(650).setLeftMargin(200).setRightMargin(200));
             LayoutParamsUtil.resetLayoutParams(dialog_yf_shop_ask_btn_tv, new Lp(per).setBottomMargin(50));
-            ViewUtil.setText(dialog_yf_shop_ask_btn_tv, willGo ? "前\t往" : "知道了");
+            ViewUtil.setText(dialog_yf_shop_ask_btn_tv, btnText);
             dialog_close.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
@@ -1604,11 +1604,8 @@ public class ViewUtil {
             dialog_yf_shop_ask_btn_tv.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    if(willGo) {
-                        Jump2View.getInstance().goActUserAddrInfo(activity);
-                        USER_INFO_ADDR.onEvent();
-                    } else {
-                        dialog.dismiss();
+                    if(action1 != null){
+                        action1.call(dialog);
                     }
                 }
             });

+ 31 - 2
app/src/main/java/com/sheep/gamegroup/view/activity/ActMyMoney.java

@@ -6,9 +6,11 @@ import android.support.annotation.Nullable;
 import android.support.design.widget.TabLayout;
 import android.support.v4.app.Fragment;
 import android.support.v4.view.ViewPager;
+import android.support.v4.widget.NestedScrollView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.ImageView;
+import android.widget.ScrollView;
 import android.widget.TextView;
 
 import com.kfzs.duanduan.utils.NumberFormatUtils;
@@ -21,6 +23,7 @@ import com.sheep.gamegroup.absBase.BaseRefreshLoadMoreFragment;
 import com.sheep.gamegroup.absBase.ILoadMore;
 import com.sheep.gamegroup.absBase.IRefresh;
 import com.sheep.gamegroup.model.entity.BaseMessage;
+import com.sheep.gamegroup.model.entity.Lp;
 import com.sheep.gamegroup.model.entity.UserAssets;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.module.personal.fragment.FgtRechargeBalanceLog;
@@ -30,8 +33,10 @@ import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.GlideImageLoader;
 import com.sheep.gamegroup.util.Jump2View;
+import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.RefreshUtil;
 import com.sheep.gamegroup.util.ViewUtil;
+import com.sheep.gamegroup.util.viewHelper.LayoutParamsUtil;
 import com.sheep.gamegroup.view.adapter.TitleFragmentListAdapter;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
@@ -56,7 +61,11 @@ public class ActMyMoney extends BaseActivity {
 
     @BindView(R.id.refresh)
     SmartRefreshLayout refresh;
+    @BindView(R.id.scrollView)
+    NestedScrollView scrollView;
 
+    @BindView(R.id.img_baseactivity_title)
+    View img_baseactivity_title;
     @BindView(R.id.indicator)
     TabLayout indicator;
     @BindView(R.id.pager)
@@ -80,6 +89,9 @@ public class ActMyMoney extends BaseActivity {
     @BindView(R.id.my_money_dingxiang_amount_iv)
     ImageView my_money_dingxiang_amount_iv;
 
+    @BindView(R.id.act_my_money_bottom_v)
+    View act_my_money_bottom_v;
+
     private TitleFragmentListAdapter mAdapter;
 
     @Override
@@ -100,7 +112,6 @@ public class ActMyMoney extends BaseActivity {
                 .setTitleFinish(this);
         //顶部背景添加弧度
         GlideImageLoader.setImage(act_my_money_bg_iv, ViewUtil.getNetImgByName("home_blue_bg_hb"), R.mipmap.home_blue_bg);
-
         mAdapter = new TitleFragmentListAdapter(getSupportFragmentManager());
         mAdapter.add(new FgtRechargeBalanceLog(), tabNames[0]);
         mAdapter.add(new FgtWithdraw(), tabNames[1]);
@@ -129,6 +140,12 @@ public class ActMyMoney extends BaseActivity {
             }
         });
         RefreshUtil.newInstance().publicParameterLoadMore(refresh, this);
+        viewPager.addOnLayoutChangeListener(new View.OnLayoutChangeListener() {
+            public void onLayoutChange(View view, int left, int top, int right, int bottom, int oldLeft, int oldTop, int oldRight, int oldBottom) {
+                LogUtil.println("ActMyMoney", "viewPager", "onLayoutChange", left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom);
+                LayoutParamsUtil.resetLayoutParams(act_my_money_bottom_v, new Lp().setHeight(G.HEIGHT - G.getRealPix(74) - img_baseactivity_title.getHeight() + top - bottom));
+            }
+        });
     }
     private void new_tab(){
         indicator.addTab(indicator.newTab().setCustomView(tab_icon(tabNames[0], true)));
@@ -136,7 +153,19 @@ public class ActMyMoney extends BaseActivity {
         indicator.addTab(indicator.newTab().setCustomView(tab_icon(tabNames[2], false)));
         //Tablayout自定义view绑定ViewPager
         viewPager.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(indicator));
-        indicator.addOnTabSelectedListener(new TabLayout.ViewPagerOnTabSelectedListener(viewPager));
+        indicator.addOnTabSelectedListener(new TabLayout.ViewPagerOnTabSelectedListener(viewPager){
+            @Override
+            public void onTabReselected(TabLayout.Tab tab) {
+                super.onTabReselected(tab);
+                scrollView.smoothScrollTo(0, indicator.getTop());
+            }
+
+            @Override
+            public void onTabSelected(TabLayout.Tab tab) {
+                super.onTabSelected(tab);
+                scrollView.smoothScrollTo(0, indicator.getTop());
+            }
+        });
         viewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
             @Override
             public void onPageScrolled(int i, float v, int i1) {

+ 4 - 1
app/src/main/res/layout/act_my_money.xml

@@ -315,7 +315,10 @@
                     android:layout_width="match_parent"
                     android:layout_height="0dip"
                     android:layout_weight="1" />
-
+                <View
+                    android:id="@+id/act_my_money_bottom_v"
+                    android:layout_width="match_parent"
+                    android:layout_height="500dp"/>
             </LinearLayout>
         </android.support.v4.widget.NestedScrollView>
     </com.scwang.smartrefresh.layout.SmartRefreshLayout>

+ 17 - 20
app/src/main/res/layout/tab_item.xml

@@ -3,32 +3,29 @@
     android:layout_width="match_parent"
     android:layout_height="50dp">
 
-    <LinearLayout
+    <View
+        android:id="@+id/tab_line"
+        android:layout_width="1dp"
+        android:layout_height="20dp"
+        android:layout_alignParentEnd="true"
+        android:layout_centerVertical="true"
+        android:background="@color/white" />
+
+    <TextView
+        android:id="@+id/tabtext"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:layout_centerHorizontal="true"
+        android:layout_toStartOf="@id/tab_line"
         android:gravity="center"
-        android:orientation="horizontal">
-
-        <TextView
-            android:id="@+id/tabtext"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:gravity="center"
-            android:text="TAB"
-            android:textColor="@color/white"
-            android:textSize="15sp" />
+        android:text="TAB"
+        android:textColor="@color/white"
+        android:textSize="15sp" />
 
-        <View
-            android:id="@+id/tab_line"
-            android:layout_width="1dp"
-            android:layout_height="20dp"
-            android:background="@color/white" />
-    </LinearLayout>
     <View
         android:layout_width="15dp"
         android:layout_height="15dp"
-        android:background="@drawable/selector_tab_triangle"
+        android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
-        android:layout_alignParentBottom="true"/>
+        android:background="@drawable/selector_tab_triangle" />
 </RelativeLayout>

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

@@ -206,7 +206,7 @@
     <string name="pay_success">支付成功</string>
     <string name="pay_fail">支付失败</string>
     <string name="you_had_cancel_pay">您取消了支付</string>
-    <string name="task_detail_vip_tip">做任务可提高收益哦,任务优先审核</string>
+    <string name="task_detail_vip_tip">做任务可提高收益哦,奖励优先审核</string>
     <string name="get_money_x_yuan">账户入账通知 尊敬的羊羊用户,恭喜元宝账户收入XXX元。</string>
     <string name="yf_shop_quan_tip">恭喜你获得%s元商品劵,你可前往商城,直接选择心仪的商品哦~</string>
     <string name="yf_shop_quan_title">—— 商城优惠券  ——</string>