network change

master
hwf453 2 years ago
parent 5ca5f88b20
commit 22366f83f4

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
@ -24,9 +25,10 @@
<uses-permission android:name="android.permission.GET_TASKS" />
<uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.GET_ACCOUNTS" />
<uses-permission
android:name="android.permission.WRITE_SETTINGS"
tools:ignore="ProtectedPermissions" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<permission
android:name="com.example.administrator.zhapp.permission.MIPUSH_RECEIVE"
@ -39,7 +41,8 @@
<uses-feature
android:name="android.hardware.nfc"
android:required="true" />
<permission-group android:name="${applicationId}.andpermission"/>
<permission-group android:name="${applicationId}.andpermission" />
<application
android:name=".MyApplication"
@ -47,8 +50,8 @@
android:icon="@mipmap/logo1"
android:label="@string/app_name"
android:networkSecurityConfig="@xml/network_security_config"
android:supportsRtl="true"
android:screenOrientation="portrait"
android:supportsRtl="true"
android:theme="@style/AppTheme">
@ -68,7 +71,7 @@
</intent-filter>
</activity>
<activity android:name=".activity.MainActivity" >
<activity android:name=".activity.MainActivity">
</activity>
<activity android:name=".activity.ydckgl.YdckglActivity" />
@ -120,13 +123,13 @@
<activity android:name=".activity.xfbwxcgl.XfbwxcglActivity" />
<activity android:name=".activity.ZdyxcglActivity" />
<activity android:name=".activity.sbxdjgl.XwangcMainActivity"/>
<activity android:name=".activity.sbxdjgl.HmShLbActivity"/>
<activity android:name=".activity.sbxdjgl.HmShLbinfoActivity"
android:windowSoftInputMode="adjustResize|stateHidden"
/>
<activity android:name=".activity.sbxdjgl.XwangcMainActivity" />
<activity android:name=".activity.sbxdjgl.HmShLbActivity" />
<activity
android:name=".activity.sbxdjgl.HmShLbinfoActivity"
android:windowSoftInputMode="adjustResize|stateHidden" />
<activity android:name=".activity.dqgzgl.dqgzglActivity"/>
<activity android:name=".activity.dqgzgl.dqgzglActivity" />
<activity
android:name=".activity.ajhxcgl.AjhxcDetaliActivity"
@ -178,16 +181,26 @@
android:enabled="true"
android:exported="true" />
<activity android:name=".activity.xfbwxcgl.XxzActivity" />
<activity
android:name=".activity.xfbwxcgl.XxzActivity"
android:screenOrientation="portrait" />
<service
android:name=".service.UploadService"
android:exported="false" />
<activity android:name=".activity.xfbwxcgl.XlyxcActivity" />
<activity android:name=".activity.xfbwxcgl.Xlyxc2Activity" />
<activity android:name=".activity.xfbwxcgl.XlyxcDetaliActivity" />
<activity android:name=".activity.ajhxcgl.AjhXzActivity" />
<activity
android:name=".activity.xfbwxcgl.XlyxcActivity"
android:screenOrientation="portrait" />
<activity
android:name=".activity.xfbwxcgl.Xlyxc2Activity"
android:screenOrientation="portrait" />
<activity
android:name=".activity.xfbwxcgl.XlyxcDetaliActivity"
android:screenOrientation="portrait" />
<activity
android:name=".activity.ajhxcgl.AjhXzActivity"
android:screenOrientation="portrait" />
<service
android:name=".service.PushService"
@ -199,19 +212,37 @@
android:name=".service.DeleteOverdueJHService"
android:exported="false" />
<activity android:name=".activity.ajhxcgl.YhpclrActivity" />
<activity android:name=".activity.sbxdjgl.SQxgdlrfActivity" />
<activity android:name=".activity.GdActivity" />
<activity
android:name=".activity.ajhxcgl.YhpclrActivity"
android:screenOrientation="portrait" />
<activity
android:name=".activity.sbxdjgl.SQxgdlrfActivity"
android:screenOrientation="portrait" />
<activity
android:name=".activity.GdActivity"
android:screenOrientation="portrait" />
<activity
android:name=".activity.ydckgl.KccxActivity"
android:screenOrientation="portrait"
android:windowSoftInputMode="stateHidden|adjustPan" />
<activity android:name=".activity.ydckgl.TestPrintActivity" />
<activity android:name=".activity.ydckgl.HjbqdyActivity" />
<activity android:name=".activity.sbxdjgl.YulActivity" />
<activity android:name=".activity.ydckgl.KcpdCxActivity" />
<activity android:name=".activity.ajhxcgl.XwaqgcUploadActivity" />
<activity
android:name=".activity.ydckgl.TestPrintActivity"
android:screenOrientation="portrait" />
<activity
android:name=".activity.ydckgl.HjbqdyActivity"
android:screenOrientation="portrait" />
<activity
android:name=".activity.sbxdjgl.YulActivity"
android:screenOrientation="portrait" />
<activity
android:name=".activity.ydckgl.KcpdCxActivity"
android:screenOrientation="portrait" />
<activity
android:name=".activity.ajhxcgl.XwaqgcUploadActivity"
android:screenOrientation="portrait" />
<activity
android:name=".activity.ajhxcgl.XwaqgcxgActivity"
android:screenOrientation="portrait"
android:windowSoftInputMode="stateHidden|adjustPan" />
<provider
@ -224,27 +255,45 @@
android:resource="@xml/file_paths" />
</provider>
<activity android:name=".activity.ajhxcgl.AjhGzActivity" />
<activity android:name=".activity.ydckgl.WztpScActivity" />
<activity
android:name=".activity.ajhxcgl.AjhGzActivity"
android:screenOrientation="portrait" />
<activity
android:name=".activity.ydckgl.WztpScActivity"
android:screenOrientation="portrait" />
<activity
android:name=".activity.ydckgl.JstkActivity"
android:screenOrientation="portrait"
android:windowSoftInputMode="stateHidden|adjustPan" />
<activity
android:name=".activity.ydckgl.ServiceTestActivity"
android:screenOrientation="portrait"
android:windowSoftInputMode="stateHidden|adjustPan" />
<activity
android:name=".activity.ydckgl.CKPhotoActivity"
android:screenOrientation="portrait" />
<activity
android:name=".activity.ajhxcgl.GzqksblrActivity"
android:screenOrientation="portrait" />
<activity
android:name=".activity.ajhxcgl.GzqkckActivity"
android:screenOrientation="portrait" />
<activity
android:name=".activity.ajhxcgl.GzqksbActivity"
android:screenOrientation="portrait" />
<activity
android:name=".activity.ajhxcgl.GzqkgbActivity"
android:screenOrientation="portrait" />
<activity
android:name=".activity.ajhxcgl.XaqksblrActivity"
android:screenOrientation="portrait" />
<activity android:name=".activity.ydckgl.CKPhotoActivity" />
<activity android:name=".activity.ajhxcgl.GzqksblrActivity" />
<activity android:name=".activity.ajhxcgl.GzqkckActivity" />
<activity android:name=".activity.ajhxcgl.GzqksbActivity" />
<activity android:name=".activity.ajhxcgl.GzqkgbActivity" />
<activity android:name=".activity.ajhxcgl.XaqksblrActivity" />
<activity android:name=".activity.ajhxcgl.xaqksbActivity" />
<activity
android:name=".activity.ajhxcgl.xaqksbActivity"
android:screenOrientation="portrait" />
<!-- //========================= 小米推送 ================================= -->
<service
@ -298,27 +347,60 @@
</intent-filter>
</receiver>
<activity android:name=".activity.ajhxcgl.GzqkrzckActivity" />
<activity
android:name=".activity.ajhxcgl.GzqkrzckActivity"
android:screenOrientation="portrait" />
<activity android:name=".activity.ajhxcgl.GzqkPushckActivity" />
<activity android:name=".activity.ajhxcgl.YhpclrListActivity" />
<activity android:name=".activity.sbxdjgl.NFCInfoActivity" />
<activity android:name=".activity.xscbgl.XscbglActivity" />
<activity android:name=".activity.xscbgl.XsBackLogActivity" />
<activity android:name=".activity.xscbgl.XsHistoryActivity" />
<activity android:name=".activity.xscbgl.XscbqyActivity" />
<activity
android:name=".activity.ajhxcgl.GzqkPushckActivity"
android:screenOrientation="portrait" />
<activity
android:name=".activity.ajhxcgl.YhpclrListActivity"
android:screenOrientation="portrait" />
<activity
android:name=".activity.sbxdjgl.NFCInfoActivity"
android:screenOrientation="portrait" />
<activity
android:name=".activity.xscbgl.XscbglActivity"
android:screenOrientation="portrait" />
<activity
android:name=".activity.xscbgl.XsBackLogActivity"
android:screenOrientation="portrait" />
<activity
android:name=".activity.xscbgl.XsHistoryActivity"
android:screenOrientation="portrait" />
<activity
android:name=".activity.xscbgl.XscbqyActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
android:screenOrientation="portrait" />
<activity
android:name=".activity.xscbgl.XscbqyWorkActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
android:screenOrientation="landscape" />
<activity android:name=".activity.xscbgl.XscbqyWorkXsActivity" />
<activity android:name=".activity.xscbgl.XsDqgzZxActivity" />
<activity android:name=".activity.xscbgl.XsDqgzBgActivity" />
<activity android:name=".activity.xscbgl.XsDqgzTjActivity" />
<activity android:name=".activity.xscbgl.XsDqgzWcActivity" />
<activity android:name=".activity.xscbgl.XsDqgzYqActivity" />
<activity android:name=".activity.xscbgl.XsDqgzQxActivity" />
<activity android:name=".activity.xscbgl.XsDqgzBgDetailActivity"/>
<activity
android:name=".activity.xscbgl.XscbqyWorkXsActivity"
android:screenOrientation="portrait" />
<activity
android:name=".activity.xscbgl.XsDqgzZxActivity"
android:screenOrientation="portrait" />
<activity
android:name=".activity.xscbgl.XsDqgzBgActivity"
android:screenOrientation="portrait" />
<activity
android:name=".activity.xscbgl.XsDqgzTjActivity"
android:screenOrientation="portrait" />
<activity
android:name=".activity.xscbgl.XsDqgzWcActivity"
android:screenOrientation="portrait" />
<activity
android:name=".activity.xscbgl.XsDqgzYqActivity"
android:screenOrientation="portrait" />
<activity
android:name=".activity.xscbgl.XsDqgzQxActivity"
android:screenOrientation="portrait" />
<activity
android:name=".activity.xscbgl.XsDqgzBgDetailActivity"
android:screenOrientation="portrait" />
</application>
</manifest>

@ -152,16 +152,16 @@ public class LoginActivity extends BaseActivity {
// et_use.setText("990002");
// et_pwd.setText("000000");
et_use.setText("310258");
et_pwd.setText("Shi&7791");
// et_use.setText("310258");
// et_pwd.setText("Shi&7791");
// et_use.setText("FGTL01");
// et_pwd.setText("123");
// et_use.setText("310673");
// et_pwd.setText("Abcd@1234");
et_use.setText("310673");
et_pwd.setText("Abcd@1234");
// et_use.setText("310482");
// et_pwd.setText("310482");

@ -216,7 +216,7 @@ public class XscbqyActivity extends BaseActivity {
intent.putExtra(Contans.KEY_IS_HIS, false);
startActivity(intent);
}
return;
break;
}
}
}
@ -267,4 +267,16 @@ public class XscbqyActivity extends BaseActivity {
super.onRestart();
requestDatas();
}
@Override
protected void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
// 在此处保存需要恢复的数据
}
@Override
protected void onRestoreInstanceState(Bundle savedInstanceState) {
super.onRestoreInstanceState(savedInstanceState);
// 在此处恢复保存的数据
}
}

@ -229,4 +229,5 @@ public class XscbqyWorkActivity extends BaseActivity {
return json;
}
}

@ -84,10 +84,6 @@ public class XscbqyWorkXsActivity extends BaseActivity {
return R.layout.activity_xscbqy_work;
}
@Override
protected void onResume() {
super.onResume();
}
@Override
protected void initView() {
@ -99,6 +95,8 @@ public class XscbqyWorkXsActivity extends BaseActivity {
smfx = getIntent().getExtras().getString(Contans.KEY_EWM_OR_NFC);
isHis = getIntent().getExtras().getBoolean(Contans.KEY_IS_HIS, false);
showLog(String.valueOf(isHis));
if (isHis) {
btnCommit.setVisibility(View.GONE);
}

@ -74,10 +74,10 @@ public class NohttpUtils {
String credential = "Bearer " + token;
request.addHeader("Authorization", credential);
showLog(request.url());
if(!TextUtils.isEmpty(token)){
showLog(credential);
showLog(new Gson().toJson(request.headers()));
}
// if(!TextUtils.isEmpty(token)){
// showLog(credential);
// showLog(new Gson().toJson(request.headers()));
// }
}
mQueue.add(what, request, new HttpResponseListener<T>(mActivity, request, callback, canCanel, isLoading, msg));
}
@ -90,10 +90,10 @@ public class NohttpUtils {
String credential = "Bearer " + token;
request.addHeader("Authorization", credential);
showLog(request.url());
if(!TextUtils.isEmpty(token)){
showLog(credential);
showLog(new Gson().toJson(request.headers()));
}
// if(!TextUtils.isEmpty(token)){
// showLog(credential);
// showLog(new Gson().toJson(request.headers()));
// }
}
mQueue.add(what, request, new HttpResponseListener<T>(mActivity, request, callback, true, true, "加载中..."));
}
@ -105,10 +105,10 @@ public class NohttpUtils {
String credential = "Bearer " + token;
request.addHeader("Authorization", credential);
showLog(request.url());
if(!TextUtils.isEmpty(token)){
showLog(credential);
showLog(new Gson().toJson(request.headers()));
}
// if(!TextUtils.isEmpty(token)){
// showLog(credential);
// showLog(new Gson().toJson(request.headers()));
// }
}
mQueue.add(what, request, new HttpResponseListenerNoProgress<T>(request, callback));
}

Loading…
Cancel
Save