6.24.4

合并版

app/src/main/java/com/silence/commonframe/activity/login/presenface/LoginPresenter.java

@@ -1,35 +1,21 @@
 package com.silence.commonframe.activity.login.presenface;
 
 import android.app.Activity;
-import android.content.Intent;
-import android.widget.Toast;
 
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import com.lzy.okgo.OkGo;
 import com.lzy.okgo.cache.CacheMode;
 import com.lzy.okgo.callback.StringCallback;
-import com.orhanobut.hawk.Hawk;
 import com.silence.commonframe.ApiService;
-import com.silence.commonframe.R;
-import com.silence.commonframe.activity.Interface.AirGuardWordTimeListener;
-import com.silence.commonframe.activity.WXBindPhoneActivity;
 import com.silence.commonframe.activity.login.Interface.LoginListener;
-import com.silence.commonframe.activity.login.LoginActivity;
 import com.silence.commonframe.bean.BaseBean;
-import com.silence.commonframe.bean.DeviceDataChangedBean;
 import com.silence.commonframe.bean.LoginBean;
 import com.silence.commonframe.common.constant.BaseConstants;
 import com.silence.commonframe.common.constant.UrlConstants;
-import com.silence.commonframe.model.AirGuardRunTimeListModel;
-import com.silence.commonframe.model.LoginFromPasswordModel;
-import com.silence.commonframe.model.SiteModel;
-import com.silence.commonframe.model.WXLoginModel;
 import com.silence.commonframe.utils.Data;
 import com.silence.commonframe.utils.LoginIn;
 
-import java.util.List;
-
 import okhttp3.Call;
 import okhttp3.Response;
 

app/src/main/java/com/silence/commonframe/activity/message/activity/CheckActivity.java

@@ -14,6 +14,7 @@ import android.widget.Toast;
 
 import com.google.gson.Gson;
 import com.silence.commonframe.R;
+import com.silence.commonframe.activity.NewSubmitActivity;
 import com.silence.commonframe.activity.message.Interface.CheckListener;
 import com.silence.commonframe.activity.message.presenter.CheckPresenter;
 import com.silence.commonframe.base.basemvp.BaseActivity;

app/src/main/java/com/silence/commonframe/activity/message/activity/NewSubmitActivity.java

@@ -7,7 +7,6 @@ import android.content.Intent;
 import android.database.Cursor;
 import android.media.MediaPlayer;
 import android.net.Uri;
-import android.os.Bundle;
 import android.provider.MediaStore;
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.RecyclerView;
@@ -26,32 +25,23 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import com.bumptech.glide.Glide;
-import com.google.gson.Gson;
 import com.mylhyl.acp.Acp;
 import com.mylhyl.acp.AcpListener;
 import com.mylhyl.acp.AcpOptions;
-import com.silence.commonframe.ApiService;
-import com.silence.commonframe.Dialog.LoadingDialog;
 import com.silence.commonframe.Dialog.TakePhotoPopwindow;
 import com.silence.commonframe.R;
-import com.silence.commonframe.activity.Interface.NewSubmitListener;
-import com.silence.commonframe.activity.presenter.NewSubmitPresenter;
+import com.silence.commonframe.activity.message.Interface.NewSubmitListener;
+import com.silence.commonframe.activity.message.presenter.NewSubmitPresenter;
 import com.silence.commonframe.adapter.NewSubmitAdapter;
 import com.silence.commonframe.base.basemvp.BaseActivity;
 import com.silence.commonframe.bean.PhotoNormalBean;
-import com.silence.commonframe.common.constant.BaseConstants;
-import com.silence.commonframe.model.UploadModel;
 import com.silence.commonframe.soundrecording.AudioRecoderUtils;
 import com.silence.commonframe.soundrecording.PopupWindowFactory;
 import com.silence.commonframe.soundrecording.TimeUtils;
-import com.silence.commonframe.utils.AtyContainer;
 import com.silence.commonframe.utils.BaseUtil;
 
-import java.io.File;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.EventListener;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Timer;
 import java.util.TimerTask;

app/src/main/java/com/silence/commonframe/activity/presenter/RunningRecordPresenter.java

@@ -8,14 +8,11 @@ import com.lzy.okgo.OkGo;
 import com.lzy.okgo.cache.CacheMode;
 import com.lzy.okgo.callback.StringCallback;
 import com.silence.commonframe.ApiService;
-import com.silence.commonframe.activity.Interface.AirGuardWordTimeListener;
 import com.silence.commonframe.activity.Interface.RunningRecordListener;
-import com.silence.commonframe.bean.AirGuardWordTimeBean;
 import com.silence.commonframe.bean.BaseBean;
 import com.silence.commonframe.bean.DeviceDataChangedBean;
 import com.silence.commonframe.common.constant.BaseConstants;
 import com.silence.commonframe.common.constant.UrlConstants;
-import com.silence.commonframe.model.AirGuardRunTimeListModel;
 import com.silence.commonframe.utils.Data;
 import com.silence.commonframe.utils.LoginIn;
 

app/src/main/java/com/silence/commonframe/activity/setup/activity/SetupActivity.java

@@ -15,11 +15,11 @@ import android.widget.Toast;
 import com.silence.commonframe.App;
 import com.silence.commonframe.Dialog.CDialog;
 import com.silence.commonframe.R;
-import com.silence.commonframe.activity.Interface.SetupListener;
+
 import com.silence.commonframe.activity.login.LoginActivity;
-import com.silence.commonframe.activity.presenter.SetupPresenter;
+
 import com.silence.commonframe.activity.setup.Interface.SetupListener;
-import com.silence.commonframe.activity.LoginActivity;
+
 import com.silence.commonframe.activity.WXPublicCodeActivity;
 import com.silence.commonframe.activity.setup.presenter.SetupPresenter;
 import com.silence.commonframe.base.basemvp.BaseActivity;

app/src/main/java/com/silence/commonframe/base/basemvp/BaseActivity.java

@@ -333,7 +333,7 @@ public abstract class BaseActivity<T extends BasePresenter, E extends BaseModel>
                         activity.finish();
                     }
                 })
-                .setLeftImageIsHite(isBack)
+                .setLeftVisible(isBack)
                 .setLeftImageResource(R.mipmap.whiteback)
                 .setBackgroundColor(ContextCompat.getColor(activity,R.color.myblue)
                 );
@@ -355,7 +355,7 @@ public abstract class BaseActivity<T extends BasePresenter, E extends BaseModel>
                         activity.finish();
                     }
                 })
-                .setLeftImageIsHite(isBack)
+                .setLeftVisible(isBack)
                 .setLeftImageResource(R.mipmap.whiteback)
                 .setBackgroundColor(ContextCompat.getColor(activity,R.color.myblue)
                 );

app/src/main/java/com/silence/commonframe/base/basemvp/BaseFragment.java

@@ -359,7 +359,7 @@ public abstract  class BaseFragment<T extends BasePresenter, E extends BaseModel
                         activity.finish();
                     }
                 })
-                .setLeftImageIsHite(isBack)
+                .setLeftVisible(isBack)
                 .setLeftImageResource(R.mipmap.whiteback)
                 .setBackgroundColor(ContextCompat.getColor(activity,R.color.myblue)
                 );

app/src/main/java/com/silence/commonframe/wxapi/WXEntryActivity.java

@@ -14,12 +14,9 @@ import com.lzy.okgo.callback.StringCallback;
 import com.silence.commonframe.ApiService;
 import com.silence.commonframe.App;
 import com.silence.commonframe.R;
-import com.silence.commonframe.activity.SetupActivity;
-import com.silence.commonframe.activity.LoginActivity;
-import com.silence.commonframe.activity.setup.activity.SetupActivity;
 import com.silence.commonframe.activity.WXBindPhoneActivity;
 import com.silence.commonframe.activity.login.LoginActivity;
-import com.silence.commonframe.bean.PhoneBindWx;
+import com.silence.commonframe.activity.setup.activity.SetupActivity;
 import com.silence.commonframe.uikit.NetworkUtil;
 import com.silence.commonframe.utils.Data;
 import com.tencent.mm.opensdk.constants.ConstantsAPI;