Explorar o código

新手对话框最多只显示一次,且打断后不再显示

zengjiebin %!s(int64=8) %!d(string=hai) anos
pai
achega
f270c24270

+ 1 - 1
app/build.gradle

@@ -74,7 +74,7 @@ android {
             ]
             buildConfigField "String", "DUANDUAN_DATASHARE", '"sheeptest"'
             buildConfigField "String", "DUANDUAN_GRAPH", '"sheeptest"'
-            buildConfigField "boolean", "XXTEA_ENCRYPT", 'false'//不用加密
+            buildConfigField "boolean", "XXTEA_ENCRYPT", 'true'//false为不用加密
             buildConfigField "String", "API_DOMAIN", '"test.bdmapp.kfzs.com"'
             buildConfigField "String", "APP_URL", '"http://10.8.210.171:8080/"'//张伟
             buildConfigField "String", "JFSC_DOMAIN", '"http://10.8.210.190:8080/"'//积分商城

+ 4 - 4
app/src/main/java/com/kfzs/duanduan/fragment/FgtSmallSheep.java

@@ -27,6 +27,7 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.bumptech.glide.request.RequestOptions;
 import com.kfzs.duanduan.BaseCompatFragment;
 import com.kfzs.duanduan.event.BigEvent;
+import com.kfzs.duanduan.react.SharedPreferences;
 import com.layoutscroll.layoutscrollcontrols.view.EasyLayoutScroll;
 import com.sheep.gamegroup.di.components.DaggerSmallSheepComponent;
 import com.sheep.gamegroup.di.modules.SmallSheepModule;
@@ -272,9 +273,8 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                 .preload(800, 800);
         if(userEntity.getNewbie_task_status() < 15){//为15时代表已经完成所有新手任务,不是新手
             newbie_task.setVisibility(View.VISIBLE);
-            if(isShowNewbieTaskDialog){
-                isShowNewbieTaskDialog = false;
-            } else {
+            boolean isShowNewbieTaskDialog = SharedPreferences.getInstance().getBoolean("isShowNewbieTaskDialog", true);//默认可以显示对话框
+            if(!isShowNewbieTaskDialog){
                 return;
             }
             SheepApp.getInstance().getNetComponent().getApiService().getNewbieTask()
@@ -287,6 +287,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                                     if(BinaryUtil.isInt(userEntity.getNewbie_task_status(),0, 0)){//第一个任务未完成
                                         DialogNewbieTaskRegistSuccess.showDialog(getActivity());
                                     } else if(newbieTaskList != null && !newbieTaskList.isEmpty()){
+                                        SharedPreferences.getInstance().putBoolean("isShowNewbieTaskDialog", false);//设置为不再显示新手对话框
                                         List<NewbieTask> taskList = new ArrayList<>();
                                         NewbieTask task = null;
                                         for (NewbieTask newbieTask : newbieTaskList) {
@@ -314,7 +315,6 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         }
         //添加代码请在上面的if else之前,否则出错不要找我 by realicing
     }
-    private boolean isShowNewbieTaskDialog = true;//只有首次会显示未做的新手任务对话框
     @Override
     public void failData2View(Object o) {
         G.showToast("网络错误");

+ 15 - 2
app/src/main/java/com/sheep/gamegroup/view/activity/ActUnderstandSheep.java

@@ -9,6 +9,7 @@ import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.kfzs.duanduan.react.SharedPreferences;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.NewbieTask;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
@@ -56,8 +57,14 @@ public class ActUnderstandSheep extends BaseActivity {
     public void initView() {
         activity = this;
         TitleBarUtils.getInstance()
-                .setTitle(this, "一分钟快速了解小绵羊")
-                .setTitleFinish(this);
+                .setTitle(this, "一分钟快速了解小绵羊");
+        activity.findViewById(R.id.img_baseactivity_title).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                activity.finish();
+                SharedPreferences.getInstance().putBoolean("isShowNewbieTaskDialog", false);//设置为不再显示新手对话框
+            }
+        });
         final int count = BuildConfig.DEBUG ? 10 : 15;
         timer = RxjavaCountDownTimer.getInstance(count)
                 .setOnTickListener(new RxjavaCountDownTimer.OnTickListener() {
@@ -103,6 +110,12 @@ public class ActUnderstandSheep extends BaseActivity {
     }
 
     @Override
+    public void onBackPressed() {
+        super.onBackPressed();
+        SharedPreferences.getInstance().putBoolean("isShowNewbieTaskDialog", false);//设置为不再显示新手对话框
+    }
+
+    @Override
     public void initData() {
     }
 

+ 4 - 0
app/src/main/java/com/sheep/gamegroup/view/dialog/DialogNewbieTask1.java

@@ -62,12 +62,16 @@ public class DialogNewbieTask1 {
             setTextSure(dialog_sure_2, newbieTaskList.get(1), 1);
             dialog_sure_2.setVisibility(View.VISIBLE);
             dialog_sure_2.setOnClickListener(onClickListener);
+        } else {
+            dialog_sure_2.setVisibility(View.GONE);
         }
         final TextView dialog_sure_3 = ViewFindUtils.find(view, R.id.dialog_sure_3);
         if(newbieTaskList.size() > 2){
             setTextSure(dialog_sure_3, newbieTaskList.get(2), 2);
             dialog_sure_3.setVisibility(View.VISIBLE);
             dialog_sure_3.setOnClickListener(onClickListener);
+        } else {
+            dialog_sure_3.setVisibility(View.GONE);
         }
         final View dialog_close = ViewFindUtils.find(view, R.id.dialog_close);
         dialog_close.setOnClickListener(new View.OnClickListener() {

+ 8 - 0
app/src/main/java/com/sheep/gamegroup/view/dialog/DialogNewbieTaskRegistSuccess.java

@@ -7,6 +7,7 @@ import android.text.Html;
 import android.view.View;
 import android.widget.TextView;
 
+import com.kfzs.duanduan.react.SharedPreferences;
 import com.kfzs.duanduan.utils.dlg.ViewFindUtils;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.UMConfigUtils;
@@ -29,6 +30,13 @@ public class DialogNewbieTaskRegistSuccess {
             @Override
             public void onClick(View view) {
                 Jump2View.getInstance().goUnderstandSheep(activity, null);
+                mAlertDialog.dismiss();
+            }
+        });
+        mAlertDialog.setOnCancelListener(new DialogInterface.OnCancelListener() {
+            @Override
+            public void onCancel(DialogInterface dialogInterface) {
+                SharedPreferences.getInstance().putBoolean("isShowNewbieTaskDialog", false);//设置为不再显示新手对话框
             }
         });
         final View dialog_close = ViewFindUtils.find(view, R.id.dialog_close);