Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 4882866

Browse files
faridsavafaridsava
committed
AS-2166 #comment pre sync with branch develop
1 parent 239195c commit 4882866

32 files changed

+1640
-2178
lines changed

‎qasdk/src/main/java/co/astrnt/qasdk/ApiService.kt‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,93 +14,93 @@ interface ApiService {
1414
@FormUrlEncoded
1515
@POST("v2/user/register")
1616
fun registerUser(@Header("token") token: String,
17-
@FieldMap data: HashMap<String, String>): Observable<InterviewResultApiDao>
17+
@FieldMap data: HashMap<String, String?>): Observable<InterviewResultApiDao>
1818

1919
@FormUrlEncoded
2020
@POST("v2/interview/start")
2121
fun startInterview(@Header("token") token: String,
22-
@FieldMap data: HashMap<String, String>): Observable<InterviewStartApiDao>
22+
@FieldMap data: HashMap<String, String?>): Observable<InterviewStartApiDao>
2323

2424
@FormUrlEncoded
2525
@POST("v2/set/try-sample-question")
2626
fun setTrySampleQuestion(@Header("token") token: String,
27-
@FieldMap data: HashMap<String, String>): Observable<BaseApiDao>
27+
@FieldMap data: HashMap<String, String?>): Observable<BaseApiDao>
2828

2929
@FormUrlEncoded
3030
@POST("v2/interview/finish")
3131
fun finishInterview(@Header("token") token: String,
32-
@FieldMap data: HashMap<String, String>): Observable<BaseApiDao>
32+
@FieldMap data: HashMap<String, String?>): Observable<BaseApiDao>
3333

3434
@FormUrlEncoded
3535
@POST("v2/cv/status")
3636
fun cvStatus(@Header("token") token: String,
37-
@FieldMap data: HashMap<String, String>): Observable<BaseApiDao>
37+
@FieldMap data: HashMap<String, String?>): Observable<BaseApiDao>
3838

3939
@FormUrlEncoded
4040
@POST("v2/cv/start")
4141
fun cvStart(@Header("token") token: String,
42-
@FieldMap data: HashMap<String, String>): Observable<BaseApiDao>
42+
@FieldMap data: HashMap<String, String?>): Observable<BaseApiDao>
4343

4444
@FormUrlEncoded
4545
@POST("v2/question/attempt")
4646
fun addAttempt(@Header("token") token: String,
47-
@FieldMap data: HashMap<String, String>): Observable<BaseApiDao>
47+
@FieldMap data: HashMap<String, String?>): Observable<BaseApiDao>
4848

4949
@FormUrlEncoded
5050
@POST("v2/media/attempt")
5151
fun addMediaAttempt(@Header("token") token: String,
52-
@FieldMap data: HashMap<String, String>): Observable<BaseApiDao>
52+
@FieldMap data: HashMap<String, String?>): Observable<BaseApiDao>
5353

5454
@FormUrlEncoded
5555
@POST("v2/question/answer")
5656
fun answerQuestion(@Header("token") token: String,
57-
@FieldMap data: HashMap<String, String>): Observable<BaseApiDao>
57+
@FieldMap data: HashMap<String, String?>): Observable<BaseApiDao>
5858

5959
@FormUrlEncoded
6060
@POST("v2/question/finish")
6161
fun finishQuestion(@Header("token") token: String,
62-
@FieldMap data: HashMap<String, String>): Observable<BaseApiDao>
62+
@FieldMap data: HashMap<String, String?>): Observable<BaseApiDao>
6363

6464
@FormUrlEncoded
6565
@POST("v2/section/start")
6666
fun startSection(@Header("token") token: String,
67-
@FieldMap data: HashMap<String, String>): Observable<InterviewStartApiDao>
67+
@FieldMap data: HashMap<String, String?>): Observable<InterviewStartApiDao>
6868

6969
@FormUrlEncoded
7070
@POST("v2/section/stop")
7171
fun stopSection(@Header("token") token: String,
72-
@FieldMap data: HashMap<String, String>): Observable<BaseApiDao>
72+
@FieldMap data: HashMap<String, String?>): Observable<BaseApiDao>
7373

7474
@FormUrlEncoded
7575
@POST("v2/interview/update/elapsedTime")
7676
fun updateElapsedTime(@Header("token") token: String,
77-
@FieldMap data: HashMap<String, String>): Observable<BaseApiDao>
77+
@FieldMap data: HashMap<String, String?>): Observable<BaseApiDao>
7878

7979
@FormUrlEncoded
8080
@POST("v2/get/interview/summary")
8181
fun summarySection(@Header("token") token: String,
82-
@FieldMap data: HashMap<String, String>): Observable<SummarySectionApiDao>
82+
@FieldMap data: HashMap<String, String?>): Observable<SummarySectionApiDao>
8383

8484
@FormUrlEncoded
8585
@POST("v2/get/interview/summary")
8686
fun summary(@Header("token") token: String,
87-
@FieldMap data: HashMap<String, String>): Observable<SummaryApiDao>
87+
@FieldMap data: HashMap<String, String?>): Observable<SummaryApiDao>
8888

8989
@GET("v2/interview/ping")
9090
fun pingNetwork(@Header("token") token: String): Observable<BaseApiDao>
9191

9292
@FormUrlEncoded
9393
@POST("v2/candidate/logs")
9494
fun sendLog(@Header("token") token: String,
95-
@FieldMap data: HashMap<String, String>): Observable<BaseApiDao>
95+
@FieldMap data: HashMap<String, String?>): Observable<BaseApiDao>
9696

9797
@FormUrlEncoded
9898
@POST("v2/user/gdpr_complied")
9999
fun gdprComplied(@Header("token") token: String,
100-
@FieldMap data: HashMap<String, String>): Observable<BaseApiDao>
100+
@FieldMap data: HashMap<String, String?>): Observable<BaseApiDao>
101101

102102
@FormUrlEncoded
103103
@POST("v2/question/last_seen")
104104
fun addLastSeen(@Header("token") token: String,
105-
@FieldMap data: HashMap<String, String>): Observable<BaseApiDao>
105+
@FieldMap data: HashMap<String, String?>): Observable<BaseApiDao>
106106
}

‎qasdk/src/main/java/co/astrnt/qasdk/AstrntSDK.java‎

Lines changed: 90 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package co.astrnt.qasdk;
22

3+
import android.app.ActivityManager;
34
import android.content.Context;
45
import android.content.res.Resources;
56
import android.os.Build;
@@ -15,6 +16,7 @@
1516
import net.gotev.uploadservice.okhttp.OkHttpStack;
1617

1718
import java.io.File;
19+
import java.text.DecimalFormat;
1820
import java.util.ArrayList;
1921
import java.util.List;
2022
import java.util.Locale;
@@ -482,6 +484,7 @@ private void updateInterviewSelectedAnswer(InterviewApiDao interview, InterviewR
482484
"Section duration using from info " + interviewResultApiDao.getInformation().getSectionDurationLeft()
483485
)
484486
);
487+
section.setOnGoing(true);
485488
section.setDuration(interviewResultApiDao.getInformation().getSectionDurationLeft());
486489
}
487490
}
@@ -2126,7 +2129,7 @@ public void markNotAnswer(QuestionApiDao questionApiDao) {
21262129

21272130
LogUtil.addNewLog(getInterviewCode(),
21282131
new LogDao("Video Upload Info",
2129-
String.format(Locale.getDefault(), "Upload file not found. Mark not answer for Question Id : %d", questionApiDao.getId())
2132+
String.format(Locale.getDefault(), "Mark not answer for Question Id : %d", questionApiDao.getId())
21302133
)
21312134
);
21322135

@@ -2363,6 +2366,33 @@ public long getNeededStorage() {
23632366
return availableStorage - requiredStorage;
23642367
}
23652368

2369+
public String getMemorySizeHumanized(long totalMemory, Context getContext) {
2370+
Context context = getContext;
2371+
ActivityManager activityManager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
2372+
ActivityManager.MemoryInfo memoryInfo = new ActivityManager.MemoryInfo();
2373+
activityManager.getMemoryInfo(memoryInfo);
2374+
DecimalFormat twoDecimalForm = new DecimalFormat("#.##");
2375+
String finalValue = "";
2376+
2377+
double kb = totalMemory / 1024.0;
2378+
double mb = totalMemory / 1048576.0;
2379+
double gb = totalMemory / 1073741824.0;
2380+
double tb = totalMemory / 1099511627776.0;
2381+
2382+
if (tb > 1) {
2383+
finalValue = twoDecimalForm.format(tb).concat(" TB");
2384+
} else if (gb > 1) {
2385+
finalValue = twoDecimalForm.format(gb).concat(" GB");
2386+
} else if (mb > 1) {
2387+
finalValue = twoDecimalForm.format(mb).concat(" MB");
2388+
}else if(kb > 1){
2389+
finalValue = twoDecimalForm.format(mb).concat(" KB");
2390+
} else {
2391+
finalValue = twoDecimalForm.format(totalMemory).concat(" Bytes");
2392+
}
2393+
return finalValue;
2394+
}
2395+
23662396
public boolean isStorageEnough() {
23672397
long questionsStorage = getTotalQuestionRawStorage();
23682398
long uploadStorage = getTotalQuestionUpload();
@@ -2669,6 +2699,65 @@ private void addSelectedAnswer(QuestionApiDao questionApiDao, RealmList<Integer>
26692699
}
26702700
}
26712701

2702+
2703+
public void addAnswer2(QuestionApiDao questionApiDao, String answer) {
2704+
if (!realm.isInTransaction()) {
2705+
realm.beginTransaction();
2706+
2707+
questionApiDao.setAnswer(answer);
2708+
if (answer.isEmpty()) {
2709+
questionApiDao.setAnswered(false);
2710+
} else {
2711+
questionApiDao.setAnswered(true);
2712+
}
2713+
2714+
realm.copyToRealmOrUpdate(questionApiDao);
2715+
realm.commitTransaction();
2716+
} else {
2717+
addAnswer2(questionApiDao, answer);
2718+
}
2719+
}
2720+
2721+
2722+
public void addSelectedAnswer2(QuestionApiDao questionApiDao, MultipleAnswerApiDao answer) {
2723+
if (!realm.isInTransaction()) {
2724+
2725+
if (questionApiDao != null && questionApiDao.getMultiple_answers() != null) {
2726+
RealmList<MultipleAnswerApiDao> selectedAnswer = new RealmList<>();
2727+
realm.beginTransaction();
2728+
2729+
RealmList<MultipleAnswerApiDao> multipleAnswer = questionApiDao.getMultiple_answers();
2730+
for (MultipleAnswerApiDao item : multipleAnswer) {
2731+
if (questionApiDao.isMultipleChoice()) {
2732+
item.setSelected(true);
2733+
} else {
2734+
if (item.getId() == answer.getId()) {
2735+
questionApiDao.setAnswerId(item.getId());
2736+
item.setSelected(true);
2737+
} else {
2738+
item.setSelected(true);
2739+
}
2740+
}
2741+
}
2742+
2743+
for (MultipleAnswerApiDao item : multipleAnswer) {
2744+
if (item.isSelected()) {
2745+
selectedAnswer.add(item);
2746+
}
2747+
}
2748+
2749+
questionApiDao.setSelectedAnswer(selectedAnswer);
2750+
questionApiDao.setMultiple_answers(multipleAnswer);
2751+
2752+
realm.copyToRealmOrUpdate(questionApiDao);
2753+
realm.commitTransaction();
2754+
}
2755+
2756+
} else {
2757+
addSelectedAnswer2(questionApiDao, answer);
2758+
}
2759+
}
2760+
26722761
public void addAnswer(QuestionApiDao questionApiDao, String answer) {
26732762
if (!realm.isInTransaction()) {
26742763
realm.beginTransaction();

‎qasdk/src/main/java/co/astrnt/qasdk/VideoSDK.java‎

Lines changed: 0 additions & 70 deletions
This file was deleted.

‎qasdk/src/main/java/co/astrnt/qasdk/constants/PreferenceKey.kt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package co.astrnt.qasdk.constants
22

3-
object PreferenceKey {
3+
object
4+
PreferenceKey {
45
const val KEY_FIRST_OPEN = "key_first_open"
56
const val KEY_SHOW_RATING = "key_show_rating"
67
const val KEY_NEED_REGISTER = "key_need_register"
@@ -34,4 +35,5 @@ object PreferenceKey {
3435
const val KEY_IS_RUNNING_COMPRESSING = "RunningCOMPRESSING"
3536
const val KEY_IS_LAST_QUESTION = "LastQuestion"
3637
const val KEY_IS_SECTION_SUMMARY = "SECTIONSUMMARY"
38+
const val KEY_IS_COUNTDOWN = "COUNTDOWN"
3739
}

‎qasdk/src/main/java/co/astrnt/qasdk/core/AstronautApi.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import retrofit2.converter.gson.GsonConverterFactory
2323

2424

2525

26-
class AstronautApi(baseUrl: String?, isDebugable: Boolean) {
26+
class AstronautApi(baseUrl: String, isDebugable: Boolean) {
2727
val apiService: ApiService
2828

2929
companion object {

‎qasdk/src/main/java/co/astrnt/qasdk/core/ContinueObserver.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ import co.astrnt.qasdk.utils.LogUtil.addNewLog
1313

1414
abstract class ContinueObserver : MyObserver<InterviewResultApiDao>() {
1515

16-
override fun onApiResultOk(resultApiDao: InterviewResultApiDao?) {
16+
override fun onApiResultOk(resultApiDao: InterviewResultApiDao) {
1717
var currentInterview = astrntSDK.currentInterview
1818
val interviewCode = astrntSDK.interviewCode
19-
val newInterview = resultApiDao?.interview
20-
val information = resultApiDao?.information
19+
val newInterview = resultApiDao.interview
20+
val information = resultApiDao.information
2121
if (information!!.isFinished) {
2222
astrntSDK.setInterviewFinished()
2323
astrntSDK.isFinishInterview = false
@@ -54,8 +54,8 @@ abstract class ContinueObserver : MyObserver<InterviewResultApiDao>() {
5454
onAstronautProfileType(newInterview)
5555
}
5656
else -> {
57-
val message = resultApiDao?.message
58-
if (resultApiDao?.title != null) {
57+
val message = resultApiDao.message
58+
if (resultApiDao.title != null) {
5959
onApiResultError(resultApiDao.title.toString(), message.toString(), "error")
6060
} else {
6161
onApiResultError("", message.toString(), "error")
@@ -70,5 +70,5 @@ abstract class ContinueObserver : MyObserver<InterviewResultApiDao>() {
7070
}
7171

7272
abstract fun onContinueInterview()
73-
abstract fun onAstronautProfileType(interview: InterviewApiDao?)
73+
abstract fun onAstronautProfileType(interview: InterviewApiDao)
7474
}

0 commit comments

Comments
 (0)