Merge remote-tracking branch 'origin/sheep2.0' into sheep2.0

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

@@ -92,6 +92,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 
 import javax.inject.Inject;
 

app/src/main/java/com/kfzs/duanduan/services/DownloadTaskService.java

@@ -10,6 +10,8 @@ import com.arialyy.aria.core.download.DownloadTarget;
 import com.kfzs.duanduan.KFZSApp;
 import com.kfzs.duanduan.datashare.DDProviderHelper;
 import com.kfzs.duanduan.datashare.provider.download.DownLoadInfo;
+import com.kfzs.duanduan.event.BigEvent;
+import com.kfzs.duanduan.event.EventTypes;
 import com.sheep.gamegroup.model.entity.DialogEntity;
 import com.sheep.gamegroup.model.entity.TaskEty;
 import com.sheep.gamegroup.util.CommonUtil;
@@ -20,6 +22,8 @@ import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 
+import org.greenrobot.eventbus.EventBus;
+
 import java.io.File;
 import java.util.List;
 
@@ -376,6 +380,8 @@ public class DownloadTaskService {
             filePath = DIR+ File.separator+downLoadInfo.getMGameName()+ ClassFileHelper.FILE_SUFFIX;
         }
         task.setFilePath(filePath).start();
+        //发送红点
+        EventBus.getDefault().post(BigEvent.get().setEventTypes(EventTypes.TIPS_DOWN_ICON));
     }
 
     public void pause(DownLoadInfo downLoadInfo) {

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

@@ -98,7 +98,9 @@ public class ActMainGame extends BaseActivity {
                     @Override
                     public void onClick(View view) {
                         startActivity(new Intent(activity, ActDownloadMgr.class));
-                        mImgDot.setVisibility(View.GONE);
+//                        mImgDot.setVisibility(View.GONE);
+                        TitleBarUtils.getInstance()
+                                .setRightRedPoint(activity, View.GONE);
                         UMConfigUtils.onEvent(UMConfigUtils.Event.GAME_DOWNLOAD_MANAGER);
                     }
                 });
@@ -323,7 +325,9 @@ public class ActMainGame extends BaseActivity {
     public void onEventMainThread(BigEvent event) {
         switch (event.getEventTypes()) {
             case TIPS_DOWN_ICON:
-                mImgDot.setVisibility(View.VISIBLE);
+//                mImgDot.setVisibility(View.VISIBLE);
+                  TitleBarUtils.getInstance()
+                          .setRightRedPoint(activity, View.VISIBLE);
                 break;
             case STORAGE_LOW:
                 DialogStorageLow.showDialog(this);

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

@@ -11,15 +11,18 @@ import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.alipay.PayResult;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.RechargeEntity;
+import com.sheep.gamegroup.model.entity.RechargePriceEntity;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.MyGridview;
 import com.sheep.gamegroup.view.adapter.RechargeAdapter;
+import com.sheep.gamegroup.view.adapter.RechargePriceAdapter;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import butterknife.BindView;
@@ -37,6 +40,8 @@ public class SignRechargeAct extends BaseActivity {
     int mPayType = -1;//选择支付方式的id
     String mAmount = null;//支付的金额
 
+    @BindView(R.id.rechargeprice_greidview)
+    MyGridview rechargeprice_greidview;
     @BindView(R.id.recharge_greidview)
     MyGridview rechargeGreidview;
 
@@ -44,10 +49,13 @@ public class SignRechargeAct extends BaseActivity {
     @BindView(R.id.et_recharge_price)
     EditText etRechargePrice;
 
+    RechargePriceAdapter rechargePriceAdapter;
+    List<RechargePriceEntity> mPriceEntityList = new ArrayList<>();
+    int select = -1;
 
     @Override
     protected int getLayoutId() {
-        return R.layout.signrecharge_act_layout;
+        return R.layout.recharge_act_layout;
     }
 
     @Override
@@ -64,6 +72,31 @@ public class SignRechargeAct extends BaseActivity {
     @Override
     public void initData() {
 
+        addDatas();
+        /**
+         * 支付金额选择
+         */
+        rechargePriceAdapter = new RechargePriceAdapter(SignRechargeAct.this, mPriceEntityList);
+        rechargeprice_greidview.setVerticalSpacing(20);
+        rechargeprice_greidview.setAdapter(rechargePriceAdapter);
+        rechargeprice_greidview.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                select = position;
+                rechargePriceAdapter.setInPut(false);
+                RechargePriceEntity rechargePriceEntity = (RechargePriceEntity) parent.getItemAtPosition(position);
+                etRechargePrice.setText("" + rechargePriceEntity.getPrice());
+                for (int i = 0; i < mPriceEntityList.size(); i++) {
+                    if (position == i) {
+                        mPriceEntityList.get(i).setSelectState(true);
+                    } else {
+                        mPriceEntityList.get(i).setSelectState(false);
+                    }
+                }
+                rechargePriceAdapter.notifyDataSetChanged();
+
+            }
+        });
 
         /**
          * 支付方式选择
@@ -197,4 +230,13 @@ public class SignRechargeAct extends BaseActivity {
         payThread.start();
     }
 
+
+    private void addDatas() {
+        mPriceEntityList.add(new RechargePriceEntity(false,"10元", 10));
+        mPriceEntityList.add(new RechargePriceEntity(false,"20元", 20));
+        mPriceEntityList.add(new RechargePriceEntity(false,"50元", 50));
+        mPriceEntityList.add(new RechargePriceEntity(false,"100元", 100));
+        mPriceEntityList.add(new RechargePriceEntity(false,"200元", 200));
+        mPriceEntityList.add(new RechargePriceEntity(false,"500元", 500));
+    }
 }

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

@@ -69,6 +69,7 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 
 import javax.inject.Inject;
 
@@ -543,7 +544,16 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                         public void onNext(BaseMessage baseMessage) {
                             LogUtil.println("MonitorAppService baseMessage onNext "+ JSON.toJSONString(baseMessage));
                             CommonUtil.getInstance().setTAskEnty(null);
-                            G.showToast(String.format(Locale.CHINA, "恭喜你，任务已完成，获得奖励%s元", taskReleaseEty.getBonus()));
+                            String amount = taskReleaseEty.getBonus();
+                            try{
+                                Map h = JSON.parseObject(baseMessage.getData() +"");
+
+                                amount = h.get("amount") + "";
+                            }catch (Exception e){
+                                e.printStackTrace();
+                            }
+
+                            G.showToast(String.format(Locale.CHINA, "恭喜你，任务已完成，获得奖励%s元", TextUtils.isEmpty(amount) ? taskReleaseEty.getBonus() : amount));
                             finish();
                         }
 

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

@@ -13,6 +13,8 @@ import android.widget.LinearLayout;
 
 import com.alibaba.fastjson.JSONArray;
 import com.kfzs.duanduan.ActDownloadMgr;
+import com.kfzs.duanduan.event.BigEvent;
+import com.kfzs.duanduan.view.DialogStorageLow;
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.GridViewEntity;
@@ -27,6 +29,9 @@ import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
@@ -77,6 +82,7 @@ public class TryMakeMoneyact extends BaseActivity {
     @Override
     public void initView() {
         activity = this;
+        EventBus.getDefault().register(activity);
         is_succession = getIntent()
                 .getIntExtra(
                         "is_succession", 0);
@@ -91,6 +97,8 @@ public class TryMakeMoneyact extends BaseActivity {
                 .setRightImgBotton(activity, R.drawable.index_download, new View.OnClickListener() {
                     @Override
                     public void onClick(View view) {
+                        TitleBarUtils.getInstance()
+                                .setRightRedPoint(activity, View.GONE);
                         startActivity(new Intent(TryMakeMoneyact.this, ActDownloadMgr.class));
                         UMConfigUtils.onEvent(UMConfigUtils.Event.GAME_DOWNLOAD_MANAGER);
                     }
@@ -229,4 +237,25 @@ public class TryMakeMoneyact extends BaseActivity {
         }
         tabGridviewAdp.notifyDataSetChanged();
     }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        EventBus.getDefault().unregister(this);
+    }
+
+    /**
+     * 主要的事件广播接收更新处理
+     *
+     * @param event
+     */
+    @Subscribe
+    public void onEventMainThread(BigEvent event) {
+        switch (event.getEventTypes()) {
+            case TIPS_DOWN_ICON:
+                TitleBarUtils.getInstance()
+                        .setRightRedPoint(activity, View.VISIBLE);
+                break;
+        }
+    }
 }

app/src/main/java/com/sheep/jiuyan/samllsheep/utils/TitleBarUtils.java

@@ -164,13 +164,22 @@ public class TitleBarUtils {
     }
 
     /**
+     * 设置红点是否显示
+     * @param activity
+     * @param visibility
+     */
+    public void setRightRedPoint(Activity activity, int visibility){
+
+        activity.findViewById(R.id.img_download_manager_dots).setVisibility(visibility);
+    }
+
+    /**
      * 设置右边按钮显示状态
      *
      * @param activity
      * @param visibility
      */
     public void setRightBtnVisibility(Activity activity, int visibility) {
-        activity.findViewById(R.id.btn_baseactivity_right).setVisibility(visibility);
     }
 
     /**

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

@@ -26,19 +26,39 @@
         android:textSize="@dimen/text_size_4"/>
 
     <!--右边按钮-->
-    <Button
-        android:id="@+id/btn_baseactivity_right"
-        style="?android:attr/borderlessButtonStyle"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_marginRight="5dp"
-        android:background="@color/translate"
-        android:gravity="center"
-        android:minWidth="@dimen/layout_heigh_default"
-        android:textColor="@color/black_text_deep"
-        android:textSize="@dimen/text_size_3"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentEnd="true" />
+
+    <RelativeLayout
+        android:id="@+id/download_layouts"
+        android:layout_width="@dimen/app_nav_toolbar_height"
+        android:layout_height="@dimen/app_nav_toolbar_height"
+        android:layout_alignParentRight="true"
+        android:layout_centerInParent="true"
+        android:visibility="visible">
+
+        <Button
+            android:id="@+id/btn_baseactivity_right"
+            style="?android:attr/borderlessButtonStyle"
+            android:layout_width="@dimen/app_nav_toolbar_height"
+            android:layout_height="@dimen/app_nav_toolbar_height"
+            android:layout_marginRight="5dp"
+            android:background="@color/translate"
+            android:gravity="center"
+            android:minWidth="@dimen/layout_heigh_default"
+            android:textColor="@color/black_text_deep"
+            android:textSize="@dimen/text_size_3"
+            android:layout_alignParentTop="true"
+            android:layout_alignParentEnd="true" />
+
+        <ImageView
+            android:id="@+id/img_download_manager_dots"
+            android:layout_width="6dp"
+            android:layout_height="6dp"
+            android:layout_alignParentRight="true"
+            android:layout_marginRight="10dp"
+            android:layout_marginTop="10dp"
+            android:src="@drawable/sp_dot_red"
+            android:visibility="gone" />
+    </RelativeLayout>
     <!--右边图片按钮-->
     <ImageButton
         android:id="@+id/ibtn_baseactivity_right"