搜索游戏添加下载游戏功能

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

@@ -123,7 +123,6 @@ public class FgtPersonalCenter extends BaseCompatFragment {
         String appVersonName = ApkUtils.getCurrentPkgVersionName(SheepApp.getInstance());
         version_item_tv.setText("小绵羊V");
         version_item_tv.append(appVersonName);
-        getShardData();
         initCacheSize();
 
     }
@@ -228,8 +227,8 @@ public class FgtPersonalCenter extends BaseCompatFragment {
                 Jump2View.getInstance().goFeedbackAct(activity);
                 break;
             case R.id.recommend_friend_layout://推荐给好友
-                if (Ety != null) {
-                    ViewUtil.shareLink(activity, Ety.getShare_link());
+                if (userEntitys != null) {
+                    ViewUtil.shareLink(activity, userEntitys.getShareLink());
                 }
                 USER_SHARE.onEvent();
                 break;
@@ -270,34 +269,6 @@ public class FgtPersonalCenter extends BaseCompatFragment {
     }
 
 
-    FriendAndAwardEntity Ety;
-
-    /**
-     * 获取分享数据
-     */
-    private void getShardData() {
-        SheepApp.getInstance().getNetComponent().getApiService().FriendCountAndAward()
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
-                    @Override
-                    public void onError(BaseMessage baseMessage) {
-                        showToast(baseMessage.getMsg());
-                    }
-
-                    @Override
-                    public void onNext(BaseMessage baseMessage) {
-                        if (baseMessage != null) {
-                            Ety = FastJsonUtils.toBean(JSONObject.toJSONString(baseMessage.getData()), FriendAndAwardEntity.class);
-                        } else {
-                            showToast("数据解析出错");
-                        }
-
-                    }
-                });
-
-    }
-
     @Override
     public void onResume() {
         super.onResume();

app/src/main/java/com/sheep/gamegroup/model/entity/TaskReleaseEty.java

@@ -2,6 +2,8 @@ package com.sheep.gamegroup.model.entity;
 
 import android.text.TextUtils;
 
+import com.sheep.gamegroup.heler.DownloadHelper;
+
 import java.io.Serializable;
 
 /**
@@ -249,4 +251,11 @@ public class TaskReleaseEty implements Serializable{
     public boolean isOffline() {
         return status == 3 || status == 4;
     }
+
+
+    private DownloadHelper downloadHelper = new DownloadHelper();
+
+    public DownloadHelper getDownloadHelper() {
+        return downloadHelper;
+    }
 }

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

@@ -4,6 +4,7 @@ import android.support.v7.widget.AppCompatAutoCompleteTextView;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.text.Editable;
+import android.text.InputFilter;
 import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.view.KeyEvent;
@@ -124,24 +125,21 @@ public class ActSearchGame extends BaseActivity {
                 TextView find_information_game_time = (TextView) itemView.findViewById(R.id.find_information_game_time);
                 TextView find_information_game_yuan = (TextView) itemView.findViewById(R.id.find_information_game_yuan);
                 TextView find_information_game_task = (TextView) itemView.findViewById(R.id.find_information_game_task);
+                TextView find_information_game_task0 = (TextView) itemView.findViewById(R.id.find_information_game_task0);
                 ViewUtil.setImage(find_information_game_icon, taskEty.getIcon());
                 ViewUtil.setText(find_information_game_name, item.getName());
                 ViewUtil.setText(find_information_game_surplus);
                 ViewUtil.setText(find_information_game_time, taskEty.getTask_name());
                 find_information_game_yuan.setVisibility(View.GONE);
-                find_information_game_task.setText("立即充值");
-                find_information_game_task.setOnClickListener(new View.OnClickListener() {
+                find_information_game_task0.setVisibility(View.VISIBLE);
+                find_information_game_task0.setText("立即充值");
+                find_information_game_task0.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View view) {
                         ViewUtil.showGamePayAccount(activity, taskEty.getThird_task_id(), item.getName());
                     }
                 });
-                itemView.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View view) {
-                        Jump2View.getInstance().goTaskDetailView(activity, item.getId());
-                    }
-                });
+                item.getDownloadHelper().updateDownloadTaskView(activity, taskEty, find_information_game_task);
             }
         };
         search_game_list.setAdapter(adapter);
@@ -175,6 +173,9 @@ public class ActSearchGame extends BaseActivity {
     };
     @Override
     public void initListener() {
+        if(TestUtil.isTest()){
+            search_game_input.setFilters(new InputFilter[]{new InputFilter.LengthFilter(1000)});
+        }
         search_game_input.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
@@ -192,16 +193,15 @@ public class ActSearchGame extends BaseActivity {
 
             @Override
             public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
-                if(search_game_input.getText().toString().startsWith("http") && TestUtil.isTest()){//测试用
-                    return;
-                }
-                search_game_input.removeCallbacks(autoSearchRunnable);
-                search_game_input.postDelayed(autoSearchRunnable, 1000L);//1秒后自动搜索
             }
 
             @Override
             public void afterTextChanged(Editable editable) {
-
+                if(editable.toString().startsWith("h") && TestUtil.isTest()){//测试用 http中的h开头
+                    return;
+                }
+                search_game_input.removeCallbacks(autoSearchRunnable);
+                search_game_input.postDelayed(autoSearchRunnable, 1000L);//1秒后自动搜索
             }
         });
     }
@@ -265,7 +265,7 @@ public class ActSearchGame extends BaseActivity {
         searchGameRecord.setTime(System.currentTimeMillis());
         MyDbManager.getInstance().saveOrUpdate(searchGameRecord);
         searchGameRecordList.add(searchGameRecord);
-//        inputAdapter.notifyDataSetChanged();
+//        initInput();
 
         if(inputText.startsWith("http") && inputText.length() > 6 && TestUtil.isTest()){//测试用
             Jump2View.getInstance().goWeb(activity, inputText, "测试内部H5");

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

@@ -1,10 +1,8 @@
 package com.sheep.gamegroup.view.activity;
 
-import android.app.AlertDialog;
 import android.support.v4.view.ViewPager;
 import android.util.SparseArray;
 import android.view.View;
-import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
@@ -15,8 +13,10 @@ import com.sheep.gamegroup.di.components.DaggerAskGetMoneyComponent;
 import com.sheep.gamegroup.di.modules.AskGetMoneyModule;
 import com.sheep.gamegroup.model.entity.DialogConfig;
 import com.sheep.gamegroup.model.entity.FriendAndAwardEntity;
+import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.presenter.AskGetMoneyContract;
 import com.sheep.gamegroup.presenter.AskGetMoneyPresenter;
+import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.StringUtils;
 import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
@@ -34,6 +34,7 @@ import javax.inject.Inject;
 
 import butterknife.BindView;
 import butterknife.OnClick;
+import rx.functions.Action1;
 
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.LINK_SHARE;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.QR_COPY;
@@ -95,11 +96,18 @@ public class AskGetMoneyAct extends BaseUMActivity implements UMShareListener, A
     public void initListener() {
 
     }
-
+    private UserEntity userEntity;
     @Override
     public void initData() {
         showProgress();
         mPresenter.getTask(null);
+        CommonUtil.getInstance().updateUserInfo(new Action1<UserEntity>() {
+            @Override
+            public void call(UserEntity result) {
+                if(result != null)
+                    userEntity = result;
+            }
+        });
     }
 
     private void shareToWX() {
@@ -111,8 +119,12 @@ public class AskGetMoneyAct extends BaseUMActivity implements UMShareListener, A
     }
 
     private void shareToOther(int code) {
+        if(userEntity == null){
+            G.showToast("数据正在加载中");
+            return;
+        }
         UMImage thumb = new UMImage(this, R.drawable.icon);
-        UMWeb web = new UMWeb(mEntity.getShare_link());
+        UMWeb web = new UMWeb(userEntity.getShareLink());
         web.setTitle(mEntity.getShare_title());//标题
         web.setThumb(thumb);  //缩略图
         web.setDescription(mEntity.getShare_desc());//描述
@@ -127,14 +139,18 @@ public class AskGetMoneyAct extends BaseUMActivity implements UMShareListener, A
 
 
     private void shareToLink() {
+        if(userEntity == null){
+            G.showToast("数据正在加载中");
+            return;
+        }
         LINK_SHARE.onEvent();
-        ViewUtil.showMsgDialog(this, new DialogConfig().setTitle("分享链接").setMsg(mEntity.getShare_link())
+        ViewUtil.showMsgDialog(this, new DialogConfig().setTitle("分享链接").setMsg(userEntity.getShareLink())
             .setMsgMore("通过连接加入小绵羊即可成为你的好友").setMsgMoreColor(R.color.txt_black_9e9c9c)
             .setBtnLeftText("复制链接").setBtnLeftOnClickListener(new View.OnClickListener() {
                         @Override
                         public void onClick(View view) {
                             QR_COPY.onEvent();
-                            StringUtils.CopyText(AskGetMoneyAct.this,mEntity.getShare_link());
+                            StringUtils.CopyText(AskGetMoneyAct.this, userEntity.getShareLink());
                             G.showToast("复制链接成功");
                         }
                     }));
@@ -203,7 +219,11 @@ public class AskGetMoneyAct extends BaseUMActivity implements UMShareListener, A
                     SHARE_TO_QQ.onEvent();
                     break;
                 case R.id.rl_qr:
-                    ViewUtil.showQR(AskGetMoneyAct.this, mEntity.getShare_link());
+                    if(userEntity == null){
+                        G.showToast("数据正在加载中");
+                        break;
+                    }
+                    ViewUtil.showQR(AskGetMoneyAct.this, userEntity.getShareLink());
                     break;
                 case R.id.rl_link:
                     shareToLink();

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

@@ -439,7 +439,7 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View{
 
     @Override
     public void bindTelSmsSuccess(BaseMessage o) {
-
+        G.showToast("请查看手机验证码");
     }
 
     @Override

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

@@ -90,7 +90,7 @@ public class PhoneAct extends BaseActivity implements PhoneContract.View {
                 .inject(this);
         if(TestUtil.isTest()){
             phoneEtAccount.setInputType(InputType.TYPE_CLASS_TEXT);
-            phoneEtAccount.setFilters(new InputFilter[]{new InputFilter.LengthFilter(40)});
+            phoneEtAccount.setFilters(new InputFilter[]{new InputFilter.LengthFilter(1000)});
         }
         GlideImageLoader.centerImage( phone_iv, "http://cdngame.kuaifazs.com/icon_phone.png");
     }