2 Коммиты 16b0294012 ... 8f2ab1bade

Автор SHA1 Сообщение Дата
  zhoujuncai 8f2ab1bade Merge remote-tracking branch 'origin/sheep_develop' into sheep_develop лет назад: 7
  zhoujuncai 92bdd00518 签到页面功能完善 лет назад: 7
39 измененных файлов с 1369 добавлено и 30 удалено
  1. 28 5
      app/src/main/AndroidManifest.xml
  2. 1 1
      app/src/main/java/com/sheep/gamegroup/view/fragment/FgtPersonalCenter.java
  3. 101 0
      app/src/main/java/com/sheep/jiuyan/samllsheep/bean/NavBean.java
  4. 23 0
      app/src/main/java/com/sheep/jiuyan/samllsheep/bean/SignDay.java
  5. 71 0
      app/src/main/java/com/sheep/jiuyan/samllsheep/bean/SignsBean.java
  6. 37 5
      app/src/main/java/com/sheep/jiuyan/samllsheep/net/map/ApiService.java
  7. 47 0
      app/src/main/java/com/sheep/jiuyan/samllsheep/ui/activity/ActiveRuleActivity.java
  8. 85 0
      app/src/main/java/com/sheep/jiuyan/samllsheep/ui/activity/PlayVideoActivity.java
  9. 264 1
      app/src/main/java/com/sheep/jiuyan/samllsheep/ui/activity/SignActivity.java
  10. 96 0
      app/src/main/java/com/sheep/jiuyan/samllsheep/ui/activity/UserNavActivity.java
  11. BIN
      app/src/main/res/drawable-xhdpi/coin.webp
  12. BIN
      app/src/main/res/drawable-xhdpi/giftbox_open.webp
  13. BIN
      app/src/main/res/drawable-xhdpi/ic_stdkh_image.webp
  14. BIN
      app/src/main/res/drawable-xxhdpi/coin.webp
  15. BIN
      app/src/main/res/drawable-xxhdpi/giftbox_open.webp
  16. BIN
      app/src/main/res/drawable-xxhdpi/ic_stdkh_image.webp
  17. BIN
      app/src/main/res/drawable-xxxhdpi/coin.webp
  18. BIN
      app/src/main/res/drawable-xxxhdpi/giftbox_open.webp
  19. BIN
      app/src/main/res/drawable-xxxhdpi/ic_stdkh_image.webp
  20. 5 0
      app/src/main/res/drawable/shape_but_blue_bg.xml
  21. 5 0
      app/src/main/res/drawable/shape_publish_screen_capture_bg.xml
  22. 5 0
      app/src/main/res/drawable/shape_sign_bg_none.xml
  23. 5 0
      app/src/main/res/drawable/shape_sign_bg_select.xml
  24. 7 0
      app/src/main/res/drawable/shape_sign_blue_but_bg.xml
  25. 7 0
      app/src/main/res/drawable/shape_sign_but_bg.xml
  26. 7 0
      app/src/main/res/drawable/shape_sign_green_but_bg.xml
  27. 5 0
      app/src/main/res/drawable/shape_sign_item_no_sign.xml
  28. 5 0
      app/src/main/res/drawable/shape_sign_window_money_bg.xml
  29. 23 0
      app/src/main/res/layout/activity_active_rule.xml
  30. 23 0
      app/src/main/res/layout/activity_play_video.xml
  31. 194 3
      app/src/main/res/layout/activity_sign.xml
  32. 5 11
      app/src/main/res/layout/activity_user_nav.xml
  33. 13 0
      app/src/main/res/layout/header_new_user_nav.xml
  34. 54 0
      app/src/main/res/layout/item_new_user_guide.xml
  35. 166 0
      app/src/main/res/layout/sign_ok_dialog.xml
  36. 29 0
      app/src/main/res/layout/view_title_bar.xml
  37. 55 0
      app/src/main/res/layout/viiew_publish_phone_and_capture.xml
  38. 2 4
      app/src/main/res/values/attrs.xml
  39. 1 0
      app/src/main/res/values/strings.xml

+ 28 - 5
app/src/main/AndroidManifest.xml

@@ -174,7 +174,7 @@
             android:screenOrientation="portrait"
             android:theme="@style/FullScreenTheme"></activity>
         <activity
-            android:name="com.sheep.gamegroup.view.activity.SplashAct"
+            android:name=".ui.activity.SignActivity"
             android:screenOrientation="portrait"
             android:theme="@style/SplashTheme">
             <intent-filter>
@@ -183,6 +183,16 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <!--<activity-->
+        <!--android:name="com.sheep.gamegroup.view.activity.SplashAct"-->
+        <!--android:screenOrientation="portrait"-->
+        <!--android:theme="@style/SplashTheme">-->
+        <!--<intent-filter>-->
+        <!--<action android:name="android.intent.action.MAIN" />-->
+        <!---->
+        <!--<category android:name="android.intent.category.LAUNCHER" />-->
+        <!--</intent-filter>-->
+        <!--</activity>-->
         <activity
             android:name="com.sheep.gamegroup.view.activity.MiddleSchemeAct"
             android:configChanges="keyboardHidden|screenSize|orientation"
@@ -749,11 +759,24 @@
             android:theme="@style/AppTheme.NoTitleBar.AlphaStatusBar"
             android:windowSoftInputMode="stateHidden" />
         <!-- 签到 -->
+        <!--<activity-->
+        <!--android:name=".ui.activity.SignActivity"-->
+        <!--android:screenOrientation="portrait"-->
+        <!--android:theme="@style/AppTheme.NoTitleBar.AlphaStatusBar" />-->
+        <!-- 用户引导 -->
         <activity
-            android:name=".ui.activity.SignActivity"
-            android:screenOrientation="portrait"
-            android:theme="@style/AppTheme.NoTitleBar.AlphaStatusBar" />
-        <activity android:name=".ui.activity.UserNavActivity" />
+            android:name=".ui.activity.UserNavActivity"
+            android:configChanges="orientation|screenSize"
+            android:screenOrientation="portrait" />
+        <!-- 活动规则 -->
+        <activity
+            android:name=".ui.activity.ActiveRuleActivity"
+            android:screenOrientation="portrait" />
+        <!-- 全屏视频播放 -->
+        <activity
+            android:name=".ui.activity.PlayVideoActivity"
+            android:configChanges="orientation|screenSize"
+            android:screenOrientation="landscape" />
     </application>
 
 </manifest>

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

@@ -218,7 +218,7 @@ public class FgtPersonalCenter extends BaseFragment {
      * 初始化用户中心模块列表
      */
     private void initUserModuleItem() {
-        Network.api().userModule(null, "android")
+        Network.api().userModule()
                 .compose(Scheduler.apply(this.<List<UserCenterModule>>bindUntilEvent(FragmentEvent.DESTROY)))
                 .subscribe(new Observer<List<UserCenterModule>>() {
                     @Override

+ 101 - 0
app/src/main/java/com/sheep/jiuyan/samllsheep/bean/NavBean.java

@@ -0,0 +1,101 @@
+package com.sheep.jiuyan.samllsheep.bean;
+
+/**
+ * Created by: zhoujuncai.
+ * Created date: 2018/11/5.
+ * Description: 新手导航导航接口返回对象
+ */
+public class NavBean {
+
+    /**
+     * 内容
+     * content : string
+     * 创建时间
+     * created_at : 0
+     * ID
+     * id : 0
+     * 平台
+     * platform : 0
+     * 标题
+     * title : string
+     * 类型: 1: 文字 2: 视频
+     * type : 0
+     * 更新时间
+     * updated_at : 0
+     * 视频地址
+     * video_url : string
+     */
+
+    private String content;
+    private int created_at;
+    private int id;
+    private int platform;
+    private String title;
+    private int type;
+    private int updated_at;
+    private String video_url;
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public int getCreated_at() {
+        return created_at;
+    }
+
+    public void setCreated_at(int created_at) {
+        this.created_at = created_at;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public int getPlatform() {
+        return platform;
+    }
+
+    public void setPlatform(int platform) {
+        this.platform = platform;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public int getType() {
+        return type;
+    }
+
+    public void setType(int type) {
+        this.type = type;
+    }
+
+    public int getUpdated_at() {
+        return updated_at;
+    }
+
+    public void setUpdated_at(int updated_at) {
+        this.updated_at = updated_at;
+    }
+
+    public String getVideo_url() {
+        return video_url;
+    }
+
+    public void setVideo_url(String video_url) {
+        this.video_url = video_url;
+    }
+}

+ 23 - 0
app/src/main/java/com/sheep/jiuyan/samllsheep/bean/SignDay.java

@@ -0,0 +1,23 @@
+package com.sheep.jiuyan.samllsheep.bean;
+
+/**
+ * Created by: zhoujuncai.
+ * Created date: 2018/11/5.
+ * Description: 每日签到
+ */
+public class SignDay {
+
+    /**
+     * data : 0.7
+     */
+
+    private double data;
+
+    public double getData() {
+        return data;
+    }
+
+    public void setData(double data) {
+        this.data = data;
+    }
+}

+ 71 - 0
app/src/main/java/com/sheep/jiuyan/samllsheep/bean/SignsBean.java

@@ -0,0 +1,71 @@
+package com.sheep.jiuyan.samllsheep.bean;
+
+import java.util.List;
+
+/**
+ * Created by: zhoujuncai.
+ * Created date: 2018/11/5.
+ * Description: 签到对象
+ */
+public class SignsBean {
+
+    private List<DataBean> data;
+
+    public List<DataBean> getData() {
+        return data;
+    }
+
+    public void setData(List<DataBean> data) {
+        this.data = data;
+    }
+
+    public static class DataBean {
+        /**
+         * 用户ID
+         * user_id : 63201
+         * 签到周期
+         * day : 1
+         * 签到日期
+         * sign_date : 2018-11-05
+         * 是否补签
+         * is_supplement : 0
+         */
+
+        private int user_id;
+        private int day;
+        private String sign_date;
+        private int is_supplement;
+
+        public int getUser_id() {
+            return user_id;
+        }
+
+        public void setUser_id(int user_id) {
+            this.user_id = user_id;
+        }
+
+        public int getDay() {
+            return day;
+        }
+
+        public void setDay(int day) {
+            this.day = day;
+        }
+
+        public String getSign_date() {
+            return sign_date;
+        }
+
+        public void setSign_date(String sign_date) {
+            this.sign_date = sign_date;
+        }
+
+        public int getIs_supplement() {
+            return is_supplement;
+        }
+
+        public void setIs_supplement(int is_supplement) {
+            this.is_supplement = is_supplement;
+        }
+    }
+}

+ 37 - 5
app/src/main/java/com/sheep/jiuyan/samllsheep/net/map/ApiService.java

@@ -1,13 +1,15 @@
 package com.sheep.jiuyan.samllsheep.net.map;
 
+import com.sheep.jiuyan.samllsheep.bean.NavBean;
+import com.sheep.jiuyan.samllsheep.bean.SignDay;
+import com.sheep.jiuyan.samllsheep.bean.SignsBean;
 import com.sheep.jiuyan.samllsheep.bean.UserCenterModule;
 
 import java.util.List;
 
 import io.reactivex.Observable;
 import retrofit2.http.GET;
-import retrofit2.http.Header;
-import retrofit2.http.Query;
+import retrofit2.http.POST;
 
 /**
  * Created by: zhoujuncai.
@@ -17,13 +19,43 @@ import retrofit2.http.Query;
 public interface ApiService {
 
     /* 服务器地址 */
-    String BASE_URL = "http://test.sheep.kfzs.com/v1/";
+    String BASE_URL = "http://test.sheep.kfzs.com/";
     /* 超时 */
     int TIME_OUT = 15;
 
     /**
      * 用户中心模块获取
      */
-    @GET("/app/user_module/")
-    Observable<List<UserCenterModule>> userModule(@Header("Authorization") String auth, @Query("platform") String platform);
+    @GET("/v1/app/user_module/")
+    Observable<List<UserCenterModule>> userModule();
+
+    /**
+     * 新手引导
+     */
+    @GET("/v1/app/user/novice_guidance")
+    Observable<List<NavBean>> userGuide();
+
+    /**
+     * 每日签到
+     */
+    @POST("/v1/app/user_sign/sign_in")
+    Observable<SignDay> signEveryDay();
+
+    /**
+     * 签到状态获取
+     */
+    @GET("/v1/app/user_sign/signs")
+    Observable<SignsBean> getSigns();
+
+    /**
+     * 补签
+     */
+    @POST("/v1/app/user_sign/sign_in_supplement")
+    Observable<SignDay> signInSupplement();
+
+    /**
+     * 刮奖
+     */
+    @POST("/v1/app/user_sign/scratch_card")
+    Observable<SignDay> signScratchCard();
 }

+ 47 - 0
app/src/main/java/com/sheep/jiuyan/samllsheep/ui/activity/ActiveRuleActivity.java

@@ -0,0 +1,47 @@
+package com.sheep.jiuyan.samllsheep.ui.activity;
+
+import android.widget.TextView;
+
+import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.ui.base.BaseActivity;
+
+import butterknife.BindView;
+import butterknife.OnClick;
+
+/**
+ * Created by: zhoujuncai.
+ * Created date: 2018/11/5.
+ * Description: 活动规则
+ */
+public class ActiveRuleActivity extends BaseActivity {
+
+    @BindView(R.id.title_text)
+    TextView titleText;
+    @BindView(R.id.active_rule_text)
+    TextView activeRuleText;
+
+    @Override
+    protected int onLayout() {
+        return R.layout.activity_active_rule;
+    }
+
+    @Override
+    protected void onObject() {
+
+    }
+
+    @Override
+    protected void onView() {
+        titleText.setText("活动规则");
+    }
+
+    @Override
+    protected void onData() {
+
+    }
+
+    @OnClick(R.id.back_but)
+    public void onViewClicked() {
+        finish();
+    }
+}

+ 85 - 0
app/src/main/java/com/sheep/jiuyan/samllsheep/ui/activity/PlayVideoActivity.java

@@ -0,0 +1,85 @@
+package com.sheep.jiuyan.samllsheep.ui.activity;
+
+import android.content.res.Configuration;
+import android.os.Bundle;
+import android.view.Surface;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.widget.RelativeLayout;
+import android.widget.VideoView;
+
+import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.ui.base.BaseActivity;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+
+/**
+ * Created by: zhoujuncai.
+ * Created date: 2018/11/5.
+ * Description: 全屏播放视频
+ */
+public class PlayVideoActivity extends BaseActivity {
+
+    @BindView(R.id.videoView)
+    VideoView videoView;
+    @BindView(R.id.video_layout)
+    RelativeLayout videoLayout;
+    private ViewGroup.LayoutParams params;
+
+    @Override
+    protected int onLayout() {
+        return R.layout.activity_play_video;
+    }
+
+    @Override
+    protected void onObject() {
+
+    }
+
+    @Override
+    protected void onView() {
+
+    }
+
+    @Override
+    protected void onData() {
+
+    }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+        int rot = getWindowManager().getDefaultDisplay().getRotation();
+        if (rot == Surface.ROTATION_90 || rot == Surface.ROTATION_270) {
+            params = videoLayout.getLayoutParams();
+            RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT, RelativeLayout.LayoutParams.MATCH_PARENT);
+            layoutParams.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM);
+            layoutParams.addRule(RelativeLayout.ALIGN_PARENT_TOP);
+            layoutParams.addRule(RelativeLayout.ALIGN_PARENT_LEFT);
+            layoutParams.addRule(RelativeLayout.ALIGN_PARENT_RIGHT);
+            videoLayout.setLayoutParams(layoutParams);
+            getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
+
+        } else if (rot == Surface.ROTATION_0) {
+            videoLayout.setLayoutParams(params);
+        }
+    }
+
+    @OnClick(R.id.videoView)
+    public void onViewClicked() {
+        if (videoView.isPlaying()) {
+            videoView.pause();
+        } else if (!videoView.isPlaying()) {
+            videoView.start();
+        }
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        // TODO: add setContentView(...) invocation
+        ButterKnife.bind(this);
+    }
+}

+ 264 - 1
app/src/main/java/com/sheep/jiuyan/samllsheep/ui/activity/SignActivity.java

@@ -1,25 +1,56 @@
 package com.sheep.jiuyan.samllsheep.ui.activity;
 
+import android.annotation.SuppressLint;
+import android.content.Intent;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import com.sheep.gamegroup.view.activity.AskGetMoneyAct;
+import com.sheep.gamegroup.view.activity.SignCardAct;
 import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.bean.SignDay;
+import com.sheep.jiuyan.samllsheep.bean.SignsBean;
+import com.sheep.jiuyan.samllsheep.net.Network;
+import com.sheep.jiuyan.samllsheep.net.Scheduler;
 import com.sheep.jiuyan.samllsheep.ui.base.BaseActivity;
 import com.sheep.jiuyan.samllsheep.ui.view.EggView;
+import com.trello.rxlifecycle2.android.ActivityEvent;
+import com.umeng.socialize.ShareAction;
+import com.umeng.socialize.UMShareListener;
+import com.umeng.socialize.bean.SHARE_MEDIA;
+import com.umeng.socialize.media.UMImage;
+import com.umeng.socialize.media.UMWeb;
+
+import java.util.List;
 
 import butterknife.BindView;
 import butterknife.OnClick;
+import io.reactivex.Observer;
+import io.reactivex.disposables.Disposable;
 
 /**
  * Created by: zhoujuncai.
  * Created date: 2018/10/31.
  * Description: 签到
  */
-public class SignActivity extends BaseActivity {
+public class SignActivity extends BaseActivity implements UMShareListener {
 
     @BindView(R.id.eggs_view)
     EggView eggsView;
     @BindView(R.id.sign_info_text)
     TextView signInfoText;
+    @BindView(R.id.sign_day_list)
+    LinearLayout signDayList;
+    @BindView(R.id.sign_now_but)
+    TextView signNowBut;
+    @BindView(R.id.sign_guajiangqu)
+    RelativeLayout signGuajiang;
+    /* 是否有漏签 */
+    private boolean attech = false;
 
     @Override
     protected int onLayout() {
@@ -38,7 +69,169 @@ public class SignActivity extends BaseActivity {
 
     @Override
     protected void onData() {
+        initSigns();
+    }
+
+    private void initSigns() {
+        Network.api().getSigns()
+                .compose(Scheduler.apply(this.<SignsBean>bindUntilEvent(ActivityEvent.DESTROY)))
+                .subscribe(new Observer<SignsBean>() {
+                    @Override
+                    public void onSubscribe(Disposable d) {
+
+                    }
+
+                    @SuppressLint("SetTextI18n")
+                    @Override
+                    public void onNext(SignsBean signsBean) {
+                        List<SignsBean.DataBean> data = signsBean.getData();
+                        signInfoText.setText("已签到" + data.size() + "天,连续6天打卡可参与刮奖");
+                        int max = 0;
+                        /* 遍历最大签到周期 */
+                        for (SignsBean.DataBean bean : data) {
+                            if (max == 0) {
+                                max = bean.getDay();
+                            } else {
+                                max = Math.max(max, bean.getDay());
+                            }
+                        }
+                        /* 判断是否有漏签 */
+                        if (max > data.size()) {
+                            attech = true;
+                            signNowBut.setText("复活补签");
+                            /* 设置从第一天到最后一天的状态为未签到 */
+                            for (int i = 0; i < max - 1; i++) {
+                                SignsBean.DataBean dataBean = data.get(i);
+                                TextView childAt = (TextView) signDayList.getChildAt(dataBean.getDay() - 1);
+                                childAt.setBackground(getResources().getDrawable(R.drawable.shape_sign_bg_select));
+                            }
+                        }
+                        /* 设置已签到的天数状态 */
+                        for (int i = 0; i < data.size(); i++) {
+                            SignsBean.DataBean dataBean = data.get(i);
+                            TextView childAt = (TextView) signDayList.getChildAt(dataBean.getDay() - 1);
+                            childAt.setBackground(getResources().getDrawable(R.drawable.shape_sign_bg_select));
+                            if (dataBean.getDay() == 6) {
+                                childAt.setCompoundDrawablesRelativeWithIntrinsicBounds(null, null, null, getResources().getDrawable(R.drawable.giftbox_open));
+                            } else {
+                                childAt.setCompoundDrawablesRelativeWithIntrinsicBounds(null, null, null, getResources().getDrawable(R.drawable.qiandao));
+                            }
+                        }
+                    }
+
+                    @Override
+                    public void onError(Throwable e) {
+
+                    }
+
+                    @Override
+                    public void onComplete() {
 
+                    }
+                });
+    }
+
+    /**
+     * 补签
+     */
+    private void attechSign() {
+        Network.api().signInSupplement()
+                .compose(Scheduler.apply(this.<SignDay>bindUntilEvent(ActivityEvent.DESTROY)))
+                .subscribe(new Observer<SignDay>() {
+                    @Override
+                    public void onSubscribe(Disposable d) {
+
+                    }
+
+                    @Override
+                    public void onNext(SignDay signDay) {
+                        attech = false;
+                        signNowBut.setText("签到");
+                        // 重新请求签到状态接口
+                        initSigns();
+                    }
+
+                    @Override
+                    public void onError(Throwable e) {
+
+                    }
+
+                    @Override
+                    public void onComplete() {
+
+                    }
+                });
+    }
+
+    /**
+     * 签到
+     */
+    private void signNow() {
+        Network.api().signEveryDay()
+                .compose(Scheduler.apply(this.<SignDay>bindUntilEvent(ActivityEvent.DESTROY)))
+                .subscribe(new Observer<SignDay>() {
+                    @Override
+                    public void onSubscribe(Disposable d) {
+
+                    }
+
+                    @Override
+                    public void onNext(SignDay signDay) {
+                        signNowBut.setText("已签到");
+                        signNowBut.setClickable(false);
+                        signNowBut.setFocusable(false);
+                        makeAndShowWindow("已签到", signDay.getData());
+                        initSigns();
+                    }
+
+                    @Override
+                    public void onError(Throwable e) {
+
+                    }
+
+                    @Override
+                    public void onComplete() {
+
+                    }
+                });
+    }
+
+    /**
+     * 创建并显示窗口
+     */
+    @SuppressLint({"InflateParams", "SetTextI18n"})
+    private void makeAndShowWindow(String title, double money) {
+        final View dialog = LayoutInflater.from(this).inflate(R.layout.sign_ok_dialog, null);
+        ((TextView) dialog.findViewById(R.id.sign_window_title)).setText(title);
+        ((TextView) dialog.findViewById(R.id.sign_money_number)).setText("+" + money);
+        dialog.findViewById(R.id.sign_window_next).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                // 换一个
+            }
+        });
+        dialog.findViewById(R.id.sign_window_share).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                ((ViewGroup) getWindow().getDecorView()).removeView(dialog);
+                UMWeb web = new UMWeb("下载链接");
+                web.setTitle(getString(R.string.app_name));
+                web.setThumb(new UMImage(SignActivity.this, R.drawable.icon));
+                web.setDescription("任务详情");
+                new ShareAction(SignActivity.this)
+                        .withMedia(web)
+                        .setDisplayList(SHARE_MEDIA.QQ, SHARE_MEDIA.WEIXIN, SHARE_MEDIA.QZONE, SHARE_MEDIA.WEIXIN_CIRCLE)
+                        .setCallback(SignActivity.this)
+                        .open();
+            }
+        });
+        dialog.findViewById(R.id.close_but).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                ((ViewGroup) getWindow().getDecorView()).removeView(dialog);
+            }
+        });
+        ((ViewGroup) getWindow().getDecorView()).addView(dialog);
     }
 
     @OnClick(R.id.back_but)
@@ -48,5 +241,75 @@ public class SignActivity extends BaseActivity {
 
     @OnClick(R.id.active_info)
     public void onActiveInfoClicked() {
+        startActivity(new Intent(SignActivity.this, ActiveRuleActivity.class));
+    }
+
+    @OnClick(R.id.sign_now_but)
+    public void onSignNowButClicked() {
+        if (attech) {
+            attechSign();
+        } else {
+            signNow();
+        }
+    }
+
+    @OnClick(R.id.go_to_pack_but)
+    public void onGoToPackButClicked() {
+        startActivity(new Intent(SignActivity.this, SignCardAct.class));
+        finish();
+    }
+
+    @OnClick(R.id.sign_guajiangqu)
+    public void onSignGuajiangquClicked() {
+        Network.api().signScratchCard()
+                .compose(Scheduler.apply(this.<SignDay>bindUntilEvent(ActivityEvent.DESTROY)))
+                .subscribe(new Observer<SignDay>() {
+                    @Override
+                    public void onSubscribe(Disposable d) {
+
+                    }
+
+                    @Override
+                    public void onNext(SignDay signDay) {
+                        signGuajiang.setVisibility(View.GONE);
+                        makeAndShowWindow("刮奖成功", signDay.getData());
+                    }
+
+                    @Override
+                    public void onError(Throwable e) {
+
+                    }
+
+                    @Override
+                    public void onComplete() {
+
+                    }
+                });
+    }
+
+    @OnClick(R.id.go_to_yaoqing)
+    public void onGoToYaoqingClicked() {
+        startActivity(new Intent(SignActivity.this, AskGetMoneyAct.class));
+        finish();
+    }
+
+    @Override
+    public void onStart(SHARE_MEDIA share_media) {
+
+    }
+
+    @Override
+    public void onResult(SHARE_MEDIA share_media) {
+
+    }
+
+    @Override
+    public void onError(SHARE_MEDIA share_media, Throwable throwable) {
+
+    }
+
+    @Override
+    public void onCancel(SHARE_MEDIA share_media) {
+
     }
 }

+ 96 - 0
app/src/main/java/com/sheep/jiuyan/samllsheep/ui/activity/UserNavActivity.java

@@ -1,7 +1,31 @@
 package com.sheep.jiuyan.samllsheep.ui.activity;
 
+import android.annotation.SuppressLint;
+import android.content.Intent;
+import android.net.Uri;
+import android.support.v4.app.ActivityOptionsCompat;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.TextView;
+import android.widget.VideoView;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
 import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.bean.NavBean;
+import com.sheep.jiuyan.samllsheep.net.Network;
+import com.sheep.jiuyan.samllsheep.net.Scheduler;
 import com.sheep.jiuyan.samllsheep.ui.base.BaseActivity;
+import com.trello.rxlifecycle2.android.ActivityEvent;
+
+import java.util.List;
+
+import butterknife.BindView;
+import butterknife.OnClick;
+import io.reactivex.Observer;
+import io.reactivex.disposables.Disposable;
 
 /**
  * Created by: zhoujuncai.
@@ -9,6 +33,10 @@ import com.sheep.jiuyan.samllsheep.ui.base.BaseActivity;
  * Description: 新手导航界面
  */
 public class UserNavActivity extends BaseActivity {
+
+    @BindView(R.id.new_user_guide_list)
+    RecyclerView newUserGuideList;
+
     @Override
     protected int onLayout() {
         return R.layout.activity_user_nav;
@@ -16,7 +44,70 @@ public class UserNavActivity extends BaseActivity {
 
     @Override
     protected void onObject() {
+        Network.api().userGuide()
+                .compose(Scheduler.apply(this.<List<NavBean>>bindUntilEvent(ActivityEvent.DESTROY)))
+                .subscribe(new Observer<List<NavBean>>() {
+                    @Override
+                    public void onSubscribe(Disposable d) {
+
+                    }
 
+                    @SuppressLint("InflateParams")
+                    @Override
+                    public void onNext(List<NavBean> navBeans) {
+                        BaseQuickAdapter<NavBean, BaseViewHolder> adapter = new BaseQuickAdapter<NavBean, BaseViewHolder>(R.layout.item_new_user_guide, navBeans) {
+                            @Override
+                            protected void convert(BaseViewHolder helper, NavBean item) {
+                                helper.setText(R.id.nav_content_text, item.getTitle());
+                                if (item.getType() == 1) {
+                                    helper.getView(R.id.nav_guide_video).setVisibility(View.GONE);
+                                    helper.getView(R.id.nav_guide_video_full).setVisibility(View.GONE);
+                                    TextView textView = helper.getView(R.id.nav_content_text);
+                                    textView.setText(item.getContent());
+                                    textView.setVisibility(View.VISIBLE);
+                                } else if (item.getType() == 2) {
+                                    helper.getView(R.id.nav_content_text).setVisibility(View.GONE);
+                                    final VideoView vv = helper.getView(R.id.nav_guide_video);
+                                    vv.setVisibility(View.VISIBLE);
+                                    vv.setVideoURI(Uri.parse(item.getVideo_url()));
+                                    vv.setOnClickListener(new View.OnClickListener() {
+                                        @Override
+                                        public void onClick(View v) {
+                                            if (vv.isPlaying()) {
+                                                vv.pause();
+                                            } else if (!vv.isPlaying()) {
+                                                vv.start();
+                                            }
+                                        }
+                                    });
+                                    final TextView tv = helper.getView(R.id.nav_guide_video_full);
+                                    tv.setVisibility(View.VISIBLE);
+                                    tv.setOnClickListener(new View.OnClickListener() {
+                                        @Override
+                                        public void onClick(View v) {
+                                            startActivity(new Intent(UserNavActivity.this, PlayVideoActivity.class),
+                                                    ActivityOptionsCompat.makeSceneTransitionAnimation(UserNavActivity.this, vv, "video").toBundle());
+                                        }
+                                    });
+                                }
+                            }
+                        };
+                        adapter.addHeaderView(LayoutInflater.from(UserNavActivity.this).inflate(R.layout.header_new_user_nav, null));
+                        LinearLayoutManager manager = new LinearLayoutManager(UserNavActivity.this, LinearLayoutManager.VERTICAL, false);
+                        newUserGuideList.setLayoutManager(manager);
+                        newUserGuideList.setAdapter(adapter);
+                    }
+
+                    @Override
+                    public void onError(Throwable e) {
+
+                    }
+
+                    @Override
+                    public void onComplete() {
+
+                    }
+                });
     }
 
     @Override
@@ -28,4 +119,9 @@ public class UserNavActivity extends BaseActivity {
     protected void onData() {
 
     }
+
+    @OnClick(R.id.back_but)
+    public void onViewClicked() {
+        finish();
+    }
 }

BIN
app/src/main/res/drawable-xhdpi/coin.webp


BIN
app/src/main/res/drawable-xhdpi/giftbox_open.webp


BIN
app/src/main/res/drawable-xhdpi/ic_stdkh_image.webp


BIN
app/src/main/res/drawable-xxhdpi/coin.webp


BIN
app/src/main/res/drawable-xxhdpi/giftbox_open.webp


BIN
app/src/main/res/drawable-xxhdpi/ic_stdkh_image.webp


BIN
app/src/main/res/drawable-xxxhdpi/coin.webp


BIN
app/src/main/res/drawable-xxxhdpi/giftbox_open.webp


BIN
app/src/main/res/drawable-xxxhdpi/ic_stdkh_image.webp


+ 5 - 0
app/src/main/res/drawable/shape_but_blue_bg.xml

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

+ 5 - 0
app/src/main/res/drawable/shape_publish_screen_capture_bg.xml

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

+ 5 - 0
app/src/main/res/drawable/shape_sign_bg_none.xml

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

+ 5 - 0
app/src/main/res/drawable/shape_sign_bg_select.xml

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

+ 7 - 0
app/src/main/res/drawable/shape_sign_blue_but_bg.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="16dp" />
+    <gradient
+        android:endColor="#34A5E7"
+        android:startColor="#29D6FD" />
+</shape>

+ 7 - 0
app/src/main/res/drawable/shape_sign_but_bg.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="15dp" />
+    <gradient
+        android:endColor="#34A5E7"
+        android:startColor="#29D6FD" />
+</shape>

+ 7 - 0
app/src/main/res/drawable/shape_sign_green_but_bg.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="16dp" />
+    <gradient
+        android:endColor="#25C37F"
+        android:startColor="#2CECC4" />
+</shape>

+ 5 - 0
app/src/main/res/drawable/shape_sign_item_no_sign.xml

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

+ 5 - 0
app/src/main/res/drawable/shape_sign_window_money_bg.xml

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

+ 23 - 0
app/src/main/res/layout/activity_active_rule.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <include
+        android:id="@+id/sign_rule_title_bar"
+        layout="@layout/view_title_bar" />
+
+    <TextView
+        android:id="@+id/active_rule_text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
+        android:lineHeight="24sp"
+        android:text="@string/sign_active_rule_text"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/sign_rule_title_bar" />
+</android.support.constraint.ConstraintLayout>

+ 23 - 0
app/src/main/res/layout/activity_play_video.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <RelativeLayout
+        android:id="@+id/video_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <VideoView
+            android:id="@+id/videoView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_centerInParent="true"
+            android:transitionName="video" />
+    </RelativeLayout>
+</android.support.constraint.ConstraintLayout>

+ 194 - 3
app/src/main/res/layout/activity_sign.xml

@@ -1,7 +1,8 @@
 <?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="match_parent">
+    android:layout_height="match_parent"
+    android:background="#f8f8f8">
 
     <RelativeLayout
         android:id="@+id/title_bar"
@@ -39,7 +40,6 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="#ffffff"
             android:orientation="vertical">
 
             <RelativeLayout
@@ -80,18 +80,209 @@
                 android:id="@+id/sign_info_text"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="20dp"
+                android:background="#ffffff"
                 android:gravity="center"
+                android:paddingTop="20dp"
                 android:text="已签到1天 ,继续6天打卡可参与刮奖"
                 android:textColor="#999999"
                 android:textSize="12sp" />
 
             <LinearLayout
+                android:id="@+id/sign_day_list"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:background="#ffffff"
+                android:gravity="center"
                 android:orientation="horizontal">
 
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_margin="10dp"
+                    android:layout_weight="1"
+                    android:background="@drawable/shape_sign_bg_none"
+                    android:drawableBottom="@drawable/coin"
+                    android:gravity="center"
+                    android:minHeight="40dp"
+                    android:padding="5dp"
+                    android:text="1" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_margin="10dp"
+                    android:layout_weight="1"
+                    android:background="@drawable/shape_sign_bg_none"
+                    android:drawableBottom="@drawable/coin"
+                    android:gravity="center"
+                    android:minHeight="40dp"
+                    android:padding="5dp"
+                    android:text="2" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_margin="10dp"
+                    android:layout_weight="1"
+                    android:background="@drawable/shape_sign_bg_none"
+                    android:drawableBottom="@drawable/coin"
+                    android:gravity="center"
+                    android:minHeight="40dp"
+                    android:padding="5dp"
+                    android:text="3" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_margin="10dp"
+                    android:layout_weight="1"
+                    android:background="@drawable/shape_sign_bg_none"
+                    android:drawableBottom="@drawable/coin"
+                    android:gravity="center"
+                    android:minHeight="40dp"
+                    android:padding="5dp"
+                    android:text="4" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_margin="10dp"
+                    android:layout_weight="1"
+                    android:background="@drawable/shape_sign_bg_none"
+                    android:drawableBottom="@drawable/coin"
+                    android:gravity="center"
+                    android:minHeight="40dp"
+                    android:padding="5dp"
+                    android:text="5" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_margin="10dp"
+                    android:layout_weight="1"
+                    android:background="@drawable/shape_sign_bg_none"
+                    android:drawableBottom="@drawable/gift_dlose"
+                    android:gravity="center"
+                    android:minHeight="40dp"
+                    android:padding="5dp"
+                    android:text="6" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/white"
+                android:gravity="center"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/sign_now_but"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="20dp"
+                    android:layout_marginBottom="20dp"
+                    android:background="@drawable/shape_sign_but_bg"
+                    android:paddingLeft="25dp"
+                    android:paddingTop="5dp"
+                    android:paddingRight="25dp"
+                    android:paddingBottom="5dp"
+                    android:text="签到"
+                    android:textColor="@color/white"
+                    android:textSize="16sp" />
+
+                <RelativeLayout
+                    android:id="@+id/sign_guajiangqu"
+                    android:layout_width="250dp"
+                    android:layout_height="80dp"
+                    android:layout_marginBottom="20dp"
+                    android:background="@drawable/guajiang"
+                    android:contentDescription="@string/image_des"
+                    android:visibility="gone">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerInParent="true"
+                        android:text="刮奖区"
+                        android:textColor="#999999"
+                        android:textSize="30sp" />
+                </RelativeLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:background="#ffffff"
+                android:orientation="horizontal"
+                android:padding="16dp">
+
+                <ImageView
+                    android:layout_width="62dp"
+                    android:layout_height="62dp"
+                    android:layout_marginEnd="12dp"
+                    android:adjustViewBounds="true"
+                    android:contentDescription="@string/image_des"
+                    android:src="@mipmap/icon" />
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="早起打卡,好习惯,高回报"
+                        android:textColor="#333333" />
+
+                    <TextView
+                        android:id="@+id/go_to_pack_but"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="right"
+                        android:background="@drawable/shape_but_blue_bg"
+                        android:paddingLeft="10dp"
+                        android:paddingTop="5dp"
+                        android:paddingRight="10dp"
+                        android:paddingBottom="5dp"
+                        android:text="立即参与"
+                        android:textColor="@color/white"
+                        android:textSize="12sp" />
+
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="2000"
+                            android:textColor="#fffe5864"
+                            android:textSize="10sp" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="人参与"
+                            android:textColor="#8E8E8E"
+                            android:textSize="10sp" />
+                    </LinearLayout>
+                </LinearLayout>
             </LinearLayout>
+
+            <ImageView
+                android:id="@+id/go_to_yaoqing"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:layout_marginBottom="10dp"
+                android:background="#ffffff"
+                android:contentDescription="@string/image_des"
+                android:src="@drawable/ic_stdkh_image" />
         </LinearLayout>
     </ScrollView>
 </RelativeLayout>

+ 5 - 11
app/src/main/res/layout/activity_user_nav.xml

@@ -32,18 +32,12 @@
             android:textSize="17sp" />
     </RelativeLayout>
 
-    <LinearLayout
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/new_user_guide_list"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:gravity="center"
-        android:orientation="vertical"
-        app:layout_constraintTop_toBottomOf="@id/title_bar">
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:padding="10dp"
-            android:text="@string/new_nav_tips_title" />
-    </LinearLayout>
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/title_bar" />
 
 </android.support.constraint.ConstraintLayout>

+ 13 - 0
app/src/main/res/layout/header_new_user_nav.xml

@@ -0,0 +1,13 @@
+<?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="wrap_content"
+    android:gravity="center"
+    android:orientation="vertical">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="10dp"
+        android:text="@string/new_nav_tips_title" />
+</LinearLayout>

+ 54 - 0
app/src/main/res/layout/item_new_user_guide.xml

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <TextView
+        android:id="@+id/nav_content_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="16dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginRight="16dp"
+        android:text="QQ好友、微信好友等邀请赢好礼"
+        android:textColor="#0088ff"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/nav_content_text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="16dp"
+        android:text="首先,肯定要把赚钱这种好事推荐给身边,相信小伙伴会喜欢上我们的,通过你的分享朋友就能免费领取6.6元红包,从此踏上赚钱之路,对你感激"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/nav_content_title" />
+
+    <VideoView
+        android:id="@+id/nav_guide_video"
+        android:layout_width="match_parent"
+        android:layout_height="140dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="16dp"
+        android:transitionName="video"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/nav_content_title" />
+
+    <TextView
+        android:id="@+id/nav_guide_video_full"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:padding="8dp"
+        android:text="全屏"
+        android:textColor="@color/bg_write"
+        app:layout_constraintEnd_toEndOf="@+id/nav_guide_video"
+        app:layout_constraintTop_toTopOf="@+id/nav_guide_video" />
+</android.support.constraint.ConstraintLayout>

+ 166 - 0
app/src/main/res/layout/sign_ok_dialog.xml

@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#40000000">
+
+    <LinearLayout
+        android:id="@+id/sign_done_window"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@drawable/bulletwindow"
+        android:gravity="center_horizontal"
+        android:orientation="vertical"
+        android:padding="16dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <TextView
+            android:id="@+id/sign_window_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="签到成功"
+            android:textColor="#ffffffff"
+            android:textSize="36sp" />
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:background="@drawable/shape_sign_window_money_bg"
+            android:gravity="center"
+            android:orientation="horizontal"
+            android:paddingLeft="10dp"
+            android:paddingTop="5dp"
+            android:paddingRight="10dp"
+            android:paddingBottom="5dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="已签到"
+                android:textColor="#ff1c9cf9"
+                android:textSize="12sp" />
+
+            <TextView
+                android:id="@+id/sign_money_number"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="+0.01"
+                android:textColor="#FE5864"
+                android:textSize="12sp" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="元"
+                android:textColor="#ff1c9cf9"
+                android:textSize="12sp" />
+        </LinearLayout>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="60dp"
+            android:text="今日赚钱推荐"
+            android:textColor="#ff089dfa"
+            android:textSize="18sp" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="25dp"
+            android:background="#ffffff"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:layout_width="62dp"
+                android:layout_height="62dp"
+                android:layout_marginEnd="12dp"
+                android:adjustViewBounds="true"
+                android:contentDescription="@string/image_des"
+                android:src="@mipmap/icon" />
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_weight="1"
+                    android:text="早起打卡,好习惯,高回报"
+                    android:textColor="#333333" />
+
+                <ImageView
+                    android:id="@+id/sign_window_tag_image"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:contentDescription="@string/image_des"
+                    android:visibility="gone" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="+0.8元"
+                    android:textColor="#fffe5864"
+                    android:textSize="15sp" />
+            </LinearLayout>
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/sign_window_next"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="12dp"
+                android:background="@drawable/shape_sign_green_but_bg"
+                android:paddingLeft="20dp"
+                android:paddingTop="5dp"
+                android:paddingRight="20dp"
+                android:paddingBottom="5dp"
+                android:text="换一个"
+                android:textColor="#ffffff"
+                android:textSize="16sp" />
+
+            <TextView
+                android:id="@+id/sign_window_share"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="12dp"
+                android:background="@drawable/shape_sign_blue_but_bg"
+                android:paddingLeft="20dp"
+                android:paddingTop="5dp"
+                android:paddingRight="20dp"
+                android:paddingBottom="5dp"
+                android:text="去分享"
+                android:textColor="#ffffffff"
+                android:textSize="16sp" />
+        </LinearLayout>
+    </LinearLayout>
+
+    <ImageView
+        android:id="@+id/close_but"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:contentDescription="@string/image_des"
+        android:src="@drawable/close"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/sign_done_window" />
+</android.support.constraint.ConstraintLayout>

+ 29 - 0
app/src/main/res/layout/view_title_bar.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/title_bar"
+    android:layout_width="match_parent"
+    android:layout_height="?actionBarSize"
+    android:background="#ffffff"
+    android:gravity="center_vertical"
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp">
+
+    <ImageView
+        android:id="@+id/back_but"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:contentDescription="@string/image_des"
+        android:padding="10dp"
+        android:src="@drawable/narrow_back_black" />
+
+    <TextView
+        android:id="@+id/title_text"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_centerInParent="true"
+        android:gravity="center"
+        android:text="新手引导"
+        android:textColor="#333333"
+        android:textSize="17sp" />
+</RelativeLayout>

+ 55 - 0
app/src/main/res/layout/viiew_publish_phone_and_capture.xml

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:id="@+id/publish_done_but"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/shape_publish_screen_capture_bg"
+        android:gravity="center"
+        android:padding="12dp"
+        android:text="确定"
+        android:textSize="16sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/shape_publish_screen_capture_bg"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toTopOf="@+id/publish_done_but"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent">
+
+        <EditText
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="10dp"
+            android:background="@null"
+            android:hint="请输入手机号"
+            android:inputType="phone"
+            android:padding="10dp"
+            android:textSize="12sp" />
+
+        <HorizontalScrollView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:contentDescription="@string/image_des" />
+            </LinearLayout>
+        </HorizontalScrollView>
+    </LinearLayout>
+</android.support.constraint.ConstraintLayout>

+ 2 - 4
app/src/main/res/values/attrs.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <declare-styleable name="MutiProgress">
-        <attr name="nodesNum" format="integer"/> <!-- 节点数量 -->
-        <attr name="nodeRadius" format="dimension"/>
+        <attr name="nodesNum" format="integer" /> <!-- 节点数量 -->
+        <attr name="nodeRadius" format="dimension" />
         <attr name="progressingDrawable" format="reference" />
         <attr name="unprogressingDrawable" format="reference" />  <!-- 未完成的节点图标 -->
         <attr name="progresFailDrawable" format="reference" />
@@ -12,6 +12,4 @@
         <attr name="currNodeNO" format="integer" />   <!-- 当前所到达的节点编号  0开始计算-->
         <attr name="currNodeState" format="integer" />   <!-- 当前所到达的节点状态,0:失败  1:成功 -->
     </declare-styleable>
-
-
 </resources>

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

@@ -113,4 +113,5 @@
     <string name="search_but_text">搜索</string>
     <string name="search_hint_txt">搜索任务名称/游戏名称</string>
     <string name="new_nav_tips_title">亲爱的羊羊伙伴:\n\n  为了让你赚更多的钱,羊羊平台经过仔细整理,特整理出如下新手引导及赚钱攻略,按此攻略可赚取更多的钱!具体攻略如下:</string>
+    <string name="sign_active_rule_text">1.每连续6天可进行刮奖活动。刮奖可刮出现金及其他福利奖品,金额不定。六天过后将会从新计算连续周期。 \n2.每天签到可领取现金,金额不定。 \n3.错过了签到还可以通过分享获得补签。 \n4.连续签到6天可获得刮奖机会,刮奖可刮出高额现金,请坚持签到。 \n5.签到刮出来的现金可直接提现。 \n6.本活动解释权归小绵羊团服所有。</string>
 </resources>