xuxiuxi

2017-07-03 7ba899137511b47a6957243379afe2e7b02fa2ff

git-svn-id: http://192.168.1.226/svn/proxy@679 454eff88-639b-444f-9e54-f578c98de674

 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseApplication.java

@@ -1,8 +1,14 @@
package cn.com.basic.face.base;

import android.app.Application;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.ServiceConnection;
import android.os.IBinder;

import cn.com.basic.face.discern.entity.Device;
import cn.com.basic.face.service.ConnetedService;
import cn.com.basic.face.service.DictionaryMng;
import cn.com.basic.face.service.DeviceMng;
import cn.com.basic.face.util.WindowsUtil;
@@ -80,4 +86,32 @@
        OkHttpUtils.init(this);
    }

    boolean isConnect = false;
    boolean flag = false;

    //
    private ConnetedService.MyBinder myBinder;


    private ServiceConnection conn=new ServiceConnection() {

        @Override
        public void onServiceDisconnected(ComponentName arg0) {
            myBinder=null;

        }

        @Override
        public void onServiceConnected(ComponentName arg0, IBinder service) {
            myBinder=(ConnetedService.MyBinder) service;
        }
    };

    public void bindService(){
        isConnect = true;
        flag=true;
        Intent intent=new Intent(application,ConnetedService.class);
        application.bindService(intent, conn, Context.BIND_AUTO_CREATE);
    }

}

 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/MainActivity.java

@@ -1,6 +1,7 @@
package cn.com.basic.face.base;

import android.content.Context;
import android.content.Intent;
import android.os.Handler;
import android.support.design.widget.TabLayout;
import android.support.v4.app.Fragment;
@@ -27,6 +28,9 @@
import cn.com.basic.face.fragment.RegisterFragment;
import cn.com.basic.face.fragment.VisitFragment;

import java.io.File;
import java.io.FileOutputStream;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -151,4 +155,75 @@
        }, 2000);
    }


    private MyThread myThread;
    class MyThread extends Thread{
        @Override
        public void run() {
            try {
                setBmpDecodeEnv();
                Thread.sleep(2000);
//                Intent sendIntent =new Intent("com.xs.identity.over");
//                sendBroadcast(sendIntent);
            } catch (InterruptedException e) {
                e.printStackTrace();
            }
        }
    }
    /**
     * 将raw下的文件复制到sdCard
     */
    public boolean setBmpDecodeEnv() {

        String path=getFilesDir().getAbsolutePath();
        String filename = "base.dat";
        try{
            String databaseFilename = path + "/" + filename;
            File dir = new File(path);
            if (!dir.exists())
                dir.mkdir();
            if (!(new File(databaseFilename)).exists()){
                InputStream is = getResources().openRawResource(R.raw.base);
                FileOutputStream fos = new FileOutputStream(databaseFilename);
                byte[] buffer = new byte[8192];
                int count = 0;
                while ((count = is.read(buffer)) > 0)
                {
                    fos.write(buffer, 0, count);
                }
                fos.close();
                is.close();
            }
        }
        catch (Exception e){
            System.out.println(e.getMessage());
            return false;
        }

        String filename1 = "license.lic";
        try{
            String databaseFilename = path + "/" + filename1;
            File dir = new File(path);
            if (!dir.exists())
                dir.mkdir();
            if (!(new File(databaseFilename)).exists()){
                InputStream is = getResources().openRawResource(R.raw.license);
                FileOutputStream fos = new FileOutputStream(databaseFilename);
                byte[] buffer = new byte[8192];
                int count = 0;
                while ((count = is.read(buffer)) > 0)
                {
                    fos.write(buffer, 0, count);
                }
                fos.close();
                is.close();
            }
        }
        catch (Exception e){
            System.out.println(e.getMessage());
            return false;
        }
        return true;
    }

}

 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java

@@ -169,6 +169,12 @@


    @OnClick(R.id.fragment_register_save)

    public void fragment_register_save_click(View v) {

        readIdCard();

        //BaseApplication.getInstance().bindService();

        if (1==1) {

            return;

        }



//        RegisterMng.getInstance().add(null);

//        if (1==1) {

//            return;

@@ -618,17 +624,16 @@
    @Override

    protected void initData() {

        resetForm();

        //readIdCard();

    }



    public void readIdCard() {

        try {

            Thread.sleep(100);



            RFIDReader idCardReader = null; //RFIDReader.getInstance(MainActivity.getInstance(), "com");

            RFIDReader idCardReader = RFIDReader.getInstance(BaseApplication.getInstance(), "uart");

            idCardReader.setUartDeviceName("/dev/ttyS1");

            ByteArrayInputStream type = new ByteArrayInputStream("uart".getBytes());

            idCardReader.control(ReaderExtra.CONNECT, type);

            idCardReader.setUartDeviceName("/dev/S0");



            idCardReader.open("id_card");

            String cardId = byteArrayToHexString(idCardReader.getUid());