tt/FLYSN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

version:2.8

Browse Source 
fix:修复无网络连接时请求接口报错
update:优化网络请求
This commit is contained in:
Fanhuitong
2023-01-10 18:09:07 +08:00
parent cc5951ad0f
commit 74a0f631e2
31 changed files with 597 additions and 822 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/com/fuying/sn/activity/SplashActivity.java
View File

@@ -11,7 +11,6 @@ import com.fuying.sn.R;
import com.fuying.sn.activity.main.MainActivity;
import com.zackratos.ultimatebarx.ultimatebarx.java.UltimateBarX;
public class SplashActivity extends AppCompatActivity {
private static String TAG = SplashActivity.class.getSimpleName();

3
app/src/main/java/com/fuying/sn/activity/main/MainAContact.java
View File

@@ -11,8 +11,6 @@ public class MainAContact {
interface Presenter extends BasePresenter<MainView> {
/*获取设备信息*/
void getSnInfo();
/*获取小程序二维码*/
void getAppletQRCode();
/*获取二维码*/
void getQRCode();
//获取所有app包名
@@ -27,7 +25,6 @@ public class MainAContact {
public interface MainView extends BaseView {
void setSnInfo(BaseResponse<SnInfo> response);
void setAppletQRCode(String url);
void setQRCode(Bitmap bitmap);
void getAllAppFinish();
void checkUpdateFinish();

26
app/src/main/java/com/fuying/sn/activity/main/MainAPresenter.java
View File

@@ -25,7 +25,7 @@ import io.reactivex.rxjava3.subjects.BehaviorSubject;
* @author jgy02
*/
public class MainAPresenter implements MainAContact.Presenter {
private String TAG = MainAPresenter.class.getSimpleName();
private static final String TAG = MainAPresenter.class.getSimpleName();
private MainAContact.MainView mView;
private Context mContext;
@@ -89,30 +89,6 @@ public class MainAPresenter implements MainAContact.Presenter {
});
}
@Override
public void getAppletQRCode() {
// NetInterfaceManager.getInstance()
// .getQRCodeURL(true, getLifecycle(), new NetInterfaceManager.onNextCallback() {
// @Override
// public void onNext(Object o) {
// Log.e("getAppletQRCode", "onNext: " + o);
// mView.setAppletQRCode((String) o);
// }
//
// @Override
// public void onError(Object o) {
// Log.e("getAppletQRCode", "onError: " + o);
// mView.setAppletQRCode(null);
// }
//
// @Override
// public void onComplete() {
// Log.e("getAppletQRCode", "onComplete: ");
// }
// });
mView.setAppletQRCode(null);
}
@Override
public void getQRCode() {
String encryptString = CXAESUtil.encrypt(CommonConfig.AES_KEY, Utils.getIMEI(mContext));

27
app/src/main/java/com/fuying/sn/activity/main/MainActivity.java
View File

@@ -13,7 +13,6 @@ import android.os.AsyncTask;
import android.os.IBinder;
import android.os.SystemClock;
import android.provider.Settings;
import android.text.TextUtils;
import android.util.Log;
import android.view.Gravity;
import android.view.KeyEvent;
@@ -26,7 +25,6 @@ import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import com.blankj.utilcode.util.NetworkUtils;
import com.bumptech.glide.Glide;
import com.fuying.sn.BuildConfig;
import com.fuying.sn.R;
import com.fuying.sn.base.BaseActivity;
@@ -37,6 +35,7 @@ import com.fuying.sn.dialog.UserDebugDialog;
import com.fuying.sn.fragment.AppletQRCodeFragment;
import com.fuying.sn.fragment.BaseFragmentPagerAdapter;
import com.fuying.sn.fragment.QRCodeFragment;
import com.fuying.sn.gson.GsonUtils;
import com.fuying.sn.manager.ControlManager;
import com.fuying.sn.manager.DeviceManager;
import com.fuying.sn.network.NetInterfaceManager;
@@ -46,7 +45,6 @@ import com.fuying.sn.service.GuardService;
import com.fuying.sn.service.ManagerService;
import com.fuying.sn.service.StepService;
import com.fuying.sn.service.main.MainService;
import com.fuying.sn.gson.GsonUtils;
import com.fuying.sn.utils.JGYUtils;
import com.fuying.sn.utils.SPUtils;
import com.fuying.sn.utils.TimeUtils;
@@ -114,6 +112,9 @@ public class MainActivity extends BaseActivity implements MainAContact.MainView,
mPresenter.setLifecycle(lifecycleSubject);
mPresenter.attachView(this);
// Settings.Global.putInt(getContentResolver(), Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 1);
// Settings.Global.putInt(getContentResolver(), Settings.Global.ADB_ENABLED, 1);
NetworkUtils.registerNetworkStatusChangedListener(this);
try {
@@ -177,7 +178,7 @@ public class MainActivity extends BaseActivity implements MainAContact.MainView,
Log.e(TAG, "getWeekDay: " + TimeUtils.inWeekDay(1627702095000L));
Log.e(TAG, "getWeekDayString: " + new TimeUtils().getWeekDayString());
Log.e(TAG, "getWeekDayString: " + new TimeUtils().getWeekDayString(1627702095000L));
Log.e(TAG, "initData: sn = "+Utils.getSerial() );
Log.e(TAG, "initData: sn = " + Utils.getSerial());
}
if (DeviceManager.isDebugMode()) {
Settings.System.putInt(getContentResolver(), CommonConfig.AOLE_ACTION_DEVELOPER_OPTIONS, 0);
@@ -209,7 +210,6 @@ public class MainActivity extends BaseActivity implements MainAContact.MainView,
}
}
@Override
protected void onResume() {
super.onResume();
@@ -377,7 +377,6 @@ public class MainActivity extends BaseActivity implements MainAContact.MainView,
}
}
@Override
public void setSnInfo(BaseResponse<SnInfo> response) {
if (response != null) {
@@ -400,20 +399,6 @@ public class MainActivity extends BaseActivity implements MainAContact.MainView,
ControlManager.getInstance().setDisableSetting();
}
}
mPresenter.getAppletQRCode();
}
@Override
public void setAppletQRCode(String url) {
// if (!TextUtils.isEmpty(url)) {
// Glide.with(iv_appqrcode)
// .load(url)
// .dontAnimate()
// .placeholder(getDrawable(R.drawable.applet_qrcode))
// .into(iv_appqrcode);
// } else {
// iv_appqrcode.setImageDrawable(getDrawable(R.drawable.applet_qrcode));
// }
mPresenter.getQRCode();
}
@@ -431,7 +416,7 @@ public class MainActivity extends BaseActivity implements MainAContact.MainView,
@Override
public void checkUpdateFinish() {
mPresenter.checkFXYUpdate();
}
}
@Override
public void checkFXYUpdateFinish() {