呼市第一监狱版本

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":{}}]
+[{"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":{}}]

app/src/main/AndroidManifest.xml

@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.sucstepsoft.supervision">
 
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <application
         android:name=".BaseApplication"
         android:allowBackup="true"

app/src/main/res/values/strings.xml

@@ -1,3 +1,3 @@
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
-    <string name="app_name">E监管</string>
+    <string name="app_name" tools:ignore="MissingTranslation">狱务掌上通</string>
 </resources>

build.gradle

@@ -39,8 +39,8 @@ ext {
     gCompileSdkVersion = 28
     gMinSdkVersion = 16
     gTargetSdkVersion = 28
-    gVersionCode = 14
+    gVersionCode = 2
-    gVersionName = '1.1.3'
+    gVersionName = '1.0.1'
     //Router编译版本
     gRouterApiVersion = '1.4.1'
     gRouterCompileVersion = '1.2.2'

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";

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";

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());

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)){
+        if (TextUtils.isEmpty(deviceId)) {
-            deviceId="12341234";
+            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.SMS,
-                PermissionConstants.LOCATION,
+                        PermissionConstants.LOCATION,
-                PermissionConstants.CAMERA,
+                        PermissionConstants.CAMERA,
-                PermissionConstants.STORAGE,
+                        PermissionConstants.STORAGE,
-                PermissionConstants.MICROPHONE,
+                        PermissionConstants.MICROPHONE,
-                PermissionConstants.PHONE)
+                        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);

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;
             }
         }
     }

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")
+        Notification notification = new NotificationCompat.Builder(this, channelId)
-                .setContentTitle("E监管")
+                .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();
             }

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.SMS,
-                PermissionConstants.LOCATION,
+                        PermissionConstants.LOCATION,
-                PermissionConstants.CAMERA,
+                        PermissionConstants.CAMERA,
-                PermissionConstants.STORAGE,
+                        PermissionConstants.STORAGE,
-                PermissionConstants.MICROPHONE,
+                        PermissionConstants.MICROPHONE,
-                PermissionConstants.PHONE)
+                        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)

modulemain/src/main/res/layout/activity_login.xml

@@ -7,6 +7,7 @@
     <ImageView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:visibility="gone"
         android:layout_marginTop="20dp"
         android:src="@drawable/ic_bg_ttitle" />
 

modulemain/src/main/res/layout/activity_main.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -24,18 +23,12 @@
             android:src="@drawable/ic_login_out" />
     </LinearLayout>
 
-    <ImageView
-        android:layout_width="281dp"
-        android:layout_height="51dp"
-        android:scaleType="center"
-        android:src="@drawable/ic_bg_ttitle" />
-
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="31dp"
-        android:layout_marginTop="10dp"
+        android:layout_marginTop="45dp"
         android:layout_marginRight="31dp"
         android:gravity="center"
         android:orientation="horizontal">
@@ -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 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="13dp">
+        android:layout_marginTop="20dp">
 
         <android.support.v7.widget.RecyclerView
             android:id="@+id/rlv_function"

modulemain/src/main/res/layout/activity_splash.xml

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@drawable/login_back">
@@ -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" />
 
     <TextView
         android:layout_width="wrap_content"

modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/utils/GetFileString.java

@@ -44,7 +44,7 @@ public class GetFileString {
 			field = drawable.getField(imageName);
 			r_id = field.getInt(field.getName());
 		} catch (Exception e) {
-			r_id=R.drawable.app_logo;
+			r_id=R.drawable.app_logo_cf;
 			Log.e("ERROR", "PICTURE NOT　FOUND！");
 		}
 		return r_id;

modulesupertools/src/main/res/values/strings.xml

@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">E监管</string>
+    <string name="app_name">狱务掌上通</string>
     <string name="appKey">com.sucstepsoft.chifengjianyu.online</string>
     <string name="printer">打印机</string>
     <string name="chinesecolon">：</string>