nes-num lines-num-new"> 46 
                        @Override
47 
                        public void run() {
48 
                            listener.onStart();
49 
                        }
50 
                    });
45 51 
                    JSONObject param = new JSONObject();
46 52 
                    String bitmap64 = BitmapUtil.bitmapToBase64(bmp);
47 53 
                    try {
@ -60,15 +66,19 @@ public class FaceCompare {
60 66 
                            @Override
61 67 
                            public void run() {
62 68 
                                if(code == 200){
63 
                                    Relay.setEnable();
64 
                                    Toast.makeText(activity,name+"识别成功",Toast.LENGTH_SHORT).show();
69 
                                    listener.onSuccess(name);
65 70 
                                }else{
66 
                                    Toast.makeText(activity,name,Toast.LENGTH_SHORT).show();
71 
                                    listener.onFailure(name);
67 72 
                                }
68 73 
                            }
69 74 
                        });
70 75 
                    } catch (JSONException e) {
71 
                        e.printStackTrace();
76 
                        activity.runOnUiThread(new Runnable() {
77 
                            @Override
78 
                            public void run() {
79 
                                listener.onFailure("认证失败！");
80 
                            }
81 
                        });
72 82 
                    }
73 83 
                    isComparing = false;
74 84 
                }
@ -140,4 +150,10 @@ public class FaceCompare {
140 150 
        //return ff1.compare(ff2);
141 151 
        return FaceFeature.sim_distance(ff1, faceFeature);
142 152 
    }
153
154 
    public abstract static class CompareListener{
155 
        public void onStart(){}
156 
        public void onSuccess(String info){}
157 
        public void onFailure(String msg){}
158 
    }
143 159 
}

+ 14 - 1
asiainfo-aiface-client/app/src/main/java/com/ai/ipu/aiface/scanCamera/MainActivity.java
Ver fichero 

@ -11,11 +11,13 @@ import android.text.format.DateFormat;
11 11 
import android.view.View;
12 12 
import android.widget.ImageView;
13 13 
import android.widget.TextView;
14 
import android.widget.Toast;
14 15
15 16 
import com.ai.ipu.aiface.R;
16 17 
import com.ai.ipu.aiface.scanCamera.db.FeatureDBManager;
17 18 
import com.ai.ipu.aiface.scanCamera.util.DymicPermissionTool;
18 19 
import com.ai.ipu.aiface.scanCamera.util.LEDLight;
20 
import com.ai.ipu.aiface.scanCamera.util.Relay;
19 21 
import com.google.android.cameraview.CameraView;
20 22
21 23 
import java.util.Calendar;
 
@ -81,7 +83,18 @@ public class MainActivity extends FaceScanBaseActivity {
81 83 
    public boolean handlePreview(Bitmap bmp) {
82 84 
        preview.setVisibility(View.VISIBLE);
83 85 
        preview.setImageDrawable(new BitmapDrawable(getResources(),bmp));
84 
        compare.startCompare(this,bmp);
86 
        compare.startCompare(this, bmp, new FaceCompare.CompareListener() {
87 
            @Override
88 
            public void onSuccess(String info) {
89 
                Relay.setEnable();
90 
                Toast.makeText(MainActivity.this,info+"识别成功",Toast.LENGTH_SHORT).show();
91 
            }
92
93 
            @Override
94 
            public void onFailure(String msg) {
95 
                Toast.makeText(MainActivity.this,msg,Toast.LENGTH_SHORT).show();
96 
            }
97 
        });
85 98 
        return false;
86 99 
    }
87 100

+ 99 - 0
asiainfo-aiface-client/app/src/main/java/com/ai/ipu/aiface/scanCamera/MainActivityNew.java
Ver fichero 

@ -1,21 +1,46 @@
1 1 
package com.ai.ipu.aiface.scanCamera;
2 2
3 
import android.content.pm.PackageManager;
3 4 
import android.graphics.Bitmap;
4 5 
import android.os.Bundle;
6 
import android.os.Handler;
5 7 
import android.view.View;
6 8 
import android.view.WindowManager;
9 
import android.widget.ImageView;
10 
import android.widget.Toast;
7 11
8 12 
import com.ai.ipu.aiface.R;
13 
import com.ai.ipu.aiface.scanCamera.util.DymicPermissionTool;
14 
import com.ai.ipu.aiface.scanCamera.util.LEDLight;
15 
import com.ai.ipu.aiface.scanCamera.util.Relay;
9 16
17 
import androidx.annotation.NonNull;
10 18 
import androidx.annotation.Nullable;
11 19
12 20 
public class MainActivityNew extends FaceScanBaseActivity {
13 21
22 
    private ImageView led_switch;
23 
    private LEDLight ledLight;
24 
    private ImageView iv_loading;
25 
    private CustomAnimationDrawable animation;
26 
    private ImageView iv_icon;
27 
    private ImageView iv_circle;
28
29 
    private FaceCompare compare;
30
14 31 
    @Override
15 32 
    public void onCreate(@Nullable @android.support.annotation.Nullable Bundle bundle) {
16 33 
        getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,WindowManager.LayoutParams.FLAG_FULLSCREEN);
17 34 
        getWindow().getDecorView().setSystemUiVisibility(View.INVISIBLE);
18 35 
        super.onCreate(bundle);
36 
        DymicPermissionTool.requestPermission(this);
37 
        led_switch = findViewById(R.id.led_switch);
38 
        ledLight = new LEDLight();
39 
        compare = new FaceCompare(this);
40 
        iv_loading = findViewById(R.id.iv_loading);
41 
        iv_icon = findViewById(R.id.iv_icon);
42 
        iv_circle = findViewById(R.id.iv_circular);
43 
        animation =new CustomAnimationDrawable(iv_loading,CustomAnimationDrawable.getData(this,R.array.loading_anim),24);
19 44 
    }
20 45
21 46 
    @Override
 
@ -25,6 +50,80 @@ public class MainActivityNew extends FaceScanBaseActivity {
25 50
26 51 
    @Override
27 52 
    public boolean handlePreview(Bitmap bitmap) {
53 
        compare.startCompare(this, bitmap, new FaceCompare.CompareListener() {
54 
            @Override
55 
            public void onStart() {
56 
                iv_loading.setVisibility(View.VISIBLE);
57 
                animation.start();
58 
                iv_circle.setVisibility(View.VISIBLE);
59 
                iv_circle.setSelected(true);
60 
                iv_icon.setVisibility(View.GONE);
61 
            }
62
63 
            @Override
64 
            public void onSuccess(String info) {
65 
                animation.stop();
66 
                iv_loading.setVisibility(View.GONE);
67 
                iv_icon.setVisibility(View.VISIBLE);
68 
                iv_icon.setSelected(true);
69 
                uiHandle.postDelayed(delayrun,3000);
70 
                Relay.setEnable();
71 
                Toast.makeText(MainActivityNew.this,info+"识别成功",Toast.LENGTH_SHORT).show();
72 
            }
73
74 
            @Override
75 
            public void onFailure(String msg) {
76 
                animation.stop();
77 
                iv_loading.setVisibility(View.GONE);
78 
                iv_icon.setVisibility(View.VISIBLE);
79 
                iv_icon.setSelected(false);
80 
                iv_circle.setSelected(false);
81 
                uiHandle.postDelayed(delayrun,3000);
82 
                Toast.makeText(MainActivityNew.this,msg,Toast.LENGTH_SHORT).show();
83 
            }
84 
        });
28 85 
        return false;
29 86 
    }
87
88 
    private Handler uiHandle = new Handler();
89
90 
    private Runnable delayrun = new Runnable() {
91 
        @Override
92 
        public void run() {
93 
            iv_circle.setVisibility(View.GONE);
94 
            iv_icon.setVisibility(View.GONE);
95 
        }
96 
    };
97
98 
    @Override
99 
    public void onResume() {
100 
        super.onResume();
101 
        initLED();
102 
        ledLight.setLEDEnable(ledLight.getLEDEnable());
103 
    }
104
105 
    @Override
106 
    public void onPause() {
107 
        super.onPause();
108 
        ledLight.setLEDEnable(false);
109 
    }
110
111 
    private void initLED(){
112 
        led_switch.setSelected(ledLight.getLEDEnable());
113 
        led_switch.setOnClickListener(v -> {
114 
            ledLight.setLEDEnable(!ledLight.getLEDEnable());
115 
            led_switch.setSelected(ledLight.getLEDEnable());
116 
        });
117 
    }
118
119 
    @Override
120 
    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
121 
        if(requestCode==DymicPermissionTool.PERMISSION_REQUEST){
122 
            for (int result:grantResults){
123 
                if(result == PackageManager.PERMISSION_DENIED){
124 
                    finish();
125 
                }
126 
            }
127 
        }
128 
    }
30 129 
}

BIN
asiainfo-aiface-client/app/src/main/res/drawable-mdpi/bg_alpha.png
Ver fichero


BIN
asiainfo-aiface-client/app/src/main/res/drawable-mdpi/loading.png
Ver fichero


BIN
asiainfo-aiface-client/app/src/main/res/drawable-mdpi/loading0001.png
Ver fichero


BIN
asiainfo-aiface-client/app/src/main/res/drawable-mdpi/loading0002.png
Ver fichero


BIN
asiainfo-aiface-client/app/src/main/res/drawable-mdpi/loading0003.png
Ver fichero


BIN
asiainfo-aiface-client/app/src/main/res/drawable-mdpi/loading0004.png
Ver fichero


BIN
asiainfo-aiface-client/app/src/main/res/drawable-mdpi/loading0005.png
Ver fichero


BIN
asiainfo-aiface-client/app/src/main/res/drawable-mdpi/loading0006.png
Ver fichero


BIN
asiainfo-aiface-client/app/src/main/res/drawable-mdpi/loading0007.png
Ver fichero


BIN
asiainfo-aiface-client/app/src/main/res/drawable-mdpi/loading0008.png
Ver fichero


BIN
asiainfo-aiface-client/app/src/main/res/drawable-mdpi/loading0009.png
Ver fichero


BIN
asiainfo-aiface-client/app/src/main/res/drawable-mdpi/loading0010.png
Ver fichero


BIN
asiainfo-aiface-client/app/src/main/res/drawable-mdpi/loading0011.png
Ver fichero


BIN
asiainfo-aiface-client/app/src/main/res/drawable-mdpi/loading0012.png
Ver fichero


BIN
asiainfo-aiface-client/app/src/main/res/drawable-mdpi/loading0013.png
Ver fichero


BIN
asiainfo-aiface-client/app/src/main/res/drawable-mdpi/loading0014.png
Ver fichero


BIN
asiainfo-aiface-client/app/src/main/res/drawable-mdpi/loading0015.png
Ver fichero


BIN
asiainfo-aiface-client/app/src/main/res/drawable-mdpi/loading0016.png
Ver fichero


BIN
asiainfo-aiface-client/app/src/main/res/drawable-mdpi/loading0017.png
Ver fichero


BIN
asiainfo-aiface-client/app/src/main/res/drawable-mdpi/loading0018.png
Ver fichero


BIN
asiainfo-aiface-client/app/src/main/res/drawable-mdpi/loading0019.png
Ver fichero


BIN
asiainfo-aiface-client/app/src/main/res/drawable-mdpi/loading0020.png
Ver fichero


BIN
asiainfo-aiface-client/app/src/main/res/drawable-mdpi/loading0021.png
Ver fichero


BIN
asiainfo-aiface-client/app/src/main/res/drawable-mdpi/loading0022.png
Ver fichero


BIN
asiainfo-aiface-client/app/src/main/res/drawable-mdpi/loading0023.png
Ver fichero


BIN
asiainfo-aiface-client/app/src/main/res/drawable-mdpi/loading0024.png
Ver fichero


BIN
asiainfo-aiface-client/app/src/main/res/drawable-mdpi/loading0025.png
Ver fichero


BIN
asiainfo-aiface-client/app/src/main/res/drawable-mdpi/loading0026.png
Ver fichero


BIN
asiainfo-aiface-client/app/src/main/res/drawable-mdpi/loading0027.png
Ver fichero


+ 48 - 0
asiainfo-aiface-client/app/src/main/res/drawable/loading.xml
Ver fichero 

@ -0,0 +1,48 @@
1 
<?xml version="1.0" encoding="utf-8"?>
2 
<animation-list xmlns:android="http://schemas.android.com/apk/res/android"
3 
    android:oneshot="false">
4
5 
    <item
6 
        android:drawable="@drawable/loading0001"
7 
        android:duration="50"/>
8 
    <item
9 
        android:drawable="@drawable/loading0003"
10 
        android:duration="50"/>
11 
    <item
12 
        android:drawable="@drawable/loading0005"
13 
        android:duration="50"/>
14 
    <item
15 
        android:drawable="@drawable/loading0007"
16 
        android:duration="50"/>
17 
    <item
18 
        android:drawable="@drawable/loading0009"
19 
        android:duration="50"/>
20 
    <item
21 
        android:drawable="@drawable/loading0011"
22 
        android:duration="50"/>
23 
    <item
24 
        android:drawable="@drawable/loading0013"
25 
        android:duration="50"/>
26 
    <item
27 
        android:drawable="@drawable/loading0015"
28 
        android:duration="50"/>
29 
    <item
30 
        android:drawable="@drawable/loading0017"
31 
        android:duration="50"/>
32 
    <item
33 
        android:drawable="@drawable/loading0019"
34 
        android:duration="50"/>
35 
    <item
36 
        android:drawable="@drawable/loading0021"
37 
        android:duration="50"/>
38 
    <item
39 
        android:drawable="@drawable/loading0023"
40 
        android:duration="50"/>
41 
    <item
42 
        android:drawable="@drawable/loading0025"
43 
        android:duration="50"/>
44 
    <item
45 
        android:drawable="@drawable/loading0027"
46 
        android:duration="50"/>
47
48 
</animation-list>

+ 5 - 2
asiainfo-aiface-client/app/src/main/res/layout/activity_main.xml
Ver fichero 

@ -20,9 +20,10 @@
20 20 
        <ImageView
21 21 
            android:layout_width="wrap_content"
22 22 
            android:layout_height="wrap_content"
23 
            android:id="@+id/iv_loading"
24 
            android:visibility="gone"
23 25 
            android:layout_alignParentBottom="true"
24 
            android:layout_centerHorizontal="true"
25 
            android:src="@drawable/loading"/>
26 
            android:layout_centerHorizontal="true"/>
26 27
27 28 
    </RelativeLayout>
28 29 
@ -38,6 +39,7 @@
38 39 
        android:layout_height="wrap_content"
39 40 
        android:layout_centerHorizontal="true"
40 41 
        android:layout_marginTop="165dp"
42 
        android:visibility="gone"
41 43 
        android:src="@drawable/circular"/>
42 44
43 45 
    <ImageView
 
@ -46,6 +48,7 @@
46 48 
        android:layout_height="wrap_content"
47 49 
        android:layout_centerHorizontal="true"
48 50 
        android:layout_marginTop="650dp"
51 
        android:visibility="gone"
49 52 
        android:src="@drawable/icon"/>
50 53
51 54 
    <ImageView

+ 33 - 0
asiainfo-aiface-client/app/src/main/res/values/arrays.xml
Ver fichero 

@ -0,0 +1,33 @@
1 
<?xml version="1.0" encoding="utf-8"?>
2 
<resources>
3 
    <string-array name="loading_anim">
4 
        <item>@drawable/loading0001</item>
5 
        <item>@drawable/loading0002</item>
6 
        <item>@drawable/loading0003</item>
7 
        <item>@drawable/loading0004</item>
8 
        <item>@drawable/loading0005</item>
9 
        <item>@drawable/loading0006</item>
10 
        <item>@drawable/loading0007</item>
11 
        <item>@drawable/loading0008</item>
12 
        <item>@drawable/loading0009</item>
13 
        <item>@drawable/loading0010</item>
14 
        <item>@drawable/loading0011</item>
15 
        <item>@drawable/loading0012</item>
16 
        <item>@drawable/loading0013</item>
17 
        <item>@drawable/loading0014</item>
18 
        <item>@drawable/loading0015</item>
19 
        <item>@drawable/loading0016</item>
20 
        <item>@drawable/loading0017</item>
21 
        <item>@drawable/loading0018</item>
22 
        <item>@drawable/loading0019</item>
23 
        <item>@drawable/loading0020</item>
24 
        <item>@drawable/loading0021</item>
25 
        <item>@drawable/loading0022</item>
26 
        <item>@drawable/loading0023</item>
27 
        <item>@drawable/loading0024</item>
28 
        <item>@drawable/loading0025</item>
29 
        <item>@drawable/loading0026</item>
30 
        <item>@drawable/loading0027</item>
31 
    </string-array>
32
33 
</resources>

[FE]:日报回显数据修改 · 734f7cc4ce - Nuosi Git Service
Главная Обзор Помощь
Войти
asiainfo
/
ebc
Следить 4
В избранное 0
Ответвить 0
Код Обсуждения 0 Запросы на слияние 0 Коммиты 403 Релизы 0 Вики
Просмотр исходного кода

[FE]:日报回显数据修改

xiayu3 лет назад: 4
Родитель
fcaf6b7f28
Сommit
734f7cc4ce
1 измененных файлов с 29 добавлено и 7 удалено
Разделённый вид Показать статистику Diff
  1. 29 7
      security-protection-platform/src/modules/attendance/report/index.vue

+ 29 - 7
security-protection-platform/src/modules/attendance/report/index.vue
Просмотреть файл 

@ -15,6 +15,7 @@
15 15 
            </div>
16 16 
            <div class="search-btn">
17 17 
              <t-button color="primary" @click="handSearchDay">查询</t-button>
18 
              <t-button @click="resetDailyData">重置</t-button>
18 19 
            </div>
19 20 
          </div>
20 21 
          <t-table :data="dailyTableData" :loading="loadDailyTable" size="sm" line class="table-detail">
 
@ -34,8 +35,8 @@
34 35 
        <!-- 月报 -->
35 36 
        <t-tab-panel label="月报" panel-id="tab-2">
36 37 
          <div class="row mt-32">
37 
            <div class="col-3">
38 
              <span>月份:</span>
38 
            <div class="keep-row">
39 
              <span>月份：</span>
39 40 
              <t-date-picker v-model="monthlyForm.month" style="width:200px" type="month" placeholder="请选择月份"></t-date-picker>
40 41 
            </div>
41 42 
            <div class="keep-row">
 
@ -44,6 +45,7 @@
44 45 
            </div>
45 46 
            <div class="search-btn">
46 47 
              <t-button color="primary" @click="handSearchMonth">查询</t-button>
48 
              <t-button @click="resetMonthData">重置</t-button>
47 49 
            </div>
48 50 
          </div>
49 51 
          <t-button class="export-excel" color="primary">
 
@ -147,16 +149,12 @@ export default {
147 149 
      }
148 150 
    }
149 151 
  },
150 
  mounted () {
151 
    this.getDailyTable()
152 
  },
153 152 
  methods: {
154 153 
    handleDailyInited () {
155 
      this.getDailyTable()
154 
      // this.getDailyTable()
156 155 
    },
157 156 
    changeTabs (tabName) {
158 157 
      this.tabName = tabName
159 
      this.getMonthTable()
160 158 
    },
161 159 
    // 搜索
162 160 
    handSearchDay () {
 
@ -176,6 +174,30 @@ export default {
176 174 
      this.monthlyForm.current = val
177 175 
      this.getMonthTable()
178 176 
    },
177 
    // 重置日报数据
178 
    resetDailyData() {
179 
      let now = new Date()
180 
      this.dailyForm = {
181 
        workDay: formatDateTime(now, 'yyyy-MM-dd'),
182 
        userid: null,
183 
        depId: '',
184 
        orgId: '',
185 
        current: 1,
186 
        pageSize: 10
187 
      }
188 
    },
189 
    // 重置月报数据
190 
    resetMonthData() {
191 
      let now = new Date()
192 
      this.monthlyForm = {
193 
        month: formatDateTime(new Date().setMonth(now.getMonth() - 1), 'yyyy-MM'),
194 
        userid: null,
195 
        depId: '',
196 
        orgId: '',
197 
        current: 1,
198 
        pageSize: 10
199 
      }
200 
    },
179 201 
    // 获得月报表格数据
180 202 
    getMonthTable () {
181 203 
      this.loadMonthTable = true