修复bug

app/src/main/AndroidManifest.xml

@@ -41,7 +41,6 @@
 
         <activity
             android:name=".ui.LoginActivity"
-            android:launchMode="singleTop"
             android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -51,7 +50,6 @@
         </activity>
         <activity
             android:name=".ui.MainActivity"
-            android:launchMode="singleInstance"
             android:screenOrientation="portrait" />
         <activity
             android:name=".ui.VersionActivity"

app/src/main/java/com/wisewoods/eduandroid/ui/MainActivity.java

@@ -49,11 +49,9 @@ public class MainActivity extends BaseActivity<ActivityMainBinding> implements S
     public void logout(BaseEvent.LogoutEvent event) {
         TRTCMeeting.sharedInstance(Utils.getApp()).logout(null);
 
-        ActivityUtils.finishAllActivities();
         XGPushManager.clearAccounts(Utils.getApp());
-        Intent intent = new Intent(Utils.getApp(), LoginActivity.class);
-        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        ActivityUtils.startActivity(intent);
+        ActivityUtils.startActivity(LoginActivity.class);
+        ActivityUtils.finishAllActivities();
     }
 
     private void getVersionData() {

app/src/main/java/com/wisewoods/eduandroid/ui/TaskActivity.java

@@ -9,6 +9,7 @@ import com.bigkoo.pickerview.builder.TimePickerBuilder;
 import com.bigkoo.pickerview.view.TimePickerView;
 import com.blankj.utilcode.util.ActivityUtils;
 import com.blankj.utilcode.util.GsonUtils;
+import com.blankj.utilcode.util.LogUtils;
 import com.blankj.utilcode.util.TimeUtils;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.listener.OnItemChildClickListener;
@@ -58,6 +59,12 @@ public class TaskActivity extends BaseListActivity<ActivityTaskBinding>
         ActivityUtils.startActivity(intent);
     }
 
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        LogUtils.e("task页面关闭");
+    }
+
     @Override
     protected void initListData() {
         rv = binding.rvTask;

app/src/main/java/com/wisewoods/eduandroid/ui/adapter/TaskAdapter.java

@@ -23,7 +23,7 @@ public class TaskAdapter extends BasePageAdapter<TaskList.TaskBean> {
                 .setText(R.id.tv_content, taskBean.taskContent)
                 .setGone(R.id.tv_time, state != 0)
                 .setGone(R.id.iv_zx, taskBean.taskStatus != 4)
-                .setGone(R.id.tv_state, state == 0);
+                .setGone(R.id.tv_state, taskBean.taskStatus == 4 || state == 0);
 
         switch (taskBean.prepName) {
             case "餐饮需求":

base/src/main/java/com/wisewoods/base/net/ApiService.java

@@ -57,8 +57,8 @@ import retrofit2.http.Query;
 
 public interface ApiService {
 
-    String SERVER = "https://edu.jlccta.com/";  //正式环境
-//        String SERVER = "https://edutest.jlccta.com/";  //测试环境
+//    String SERVER = "https://edu.jlccta.com/";  //正式环境
+        String SERVER = "https://edutest.jlccta.com/";  //测试环境
 //        String SERVER = "http://10.16.4.8/";  //测试环境
     String PROJECT = "prod-api/";
 //        String PROJECT = "dev-api/";

version.properties

@@ -1,2 +1,2 @@
-#Thu Jul 21 14:18:11 CST 2022
-APP_VERSION_CODE=57
+#Mon Aug 15 11:24:07 CST 2022
+APP_VERSION_CODE=78