ifengouy преди 2 години
родител
ревизия
db3186c713

+ 5 - 3
app/src/main/AndroidManifest.xml

@@ -10,17 +10,17 @@
     <uses-permission android:name="android.permission.CAMERA" />
 
     <!-- 显示系统窗口权限 -->
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
     <!-- 在 屏幕最顶部显示权限-->
     <uses-permission android:name="android.permission.SYSTEM_OVERLAY_WINDOW" />
 
     <application
+        android:name=".BaseApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:name=".BaseApplication"
         android:theme="@style/AppTheme">
         <activity android:name=".SplashActivity">
             <intent-filter>
@@ -37,7 +37,9 @@
         <activity android:name=".activity.SettingAc" />
         <activity android:name=".activity.NoCardRegActivity" />
 
-        <service android:name=".service.PullDataService" />
+        <service
+            android:name=".service.PullDataService"
+            android:permission="android.permission.BIND_JOB_SERVICE" />
     </application>
 
 </manifest>

+ 1 - 1
app/src/main/java/com/sunwin/visitorapp/BaseApplication.java

@@ -33,7 +33,7 @@ public class BaseApplication extends Application {
         Timber.plant(new Timber.DebugTree());
 
         CacheUtil.init(this);
-        OrmDBHelper.init(this);
+//        OrmDBHelper.init(this);
 //        PresentationManager.checkAndShow(this);
     }
 

+ 13 - 10
app/src/main/java/com/sunwin/visitorapp/activity/VisitorRegActivity.java

@@ -9,12 +9,14 @@ import android.widget.TextView;
 import androidx.fragment.app.Fragment;
 
 import com.sunwin.visitorapp.BaseActivity;
+import com.sunwin.visitorapp.BaseApplication;
 import com.sunwin.visitorapp.R;
 import com.sunwin.visitorapp.adapter.CardAdapter;
 import com.sunwin.visitorapp.adapter.VisitorRegAdapter;
 import com.sunwin.visitorapp.fragment.IdcardRegFragment;
 import com.sunwin.visitorapp.fragment.NoCardRegFragment;
 import com.sunwin.visitorapp.fragment.RegTypeFragment;
+import com.sunwin.visitorapp.service.PullDataService;
 import com.sunwin.visitorapp.utils.Constant;
 import com.sunwin.visitorapp.utils.ToastUtils;
 import com.sunwin.visitorapp.view.MyGridView;
@@ -46,6 +48,7 @@ public class VisitorRegActivity extends BaseActivity implements View.OnClickList
         isLoginUser = getIntent().getBooleanExtra(Constant.IIntentValue.ISLOGINUSER, false);
         initialData();
         initView();
+        PullDataService.enqueueWork(this, new Intent());
     }
 
     private void initialData() {
@@ -61,11 +64,11 @@ public class VisitorRegActivity extends BaseActivity implements View.OnClickList
             iconList.add(R.mipmap.visitor_reg_default);
         }
 
-        if (isLoginUser) {
-            backgroundRes = new int[]{R.drawable.menu_orange, R.drawable.menu_green, R.drawable.menu_yellow, R.drawable.menu_red, R.drawable.menu_gray};
-            bottomIcon = new int[]{R.drawable.ui_vector_record, R.drawable.ui_vector_sign, R.drawable.ui_vector_register, R.drawable.ui_vector_leave, R.drawable.ui_vector_check};
-            bottomItemArray = new String[]{"访客记录", "访客签到", "访客登记", "访客签离", "快速核验"};
-        }
+//        if (isLoginUser) {
+//            backgroundRes = new int[]{R.drawable.menu_orange, R.drawable.menu_green, R.drawable.menu_yellow, R.drawable.menu_red, R.drawable.menu_gray};
+//            bottomIcon = new int[]{R.drawable.ui_vector_record, R.drawable.ui_vector_sign, R.drawable.ui_vector_register, R.drawable.ui_vector_leave, R.drawable.ui_vector_check};
+//            bottomItemArray = new String[]{"访客记录", "访客签到", "访客登记", "访客签离", "快速核验"};
+//        }
     }
 
     private void initView() {
@@ -73,15 +76,15 @@ public class VisitorRegActivity extends BaseActivity implements View.OnClickList
         mTvHeadTitle = (TextView) findViewById(R.id.tv_head_title);
         mTvDate = (TextView) findViewById(R.id.tv_date);
 //        mGridview = findViewById(R.id.gridview);
-        mGridviewBottom = findViewById(R.id.gridviewBottom);
         VisitorRegAdapter adapter = new VisitorRegAdapter(itemList, iconList);
-        CardAdapter cardAdapter = new CardAdapter(bottomItemArray, bottomIcon, backgroundRes);
 //        mGridview.setAdapter(adapter);
-        mGridviewBottom.setAdapter(cardAdapter);
 
 //        mGridview.setOnItemClickListener(this);
-        mGridviewBottom.setOnItemClickListener(this);
-        mGridviewBottom.setVisibility(isLoginUser ? View.VISIBLE : View.GONE);
+//        mGridviewBottom = findViewById(R.id.gridviewBottom);
+//        CardAdapter cardAdapter = new CardAdapter(bottomItemArray, bottomIcon, backgroundRes);
+//        mGridviewBottom.setAdapter(cardAdapter);
+//        mGridviewBottom.setOnItemClickListener(this);
+//        mGridviewBottom.setVisibility(isLoginUser ? View.VISIBLE : View.GONE);
         RegTypeFragment regTypeFragment = new RegTypeFragment(this);
 
         showFragment(regTypeFragment);

+ 9 - 0
app/src/main/java/com/sunwin/visitorapp/service/PullDataService.java

@@ -1,5 +1,6 @@
 package com.sunwin.visitorapp.service;
 
+import android.content.Context;
 import android.content.Intent;
 
 import androidx.annotation.NonNull;
@@ -27,6 +28,14 @@ import retrofit2.Response;
 
 public class PullDataService extends JobIntentService {
     private static final String TAG = "PullDataService";
+    /**
+     * 这个Service 唯一的id
+     */
+    static final int JOB_ID = 0x111;
+
+    public static void enqueueWork(Context context, Intent work) {
+        enqueueWork(context, PullDataService.class, JOB_ID, work);
+    }
 
     @Override
     protected void onHandleWork(@NonNull @NotNull Intent intent) {

+ 1 - 1
app/src/main/java/com/sunwin/visitorapp/utils/Constant.java

@@ -17,7 +17,7 @@ public class Constant {
 
     public static int isUse = SharePrefenceUtils.getInt("isUse", 1);
 
-    public static String BASE_HOST = "192.168.31.7:8080/";//正式服务器
+    public static String BASE_HOST = "http://192.168.31.7:8080/";//正式服务器
     public static final String SWBINDIR = "/sdcard/models";
     public static final String SWRECODE = "/sdcard/swRecode";