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

添加部分界面,更新日历组件

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

+ 1 - 1
app/build.gradle

@@ -346,7 +346,7 @@ dependencies {
 //    implementation 'com.github.nanchen2251:CompressHelper:1.0.5'
 //    implementation 'com.github.nanchen2251:CompressHelper:1.0.5'
 //    implementation(name: 'compresshelper-release', ext: 'aar')
 //    implementation(name: 'compresshelper-release', ext: 'aar')
     implementation files('libs/compresshelper-release.jar')
     implementation files('libs/compresshelper-release.jar')
-    implementation ('com.haibin:calendarview:3.4.4') {
+    implementation ('com.haibin:calendarview:3.4.8') {
         exclude group: 'com.android.support', module: 'appcompat-v7'
         exclude group: 'com.android.support', module: 'appcompat-v7'
         exclude group: 'com.android.support', module: 'recyclerview-v7'
         exclude group: 'com.android.support', module: 'recyclerview-v7'
     }
     }

+ 20 - 0
app/src/main/AndroidManifest.xml

@@ -793,6 +793,26 @@
         <activity
         <activity
             android:name="com.sheep.gamegroup.view.activity.ActFootprint"
             android:name="com.sheep.gamegroup.view.activity.ActFootprint"
             android:screenOrientation="portrait" />
             android:screenOrientation="portrait" />
+        <!-- 小绵羊3.4.5 收徒红包  -->
+        <activity
+            android:name="com.sheep.gamegroup.view.activity.ActApprenticeRedPacket"
+            android:screenOrientation="portrait" />
+        <!-- 小绵羊3.4.5 兑换商城  -->
+        <activity
+            android:name="com.sheep.gamegroup.view.activity.ActExchangeMall"
+            android:screenOrientation="portrait" />
+        <!-- 小绵羊3.4.5 每日分享  -->
+        <activity
+            android:name="com.sheep.gamegroup.view.activity.ActEveryDayShare"
+            android:screenOrientation="portrait" />
+        <!-- 小绵羊3.4.5 娱乐抽奖  -->
+        <activity
+            android:name="com.sheep.gamegroup.view.activity.ActEntertainmentLuckDraw"
+            android:screenOrientation="portrait" />
+        <!-- 小绵羊3.4.5 金币中心  -->
+        <activity
+            android:name="com.sheep.gamegroup.view.activity.ActCoinCenter"
+            android:screenOrientation="portrait" />
     </application>
     </application>
 
 
 </manifest>
 </manifest>

+ 9 - 0
app/src/main/java/com/sheep/gamegroup/model/entity/EveryDayShare.java

@@ -0,0 +1,9 @@
+package com.sheep.gamegroup.model.entity;
+
+/**
+ * Created by realicing on 2018/11/23.
+ * realicing@sina.com
+ * 小绵羊3.4.5新增--每日分享
+ */
+public class EveryDayShare {
+}

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

@@ -532,19 +532,19 @@ public class CommonUtil {
                 Jump2View.getInstance().goActFootPrint();
                 Jump2View.getInstance().goActFootPrint();
                 break;
                 break;
             case IDConstant.JUMP_APPRENTICE_RED_PACKET://收徒红包
             case IDConstant.JUMP_APPRENTICE_RED_PACKET://收徒红包
-                G.showToast(R.string.coming_soon);
+                Jump2View.getInstance().goActApprenticeRedPacket();
                 break;
                 break;
             case IDConstant.JUMP_EXCHANGE_MALL://兑换商城
             case IDConstant.JUMP_EXCHANGE_MALL://兑换商城
-                G.showToast(R.string.coming_soon);
+                Jump2View.getInstance().goActExchangeMall();
                 break;
                 break;
             case IDConstant.JUMP_EVERY_DAY_SHARE://每日分享
             case IDConstant.JUMP_EVERY_DAY_SHARE://每日分享
-                G.showToast(R.string.coming_soon);
+                Jump2View.getInstance().goActEveryDayShare();
                 break;
                 break;
             case IDConstant.JUMP_ENTERTAINMENT_LUCK_DRAW://娱乐抽奖
             case IDConstant.JUMP_ENTERTAINMENT_LUCK_DRAW://娱乐抽奖
-                G.showToast(R.string.coming_soon);
+                Jump2View.getInstance().goActEntertainmentLuckDraw();
                 break;
                 break;
             case IDConstant.JUMP_COIN_CENTER://金币中心
             case IDConstant.JUMP_COIN_CENTER://金币中心
-                G.showToast(R.string.coming_soon);
+                Jump2View.getInstance().goActCoinCenter();
                 break;
                 break;
             default:
             default:
                 String url = jump.getUrl();
                 String url = jump.getUrl();

+ 45 - 0
app/src/main/java/com/sheep/gamegroup/util/Jump2View.java

@@ -44,14 +44,19 @@ import com.sheep.gamegroup.model.entity.WebviewEntity;
 import com.sheep.gamegroup.model.entity.XianWanEntity;
 import com.sheep.gamegroup.model.entity.XianWanEntity;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.util.share.ShareLinkConfig;
 import com.sheep.gamegroup.util.share.ShareLinkConfig;
+import com.sheep.gamegroup.view.activity.ActApprenticeRedPacket;
 import com.sheep.gamegroup.view.activity.ActArticleComment;
 import com.sheep.gamegroup.view.activity.ActArticleComment;
 import com.sheep.gamegroup.view.activity.ActAudit;
 import com.sheep.gamegroup.view.activity.ActAudit;
 import com.sheep.gamegroup.view.activity.ActBindMobileRegister;
 import com.sheep.gamegroup.view.activity.ActBindMobileRegister;
+import com.sheep.gamegroup.view.activity.ActCoinCenter;
 import com.sheep.gamegroup.view.activity.ActCommentGameApp;
 import com.sheep.gamegroup.view.activity.ActCommentGameApp;
 import com.sheep.gamegroup.view.activity.ActCreditCardTaskList;
 import com.sheep.gamegroup.view.activity.ActCreditCardTaskList;
 import com.sheep.gamegroup.view.activity.ActCreditCardWeb;
 import com.sheep.gamegroup.view.activity.ActCreditCardWeb;
 import com.sheep.gamegroup.view.activity.ActDownloadWelfareList;
 import com.sheep.gamegroup.view.activity.ActDownloadWelfareList;
+import com.sheep.gamegroup.view.activity.ActEntertainmentLuckDraw;
+import com.sheep.gamegroup.view.activity.ActEveryDayShare;
 import com.sheep.gamegroup.view.activity.ActExchangeCMCC;
 import com.sheep.gamegroup.view.activity.ActExchangeCMCC;
+import com.sheep.gamegroup.view.activity.ActExchangeMall;
 import com.sheep.gamegroup.view.activity.ActFootprint;
 import com.sheep.gamegroup.view.activity.ActFootprint;
 import com.sheep.gamegroup.view.activity.ActGameAccount;
 import com.sheep.gamegroup.view.activity.ActGameAccount;
 import com.sheep.gamegroup.view.activity.ActGameAgencyRecharge;
 import com.sheep.gamegroup.view.activity.ActGameAgencyRecharge;
@@ -2279,4 +2284,44 @@ public class Jump2View {
         Intent intent = new Intent(activity, ActFootprint.class);
         Intent intent = new Intent(activity, ActFootprint.class);
         activity.startActivity(intent);
         activity.startActivity(intent);
     }
     }
+    /**
+     * 小绵羊3.4.5新增--跳转到收徒红包界面
+     */
+    public void goActApprenticeRedPacket() {
+        Activity activity = ActivityManager.getInstance().currentActivity();
+        Intent intent = new Intent(activity, ActApprenticeRedPacket.class);
+        activity.startActivity(intent);
+    }
+    /**
+     * 小绵羊3.4.5新增--跳转到兑换商城界面
+     */
+    public void goActExchangeMall() {
+        Activity activity = ActivityManager.getInstance().currentActivity();
+        Intent intent = new Intent(activity, ActExchangeMall.class);
+        activity.startActivity(intent);
+    }
+    /**
+     * 小绵羊3.4.5新增--跳转到每日分享界面
+     */
+    public void goActEveryDayShare() {
+        Activity activity = ActivityManager.getInstance().currentActivity();
+        Intent intent = new Intent(activity, ActEveryDayShare.class);
+        activity.startActivity(intent);
+    }
+    /**
+     * 小绵羊3.4.5新增--跳转到娱乐抽奖界面
+     */
+    public void goActEntertainmentLuckDraw() {
+        Activity activity = ActivityManager.getInstance().currentActivity();
+        Intent intent = new Intent(activity, ActEntertainmentLuckDraw.class);
+        activity.startActivity(intent);
+    }
+    /**
+     * 小绵羊3.4.5新增--跳转到金币中心界面
+     */
+    public void goActCoinCenter() {
+        Activity activity = ActivityManager.getInstance().currentActivity();
+        Intent intent = new Intent(activity, ActCoinCenter.class);
+        activity.startActivity(intent);
+    }
 }
 }

+ 20 - 0
app/src/main/java/com/sheep/gamegroup/view/activity/ActApprenticeRedPacket.java

@@ -0,0 +1,20 @@
+package com.sheep.gamegroup.view.activity;
+
+import android.support.v4.app.Fragment;
+
+import com.sheep.gamegroup.absBase.BaseContainerActivity;
+import com.sheep.gamegroup.view.fragment.FgtFootprint;
+
+/**
+ * Created by realicing on 2018/11/23.
+ * realicing@sina.com
+ * 小绵羊3.4.5新增--收徒红包
+ */
+public class ActApprenticeRedPacket extends BaseContainerActivity {
+
+    @Override
+    protected Fragment initFragment() {
+        return new FgtFootprint();
+    }
+
+}

+ 20 - 0
app/src/main/java/com/sheep/gamegroup/view/activity/ActCoinCenter.java

@@ -0,0 +1,20 @@
+package com.sheep.gamegroup.view.activity;
+
+import android.support.v4.app.Fragment;
+
+import com.sheep.gamegroup.absBase.BaseContainerActivity;
+import com.sheep.gamegroup.view.fragment.FgtFootprint;
+
+/**
+ * Created by realicing on 2018/11/23.
+ * realicing@sina.com
+ * 小绵羊3.4.5新增--金币中心
+ */
+public class ActCoinCenter extends BaseContainerActivity {
+
+    @Override
+    protected Fragment initFragment() {
+        return new FgtFootprint();
+    }
+
+}

+ 20 - 0
app/src/main/java/com/sheep/gamegroup/view/activity/ActEntertainmentLuckDraw.java

@@ -0,0 +1,20 @@
+package com.sheep.gamegroup.view.activity;
+
+import android.support.v4.app.Fragment;
+
+import com.sheep.gamegroup.absBase.BaseContainerActivity;
+import com.sheep.gamegroup.view.fragment.FgtFootprint;
+
+/**
+ * Created by realicing on 2018/11/23.
+ * realicing@sina.com
+ * 小绵羊3.4.5新增--娱乐抽奖
+ */
+public class ActEntertainmentLuckDraw extends BaseContainerActivity {
+
+    @Override
+    protected Fragment initFragment() {
+        return new FgtFootprint();
+    }
+
+}

+ 21 - 0
app/src/main/java/com/sheep/gamegroup/view/activity/ActEveryDayShare.java

@@ -0,0 +1,21 @@
+package com.sheep.gamegroup.view.activity;
+
+import android.support.v4.app.Fragment;
+
+import com.sheep.gamegroup.absBase.BaseContainerActivity;
+import com.sheep.gamegroup.view.fragment.FgtEveryDayShare;
+import com.sheep.gamegroup.view.fragment.FgtFootprint;
+
+/**
+ * Created by realicing on 2018/11/23.
+ * realicing@sina.com
+ * 小绵羊3.4.5新增--每日分享
+ */
+public class ActEveryDayShare extends BaseContainerActivity {
+
+    @Override
+    protected Fragment initFragment() {
+        return new FgtEveryDayShare();
+    }
+
+}

+ 20 - 0
app/src/main/java/com/sheep/gamegroup/view/activity/ActExchangeMall.java

@@ -0,0 +1,20 @@
+package com.sheep.gamegroup.view.activity;
+
+import android.support.v4.app.Fragment;
+
+import com.sheep.gamegroup.absBase.BaseContainerActivity;
+import com.sheep.gamegroup.view.fragment.FgtFootprint;
+
+/**
+ * Created by realicing on 2018/11/23.
+ * realicing@sina.com
+ * 小绵羊3.4.5新增--兑换商城
+ */
+public class ActExchangeMall extends BaseContainerActivity {
+
+    @Override
+    protected Fragment initFragment() {
+        return new FgtFootprint();
+    }
+
+}

+ 29 - 0
app/src/main/java/com/sheep/gamegroup/view/adapter/AdpEveryDayShare.java

@@ -0,0 +1,29 @@
+package com.sheep.gamegroup.view.adapter;
+
+import com.sheep.gamegroup.model.entity.EveryDayShare;
+import com.sheep.gamegroup.util.ViewHolder;
+import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.SheepApp;
+
+import java.util.List;
+
+/**
+ * Created by realicing on 2018/11/23.
+ * realicing@sina.com
+ * 小绵羊3.4.5新增--每日分享
+ */
+public class AdpEveryDayShare extends AdbCommonRecycler<EveryDayShare>{
+    public AdpEveryDayShare(List<EveryDayShare> list) {
+        super(SheepApp.getInstance(), list);
+    }
+
+    @Override
+    public int getViewIdByType(int type) {
+        return R.layout.item_every_day_share;
+    }
+
+    @Override
+    public void convert(ViewHolder holder, EveryDayShare everyDayShare) {
+
+    }
+}

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

@@ -83,6 +83,12 @@ public class FgtArticleComment extends BaseListFragment3<UserComment> implements
     //输入框
     //输入框
     private EditText input_comment_input;
     private EditText input_comment_input;
 
 
+    //是否显示无数据占位图
+    protected void updateEmptyView() {
+        if (useSelfEmpty())
+            CommonUtil.getInstance().updateEmptyView(empty_view, list.isEmpty() && (article_id <= 0 || article == null));
+    }
+
     @Override
     @Override
     public void initView() {
     public void initView() {
         TitleBarUtils.getInstance().setTitle(getView(), "详情")
         TitleBarUtils.getInstance().setTitle(getView(), "详情")

+ 37 - 0
app/src/main/java/com/sheep/gamegroup/view/fragment/FgtEveryDayShare.java

@@ -0,0 +1,37 @@
+package com.sheep.gamegroup.view.fragment;
+
+import android.support.v7.widget.RecyclerView;
+
+import com.sheep.gamegroup.model.api.ApiService;
+import com.sheep.gamegroup.model.entity.BaseMessage;
+import com.sheep.gamegroup.model.entity.EveryDayShare;
+import com.sheep.gamegroup.view.adapter.AdpEveryDayShare;
+
+import io.reactivex.Observable;
+
+/**
+ * Created by realicing on 2018/11/23.
+ * realicing@sina.com
+ * 小绵羊3.4.5新增--每日分享
+ */
+public class FgtEveryDayShare extends BaseListFragment2<EveryDayShare>{
+    @Override
+    protected RecyclerView.Adapter getAdapter() {
+        return new AdpEveryDayShare(list);
+    }
+
+    @Override
+    protected String getKey(int page, int per_page) {
+        return null;
+    }
+
+    @Override
+    protected Observable<BaseMessage> getApi(ApiService apiService) {
+        return null;
+    }
+
+    @Override
+    protected Class<EveryDayShare> getTClass() {
+        return EveryDayShare.class;
+    }
+}

+ 6 - 0
app/src/main/res/layout/item_every_day_share.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+</android.support.constraint.ConstraintLayout>