新手任务功能界面美化

app/src/main/java/com/kfzs/duanduan/fragment/FgtSmallSheep.java

@@ -117,6 +117,8 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     RadioGroup group_banner;
     @BindView(R.id.scrollView)
     ScrollView scrollView;
+    @BindView(R.id.newbie_task)
+    View newbie_task;
 
     @Inject
     SmallSheepPresenter pagePresenter;
@@ -233,12 +235,23 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                 UMConfigUtils.onEvent(UMConfigUtils.Event.SHEEP_TASK_LIE);
                 break;
             case R.id.newbie_task://新手任务
+                if(userEntity == null){
+                    return;
+                }
                 SheepApp.getInstance().getNetComponent().getApiService().getNewbieTask()
                         .subscribeOn(Schedulers.io())
                         .observeOn(AndroidSchedulers.mainThread())
                         .subscribe(new SheepSubscriber<BaseMessage>(getContext()) {
                             @Override
                             public void onNext(BaseMessage baseMessage) {
+                                List<NewbieTask> newbieTaskList = baseMessage.getDatas(NewbieTask.class);
+                                List<NewbieTask> taskList = new ArrayList<>();
+                                for (NewbieTask newbieTask : newbieTaskList) {
+                                    if(BinaryUtil.isInt(userEntity.getNewbie_task_status(),newbieTask.getId() - 1, 0)) {//未完成
+                                        taskList.add(newbieTask);
+                                    }
+                                }
+                                baseMessage.setData(taskList);
                                 Jump2View.getInstance().goNewbieTaskList(activity, baseMessage);
                             }
 
@@ -279,6 +292,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                 .apply(new RequestOptions().diskCacheStrategy(DiskCacheStrategy.RESOURCE))
                 .preload(800, 800);
         if(userEntity.getNewbie_task_status() < 16){//为16时代表已经完成所有新手任务，不是新手
+            newbie_task.setVisibility(View.VISIBLE);
             SheepApp.getInstance().getNetComponent().getApiService().getNewbieTask()
                             .subscribeOn(Schedulers.io())
                             .observeOn(AndroidSchedulers.mainThread())
@@ -311,6 +325,8 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                                 }
                             });
 
+        } else {
+            newbie_task.setVisibility(View.GONE);
         }
     }
 

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

@@ -41,8 +41,12 @@ import com.sheep.gamegroup.view.activity.WebviewAct;
 import com.sheep.gamegroup.view.activity.WithdrawalAct;
 import com.sheep.gamegroup.view.activity.WithdrawalListAct;
 import com.sheep.gamegroup.view.activity.WithdrawalResultAct;
+import com.sheep.jiuyan.samllsheep.BuildConfig;
+import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 
+import org.xutils.ex.DbException;
+
 /**
  * Created by ljy on 2018/3/18.
  */
@@ -65,11 +69,20 @@ public class Jump2View {
      */
     public void goWithdrawal(Context context, Object o){
         if(!isBindWeixin(context)){
-            goBindOrChangeWeixinView(context, o==null?false:false);
+            goBindOrChangeWeixinView(context, false);
             return;
         }
-        Intent intent = new Intent(context, WithdrawalAct.class);
-        context.startActivity(intent);
+        try {
+            UserEntity userEntity = MyDbManager.getInstance().dbFindUser();
+            boolean isFinishFirstWithdrawal = BinaryUtil.isInt(userEntity.getNewbie_task_status(),1, 1);
+            Intent intent = new Intent(context, WithdrawalAct.class);
+            intent.putExtra(Boolean.class.getSimpleName(), isFinishFirstWithdrawal);// 是否完成首次提现任务
+            context.startActivity(intent);
+        } catch (DbException e) {
+            e.printStackTrace();
+            if(BuildConfig.DEBUG)
+                G.showToast("测试：报错了，不能跳转到提现页面啦");
+        }
     }
 
 

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

@@ -34,7 +34,7 @@ public class ActNewbieTaskList extends BaseActivity {
 
     @Override
     protected int getLayoutId() {
-        return R.layout.withdrawal_list;
+        return R.layout.act_newbie_task_list;
     }
 
     @Override
@@ -48,30 +48,6 @@ public class ActNewbieTaskList extends BaseActivity {
         swipe_container.setFooterView(this, withdrawalListview, R.layout.listview_footer);
         adp = new NewbieTaskAdp(activity, etyList);
         withdrawalListview.setAdapter(adp);
-        adp.notifyDataSetChanged();
-
-        swipe_container.setOnRefreshListener(new RefreshLayout.OnRefreshListener() {
-            @Override
-            public void onRefresh() {
-
-                etyList.clear();
-                initData();
-            }
-        });
-
-        swipe_container.setOnLoadListener(new RefreshLayout.OnLoadListener() {
-            @Override
-            public void onLoad() {
-                swipe_container.setLoading(false);
-                new Handler().postDelayed(new Runnable() {
-                    @Override
-                    public void run() {
-                        swipe_container.setRefreshing(false);
-                    }
-                }, 1000);
-
-            }
-        });
 
     }
 

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

@@ -68,6 +68,7 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
     private String amount;
     private String balanceAmount = "0";//余额
 
+    private boolean isFinishFirstWithdrawal;//是否完成首次提现任务
     @Override
     protected int getLayoutId() {
         return R.layout.withdrawal_layout;
@@ -76,9 +77,10 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
     @Override
     public void initView() {
         activity = this;
+        isFinishFirstWithdrawal = getIntent().getBooleanExtra(Boolean.class.getSimpleName(), true);
         TitleBarUtils
                 .getInstance()
-                .setTitle(activity, "提现")
+                .setTitle(activity, isFinishFirstWithdrawal ? "提现" : "首次提现+1.2元")
                 .setTitleFinish(activity);
         DaggerWithdrawalComponent.builder()
                 .netComponent(SheepApp.get(this).getNetComponent())
@@ -102,6 +104,9 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
                     }
                     adapter.notifyDataSetChanged();
                 }
+                TitleBarUtils
+                        .getInstance()
+                        .setTitle(activity, ((GridViewEntity)listData.get(position)).getValue().equals("2") ? "首次提现+1.2元" : "提现");
             }
         });
         showProgress();
@@ -162,12 +167,21 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
      */
     private ArrayList<Object> assemblyData(){
         listData.clear();
-        listData.add(new GridViewEntity(true,10+""));
-        listData.add(new GridViewEntity(false,30+""));
-        listData.add(new GridViewEntity(false,50+""));
-        listData.add(new GridViewEntity(false,100+""));
-        listData.add(new GridViewEntity(false,500+""));
-        listData.add(new GridViewEntity(false,1000+""));
+        if(isFinishFirstWithdrawal){
+            listData.add(new GridViewEntity(true,10+""));
+            listData.add(new GridViewEntity(false,30+""));
+            listData.add(new GridViewEntity(false,50+""));
+            listData.add(new GridViewEntity(false,100+""));
+            listData.add(new GridViewEntity(false,500+""));
+            listData.add(new GridViewEntity(false,1000+""));
+        } else {
+            listData.add(new GridViewEntity(true,"2"));
+            listData.add(new GridViewEntity(false,10+""));
+            listData.add(new GridViewEntity(false,30+""));
+            listData.add(new GridViewEntity(false,50+""));
+            listData.add(new GridViewEntity(false,100+""));
+            listData.add(new GridViewEntity(false,500+""));
+        }
         return listData;
     }
 

app/src/main/java/com/sheep/gamegroup/view/dialog/DialogNewbieTask1.java

@@ -1,17 +1,13 @@
 package com.sheep.gamegroup.view.dialog;
 
 import android.app.Activity;
-import android.content.DialogInterface;
 import android.support.v7.app.AlertDialog;
+import android.text.Html;
 import android.view.View;
 import android.widget.TextView;
 
 import com.kfzs.duanduan.utils.dlg.ViewFindUtils;
 import com.sheep.gamegroup.model.entity.NewbieTask;
-import com.sheep.gamegroup.util.Jump2View;
-import com.sheep.gamegroup.util.RxjavaCountDownTimer;
-import com.sheep.gamegroup.util.UMConfigUtils;
-import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 
 import java.util.List;
@@ -26,22 +22,27 @@ public class DialogNewbieTask1 {
         final AlertDialog mAlertDialog = new AlertDialog.Builder(activity, R.style.MyDialogActivityTheme)
                 .setView(view)
                 .create();
+        final TextView dialog_tip_2 = ViewFindUtils.find(view, R.id.dialog_tip_2);
+        dialog_tip_2.setVisibility(View.VISIBLE);
         final TextView dialog_tip = ViewFindUtils.find(view, R.id.dialog_tip);
         if(task != null){
+            String start = "";
             switch (task.getId()){
                 case 1://了解小绵羊奖励
-                    dialog_tip.setText("获得小绵羊阅读奖励"+task.getAmount()+"元");
+                    start = "获得小绵羊阅读奖励";
                     break;
                 case 2://首次提现
-                    dialog_tip.setText("获得首次提现奖励"+task.getAmount()+"元");
+                    start = "获得首次提现奖励";
                     break;
                 case 3://成功邀请好友注册
-                    dialog_tip.setText("获得邀请好友注册奖励"+task.getAmount()+"元");
+                    start = "获得邀请好友注册奖励";
                     break;
                 case 4://首次做任务赚钱
-                    dialog_tip.setText("获得首次做任务赚钱额外奖励"+task.getAmount()+"元");
+                    start = "获得首次做任务赚钱额外奖励";
                     break;
             }
+            String sr = start+" <font color='#e2271d'><big>" + task.getAmount() + "</big></font> 元";
+            dialog_tip.setText(Html.fromHtml(sr));
         }
         View.OnClickListener onClickListener = new View.OnClickListener() {
             @Override
@@ -51,18 +52,18 @@ public class DialogNewbieTask1 {
                 mAlertDialog.dismiss();
             }
         };
-        final TextView dialog_sure = ViewFindUtils.find(view, R.id.dialog_sure);
-        setText(dialog_sure, newbieTaskList.get(0), 0);
-        dialog_sure.setOnClickListener(onClickListener);
+        final TextView dialog_sure_1 = ViewFindUtils.find(view, R.id.dialog_sure_1);
+        setTextSure(dialog_sure_1, newbieTaskList.get(0), 0);
+        dialog_sure_1.setOnClickListener(onClickListener);
         final TextView dialog_sure_2 = ViewFindUtils.find(view, R.id.dialog_sure_2);
         if(newbieTaskList.size() > 1) {
-            setText(dialog_sure_2, newbieTaskList.get(1), 1);
+            setTextSure(dialog_sure_2, newbieTaskList.get(1), 1);
             dialog_sure_2.setVisibility(View.VISIBLE);
             dialog_sure_2.setOnClickListener(onClickListener);
         }
         final TextView dialog_sure_3 = ViewFindUtils.find(view, R.id.dialog_sure_3);
         if(newbieTaskList.size() > 2){
-            setText(dialog_sure_3, newbieTaskList.get(2), 2);
+            setTextSure(dialog_sure_3, newbieTaskList.get(2), 2);
             dialog_sure_3.setVisibility(View.VISIBLE);
             dialog_sure_3.setOnClickListener(onClickListener);
         }
@@ -81,7 +82,7 @@ public class DialogNewbieTask1 {
         return mAlertDialog;
     }
 
-    private static void setText(TextView dialog_sure, NewbieTask newbieTask, int index) {
+    private static void setTextSure(TextView dialog_sure, NewbieTask newbieTask, int index) {
         switch (newbieTask.getId()){
             case 2:
                 dialog_sure.setText((index+1)+".完成首次提现（+"+newbieTask.getAmount()+"元）");

app/src/main/java/com/sheep/gamegroup/view/dialog/DialogNewbieTaskRegistSuccess.java

@@ -3,6 +3,7 @@ package com.sheep.gamegroup.view.dialog;
 import android.app.Activity;
 import android.content.DialogInterface;
 import android.support.v7.app.AlertDialog;
+import android.text.Html;
 import android.view.View;
 import android.widget.TextView;
 
@@ -18,6 +19,9 @@ public class DialogNewbieTaskRegistSuccess {
         final AlertDialog mAlertDialog = new AlertDialog.Builder(activity, R.style.MyDialogActivityTheme)
                 .setView(view)
                 .create();
+        final TextView dialog_tip = ViewFindUtils.find(view, R.id.dialog_tip);
+        String sr = "获得新人注册奖励 "+"<font color='#e2271d'><big>" + 1.8 + "</big></font> 元";
+        dialog_tip.setText(Html.fromHtml(sr));
         final TextView dialog_sure = ViewFindUtils.find(view, R.id.dialog_sure);
         dialog_sure.setOnClickListener(new View.OnClickListener() {
             @Override

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

@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <corners android:radius="5dp" />
-    <solid android:color="@color/blue_start"/>
+    <solid android:color="#61c8fb"/>
 </shape>

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <corners android:radius="10dp"/>
+    <corners android:radius="15dp"/>
 
-    <solid android:color="#009933"/>
+    <solid android:color="#2ba245"/>
 </shape>

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

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/bg_gray"
+    android:orientation="vertical">
+
+    <include layout="@layout/title" />
+    <com.sheep.gamegroup.view.customview.RefreshLayout
+        android:id="@+id/swipe_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="@dimen/content_padding_10">
+
+        <ListView
+            android:id="@+id/withdrawal_listview"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:listSelector="@color/transparent"
+            android:divider="@null"
+            android:layout_margin="@dimen/content_padding_13"
+            android:scrollbars="none"/>
+
+    </com.sheep.gamegroup.view.customview.RefreshLayout>
+</LinearLayout>

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

@@ -13,7 +13,7 @@
             android:id="@+id/dialog_center_ll"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="65dp"
+            android:layout_marginTop="75dp"
             android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
             android:gravity="center"
             android:orientation="vertical"
@@ -22,60 +22,58 @@
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="70dp"
+                android:layout_marginTop="75dp"
                 android:padding="@dimen/content_padding_10"
                 android:gravity="center"
                 android:text="恭喜您"
-                android:textColor="@color/selector_color_choose_head"
-                android:textSize="14sp" />
+                android:textColor="#232323"
+                android:textSize="17sp" />
             <TextView
                 android:id="@+id/dialog_tip"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
-                android:text="获得新人注册奖励1.8元"
-                android:textColor="@color/selector_color_choose_head"
-                android:textSize="14sp" />
+                android:text="获得新人注册奖励 1.8 元"
+                android:textColor="#7e7e7e"
+                android:textSize="16sp" />
+            <TextView
+                android:id="@+id/dialog_tip_2"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/content_padding_30"
+                android:gravity="center"
+                android:text="想获取更多奖励，您还可以通过："
+                android:textColor="#7e7e7e"
+                android:visibility="gone"
+                android:textSize="12sp" />
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/content_padding_20"
-                android:gravity="center"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                android:gravity="center">
 
                 <Button
-                    android:id="@+id/dialog_sure"
+                    android:id="@+id/dialog_sure_1"
                     style="@style/style_button_newbie_task"
-                    android:text="了解小绵羊，领取更多资金" />
+                    android:text="1.完成首次提现（+1.2元）" />
                 <Button
                     android:id="@+id/dialog_sure_2"
                     style="@style/style_button_newbie_task"
-                    android:visibility="gone"
                     android:text="2.成功邀请好友注册（+2元）" />
                 <Button
                     android:id="@+id/dialog_sure_3"
                     style="@style/style_button_newbie_task"
-                    android:visibility="gone"
                     android:text="3.首次做任务赚钱（+1元）" />
 
             </LinearLayout>
         </LinearLayout>
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+
+        <ImageView
+            android:layout_width="285dp"
+            android:layout_height="150dp"
             android:layout_centerHorizontal="true"
-            android:gravity="center"
-            android:weightSum="10"
-            android:orientation="horizontal">
-            <ImageView
-                android:layout_width="0dp"
-                android:layout_weight="8"
-                android:layout_height="wrap_content"
-                android:scaleType="fitXY"
-                android:adjustViewBounds="true"
-                android:src="@drawable/newbie_task_coin" />
-        </LinearLayout>
+            android:src="@drawable/newbie_task_coin" />
 
         <ImageView
             android:id="@+id/dialog_close"

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

@@ -121,18 +121,24 @@
                     android:layout_alignParentEnd="true"
                     android:layout_alignParentBottom="true">
                     <TextView
+                        android:id="@+id/newbie_task_tip_tv"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginEnd="@dimen/content_padding_10"
-                        android:layout_marginBottom="@dimen/content_padding_10"
+                        android:layout_marginBottom="@dimen/content_padding_13"
                         android:paddingTop="@dimen/content_padding_small"
                         android:paddingBottom="@dimen/content_padding_small"
                         android:paddingStart="@dimen/content_padding_10"
                         android:paddingEnd="@dimen/content_padding_10"
                         android:background="@drawable/shape_newbie_task_tv"
-                        android:textSize="14sp"
+                        android:textSize="12sp"
                         android:textColor="#ffffff"
                         android:text="新手任务"/>
+                    <ImageView
+                        android:layout_width="8dp"
+                        android:layout_height="8dp"
+                        android:layout_alignParentTop="true"
+                        android:layout_alignEnd="@+id/newbie_task_tip_tv"
+                        android:src="@drawable/sp_dot_red" />
                 </RelativeLayout>
 
             </RelativeLayout>

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

@@ -1,46 +1,63 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="90dp"
-    android:layout_margin="@dimen/content_padding_10"
-    android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
-    android:padding="@dimen/content_padding_20">
-    <ImageView
-        android:id="@+id/newbie_task_iv"
-        android:layout_width="50dp"
-        android:layout_height="50dp"
-        android:src="@drawable/newbie_task_1"
-        android:layout_centerVertical="true"
-        android:layout_alignParentStart="true"/>
-    <TextView
-        android:id="@+id/newbie_task_name_tv"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="了解小绵羊"
-        android:layout_marginStart="@dimen/content_padding_10"
-        android:layout_toEndOf="@+id/newbie_task_iv"
-        android:layout_alignParentTop="true"/>
-    <ImageView
-        android:id="@+id/newbie_task_money_iv"
-        android:layout_width="20dp"
-        android:layout_height="20dp"
-        android:src="@drawable/newbie_task_moeny"
-        android:layout_marginStart="@dimen/content_padding_10"
-        android:layout_toEndOf="@+id/newbie_task_iv"
-        android:layout_alignParentBottom="true"/>
-    <TextView
-        android:id="@+id/newbie_task_money_tv"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="+0.6元"
-        android:layout_marginStart="@dimen/content_padding_3"
-        android:layout_toEndOf="@+id/newbie_task_money_iv"
-        android:layout_alignParentBottom="true"/>
-    <TextView
-        android:id="@+id/newbie_task_tv"
-        style="@style/style_button_small"
-        android:text="领取"
-        android:layout_centerVertical="true"
-        android:layout_alignParentEnd="true"/>
+    android:layout_height="wrap_content"
+    android:paddingTop="@dimen/content_padding_10"
+    android:paddingStart="@dimen/content_padding_10"
+    android:paddingEnd="@dimen/content_padding_10">
 
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="90dp"
+        android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
+        android:padding="@dimen/content_padding_20">
+
+        <ImageView
+            android:id="@+id/newbie_task_iv"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:padding="4dp"
+            android:layout_alignParentStart="true"
+            android:layout_centerVertical="true"
+            android:src="@drawable/newbie_task_1" />
+
+        <TextView
+            android:id="@+id/newbie_task_name_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentTop="true"
+            android:layout_marginStart="@dimen/content_padding_10"
+            android:layout_toEndOf="@+id/newbie_task_iv"
+            android:textSize="15sp"
+            android:textColor="#201d1d"
+            android:text="了解小绵羊" />
+
+        <ImageView
+            android:id="@+id/newbie_task_money_iv"
+            android:layout_width="16dp"
+            android:layout_height="16dp"
+            android:layout_alignParentBottom="true"
+            android:layout_marginStart="@dimen/content_padding_10"
+            android:layout_toEndOf="@+id/newbie_task_iv"
+            android:src="@drawable/newbie_task_moeny" />
+
+        <TextView
+            android:id="@+id/newbie_task_money_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_marginStart="@dimen/content_padding_3"
+            android:layout_toEndOf="@+id/newbie_task_money_iv"
+            android:textSize="12sp"
+            android:textColor="#7e7e7e"
+            android:text="+0.6元" />
+
+        <TextView
+            android:id="@+id/newbie_task_tv"
+            style="@style/style_button_small"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
+            android:text="领取" />
+
+    </RelativeLayout>
 </RelativeLayout>