diff --git a/app/release/output.json b/app/release/output.json old mode 100755 new mode 100644 index 2886463..773d283 --- a/app/release/output.json +++ b/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":14,"versionName":"1.1.3","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}] \ No newline at end of file +[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":2,"versionName":"1.0.1","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}] \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4f618e6..453ed8c 100755 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -3,6 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" package="com.sucstepsoft.supervision"> + - E监管 + + 狱务掌上通 diff --git a/build.gradle b/build.gradle index 7c3f39b..df5f534 100755 --- a/build.gradle +++ b/build.gradle @@ -39,8 +39,8 @@ ext { gCompileSdkVersion = 28 gMinSdkVersion = 16 gTargetSdkVersion = 28 - gVersionCode = 14 - gVersionName = '1.1.3' + gVersionCode = 2 + gVersionName = '1.0.1' //Router编译版本 gRouterApiVersion = '1.4.1' gRouterCompileVersion = '1.2.2' diff --git a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/constant/PathConfig.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/constant/PathConfig.java index 21f644d..d0bf672 100755 --- a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/constant/PathConfig.java +++ b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/constant/PathConfig.java @@ -14,6 +14,7 @@ public class PathConfig { public static final String MODULE_CALL = "call"; public static final String MODULE_PRISON = "prison"; public static final String MODULE_CHECK = "check"; + public static final String MODULE_ADDRESS_LIST="mailList"; public static final String MODULE_DISTINGUISH = "distinguish"; public static final String MODULE_OA = "officeAutomation"; public static final String MODULE_PARTY = "party"; diff --git a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/BaseUrlApi.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/BaseUrlApi.java index 04f08ac..ddcdf32 100755 --- a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/BaseUrlApi.java +++ b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/BaseUrlApi.java @@ -8,14 +8,14 @@ package com.sucstepsoft.cm_utils.core.retrofit_net; */ public class BaseUrlApi { //==========================项目地址====================== - public static final String IP = "http://192.168.57.128:8083/";//TODO 正式IP + public static final String IP = "http://192.168.0.115:8080/";//TODO 正式IP // public static final String IP = "http://192.168.43.176:8083/";//TODO 测试IP // public static final String IP = "http://192.168.0.115:8083/";//TODO 测试IP // public static final String PROJECT_NAME = "prison_management/"; public static final String PROJECT_NAME = "prison/"; // public static final String PROJECT_NAME = "prison_war_exploded/"; //==================Socket地址================== - public static final String BASE_SOCKET = "http://192.168.57.128:8887";//TODO 正式Socket + public static final String BASE_SOCKET = "http://192.168.0.115:8887";//TODO 正式Socket // public static final String BASE_SOCKET = "http://192.168.43.176:8887";//TODO 测试Socket public static final String BASE_URL = IP + PROJECT_NAME; public static final String APP_VERSION = BASE_URL + "appCmVersionManagement/getAppVersion"; diff --git a/modulemain/src/main/java/com/sucstepsoft/modulemain/base/BasePlanMapActivity.java b/modulemain/src/main/java/com/sucstepsoft/modulemain/base/BasePlanMapActivity.java index 61b29dc..f19db60 100755 --- a/modulemain/src/main/java/com/sucstepsoft/modulemain/base/BasePlanMapActivity.java +++ b/modulemain/src/main/java/com/sucstepsoft/modulemain/base/BasePlanMapActivity.java @@ -93,7 +93,7 @@ public class BasePlanMapActivity extends BaseActivity { public void initData() { mBind = ButterKnife.bind(this); refreshView(STATE_LOAD_SUCCESS); - mTvBaseTitle.setText("E监管"); + mTvBaseTitle.setText("狱务掌上通"); mTvPublish.setVisibility(View.VISIBLE); mTvPublish.setText("扫码"); mTvPublish.setOnClickListener(v -> openCameraScanner()); diff --git a/modulemain/src/main/java/com/sucstepsoft/modulemain/base/LoginActivity.java b/modulemain/src/main/java/com/sucstepsoft/modulemain/base/LoginActivity.java index a8e3e57..2857e3f 100755 --- a/modulemain/src/main/java/com/sucstepsoft/modulemain/base/LoginActivity.java +++ b/modulemain/src/main/java/com/sucstepsoft/modulemain/base/LoginActivity.java @@ -11,7 +11,6 @@ import android.text.TextUtils; import android.text.TextWatcher; import android.text.method.HideReturnsTransformationMethod; import android.text.method.PasswordTransformationMethod; -import android.view.TextureView; import android.view.View; import android.view.WindowManager; import android.widget.Button; @@ -148,9 +147,10 @@ public class LoginActivity extends BaseActivity { return; } String deviceId = telephonyManager.getDeviceId(); - if(TextUtils.isEmpty(deviceId)){ - deviceId="12341234"; + if (TextUtils.isEmpty(deviceId)) { + deviceId = "12341234"; } + LogUtils.e(deviceId + "==" + name + "===" + pwd); RetrofitManager.getInstance() .create(MainApiService.class) .doLogin(name, pwd, deviceId) @@ -204,12 +204,12 @@ public class LoginActivity extends BaseActivity { */ private void requestPermission() { PermissionUtils.permission( - PermissionConstants.SMS, - PermissionConstants.LOCATION, - PermissionConstants.CAMERA, - PermissionConstants.STORAGE, - PermissionConstants.MICROPHONE, - PermissionConstants.PHONE) + PermissionConstants.SMS, + PermissionConstants.LOCATION, + PermissionConstants.CAMERA, + PermissionConstants.STORAGE, + PermissionConstants.MICROPHONE, + PermissionConstants.PHONE) .callback(new PermissionUtils.SimpleCallback() { @Override public void onGranted() { @@ -223,6 +223,7 @@ public class LoginActivity extends BaseActivity { } String loginName = UserInfoSPUtils.getLoginName(); String pwd = UserInfoSPUtils.getPwd(); + LogUtils.e(loginName+"==="+pwd); if (!TextUtils.isEmpty(loginName) && !TextUtils.isEmpty(pwd)) { mEtUserPhone.setText(loginName); mEtUserPwd.setText(pwd); diff --git a/modulemain/src/main/java/com/sucstepsoft/modulemain/base/MainActivity.java b/modulemain/src/main/java/com/sucstepsoft/modulemain/base/MainActivity.java index a7a48d4..2c8f32f 100755 --- a/modulemain/src/main/java/com/sucstepsoft/modulemain/base/MainActivity.java +++ b/modulemain/src/main/java/com/sucstepsoft/modulemain/base/MainActivity.java @@ -5,6 +5,7 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; +import android.os.Build; import android.os.SystemClock; import android.provider.Settings; import android.support.v7.widget.GridLayoutManager; @@ -90,7 +91,11 @@ public class MainActivity extends BaseActivity { buildFunction(); requestPermiss(); //TODO 开启 -// startService(new Intent(this, SockService.class)); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + startForegroundService(new Intent(this, SockService.class)); + }else{ + startService(new Intent(this, SockService.class)); + } mGson = new Gson(); MessageBean bean = (MessageBean) getIntent().getSerializableExtra("bean"); if (bean != null) { @@ -415,6 +420,9 @@ public class MainActivity extends BaseActivity { case PathConfig.MODULE_PATROL://电子巡更 jumpActivity(PathConfig.PATH_MODULE_PATROL_HOME); break; + case PathConfig.MODULE_ADDRESS_LIST://通讯录 +// jumpActivity(PathConfig.); + break; } } } diff --git a/modulemain/src/main/java/com/sucstepsoft/modulemain/base/SockService.java b/modulemain/src/main/java/com/sucstepsoft/modulemain/base/SockService.java index 03c06f6..86d0469 100755 --- a/modulemain/src/main/java/com/sucstepsoft/modulemain/base/SockService.java +++ b/modulemain/src/main/java/com/sucstepsoft/modulemain/base/SockService.java @@ -1,11 +1,15 @@ package com.sucstepsoft.modulemain.base; import android.app.Notification; +import android.app.NotificationChannel; import android.app.NotificationManager; import android.app.Service; import android.content.Intent; import android.graphics.BitmapFactory; +import android.graphics.Color; +import android.os.Build; import android.os.IBinder; +import android.support.annotation.RequiresApi; import android.support.v4.app.NotificationCompat; import com.sucstepsoft.cm_utils.core.retrofit_net.BaseUrlApi; @@ -19,10 +23,15 @@ public class SockService extends Service { @Override public void onCreate() { super.onCreate(); - + String channelId = ""; + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + channelId = createChannelId("chat", "com.tenlionsoft.ywzst"); + } else { + channelId = ""; + } NotificationManager manager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE); - Notification notification = new NotificationCompat.Builder(this, "chat") - .setContentTitle("E监管") + Notification notification = new NotificationCompat.Builder(this, channelId) + .setContentTitle("狱务掌上通") .setContentText("") .setWhen(System.currentTimeMillis()) .setSmallIcon(R.drawable.ic_camera) @@ -33,6 +42,16 @@ public class SockService extends Service { startForeground(1, notification); } + @RequiresApi(api = Build.VERSION_CODES.O) + private String createChannelId(String id, String name) { + NotificationChannel channel = new NotificationChannel(id, name, NotificationManager.IMPORTANCE_NONE); + channel.setLightColor(Color.BLUE); + channel.setLockscreenVisibility(Notification.VISIBILITY_PRIVATE); + NotificationManager manager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE); + manager.createNotificationChannel(channel); + return id; + } + @Override public IBinder onBind(Intent intent) { return null; @@ -47,7 +66,7 @@ public class SockService extends Service { mWsManager = new WsManager .Builder(getApplication()) .wsUrl(BaseUrlApi.BASE_SOCKET) - .needReconnect(false)//TODO 是否需要重连 + .needReconnect(true)//TODO 是否需要重连 .build(); mWsManager.startConnect(); } diff --git a/modulemain/src/main/java/com/sucstepsoft/modulemain/base/SplashActivity.java b/modulemain/src/main/java/com/sucstepsoft/modulemain/base/SplashActivity.java index a265292..fbfd2fb 100755 --- a/modulemain/src/main/java/com/sucstepsoft/modulemain/base/SplashActivity.java +++ b/modulemain/src/main/java/com/sucstepsoft/modulemain/base/SplashActivity.java @@ -60,12 +60,12 @@ public class SplashActivity extends BaseActivity { */ private void requestPermission() { PermissionUtils.permission( - PermissionConstants.SMS, - PermissionConstants.LOCATION, - PermissionConstants.CAMERA, - PermissionConstants.STORAGE, - PermissionConstants.MICROPHONE, - PermissionConstants.PHONE) + PermissionConstants.SMS, + PermissionConstants.LOCATION, + PermissionConstants.CAMERA, + PermissionConstants.STORAGE, + PermissionConstants.MICROPHONE, + PermissionConstants.PHONE) .callback(new PermissionUtils.SimpleCallback() { @SuppressLint("CheckResult") @Override @@ -112,6 +112,9 @@ public class SplashActivity extends BaseActivity { return; } String deviceId = telephonyManager.getDeviceId(); + if (TextUtils.isEmpty(deviceId)) { + deviceId = "12341234"; + } RetrofitManager.getInstance() .create(MainApiService.class) .doLogin(name, pwd, deviceId) diff --git a/modulemain/src/main/res/drawable-xhdpi/login_back.jpg b/modulemain/src/main/res/drawable-xhdpi/login_back.jpg old mode 100755 new mode 100644 index 6866b32..9468408 Binary files a/modulemain/src/main/res/drawable-xhdpi/login_back.jpg and b/modulemain/src/main/res/drawable-xhdpi/login_back.jpg differ diff --git a/modulemain/src/main/res/layout/activity_login.xml b/modulemain/src/main/res/layout/activity_login.xml index 166105d..0c63fdb 100755 --- a/modulemain/src/main/res/layout/activity_login.xml +++ b/modulemain/src/main/res/layout/activity_login.xml @@ -7,6 +7,7 @@ diff --git a/modulemain/src/main/res/layout/activity_main.xml b/modulemain/src/main/res/layout/activity_main.xml index ef92eea..0c2e4ba 100755 --- a/modulemain/src/main/res/layout/activity_main.xml +++ b/modulemain/src/main/res/layout/activity_main.xml @@ -1,6 +1,5 @@ - - @@ -50,6 +43,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="5dp" + android:background="@drawable/shape_notify_bg" android:ellipsize="marquee" android:focusable="true" @@ -63,7 +57,7 @@ + android:layout_marginTop="20dp"> @@ -10,7 +8,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="20dp" - android:src="@drawable/ic_bg_ttitle" /> + android:src="@drawable/ic_bg_ttitle" + android:visibility="gone" /> - E监管 + 狱务掌上通 com.sucstepsoft.chifengjianyu.online 打印机 ：