Главная Обзор Помощь
Регистрация Вход
xmy_android
/
small_sheep_android
Следить 3
В избранное 0
Ответвить 0
Файлы Обсуждения 0 Запросы на слияние 0 Вики
Просмотр исходного кода

3.0.0 bug 修改

liujiangyao лет назад: 7
Родитель
89332a64f8
Сommit
efa599aa7b
9 измененных файлов с 61 добавлено и 31 удалено
Разделённый вид Показать статистику Diff
  1. 12 3
      app/src/main/java/com/kfzs/duanduan/fragment/FgtAskgetmoney.java
  2. 1 1
      app/src/main/java/com/kfzs/duanduan/fragment/FgtFriendExtractPage.java
  3. 1 1
      app/src/main/java/com/kfzs/duanduan/fragment/FgtPersonalCenter.java
  4. 13 6
      app/src/main/java/com/kfzs/duanduan/fragment/FgtSmallSheep.java
  5. 2 2
      app/src/main/java/com/sheep/gamegroup/util/CommonUtil.java
  6. 4 4
      app/src/main/java/com/sheep/gamegroup/view/activity/PersonalInfoAct.java
  7. 4 0
      app/src/main/java/com/sheep/gamegroup/view/activity/TaskDetailAct.java
  8. 5 9
      app/src/main/java/com/sheep/gamegroup/view/adapter/TaskListItemAdp.java
  9. 19 5
      app/src/main/java/com/sheep/gamegroup/view/dialog/DialogNewbieTaskRegistSuccess.java

+ 12 - 3
app/src/main/java/com/kfzs/duanduan/fragment/FgtAskgetmoney.java
Просмотреть файл 

@@ -8,6 +8,8 @@ import android.support.v4.widget.NestedScrollView;
 
 import android.text.TextUtils;
 
 import android.view.MotionEvent;
 
 import android.view.View;
 
+
 
+import com.kfzs.duanduan.ActMain;
 
 import com.tencent.smtt.sdk.WebView;
 
 import android.widget.LinearLayout;
 
 import android.widget.TextView;
 
@@ -79,11 +81,18 @@ public class FgtAskgetmoney extends BaseCompatFragment {
 
     protected void initView(Bundle savedInstanceState) {
 
         setContentView(R.layout.x_ask_getmoney_act_layout);
 
         activity = getActivity();
 
+        if(activity instanceof ActMain){
 
+            TitleBarUtils.getInstance()
 
+                    .setTitle(mContentView, "邀请赚钱")
 
+                    .setTitleListen(mContentView,0,null);
 
+        }else {
 
+            TitleBarUtils.getInstance()
 
+                    .setTitle(mContentView, "邀请赚钱")
 
+                    .setTitleFinish(mContentView, activity);
 
+        }
 
         unbinder = ButterKnife.bind(this, mContentView);
 
 
-        TitleBarUtils.getInstance()
 
-                .setTitle(mContentView, "邀请赚钱")
 
-                .setTitleListen(mContentView,0,null);
 
+
 
         String content = "<!DOCTYPEhtml>\n" +
 
                 "<html>\n" +
 
                 "  <head>\n" +

+ 1 - 1
app/src/main/java/com/kfzs/duanduan/fragment/FgtFriendExtractPage.java
Просмотреть файл 

@@ -98,7 +98,7 @@ public class FgtFriendExtractPage extends BaseFragment {
 
                     public void onNext(BaseMessage baseMessage) {
 
                         List<Friend> friendList = baseMessage.getDatas(Friend.class);
 
                         if(friendList == null) {
 
-                            baseMessage.setMsg("您还没有邀请到好友");
 
+//                            baseMessage.setMsg("您还没有邀请到好友");
 
                             onError(baseMessage);
 
                         } else {
 
                             if (activity instanceof FgtAskGetMoneyFriend) {

+ 1 - 1
app/src/main/java/com/kfzs/duanduan/fragment/FgtPersonalCenter.java
Просмотреть файл 

@@ -186,7 +186,7 @@ public class FgtPersonalCenter extends BaseCompatFragment {
 
         if (userEntity == null) {
 
             userEntity = DataUtil.getInstance().getUserEntity();
 
         }
 
-        if (!(userEntity.getParent_code().equals("") || (userEntity.getCreate_time_line() < 2) || (userEntity.getPackage_cate() == 1))) {
 
+        if (!userEntity.getParent_code().equals("") || (userEntity.getCreate_time_line() < 2) || (userEntity.getPackage_cate() == 1)) {
 
             ivRedpackage.setVisibility(View.GONE);
 
         } else {
 
             ivRedpackage.setVisibility(View.VISIBLE);

+ 13 - 6
app/src/main/java/com/kfzs/duanduan/fragment/FgtSmallSheep.java
Просмотреть файл 

@@ -234,6 +234,9 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
                     break;
 
                 case 2:
 
                     FgtTryMakeMoney item = (FgtTryMakeMoney) adpViewPagerDetail.getItem(curPosition);
 
+                    if(mViewPager == null || item == null){
 
+                        return;
 
+                    }
 
                     int count = item.getDataCount();
 
                     ViewGroup.LayoutParams params = mViewPager.getLayoutParams();
 
                     params.height = count == 0 ? G.HEIGHT / 3 : (count * getResources().getDimensionPixelSize(R.dimen.content_padding_96)+getResources().getDimensionPixelSize(R.dimen.content_padding_20));
 
@@ -1298,12 +1301,16 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
      * 新手任务
 
      */
 
     private void addNewTask(){
 
-        HomeListEntity homeListEntityNewTask = new HomeListEntity();
 
-        homeListEntityNewTask.setTitle("新手任务");
 
-        homeListEntityNewTask.setDesc("新手任务");
 
-        homeListEntityNewTask.setJump("-1");
 
-        homeListEntityNewTask.setIcon(R.mipmap.homepage_xinshourw+"");
 
-        homeListEntitys.add(0, homeListEntityNewTask);
 
+
 
+        if(onResumeCount == 0 && CommonUtil.getInstance().addNewTask(activity,userEntity) && homeListEntitysGridview != null)//第一次才调用
 
+        {
 
+            HomeListEntity homeListEntityNewTask = new HomeListEntity();
 
+            homeListEntityNewTask.setTitle("新手任务");
 
+            homeListEntityNewTask.setDesc("新手任务");
 
+            homeListEntityNewTask.setJump("-1");
 
+            homeListEntityNewTask.setIcon(R.mipmap.homepage_xinshourw + "");
 
+            homeListEntitys.add(0, homeListEntityNewTask);
 
+        }
 
         if(homeListEntitys.size() > 8){
 
             HomeListEntity homeListEntity = new HomeListEntity();
 
             homeListEntity.setTitle("查看更多");

+ 2 - 2
app/src/main/java/com/sheep/gamegroup/util/CommonUtil.java
Просмотреть файл 

@@ -418,7 +418,7 @@ public class CommonUtil {
 
     public void goNative(Context context, HomeListEntity entity, String from) {
 
 
         switch (Integer.valueOf(entity.getJump())) {
 
-            case -1://试玩赚钱
 
+            case -1://新手任务
 
 
                 DialogNewbieTaskList.tryShowDialog((Activity) context);
 
                 NEWBIE_TASK.onEvent();
 
@@ -1871,7 +1871,7 @@ public class CommonUtil {
 
                             public void onNext(BaseMessage baseMessage) {
 
                                 List<NewbieTask> newbieTaskList = baseMessage.getDatas(NewbieTask.class);
 
                                 if (newbieTaskList != null && !newbieTaskList.isEmpty() && newbieTaskList.size() > 1 && !newbieTaskList.get(1).getFinished()) {//了解小绵羊任务未完成时
 
-                                    DialogNewbieTaskRegistSuccess.showDialog(activity, finalNewbie_task_record, newbieTaskList.get(0));
 
+//                                    DialogNewbieTaskRegistSuccess.showDialog(activity, finalNewbie_task_record, newbieTaskList.get(0));
 
                                 } else if (newbieTaskList != null && !newbieTaskList.isEmpty()) {
 
                                     finalNewbie_task_record.setDontShowNewbieTaskDialog(true);
 
                                     MyDbManager.getInstance().saveOrUpdate(finalNewbie_task_record);//设置为不再显示新手对话框

+ 4 - 4
app/src/main/java/com/sheep/gamegroup/view/activity/PersonalInfoAct.java
Просмотреть файл 

@@ -169,15 +169,15 @@ public class PersonalInfoAct extends AbsChooseImageActivity {
 
             return;
 
         }
 
         switch (view.getId()) {
 
-          /*  case R.id.llayout_sex://用户性别
 
+            case R.id.llayout_sex://用户性别
 
                 ViewUtil.choiceSex(PersonalInfoAct.this, getCurrentFocus());
 
-                break;*/
 
+                break;
 
             case R.id.tv_sex://用户性别
 
                 ViewUtil.choiceSex(PersonalInfoAct.this, getCurrentFocus());
 
                 break;
 
-           /* case R.id.llayout_birthday://用户生日
 
+            case R.id.llayout_birthday://用户生日
 
                 ViewUtil.showDateDialog(PersonalInfoAct.this, tvBirthday,TextUtils.isEmpty(userEntity.getBirthday())?"1990-01-01":userEntity.getBirthday());
 
-                break;*/
 
+                break;
 
             case R.id.tv_birthday:
 
                 ViewUtil.showDateDialog(PersonalInfoAct.this, tvBirthday,TextUtils.isEmpty(userEntity.getBirthday())?"1990-01-01":userEntity.getBirthday());
 
                 break;

+ 4 - 0
app/src/main/java/com/sheep/gamegroup/view/activity/TaskDetailAct.java
Просмотреть файл 

@@ -345,6 +345,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
 
             case 1000://连续任务
 
                 if (taskEty.isAppAutoCommitTask()) {
 
                     setBottomState2();
 
+                    setBottomState();
 
                 } else {//非应用自动审核的连续任务
 
                     setSuccessionTaskBottomState();
 
                 }
 
@@ -509,6 +510,9 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
 
                 }
 
             }
 
         });
 
+        if(gettaskAcceptedEty == null){
 
+            btnTaskItem.setText("领取任务");
 
+        }
 
     }
 
 
     private void loadOld() {

+ 5 - 9
app/src/main/java/com/sheep/gamegroup/view/adapter/TaskListItemAdp.java
Просмотреть файл 

@@ -100,13 +100,6 @@ public class TaskListItemAdp extends BaseAdapter {
 
             holder.price_tv.setTextColor(context.getResources().getColor(R.color.time_created));
 
         }
 
         holder.price_tv.setText(stateStr);
 
-        if(!TextUtils.isEmpty(ety.getRemarks())){
 
-            holder.desc_tv.setVisibility(View.VISIBLE);
 
-
 
-        }else {
 
-            holder.desc_tv.setVisibility(View.GONE);
 
-        }
 
-        holder.desc_tv.setText(TextUtils.isEmpty(ety.getRemarks())?"":"失败原因:"+ety.getRemarks());
 
         convertView.setOnClickListener(new View.OnClickListener() {
 
             @Override
 
             public void onClick(View v) {
 
@@ -114,7 +107,7 @@ public class TaskListItemAdp extends BaseAdapter {
 
             }
 
         });
 
         TestUtil.setDebugDownLoad(context, convertView, ety.getRelease_task().getTask());
 
-        returnValue3(ety, holder.detail_task_tv);
 
+        returnValue3(ety, holder.detail_task_tv,holder.desc_tv);
 
         Glide.with(context)
 
                 .load(ety.getRelease_task().getTask().getIcon())
 
                 .apply(new RequestOptions().placeholder(R.mipmap.icon))
 
@@ -161,7 +154,8 @@ public class TaskListItemAdp extends BaseAdapter {
 
         }
 
         return stateStr;
 
     }
 
-    private String returnValue3(TaskAcceptedEty ety, TextView textView){
 
+    private String returnValue3(TaskAcceptedEty ety, TextView textView, TextView desc_tv){
 
+        desc_tv.setVisibility(View.GONE);
 
         String stateStr = "已接受任务";
 
         switch (ety.getStatus()){
 
             default:
 
@@ -189,6 +183,8 @@ public class TaskListItemAdp extends BaseAdapter {
 
                 textView.setBackgroundResource(R.drawable.shape_red_stroke_rectangle_10_radius);
 
                 textView.setTextColor(context.getResources().getColor(R.color.red_FD2D54));
 
                 textView.setText("重新提交");
 
+                desc_tv.setVisibility(View.VISIBLE);
 
+                desc_tv.setText(TextUtils.isEmpty(ety.getRemarks())?"":"失败原因:"+ety.getRemarks());
 
                 break;
 
         }
 
         return stateStr;

+ 19 - 5
app/src/main/java/com/sheep/gamegroup/view/dialog/DialogNewbieTaskRegistSuccess.java
Просмотреть файл 

@@ -42,17 +42,31 @@ public class DialogNewbieTaskRegistSuccess {
 
         mAlertDialog.setOnCancelListener(new DialogInterface.OnCancelListener() {
 
             @Override
 
             public void onCancel(DialogInterface dialogInterface) {
 
-                newbie_task_record.setDontShowNewbieTaskDialog(true);
 
-                MyDbManager.getInstance().saveOrUpdate(newbie_task_record);//设置为不再显示新手对话框
 
+
 
+                try {
 
+                    if(newbie_task_record == null)
 
+                        return;
 
+                    newbie_task_record.setDontShowNewbieTaskDialog(true);
 
+                    MyDbManager.getInstance().saveOrUpdate(newbie_task_record);//设置为不再显示新手对话框
 
+                } catch (Exception e) {
 
+                    e.printStackTrace();
 
+                }
 
             }
 
         });
 
         final View dialog_close = ViewFindUtils.find(view, R.id.dialog_close);
 
         dialog_close.setOnClickListener(new View.OnClickListener() {
 
             @Override
 
             public void onClick(View v) {
 
-                mAlertDialog.dismiss();
 
-                newbie_task_record.setDontShowNewbieTaskDialog(true);
 
-                MyDbManager.getInstance().saveOrUpdate(newbie_task_record);//设置为不再显示新手对话框
 
+
 
+                try {
 
+                    if(newbie_task_record == null)
 
+                        return;
 
+                    mAlertDialog.dismiss();
 
+                    newbie_task_record.setDontShowNewbieTaskDialog(true);
 
+                    MyDbManager.getInstance().saveOrUpdate(newbie_task_record);//设置为不再显示新手对话框
 
+                } catch (Exception e) {
 
+                    e.printStackTrace();
 
+                }
 
             }
 
         });
 
         try {