RAUtilsLibrary 增加service和broadcast receiver

ApexDrivers/RAUtilsLibrary/src/main/java/com/usai/redant/rautils/Utils/Network.java

@@ -2,15 +2,12 @@ package com.usai.redant.rautils.Utils;
 
 import android.app.Application;
 import android.content.Context;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.os.Bundle;
 import android.os.Environment;
-import android.text.TextUtils;
 import android.util.Log;
 
 import org.json.JSONException;
@@ -561,110 +558,113 @@ public class Network {
     }
     public static String check_push(Context c,Bundle params)
     {
-//        if(true)
-//            return null;
-        String TAG = "net_dbg@check_push";
-        if(params==null)
-            params = new Bundle();
-        params.putString("action", "handset_search");
-        params.putString("module_name", "Pull Message");
-        params.putString("uuid", RAUtil.getDUID(c.getApplicationContext()));
-//		String sessionid = ApexTrackingApplication.get_sessionid();
-        // if (TextUtils.isEmpty(sessionid))
-        // {
-        //
-        // Log.d(TAG, "no sessionid return!");
-        // return null;
-        //
-        // }
-        String user = ApexTrackingApplication.get_user();
-        if (TextUtils.isEmpty(user))
-        {
 
-            Log.d(TAG, "no user name return!");
+        if(true)
             return null;
 
-        }
-        // parms.putString("sessionid", sessionid);
-        parms.putString("user", user);
-        SQLiteDatabase db = dbUtil.OpenDB(
-                ApexTrackingApplication.get_instance(), null, false);
-        Cursor cursor = db.query("push_message", new String[] { "MAX(e_id)" },
-                "user = '" + ApexTrackingApplication.get_user() + "'", null,
-                null, null, null, null);
-        if (cursor.moveToNext())
-        {
-            String maxid = cursor.getString(0);
-            if (!TextUtils.isEmpty(maxid))
-                parms.putString("id", maxid);
-        }
-        dbUtil.CloseCursor(cursor);
-        dbUtil.CloseDB(db);
-
-        String jstr = getJson(Network.URL_PUSH, parms);
-        if (jstr == null || jstr.length() <= 0)
-        {
-            Log.d(TAG, "json is wrong");
-            return null;
-        }
-        JSONObject jsobj;
-        //
-        // array = new JSONArray(json);
-        try
-        {
-            jsobj = new JSONObject(jstr);
-            if (jsobj.length() > 0)
-            {
-                int iresult = jsobj.getInt("result");
-                if (iresult == Network.AP_SESSION_EXPIRED)
-                {
-                    Log.e(TAG, "AP_SESSION_EXPIRED");
-                    String pass;
-
-                    pass = ApexTrackingApplication.get_pass();
-                    Network.get_Auth(user, pass);
-                    jstr = getJson(Network.URL_PUSH, parms);
-                    jsobj = new JSONObject(jstr);
-                    iresult = jsobj.getInt("result");
-                }
-                if (iresult != Network.AP_MESSAGE_NEW)
-                {
-                    // session expired
-                    Log.d(TAG,
-                            "DOSE NOT GET NEW MESSAGE CODE="
-                                    + jsobj.getInt("result"));
-                    return null;
-                    // if (get_Auth(name, password) == RESULT_TRUE)
-                    // {
-                    // return get_records(name, password, parms);
-                    //
-                    // }
-                    // else
-                    // {
-                    //
-                    // Log.d(TAG,
-                    // "USER NOT AUTHORIZED CODE="
-                    // + jsobj.getInt("result"));
-                    // return null;
-                    // }
-                }
-                else
-                {
-                    return jstr;
-                }
-            }
-            else
-            {
-                Log.d(TAG, "json is wrong");
-                return null;
-            }
-        }
-        catch (JSONException e)
-        {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        }
         return null;
+//        String TAG = "net_dbg@check_push";
+//        if(params==null)
+//            params = new Bundle();
+//        params.putString("action", "handset_search");
+//        params.putString("module_name", "Pull Message");
+//        params.putString("uuid", RAUtil.getDUID(c.getApplicationContext()));
+////		String sessionid = ApexTrackingApplication.get_sessionid();
+//        // if (TextUtils.isEmpty(sessionid))
+//        // {
+//        //
+//        // Log.d(TAG, "no sessionid return!");
+//        // return null;
+//        //
+//        // }
+//        String user = ApexTrackingApplication.get_user();
+//        if (TextUtils.isEmpty(user))
+//        {
+//
+//            Log.d(TAG, "no user name return!");
+//            return null;
+//
+//        }
+//        // parms.putString("sessionid", sessionid);
+//        parms.putString("user", user);
+//        SQLiteDatabase db = dbUtil.OpenDB(
+//                ApexTrackingApplication.get_instance(), null, false);
+//        Cursor cursor = db.query("push_message", new String[] { "MAX(e_id)" },
+//                "user = '" + ApexTrackingApplication.get_user() + "'", null,
+//                null, null, null, null);
+//        if (cursor.moveToNext())
+//        {
+//            String maxid = cursor.getString(0);
+//            if (!TextUtils.isEmpty(maxid))
+//                parms.putString("id", maxid);
+//        }
+//        dbUtil.CloseCursor(cursor);
+//        dbUtil.CloseDB(db);
+//
+//        String jstr = getJson(Network.URL_PUSH, parms);
+//        if (jstr == null || jstr.length() <= 0)
+//        {
+//            Log.d(TAG, "json is wrong");
+//            return null;
+//        }
+//        JSONObject jsobj;
+//        //
+//        // array = new JSONArray(json);
+//        try
+//        {
+//            jsobj = new JSONObject(jstr);
+//            if (jsobj.length() > 0)
+//            {
+//                int iresult = jsobj.getInt("result");
+//                if (iresult == Network.AP_SESSION_EXPIRED)
+//                {
+//                    Log.e(TAG, "AP_SESSION_EXPIRED");
+//                    String pass;
+//
+//                    pass = ApexTrackingApplication.get_pass();
+//                    Network.get_Auth(user, pass);
+//                    jstr = getJson(Network.URL_PUSH, parms);
+//                    jsobj = new JSONObject(jstr);
+//                    iresult = jsobj.getInt("result");
+//                }
+//                if (iresult != Network.AP_MESSAGE_NEW)
+//                {
+//                    // session expired
+//                    Log.d(TAG,
+//                            "DOSE NOT GET NEW MESSAGE CODE="
+//                                    + jsobj.getInt("result"));
+//                    return null;
+//                    // if (get_Auth(name, password) == RESULT_TRUE)
+//                    // {
+//                    // return get_records(name, password, parms);
+//                    //
+//                    // }
+//                    // else
+//                    // {
+//                    //
+//                    // Log.d(TAG,
+//                    // "USER NOT AUTHORIZED CODE="
+//                    // + jsobj.getInt("result"));
+//                    // return null;
+//                    // }
+//                }
+//                else
+//                {
+//                    return jstr;
+//                }
+//            }
+//            else
+//            {
+//                Log.d(TAG, "json is wrong");
+//                return null;
+//            }
+//        }
+//        catch (JSONException e)
+//        {
+//            // TODO Auto-generated catch block
+//            e.printStackTrace();
+//        }
+//        return null;
 
         // return RESULT_ERROR;
     }

LibTest/LibTest.iml

@@ -8,7 +8,7 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />

LibTest/RAUtilsLibrary/RAUtilsLibrary.iml

@@ -13,11 +13,10 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

LibTest/app/app.iml

@@ -22,7 +22,7 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
+  <component name="NewModuleRootManager">
     <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
     <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
     <exclude-output />
@@ -84,18 +84,27 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/build/.DS_Store" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 27 Platform" jdkType="Android SDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:runner-1.0.2" level="project" />
     <orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.1.0@jar" level="project" />
@@ -126,5 +135,6 @@
     <orderEntry type="library" name="Gradle: android.arch.core:common:1.1.0@jar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: net.sf.kxml:kxml2:2.3.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime-1.1.0" level="project" />
+    <orderEntry type="library" name="Gradle: android-android-27" level="project" />
   </component>
 </module>