Переглянути джерело

aandroid kerry 迁移前提交

Ray Zhang 5 роки тому
батько
коміт
49234edfd4
20 змінених файлів з 0 додано та 1612 видалено
  1. 0 333
      ApexDrivers/RAUtilsLibrary/src/main/java/com/usai/redant/rautils/application/ApexApplication.java
  2. BIN
      ApexDrivers/apexdriversi/src/main/res/mipmap-hdpi/ic_launcher_forground.png
  3. BIN
      ApexDrivers/apexdriversi/src/main/res/mipmap-mdpi/ic_launcher_forground.png
  4. BIN
      ApexDrivers/apexdriversi/src/main/res/mipmap-xhdpi/ic_launcher_forground.png
  5. BIN
      ApexDrivers/apexdriversi/src/main/res/mipmap-xxhdpi/ic_launcher_forground.png
  6. BIN
      ApexDrivers/apexdriversi/src/main/res/mipmap-xxxhdpi/ic_launcher_forground.png
  7. 0 141
      ApexDrivers/apexdriverslib/src/main/java/com/usai/redant/apexdrivers/signature/SignatureActivity.java
  8. 0 167
      ApexDrivers/apexdriverslib/src/main/java/com/usai/redant/apexdrivers/signature/SignatureView.java
  9. 0 468
      ApexDrivers/apexdriverslib/src/main/java/com/usai/redant/apexdrivers/upload/UploadListActivity.java
  10. 0 18
      ApexDrivers/apexdriverslib/src/main/res/layout/activity_upload_list.xml
  11. BIN
      ApexDrivers/apexdriverslib/src/main/res/mipmap-hdpi/ic_launcher_forground.png
  12. BIN
      ApexDrivers/apexdriverslib/src/main/res/mipmap-mdpi/ic_launcher_forground.png
  13. BIN
      ApexDrivers/apexdriverslib/src/main/res/mipmap-xhdpi/ic_launcher_forground.png
  14. BIN
      ApexDrivers/apexdriverslib/src/main/res/mipmap-xxhdpi/ic_launcher_forground.png
  15. BIN
      ApexDrivers/apexdriverslib/src/main/res/mipmap-xxxhdpi/ic_launcher_forground.png
  16. BIN
      ApexDrivers/apexmobile/src/main/res/drawable-xxhdpi/ic_launcher_new.png
  17. BIN
      ApexDrivers/apexmobile/src/main/res/drawable/apexlogo_2.png
  18. 0 154
      ApexDrivers/raimage/src/main/java/com/usai/redant/raimage/RedAntApplication.java
  19. 0 214
      ApexDrivers/raimage/src/main/java/com/usai/redant/raimage/TaskActivity.java
  20. 0 117
      ApexDrivers/raimage/src/main/java/com/usai/service/RAImageBackgroundService.java

+ 0 - 333
ApexDrivers/RAUtilsLibrary/src/main/java/com/usai/redant/rautils/application/ApexApplication.java

@@ -1,333 +0,0 @@
-package com.usai.redant.rautils.application;
-
-import android.app.Activity;
-import android.app.Application;
-import android.app.Notification;
-import android.app.NotificationChannel;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.ServiceConnection;
-import android.content.SharedPreferences;
-import android.graphics.BitmapFactory;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.IBinder;
-import android.provider.Settings;
-import androidx.core.app.NotificationCompat;
-import android.text.TextUtils;
-
-import com.usai.redant.rautils.receiver.RABroadcast;
-import com.usai.redant.rautils.service.RAService;
-
-import static android.app.Notification.VISIBILITY_PUBLIC;
-import static android.app.PendingIntent.FLAG_UPDATE_CURRENT;
-
-
-public class ApexApplication extends Application {
-
-    // region Activity Life
-    private boolean isBackground = true;
-
-    public boolean isBackground() {
-        return isBackground;
-    }
-
-    private class LifeCallback implements ActivityLifecycleCallbacks {
-
-        private int activityStartCount = 0;
-        private Activity mCurrentActivity = null;
-
-        @Override
-        public void onActivityCreated(Activity activity, Bundle savedInstanceState) {
-
-        }
-
-        @Override
-        public void onActivityStarted(Activity activity) {
-            activityStartCount++;
-            mCurrentActivity = activity;
-        }
-
-        @Override
-        public void onActivityResumed(Activity activity) {
-
-            if(isBackground==true)
-            {
-                isBackground = false;
-                applicationDidEnterForeground();
-            }
-        }
-
-        @Override
-        public void onActivityPaused(Activity activity) {
-
-        }
-
-        @Override
-        public void onActivityStopped(Activity activity) {
-
-            activityStartCount--;
-            if(activityStartCount == 0)
-            {
-                isBackground = true;
-                applicationDidEnterBackground();
-            }
-        }
-
-        @Override
-        public void onActivitySaveInstanceState(Activity activity, Bundle outState) {
-
-        }
-
-        @Override
-        public void onActivityDestroyed(Activity activity) {
-
-        }
-    }
-    // endregion
-
-    // region Life Circle
-
-    private static ApexApplication instance;
-    private LifeCallback mLifeCallback;
-    private ServiceConnection mServiceConnection = null;
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        instance = this;
-        mLifeCallback = new LifeCallback();
-        registerActivityLifecycleCallbacks(mLifeCallback);
-    }
-
-    @Override
-    public void onTerminate() {
-        super.onTerminate();
-
-        unregisterActivityLifecycleCallbacks(mLifeCallback);
-        if (mServiceConnection != null) {
-            unbindService(mServiceConnection);
-        }
-    }
-
-    // endregion
-
-    // region Getter
-    public static ApexApplication sharedApplication() {
-        return instance;
-    }
-
-    public Activity getCurrentActivity() {
-        if (mLifeCallback != null) {
-
-            return mLifeCallback.mCurrentActivity;
-        }
-        return null;
-    }
-
-    // endregion
-
-    // region Callback
-
-    public void applicationDidEnterBackground() {
-
-    }
-
-    public void applicationDidEnterForeground() {
-
-    }
-
-    // endregion
-
-    // region Service & Receiver
-
-    private RAService mService;
-    public void startService(Class serviceCls) {
-
-        mServiceConnection = new ServiceConnection() {
-            @Override
-            public void onServiceConnected(ComponentName name, IBinder service) {
-
-                RAService.MyBinder binder = (RAService.MyBinder)service;
-                mService = (RAService) binder.getService();
-
-            }
-
-            @Override
-            public void onServiceDisconnected(ComponentName name) {
-
-                mService = null;
-            }
-        };
-
-        Intent serviceintent = new Intent();
-        serviceintent.setClass(this, serviceCls);
-
-        ComponentName cn;
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            cn =this.startForegroundService(serviceintent);
-        } else {
-            cn =this.startService(serviceintent);
-        }
-
-        Intent intent = new Intent(getApplicationContext(),serviceCls);
-        bindService(intent,mServiceConnection, Context.BIND_AUTO_CREATE);
-    }
-
-    public RAService getService() {
-        return mService;
-    }
-
-    // endregion
-
-    // region Alarm
-
-    public void initAlarm(Class receiverCls) {
-
-        Intent bintent = new Intent(RABroadcast.ACTION_REDANT_INIT_ALARM);
-        bintent.setClass(this, receiverCls);
-        sendBroadcast(bintent);
-    }
-
-    // endregion
-
-    // region Preference
-
-    public SharedPreferences sharedPreferences(String key) {
-
-        SharedPreferences pref=null;
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
-        {
-            Context c= this.createDeviceProtectedStorageContext();
-            pref = c.getSharedPreferences(key, 0);
-        }
-        else
-        {
-            pref = getSharedPreferences(key, 0);
-        }
-        return pref;
-    }
-
-    // endregion
-
-    // region Notification
-
-    public class NotificationContent {
-
-        public static final String ExtraKey = "aps";
-
-        private String title;
-        private String body;
-        private int id;
-        private String extra;
-
-        private int smallIcon;
-        private int largeIcon;
-
-        /**
-         * smallIcon like Driver R.drawable.small_icon_clear
-         * largeIcon like Driver R.drawable.large_notification_icon_clear
-         * */
-        public NotificationContent(int id, String title, String body, int smallIcon, int largeIcon, String extra) {
-            this.id = id;
-            this.title = title;
-            this.body = body;
-            this.extra = extra;
-            this.smallIcon = smallIcon;
-            this.largeIcon = largeIcon;
-        }
-    }
-
-    public void showNotification(NotificationContent content, String channelId, String channelName, Class activityCls) {
-        if (content == null) {
-            return;
-        }
-
-        if (TextUtils.isEmpty(content.title) || TextUtils.isEmpty(content.body)) {
-            return;
-        }
-
-        Intent intent = new Intent(getApplicationContext(), activityCls);
-        intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP | Intent.FLAG_ACTIVITY_CLEAR_TOP); // getIntent可能是null
-        if (content.extra != null) {
-            intent.putExtra(NotificationContent.ExtraKey,content.extra); // 程序在后台的情况下,点击通知将程序唤醒到前台时,并不能取得extra
-        }
-
-        /**
-         *
-         * requestCode: 需要保证不同,否则id不通的intent取到的extra也是同一个
-         * */
-        int requestCode = content.id;
-        PendingIntent contentIntent = PendingIntent.getActivity(getApplicationContext(), requestCode, intent,FLAG_UPDATE_CURRENT);
-
-        //1.获取系统通知的管理者
-        NotificationManager nm = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
-
-        Notification noti = null;
-        long[] vibrates = { 0, 1000, 1000, 1000 };
-
-//        Uri soundUri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION);
-        Uri soundUri = Settings.System.DEFAULT_NOTIFICATION_URI;
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-
-            /**
-             * Oreo不用Priority了,用importance
-             * IMPORTANCE_NONE 关闭通知
-             * IMPORTANCE_MIN 开启通知,不会弹出,但没有提示音,状态栏中无显示
-             * IMPORTANCE_LOW 开启通知,不会弹出,不发出提示音,状态栏中显示
-             * IMPORTANCE_DEFAULT 开启通知,不会弹出,发出提示音,状态栏中显示
-             * IMPORTANCE_HIGH 开启通知,会弹出,发出提示音,状态栏中显示
-             */
-            NotificationChannel channel = new NotificationChannel(channelId, channelName, NotificationManager.IMPORTANCE_HIGH);
-            // 震动
-            channel.enableVibration(true);
-            channel.setVibrationPattern(vibrates);
-
-            channel.enableLights(true);
-
-            channel.setSound(soundUri, Notification.AUDIO_ATTRIBUTES_DEFAULT);
-
-            nm.createNotificationChannel(channel);
-
-            noti = new NotificationCompat.Builder(this, channelId)
-                    .setContentTitle(content.title)
-                    .setContentText(content.body)
-                    .setSmallIcon(content.smallIcon)
-                    .setLargeIcon(BitmapFactory.decodeResource(getResources(),content.largeIcon))
-                    .setContentIntent(contentIntent)
-                    .setVisibility(VISIBILITY_PUBLIC)
-                    .setSound(soundUri)
-                    .setLights(0xff00bbff,500,200)
-                    .build();
-        } else {
-
-            noti = new Notification.Builder(this)
-                    .setContentTitle(content.title)
-                    .setContentText(content.body)
-                    .setSmallIcon(content.smallIcon)
-                    .setLargeIcon(BitmapFactory.decodeResource(getResources(),content.largeIcon))
-                    .setContentIntent(contentIntent)
-                    .setVisibility(VISIBILITY_PUBLIC)
-                    .setSound(soundUri)
-                    .setLights(0xff00bbff,500,20)
-                    .build();
-
-        }
-
-        /**
-         * vibrate属性是一个长整型的数组,用于设置手机静止和振动的时长,以毫秒为单位。
-         * 参数中下标为0的值表示手机静止的时长,下标为1的值表示手机振动的时长, 下标为2的值又表示手机静止的时长,以此类推。
-         */
-        noti.vibrate = vibrates;
-
-        noti.flags |= Notification.FLAG_AUTO_CANCEL;
-        nm.notify(content.id, noti);
-    }
-
-    // endregion
-}

BIN
ApexDrivers/apexdriversi/src/main/res/mipmap-hdpi/ic_launcher_forground.png


BIN
ApexDrivers/apexdriversi/src/main/res/mipmap-mdpi/ic_launcher_forground.png


BIN
ApexDrivers/apexdriversi/src/main/res/mipmap-xhdpi/ic_launcher_forground.png


BIN
ApexDrivers/apexdriversi/src/main/res/mipmap-xxhdpi/ic_launcher_forground.png


BIN
ApexDrivers/apexdriversi/src/main/res/mipmap-xxxhdpi/ic_launcher_forground.png


+ 0 - 141
ApexDrivers/apexdriverslib/src/main/java/com/usai/redant/apexdrivers/signature/SignatureActivity.java

@@ -1,141 +0,0 @@
-package com.usai.redant.apexdrivers.signature;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.graphics.Bitmap;
-import android.graphics.drawable.Drawable;
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.view.Menu;
-import android.view.MenuItem;
-
-import com.usai.redant.apexdrivers.R;
-import com.usai.redant.apexdrivers.base.BasicActivity;
-import com.usai.redant.rautils.utils.FileManager;
-import com.usai.redant.rautils.utils.ImageUtil;
-
-import java.io.File;
-import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-public class SignatureActivity extends BasicActivity {
-
-    public static void startSignature(Activity context,int requestCode) {
-
-        if (context == null) {
-            return;
-        }
-
-        Intent intent = new Intent(context, SignatureActivity.class);
-
-        context.startActivityForResult(intent,requestCode);
-    }
-
-    private Context mCtx = this;
-    private SignatureView mSignatureView;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_signature);
-
-        android.support.v7.app.ActionBar actionBar = getSupportActionBar();
-        if(actionBar != null){
-            actionBar.setHomeButtonEnabled(true);
-            actionBar.setDisplayHomeAsUpEnabled(true);
-        }
-
-        mSignatureView = findViewById(R.id.signature_content_view);
-
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.signature_menu,menu);
-
-        MenuItem saveItem = menu.getItem(1);
-        Drawable saveItemIcon = saveItem.getIcon();
-        ImageUtil.renderingDrawable(saveItemIcon,getResources(),R.color.ApexDriverWhite);
-
-        MenuItem clearItem = menu.getItem(0);
-        Drawable clearItemIcon = clearItem.getIcon();
-        ImageUtil.renderingDrawable(clearItemIcon,getResources(),R.color.ApexDriverWhite);
-
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        int i = item.getItemId();
-        if (i == R.id.signature_clear_btn) {
-            clearSignature();
-
-        } else if (i == R.id.signature_save_btn) {
-            saveAndFinish();
-
-        } else if (i == android.R.id.home) {
-            finish();
-
-        }
-        return true;
-    }
-
-    private void saveAndFinish() {
-
-        Intent intent = new Intent();
-        String signaturePath = saveSignature();
-        if (!TextUtils.isEmpty(signaturePath)) {
-            intent.putExtra("signaturePath",signaturePath);
-        }
-
-        setResult(RESULT_OK,intent);
-
-        finish();
-    }
-
-    private String saveSignature() {
-
-        Bitmap signature = mSignatureView.saveSignature();
-        if (signature != null) {
-
-            String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmSS").format(new Date());
-            String signatureName = "JPEG_" + timeStamp + ".jpg";
-
-//            String root = FileManager.SDCardRoot();
-//            String appName = RAUtil.getApplicationName(mCtx);
-//            String signatureDir = root + File.separator + appName + File.separator + "signature";
-
-            String signatureDir = FileManager.internalStorageFileDir(mCtx) + File.separator + "Signature";
-            String signaturePath = signatureDir + File.separator + signatureName;
-
-            File parentFile = new File(signatureDir);
-            if (!parentFile.exists()) {
-                parentFile.mkdirs();
-            }
-
-            File signatureFile = new File(signaturePath);
-            if (signatureFile.exists()) {
-                signatureFile.delete();
-            }
-            try {
-
-                signatureFile.createNewFile();
-
-                ImageUtil.saveJPGToFile(signature,signatureFile);
-
-                return signaturePath;
-
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-
-        return null;
-    }
-
-    private void clearSignature() {
-        mSignatureView.clear();
-    }
-}

+ 0 - 167
ApexDrivers/apexdriverslib/src/main/java/com/usai/redant/apexdrivers/signature/SignatureView.java

@@ -1,167 +0,0 @@
-package com.usai.redant.apexdrivers.signature;
-
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.graphics.Path;
-import android.support.annotation.Nullable;
-import android.util.AttributeSet;
-import android.view.MotionEvent;
-import android.view.View;
-
-public class SignatureView extends View {
-
-    private Paint mPaint;
-    private Path mPath;
-    private float mLineWidth = 10;
-    private float mX,mY;
-    private float minX = Float.MAX_VALUE,minY = Float.MAX_VALUE,maxX = Float.MIN_VALUE,maxY = Float.MIN_VALUE;
-
-    public SignatureView(Context context) {
-        this(context,null);
-    }
-
-    public SignatureView(Context context, @Nullable AttributeSet attrs) {
-        this(context, attrs,0);
-    }
-
-    public SignatureView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-
-        init();
-    }
-
-    private void init() {
-
-        mPaint = new Paint();
-        mPaint.setAntiAlias(true);
-        mPaint.setDither(true);
-        mPaint.setStyle(Paint.Style.STROKE);
-        mPaint.setStrokeJoin(Paint.Join.ROUND);
-        mPaint.setStrokeCap(Paint.Cap.ROUND);
-
-        setLineWidth(mLineWidth);
-        setLineColor(Color.BLACK);
-
-        mPath = new Path();
-    }
-
-    public void setLineWidth(float lineWidth) {
-        mLineWidth = lineWidth;
-
-        mPaint.setStrokeWidth(mLineWidth);
-    }
-
-    public void setLineColor(int color) {
-        mPaint.setColor(color);
-    }
-
-    public void clear() {
-
-        mX = mY = minX = minY = maxX = maxY= 0;
-        mPath.reset();
-        invalidate();
-    }
-
-    public Bitmap saveSignature() {
-
-        minX -= mLineWidth;
-        minY -= mLineWidth;
-        maxX += mLineWidth;
-        maxY += mLineWidth;
-
-        float w = maxX - minX;
-        float h = maxY - minY;
-
-//        Bitmap bitmap = Bitmap.createBitmap(getWidth(), getHeight(), Bitmap.Config.RGB_565);
-        Bitmap bitmap = Bitmap.createBitmap((int)w, (int)h, Bitmap.Config.RGB_565);
-        mPath.offset(-minX,-minY);
-
-        Canvas canvas = new Canvas(bitmap);
-
-
-//        RectF rect = new RectF(minX,minY,maxX,maxY);
-        canvas.drawColor(Color.WHITE);
-        canvas.drawPath(mPath,mPaint);
-//        canvas.clipRect(rect);
-
-        return bitmap;
-    }
-
-    @Override
-    public boolean onTouchEvent(MotionEvent event) {
-
-        float x = event.getX();
-        float y = event.getY();
-
-        calculateRect(x, y);
-
-        switch (event.getAction()) {
-            case MotionEvent.ACTION_DOWN: {
-                onTouchDown(x, y);
-            }
-            break;
-            case MotionEvent.ACTION_MOVE: {
-                onTouchMove(x, y);
-            }
-            break;
-            case MotionEvent.ACTION_UP: {
-                onTouchUp(x, y);
-            }
-            break;
-        }
-
-        return true;
-    }
-
-    private void calculateRect(float x,float y) {
-
-        minX = Math.min(x,minX);
-
-        minY = Math.min(y,minY);
-
-        maxX = Math.max(x,maxX);
-        maxY = Math.max(y,maxY);
-    }
-
-    private void onTouchDown(float x,float y) {
-
-        mPath.moveTo(x,y);
-
-        mX = x;
-        mY = y;
-
-        invalidate();
-    }
-
-    private void onTouchMove(float x,float y) {
-
-        float dx = Math.abs(x - mX);
-        float dy = Math.abs(y - mY);
-
-        if (dx >= 2 || dy >= 2) {
-
-            mPath.quadTo(mX, mY, (x + mX) / 2, (y + mY) / 2);// 二次方贝塞尔曲线
-            mX = x;
-            mY = y;
-        }
-
-
-        invalidate();
-    }
-
-    private void onTouchUp(float x,float y) {
-
-        mPath.lineTo(x,y);
-
-        invalidate();
-    }
-
-    @Override
-    protected void onDraw(Canvas canvas) {
-
-        canvas.drawPath(mPath, mPaint);
-    }
-}

+ 0 - 468
ApexDrivers/apexdriverslib/src/main/java/com/usai/redant/apexdrivers/upload/UploadListActivity.java

@@ -1,468 +0,0 @@
-package com.usai.redant.apexdrivers.upload;
-
-import android.content.BroadcastReceiver;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.ServiceConnection;
-import android.os.Bundle;
-import android.os.IBinder;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AlertDialog;
-import android.util.Log;
-import android.util.TypedValue;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.ImageButton;
-import android.widget.ListView;
-import android.widget.ProgressBar;
-import android.widget.TextView;
-
-import com.usai.redant.apexdrivers.ApexDriversBackgroundService;
-import com.usai.redant.apexdrivers.R;
-import com.usai.redant.apexdrivers.base.BasicActivity;
-import com.usai.redant.rautils.upload.RAUploadManager;
-
-
-import java.util.ArrayList;
-
-import static com.usai.redant.apexdrivers.ApexDriversBackgroundService.APEX_DRIVER_UPLOAD_COUNT_CHANGE_NOTIFICATION;
-
-/**
- * 请使用TaskActivity
- * */
-@Deprecated
-public class UploadListActivity extends BasicActivity {
-
-
-    private ArrayList<Bundle> displaylist = new ArrayList<Bundle>();
-
-    //    private SwipeMenuListView uploadList;
-    private ListView uploadList;
-    private uploadAdapter adapter;
-//    private ArrayList<Bundle> arr;
-
-    private RAUploadManager uploadManager;
-    private ApexDriversBackgroundService.MyBinder binder;
-    private ApexDriversBackgroundService uploadServiceservice;
-    private boolean serviceConnectionFlag = false; // 绑定服务标识
-    private ServiceConnection serviceConnection;
-    private RAUploadManager.UIUpdateListener uiUpdateListener = new RAUploadManager.UIUpdateListener() {
-
-        @Override
-        public void updateCell(long index, final Bundle taskinfo)
-        {
-            if(true)
-                return;
-
-            if(true) {
-
-                runOnUiThread(new Runnable() {
-                    @Override
-                    public void run() {
-
-                        adapter.notifyDataSetChanged();
-                    }
-                });
-
-                return;
-            }
-
-            final int position = (int)index;
-
-            runOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-
-                    double percent = taskinfo.getDouble("progress",0);
-
-                    long timeStart = System.currentTimeMillis();
-
-                    int startShowIndex = uploadList.getFirstVisiblePosition();
-                    int lastShowIndex = uploadList.getLastVisiblePosition();
-
-                    if (position >= startShowIndex && position <= lastShowIndex) {
-                        View cell = uploadList.getChildAt((int)position - startShowIndex);
-                        uploadAdapter.ViewHolder holder= (uploadAdapter.ViewHolder)cell.getTag();
-
-
-
-                        RAUploadManager.TaskStatus istatus = RAUploadManager.TaskStatus.values()[taskinfo.getInt("status",0)];
-                        String status="";
-                        switch(istatus)
-                        {
-                            case TaskStatusStart:
-                                status="uploading";
-                                break;
-                            case TaskStatusStop:
-                                status="stop";
-                                break;
-                            case TaskStatusError:
-                                status="warning";
-                                break;
-                            case TaskStatusWait:
-                                status="waiting";
-                                break;
-                            case TaskStatusFinish:
-                                status="finish";
-                                break;
-
-                            default:
-                                status="warning";
-                                break;
-                        }
-
-
-
-                        String err = taskinfo.getString("msg");
-                        String name = taskinfo.getString("order","");
-                        String action = taskinfo.getString("action","");
-                        String time = taskinfo.getString("time");
-                        String photoName = taskinfo.getString("name");
-
-                        holder.name_tv.setText(name);
-                        holder.progressBar.setProgress((int)(100 *percent));
-                        holder.state_tv.setText(status);
-                        holder.action_tv.setText(action);
-                        holder.time_tv.setText(time);
-                        holder.progress_tv.setText(String.format("%.2f%%",100*percent));
-                        holder.err_tv.setText(err);
-                        holder.photoName_tv.setText(photoName);
-                    }
-
-                }
-            });
-        }
-
-        @Override
-        public void updateList(final ArrayList<Bundle> newlist)
-        {
-
-
-            runOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-
-                    Log.d("_LIST","running  tid="+Thread.currentThread().getId());
-                    Log.d("_LIST", "uploadlist UI  size:  "+ newlist.size());
-                    long timeStart = System.currentTimeMillis();
-                    displaylist = (ArrayList<Bundle>) newlist.clone();
-                    adapter.notifyDataSetChanged();
-
-                }
-            });
-
-        }
-    };
-
-    private BroadcastReceiver uploadReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-
-            String action = intent.getAction();
-            if (action.equals(APEX_DRIVER_UPLOAD_COUNT_CHANGE_NOTIFICATION)) {
-
-                runOnUiThread(new Runnable() {
-                    @Override
-                    public void run() {
-                        notifyDataChanged();
-                    }
-                });
-            }
-        }
-    };
-
-    private void registerBroadcastReceiver() {
-
-        IntentFilter intentFilter = new IntentFilter();
-        intentFilter.addAction(APEX_DRIVER_UPLOAD_COUNT_CHANGE_NOTIFICATION);
-
-        registerReceiver(uploadReceiver,intentFilter);
-    }
-
-    public void notifyDataChanged() {
-
-        displaylist = (ArrayList<Bundle>) uploadManager.get_arr_queue().clone(); //uploadManager.arr_queue;
-
-        adapter.notifyDataSetChanged();
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_upload_list);
-
-        ActionBar mActionBar = getSupportActionBar();
-        mActionBar.setHomeButtonEnabled(true);
-        mActionBar.setDisplayHomeAsUpEnabled(true);
-        mActionBar.setTitle(getString(R.string.app_name));
-
-
-        // 初始化视图
-        uploadList = (ListView)findViewById(R.id.upload_list);
-        adapter = new uploadAdapter(R.layout.upload_cell);
-        uploadList.setAdapter(adapter);
-        serviceConnection = new ServiceConnection() {
-            @Override
-            public void onServiceConnected(ComponentName name, IBinder iBinder) {
-                serviceConnectionFlag = true;
-
-                binder = (ApexDriversBackgroundService.MyBinder)iBinder;
-                uploadServiceservice = (ApexDriversBackgroundService)binder.getService();
-
-
-
-
-                uploadManager = uploadServiceservice.getUploadManager();
-                if (uploadManager == null) {
-                    return;
-                }
-                uploadManager.uiUpdateListener = uiUpdateListener;
-                displaylist = (ArrayList<Bundle>) uploadManager.get_arr_queue().clone(); //uploadManager.arr_queue;
-                adapter.notifyDataSetChanged();
-            }
-
-            @Override
-            public void onServiceDisconnected(ComponentName name) {
-                serviceConnectionFlag = false;
-                uploadManager.uiUpdateListener = null;
-            }
-        };
-
-        bindService();
-
-        registerBroadcastReceiver();
-    }
-
-    @Override
-    protected void onDestroy() {
-
-        unbindService(serviceConnection);
-
-        unregisterReceiver(uploadReceiver);
-
-        super.onDestroy();
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.upload_list_menu,menu);
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        int i = item.getItemId();
-        if (i == android.R.id.home) {
-            finish();
-
-        } else if (i == R.id.clear_upload_list_btn) {
-            clearUploadList();
-
-        }
-        return true;
-    }
-
-    private void clearUploadList() {
-        if (displaylist.size() == 0) {
-            new AlertDialog.Builder(this)
-                    .setTitle(getString(R.string.warning))
-                    .setMessage(getString(R.string.upload_empty))
-                    .setPositiveButton(getString(R.string.btn_ok),null)
-                    .show();
-            return;
-        }
-
-        new AlertDialog.Builder(this)
-                .setTitle(getString(R.string.clear_title))
-                .setMessage(getString(R.string.clear_ask))
-                .setPositiveButton(getString(R.string.btn_ok), new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        // clear
-                        if (serviceConnectionFlag == true && uploadServiceservice != null) {
-                            uploadManager.clearTask();
-//                            adapter.notifyDataSetChanged();
-                        }
-
-                    }
-                })
-                .setNegativeButton(getString(R.string.btn_cancel), new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-
-                    }
-                })
-                .show();
-
-    }
-
-
-    private class uploadAdapter extends BaseAdapter {
-        private int resourceId;
-        public uploadAdapter(int resourceID) {
-
-            resourceId = resourceID;
-        }
-
-        @Override
-        public int getCount() {
-            return displaylist.size();
-        }
-
-        @Override
-        public Bundle getItem(int position) {
-            return displaylist.get(position);
-        }
-
-        @Override
-        public long getItemId(int position) {
-            return position;
-        }
-
-//        @Override
-//        public int getViewTypeCount() {
-//            return 4;
-//        }
-//
-//        @Override
-//        public int getItemViewType(int position) {
-//            /**
-//             * 0. <finish>      remove              </finish>
-//             * 1. <error>       start  remove       </error>
-//             * 2. <stop>        start               </stop>
-//             * 3. <start\wait>  none                </start\wait>
-//             * */
-//            return taskSwipeType(position);
-//        }
-
-        @NonNull
-        @Override
-        public View getView(int position, @Nullable View convertView, @NonNull ViewGroup parent) {
-
-            Log.d("_LIST","running  tid="+Thread.currentThread().getId());
-            long timeStart = System.currentTimeMillis();
-
-            final Bundle item = displaylist.get(position);
-
-            RAUploadManager.TaskStatus istatus = RAUploadManager.TaskStatus.values()[item.getInt("status",0)];
-            String status="";
-            switch(istatus)
-            {
-                case TaskStatusStart:
-                    status="uploading";
-                    break;
-                case TaskStatusStop:
-                    status="stop";
-                    break;
-                case TaskStatusError:
-                    status="warning";
-                    break;
-                case TaskStatusWait:
-                    status="waiting";
-                    break;
-                case TaskStatusFinish:
-                    status="finish";
-                    break;
-
-                default:
-                    status="warning";
-                    break;
-            }
-
-            double percent = item.getDouble("progress",0);
-            String err = item.getString("msg");
-            String name = item.getString("order","");
-            String action = item.getString("action","");
-            String time = item.getString("time");
-            String photoName = item.getString("name");
-
-            View cell;
-            ViewHolder holder;
-            if (convertView != null) {
-
-                cell = convertView;
-                holder = (ViewHolder)cell.getTag();
-
-            } else  {
-
-                cell = View.inflate(getApplicationContext(),resourceId,null);
-                holder = new ViewHolder();
-                holder.name_tv = (TextView)cell.findViewById(R.id.upload_cell_title_tv);
-                holder.photoName_tv = cell.findViewById(R.id.upload_cell_name_tv);
-                holder.action_tv = cell.findViewById(R.id.upload_cell_action_tv);
-                holder.time_tv = cell.findViewById(R.id.upload_cell_time_tv);
-                holder.progressBar = (ProgressBar)cell.findViewById(R.id.upload_progressBar);
-                holder.state_tv = (TextView)cell.findViewById(R.id.upload_state_tv);
-                holder.progress_tv = (TextView)cell.findViewById(R.id.upload_progress_tv);
-                holder.err_tv = (TextView)cell.findViewById(R.id.upload_err_tv);
-                holder.btn_reload=(ImageButton) cell.findViewById(R.id.btn_reload);
-
-
-                holder.btn_reload.setImageResource(R.drawable.ic_action_reload);
-                if(istatus!= RAUploadManager.TaskStatus.TaskStatusError)
-                {
-                    holder.btn_reload.setVisibility(View.GONE);
-                }
-                else
-                {
-                    holder.btn_reload.setVisibility(View.VISIBLE);
-                    holder.btn_reload.setOnClickListener(new View.OnClickListener() {
-                        @Override
-                        public void onClick(View v) {
-
-                            uploadManager.startTask(item);
-                            v.setVisibility(View.GONE);
-                        }
-                    });
-                }
-                cell.setTag(holder);
-            }
-
-            holder.name_tv.setText(name);
-            holder.action_tv.setText(action);
-            holder.time_tv.setText(time);
-            holder.progressBar.setProgress((int) (100 * percent));
-            holder.state_tv.setText(status);
-            holder.progress_tv.setText(String.format("%.2f%%",100*percent));
-            holder.err_tv.setText(err);
-            holder.photoName_tv.setText(photoName);
-
-
-
-            Log.d("_LIST", "getView(): POSITION   "+position+" COST   " + (System.currentTimeMillis() - timeStart));
-            return cell;
-        }
-
-        private class ViewHolder {
-            public TextView name_tv;
-            public TextView photoName_tv;
-            public TextView action_tv;
-            public TextView time_tv;
-            public ProgressBar progressBar;
-            public TextView state_tv;
-            public TextView progress_tv;
-            public TextView err_tv;
-            public ImageButton btn_reload;
-        }
-    }
-
-
-    /** Service */
-    private void bindService() {
-        Intent intent = new Intent(UploadListActivity.this, ApexDriversBackgroundService.class);
-
-        bindService(intent, serviceConnection, Context.BIND_AUTO_CREATE);
-    }
-
-    private int dp2px(int dp) {
-        return (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp,getResources().getDisplayMetrics());
-    }
-}

+ 0 - 18
ApexDrivers/apexdriverslib/src/main/res/layout/activity_upload_list.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context="com.usai.redant.apexdrivers.upload.UploadListActivity">
-
-    <ListView
-        android:id="@+id/upload_list"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        >
-
-    </ListView>
-
-
-
-</RelativeLayout>

BIN
ApexDrivers/apexdriverslib/src/main/res/mipmap-hdpi/ic_launcher_forground.png


BIN
ApexDrivers/apexdriverslib/src/main/res/mipmap-mdpi/ic_launcher_forground.png


BIN
ApexDrivers/apexdriverslib/src/main/res/mipmap-xhdpi/ic_launcher_forground.png


BIN
ApexDrivers/apexdriverslib/src/main/res/mipmap-xxhdpi/ic_launcher_forground.png


BIN
ApexDrivers/apexdriverslib/src/main/res/mipmap-xxxhdpi/ic_launcher_forground.png


BIN
ApexDrivers/apexmobile/src/main/res/drawable-xxhdpi/ic_launcher_new.png


BIN
ApexDrivers/apexmobile/src/main/res/drawable/apexlogo_2.png


+ 0 - 154
ApexDrivers/raimage/src/main/java/com/usai/redant/raimage/RedAntApplication.java

@@ -1,154 +0,0 @@
-package com.usai.redant.raimage;
-
-import android.app.AlarmManager;
-import android.app.Application;
-import android.app.PendingIntent;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.ServiceConnection;
-import android.content.SharedPreferences;
-import android.os.Build;
-import android.os.IBinder;
-import android.os.SystemClock;
-import android.provider.Settings;
-import android.text.TextUtils;
-import android.util.Log;
-
-import com.usai.service.RAImageBackgroundService;
-
-import org.json.JSONObject;
-
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReadWriteLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-
-public class RedAntApplication extends Application
-{
-
-	public static  String CHANNEL_ID = "RAImage";
-	public static  String CHANNEL_NAME = "RAImage";
-
-    private static RedAntApplication instance;  
-    public static ReadWriteLock lock = new ReentrantReadWriteLock(true);  
-    public static ReadWriteLock loglock = new ReentrantReadWriteLock(true);  
-    public static Lock logwritelock   = loglock.writeLock();   
-    public static Lock writeLock   = lock.writeLock();   
-    public static String user;
-    public static String password;
-    public static String active_address;
-    public static String station_name;
-	public static String device_id;
-	public static JSONObject server_info;
-
-	private ServiceConnection mServiceConnection;
-	private RAImageBackgroundService mService;
-
-    public static RedAntApplication getInstance() {  
-        return instance;  
-    }  
-	public static void startalarm()
-	{
-
-		Intent iAlarm = new Intent("REDANT.POP.RETRY_UPLOAD");
-		//iAlarm.putExtra("caller", caller);
-//		iAlarm.setAction("com.usai.apex.push");
-		PendingIntent sender = PendingIntent.getBroadcast(getInstance(), 0,
-				iAlarm, PendingIntent.FLAG_UPDATE_CURRENT);
-
-		long firstime = SystemClock.elapsedRealtime();
-//		UpdateLastAlermTime();
-		AlarmManager am = (AlarmManager) getInstance().getSystemService(
-				Context.ALARM_SERVICE);
-
-		// 5分钟一个周期,不停的发送广播
-		am.setRepeating(AlarmManager.ELAPSED_REALTIME_WAKEUP, firstime,
-				300 * 1000, sender);
-		Log.d("redant pop","start alarm");
-	}
-
-	public static void cancelalarm()
-	{
-
-		// 启动完成
-		Intent iAlarm = new Intent("REDANT.POP.RETRY_UPLOAD");
-//		iAlarm.setAction("com.usai.apex.push");
-		PendingIntent sender = PendingIntent.getBroadcast(getInstance(), 0,
-				iAlarm, PendingIntent.FLAG_UPDATE_CURRENT);
-
-		AlarmManager am = (AlarmManager) getInstance().getSystemService(
-				Context.ALARM_SERVICE);
-
-		am.cancel(sender);
-		Log.d("redant pop","cancel alarm");
-	}
-
-    @Override  
-    public void onCreate() {  
-        // TODO Auto-generated method stub
-		Log.d("_RAIMAGE", "onCreate: RedAntApplication");
-		super.onCreate();
-        instance = this;
-
-//        Network.handleSSLHandshake();
-
-		device_id=Settings.Secure.getString(getContentResolver(),Settings.Secure.ANDROID_ID);
-        
-		SharedPreferences pref = RedAntApplication.getInstance().getSharedPreferences("RA Image", 0);
-
-		String aa = pref.getString("aa", null);
-		String name = pref.getString("station name", null);
-		if(!TextUtils.isEmpty(aa))
-			active_address = aa;
-		if(!TextUtils.isEmpty(name))
-			station_name = name;
-
-		/** Service */
-		mServiceConnection = new ServiceConnection() {
-			@Override
-			public void onServiceConnected(ComponentName name, IBinder service) {
-
-				RAImageBackgroundService.MyBinder binder = (RAImageBackgroundService.MyBinder)service;
-				mService = (RAImageBackgroundService)binder.getService();
-
-			}
-
-			@Override
-			public void onServiceDisconnected(ComponentName name) {
-
-				mService = null;
-			}
-		};
-
-		Intent serviceIntent = new Intent();
-		serviceIntent.setClass(this, RAImageBackgroundService.class);
-
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-
-			this.startForegroundService(serviceIntent);
-		} else {
-
-			this.startService(serviceIntent);
-		}
-
-		Intent intent = new Intent(getApplicationContext(),RAImageBackgroundService.class);
-		bindService(intent,mServiceConnection, Context.BIND_AUTO_CREATE);
-
-		/***/
-    }
-
-	@Override
-	public void onTerminate() {
-		Log.d("_RAIMAGE", "onTerminate: RedAntApplication");
-		super.onTerminate();
-
-		unbindService(mServiceConnection);
-	}
-
-	@Override
-	protected void finalize() throws Throwable {
-
-		Log.d("_RAIMAGE", "finalize: RedAntApplication");
-		super.finalize();
-	}
-}

+ 0 - 214
ApexDrivers/raimage/src/main/java/com/usai/redant/raimage/TaskActivity.java

@@ -1,214 +0,0 @@
-package com.usai.redant.raimage;
-
-import android.content.Context;
-
-import android.content.SharedPreferences;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.util.Log;
-import android.view.Gravity;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageButton;
-import android.widget.ProgressBar;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.usai.redant.rautils.upload.RAUploadManager;
-import com.usai.redant.rautils.upload.UploadListActivity;
-import com.usai.service.RAImageBackgroundService;
-import com.usai.util.dbgUtil;
-
-
-public class TaskActivity extends UploadListActivity {
-
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-
-        registerCellResourceId(R.layout.upload_list_cell);
-        setServiceClass(RAImageBackgroundService.class);
-
-        super.onCreate(savedInstanceState);
-    }
-
-    @Override
-    public View dequeueCell(int position, @Nullable View convertView, @NonNull ViewGroup parent) {
-
-        return getView(position, convertView, parent);
-    }
-
-    private View getView(final int position, @Nullable View convertView, @NonNull ViewGroup parent) {
-
-        final Bundle item = getItem(position);
-
-        RAUploadManager.TaskStatus istatus = RAUploadManager.TaskStatus.values()[item.getInt("status",0)];
-        String status="";
-        switch(istatus)
-        {
-            case TaskStatusStart:
-                status="uploading";
-                break;
-            case TaskStatusStop:
-                status="stop";
-                break;
-            case TaskStatusError:
-                status="warning";
-                break;
-            case TaskStatusWait:
-                status="waiting";
-                break;
-            case TaskStatusFinish:
-                status="finish";
-                break;
-
-            default:
-                status="warning";
-                break;
-        }
-        double percent = item.getDouble("progress",(double)item.getInt("progress",0));
-        String err = item.getString("msg");
-        String name = item.getString("file","");
-
-        View cell;
-        ViewHolder holder;
-        if (convertView != null) {
-
-            cell = convertView;
-            holder = (ViewHolder)cell.getTag();
-            Log.d("_LIST", "getView: " + holder);
-
-        } else {
-
-            cell = View.inflate(getApplicationContext(), R.layout.upload_list_cell, null);
-            holder = new ViewHolder();
-            holder.name_tv = (TextView) cell.findViewById(R.id.upload_name_tv);
-            holder.progressBar = (ProgressBar) cell.findViewById(R.id.upload_progressBar);
-            holder.state_tv = (TextView) cell.findViewById(R.id.upload_state_tv);
-            holder.progress_tv = (TextView) cell.findViewById(R.id.upload_progress_tv);
-            holder.err_tv = (TextView) cell.findViewById(R.id.upload_err_tv);
-            holder.btn_reload = (ImageButton) cell.findViewById(R.id.btn_reload);
-            cell.setTag(holder);
-        }
-        holder.btn_reload.setImageResource(R.drawable.ic_action_reload);
-        if(istatus!= RAUploadManager.TaskStatus.TaskStatusError&& istatus!= RAUploadManager.TaskStatus.TaskStatusStop)
-        {
-            holder.btn_reload.setVisibility(View.GONE);
-        }
-        else
-        {
-            holder.btn_reload.setVisibility(View.VISIBLE);
-            Log.d("_LIST", "new listener: position" + position);
-            holder.btn_reload.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-
-
-                    Bundle task = getItem(position);
-
-                    Log.d("_LIST", "retry: " + task.getString("file","file is null") +"position" + position);
-
-
-                    ConnectivityManager connManager = (ConnectivityManager) RedAntApplication.getInstance().getSystemService(Context.CONNECTIVITY_SERVICE);
-
-                    NetworkInfo networkInfo = connManager.getActiveNetworkInfo();
-                    if (networkInfo == null)
-                    {
-                        dbgUtil.Logd(
-                                "Current Network info",
-                                "can not get Active NetworkInfo!");
-//                                canstart = false;
-                        Toast toast = Toast.makeText(getApplicationContext(),
-                                "No available network. Please try upload manually later.",
-                                Toast.LENGTH_LONG);
-                        toast.setGravity(Gravity.CENTER, 0, 0);
-                        toast.show();
-                        return;
-                    }
-                    else
-                    {
-                        NetworkInfo.State netState = networkInfo
-                                .getState();
-                        if (netState != NetworkInfo.State.CONNECTED)
-                        {
-                            dbgUtil.Logd(
-                                    "Current Network info",
-                                    "not Connected!State="
-                                            + netState);
-//                                    canstart = false;
-
-                            Toast toast = Toast.makeText(getApplicationContext(),
-                                    "App network connection. Please try upload manually later.",
-                                    Toast.LENGTH_LONG);
-                            toast.setGravity(Gravity.CENTER, 0, 0);
-                            toast.show();
-                            return;
-                        }
-                        else
-                        {
-                            int iconntype = -1;
-                            iconntype = networkInfo
-                                    .getType();
-
-                            SharedPreferences pref = RedAntApplication
-                                    .getInstance()
-                                    .getSharedPreferences(
-                                            "UploadManager",
-                                            0);
-                            boolean
-                                    wifi_only
-                                    =pref.getBoolean("wifi_only",
-                                    false);
-                            if(wifi_only == true
-                                    && iconntype !=
-                                    ConnectivityManager.TYPE_WIFI
-                                    && iconntype !=
-                                    9/* earthnet */)
-                            {
-//                                    canstart = false;
-
-                                Toast toast = Toast.makeText(getApplicationContext(),
-                                        "App is set to upload via WIFI only. Please change your setting or try upload manually later.",
-                                        Toast.LENGTH_LONG);
-                                toast.setGravity(Gravity.CENTER, 0, 0);
-                                toast.show();
-                                return;
-                            }
-                        }
-
-                    }
-
-                    v.setVisibility(View.GONE);
-                    startTask(task);
-                }
-            });
-        }
-
-
-
-        holder.name_tv.setText(name);
-//            holder.progressBar.setProgress(100 *(int)percent);
-        holder.progressBar.setProgress((int) (100 * percent));
-        holder.state_tv.setText(status);
-//            holder.progress_tv.setText(100*percent+"%");
-        holder.progress_tv.setText(String.format("%.2f%%",100*percent));
-        holder.err_tv.setText(err);
-
-
-
-        Log.d("_LIST", "getView(): POSITION   "+position+" file   " + item.getString("file","no file"));
-        return cell;
-    }
-
-    private class ViewHolder {
-        public TextView name_tv;
-        public ProgressBar progressBar;
-        public TextView state_tv;
-        public TextView progress_tv;
-        public TextView err_tv;
-        public ImageButton btn_reload;
-    }
-}

+ 0 - 117
ApexDrivers/raimage/src/main/java/com/usai/service/RAImageBackgroundService.java

@@ -1,117 +0,0 @@
-package com.usai.service;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.SharedPreferences;
-import android.net.NetworkInfo;
-import android.os.Bundle;
-import android.util.Base64;
-import android.util.Log;
-
-import com.usai.redant.raimage.RedAntApplication;
-
-import com.usai.redant.rautils.service.RAService;
-import com.usai.redant.rautils.upload.RAUploadManager;
-import com.usai.redant.rautils.utils.RAUtil;
-import com.usai.redant.rautils.utils.dbgUtil;
-
-import java.io.ByteArrayOutputStream;
-import java.io.ObjectOutputStream;
-import java.util.ArrayList;
-
-
-public class RAImageBackgroundService extends RAService implements RAService.ServiceUpload{
-
-    public RAImageBackgroundService() {
-
-    }
-
-    private BroadcastReceiver serviceReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-
-            String action = intent.getAction();
-            if (action.equals(RAUploadManager.UPLOAD_COUNT_CHANGED_NOTIFICATION)) {
-
-                sendUploadCountChangeNotification();
-
-            } else if (action.equals(RAUploadManager.UPLOAD_FINISH_TASK_NOTIFICATION)) {
-
-                sendUploadCountChangeNotification();
-            }
-        }
-    };
-
-    private void sendUploadCountChangeNotification() {
-
-    }
-
-    public int getUploadCount() {
-
-        return getUploadManager().get_arr_queue().size();
-    }
-
-    @Override
-    protected void Setup() {
-
-        CHANNEL_ID = RedAntApplication.CHANNEL_ID;
-        CHANNEL_NAME = RedAntApplication.CHANNEL_NAME;
-
-        RAUploadManager.configureUploadManager(getApplicationContext(), new RAUploadManager.configureBlock() {
-            @Override
-            public void configure(RAUploadManager.RAUploadManagerConfigure configure) {
-
-                configure.removeFinish = true;
-            }
-        });
-
-
-        // 2019.1.2 v1.09 升级,将旧的Task移动到新到xml中
-        SharedPreferences pref = RedAntApplication.getInstance().getSharedPreferences("RA Image", 0);
-        if (pref != null) {
-
-            String task_list = pref.getString("task_list", null);
-            if (task_list != null) {
-
-                SharedPreferences uploadPref = RAUtil.unProtectedPreferences(RedAntApplication.getInstance(),"UploadManager");
-                SharedPreferences.Editor uploadEditor = uploadPref.edit();
-
-                try {
-                    // 将旧的移动到新的
-                    uploadEditor.putString("task_list", task_list);
-                    uploadEditor.apply();
-
-                    // 删除旧的
-                    SharedPreferences.Editor editor = pref.edit();
-                    editor.remove("task_list");
-                    editor.apply();
-
-                } catch (Exception e) {
-                    e.printStackTrace();
-
-                }
-            }
-        }
-
-        initServiceUpload(this);
-        initServiceNetworkReachability(new ServiceNetworkReachabilityCallback() {
-            @Override
-            public void networkStateChanged(NetworkInfo networkInfo) {
-
-            }
-        });
-
-        dbgUtil.fileLog(this,"RAImageBackgroundService Setup()");
-
-        IntentFilter intentFilter = new IntentFilter();
-        intentFilter.addAction(RAUploadManager.UPLOAD_COUNT_CHANGED_NOTIFICATION);
-        intentFilter.addAction(RAUploadManager.UPLOAD_FINISH_TASK_NOTIFICATION);
-
-        registerReceiver(serviceReceiver,intentFilter);
-    }
-
-
-
-}