Skip to content

L
lib_base
Commit 967b3cfd by pengsong
Options

删除zendesk 添加api混淆

parent 6c6722d7
Showing with 192 additions and 246 deletions
app_build.gradle
......@@ -54,22 +54,20 @@ dependencies {
if ("${tongdun_parent_key}".size() > 5) {
implementation(name: 'android_spirit-20190220-2.0.0.1', ext: 'aar')
implementation 'com.alibaba:fastjson:1.1.58.android'
executable 'sh' args "-c", "./sdk_manager.py open TD"
commandLine 'python', "sdk_manager.py", "open", "TD"
} else {
executable 'sh' args "-c", "./sdk_manager.py close TD"
commandLine 'python', "sdk_manager.py", "close", "TD"
}
}
exec {
//活体选择
workingDir = "../lib_base/script/code"
try {
executable 'sh' args "-c", "./choose_liveness.sh ${liveness}"
} catch (Exception e) {
executable 'sh' args "-c", "./choose_liveness.sh yitu"
}
}
// exec {
// //活体选择
// workingDir = "../lib_base/script/code"
// try {
// commandLine 'sh', "./choose_liveness.sh", "${liveness}"
// } catch (Exception e) {
// commandLine 'sh' , "./choose_liveness.", "yitu"
// }
// }
// def startParams = getGradle().getStartParameter().getTaskRequests()[0]
// if(startParams!=null && startParams.getArgs().toString().contains("Website")){
......@@ -81,6 +79,7 @@ dependencies {
implementation project(':cash_plugin_toolbox')
}
walle {
// 指定渠道包的输出路径
apkOutputFolder = new File("${project.buildDir}/outputs/channels")
......
build.gradle
......@@ -127,7 +127,7 @@ dependencies {
//facebook accountKit SDK
api 'com.facebook.android:account-kit-sdk:5.+'
api 'com.google.android.gms:play-services-analytics:16.0.0'
// api 'com.google.android.gms:play-services-analytics:16.0.0'
//SDK-FACEBOOK-START
api 'com.facebook.android:facebook-android-sdk:[4,5)'
......@@ -137,7 +137,9 @@ dependencies {
// api 'com.appsflyer:af-android-sdk:4+@aar'
//zendesk
api group: 'com.zendesk', name: 'support', version: '2.1.1'
// api group: 'com.zendesk', name: 'support', version: '2.1.1'
compileOnly project(':cash_plugin_toolbox')
api 'com.squareup.okhttp3:logging-interceptor:3.14.2'
}
script/sdk_manager.py
#!/usr/bin/env python3
#!/usr/bin/env python
import json
import string
import random
......
src/main/java/com/common/activity/RefreshDeskActivity.java deleted 100644 → 0
package com.common.activity;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.os.Handler;
import android.support.annotation.Nullable;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import tech.starwin.LibConfig;
import tech.starwin.utils.LoginManager;
import tech.starwin.utils.ui_utils.UIHelper;
import zendesk.suas.Action;
import zendesk.support.request.RequestActivity;
import zendesk.support.request.RequestUiConfig;
public class RefreshDeskActivity extends RequestActivity {
private static final long LOOP_TIME = 1500;
private Handler mHandler = new Handler();
private Field mAfField = null;
private Method mRefreshCommentMethod;
private Field mStoreField = null;
private Method mDispatchMethod;
private Object mAf = null;
private Object mStore = null;
private boolean mIsPaused = false;
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
try {
mAfField = RequestActivity.class.getDeclaredField("af");
mAfField.setAccessible(true);
mStoreField = RequestActivity.class.getDeclaredField("store");
mStoreField.setAccessible(true);
mAf = mAfField.get(this);
mStore = mStoreField.get(this);
mRefreshCommentMethod = mAf.getClass().getDeclaredMethod("updateCommentsAsync");
mRefreshCommentMethod.setAccessible(true);
mDispatchMethod = mStore.getClass().getDeclaredMethod("dispatch", Action.class);
mDispatchMethod.setAccessible(true);
} catch (Exception e) {
e.printStackTrace();
finish();
return;
}
}
/**
* 启动会话界面
*/
public static void start(Context context) {
RequestUiConfig.Builder config = new RequestUiConfig.Builder();
config.withRequestSubject(LoginManager.get().getTokenInfo().getMobile());
Intent intent = RequestActivity.builder()
.withTags("2.0", LibConfig.VERSION_NAME + LibConfig.VERSION_CODE)
.intent(context, config.config());
context.startActivity(intent);
}
private void refresh() {
try {
mDispatchMethod.invoke(mStore, mRefreshCommentMethod.invoke(mAf));
} catch (Exception e) {
e.printStackTrace();
}
}
@Override
protected void onResume() {
super.onResume();
mIsPaused = false;
mHandler.postDelayed(new Runnable() {
@Override
public void run() {
if (isFinishing() || mIsPaused) {
return;
}
refresh();
mHandler.postDelayed(this, LOOP_TIME);
}
}, LOOP_TIME);
}
@Override
protected void onPause() {
super.onPause();
mIsPaused = true;
mHandler.removeCallbacksAndMessages(null);
}
@Override
protected void onStop() {
super.onStop();
if (isFinishing()) {
mHandler.removeCallbacksAndMessages(null);
}
UIHelper.closeKeybord(this);
}
}
src/main/java/com/common/activity/RefreshDeskListActivity.java deleted 100644 → 0
package com.common.activity;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.Nullable;
import zendesk.support.requestlist.RequestListActivity;
import zendesk.support.requestlist.RequestListUiConfig;
public class RefreshDeskListActivity extends RequestListActivity {
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
}
/**
* 开启历史会话
*/
public static void start(Context context) {
RequestListUiConfig.Builder config = new RequestListUiConfig
.Builder();
Intent intent = RequestListActivity.builder().
intent(context, config.config());
context.startActivity(intent);
}
}
src/main/java/tech/starwin/LibConfig.java
......@@ -24,9 +24,6 @@ import tech.starwin.utils.PreferencesManager;
import tech.starwin.utils.ScreenAutoSize;
import tech.starwin.utils.collection.UploadManager;
import tech.starwin.utils.context_utils.AppInfoUtils;
import zendesk.core.AnonymousIdentity;
import zendesk.core.Zendesk;
import zendesk.support.Support;
/**
* Created by SiKang on 2018/9/30.
......@@ -160,11 +157,11 @@ public class LibConfig {
* init zendesk
*/
private static void initZendesk(Application application) {
if (!TextUtils.isEmpty(ZENDESK_URL) && !TextUtils.isEmpty(ZENDESK_APP_ID) && !TextUtils.isEmpty(ZENDESK_OAUTH_CLIENT_ID)) {
Zendesk.INSTANCE.init(application, ZENDESK_URL, ZENDESK_APP_ID, ZENDESK_OAUTH_CLIENT_ID);
Support.INSTANCE.init(Zendesk.INSTANCE);
Zendesk.INSTANCE.setIdentity(new AnonymousIdentity());//匿名身份
}
// if (!TextUtils.isEmpty(ZENDESK_URL) && !TextUtils.isEmpty(ZENDESK_APP_ID) && !TextUtils.isEmpty(ZENDESK_OAUTH_CLIENT_ID)) {
// Zendesk.INSTANCE.init(application, ZENDESK_URL, ZENDESK_APP_ID, ZENDESK_OAUTH_CLIENT_ID);
// Support.INSTANCE.init(Zendesk.INSTANCE);
// Zendesk.INSTANCE.setIdentity(new AnonymousIdentity());//匿名身份
// }
}
/**
......
src/main/java/tech/starwin/mvp/api/LoanApi.java
......@@ -36,49 +36,49 @@ public interface LoanApi {
/**
* 获取贷款额度、期限 范围
*/
@GET("loanapp/range")
@GET("oksrz/hrmblprav")
Observable<LoanRange> getLoanRange();
/**
* 验证贷款资格
*/
@GET("loanapp/qualification")
@GET("oksrz/hrmblpqion")
Observable<ResponseErrorBody> isQualification(@Header("X-AUTH-TOKEN") String token);
/**
* 贷款进度
*/
@GET("record/progress")
@GET("oksrz/hrmbcbdrpx")
Observable<ProgressBean> getCertifyProgress(@Header("X-AUTH-TOKEN") String token,
@Query("thirdpartyDataFlag") boolean thirdpartyDataFlag);
/**
* 获取商品列表
*/
@GET("loanapp/product_default")
@GET("oksrz/hrmblppdt")
Observable<List<ProductBean>> getProductsDefault();
@GET("loanapp/product")
@GET("oksrz/hrmblplpu")
Observable<List<ProductBean>> getProducts();
/**
* 获取最新的贷款申请信息
*/
@GET("loanapp/latest/v2")
@GET("oksrz/hrmblpla2")
Observable<LatestLoanAppBean> getLatestLoanApp(@Header("X-AUTH-TOKEN") String token);
/**
* 取消贷款
*/
@FormUrlEncoded
@POST("loanapp/cancel")
@POST("oksrz/hrmblpca")
Observable<ResponseBody> cancelLoan(@Field("loanAppId") String loanAppId,
@Header("X-AUTH-TOKEN") String token);
/**
* 贷款详情
*/
@GET("loanapp/repayment-amount-detail")
@GET("oksrz/hrmblplrade")
Observable<LoaningAmoutBean> getLoanAmoutData(@Query("principal") double amount,
@Query("period") int day,
@Query("periodUnit") String periodUnit,
......@@ -87,14 +87,14 @@ public interface LoanApi {
/**
* 我的贷款记录
*/
@GET("loanapp/all/v2")
@GET("oksrz/hrmblpa2bz")
Observable<List<HistoryLoanAppInfoBean>> getLoanAppAll(@Header("X-AUTH-TOKEN") String token);
/**
* 获取付款方式
*/
@GET("loanapp/deposit/methods")
@GET("oksrz/hrmblpdedm")
Observable<DepositMethodsBean> getDepostMethods(@Header("X-AUTH-TOKEN") String token);
......@@ -105,7 +105,7 @@ public interface LoanApi {
* @param method 还款方式
* @param amout 还款金额
*/
@POST("loanapp/deposit")
@POST("oksrz/hrmblpdey")
Observable<DepositResponseBean> getRepayOrder(@Query("loanAppId") String loanAppId,
@Query("currency") String currency,
@Query("depositMethod") String method,
......@@ -117,21 +117,21 @@ public interface LoanApi {
/**
* 是否授权数据
*/
@GET("record/harvest-grant-status")
@GET("oksrz/hrmbcbdhgs")
Observable<HarvestGrantBean> getHarvestGrant(@Header("X-AUTH-TOKEN") String token);
/**
* 银行列表
*/
@GET("bank/support")
@GET("oksrz/hrmbsp/bst")
Observable<List<BankBean>> getBankList();
/**
* 申请贷款，提交银行卡
*/
@PUT("loanapp/{loanAppId}/bank")//API-REPAIR*-*@PUT("loanapp/bank/{loanAppId}")
@PUT("oksrz/hrmblpbkz/{loanAppId}")//API-REPAIR*-*@PUT("oksrz/hrmblpbkz/{loanAppId}")
Observable<ResponseBody> addBank(@Path("loanAppId") String loanAppId, @Query("bankCode") @NonNull String bankCode, @Query("cardNo") String cardNo,
@Query("applyFor") String applyFor, @Query("applyChannel") @NonNull String applyChannel, @Query("applyPlatform") String android,
@Query("couponId") long couponId, @Header("X-AUTH-TOKEN") String token);
......
src/main/java/tech/starwin/mvp/api/UploadApi.java
......@@ -35,7 +35,7 @@ public interface UploadApi {
* CONTRACT_VIDEO：合同;
*/
@Multipart
@PUT("record/files")
@PUT("oksrz/hrmbcbdrf")
Observable<ResponseBody> uploadPhoto(
@Part MultipartBody.Part photoFile,
@Query("fileType") String fileType,
......@@ -43,23 +43,23 @@ public interface UploadApi {
);
@FormUrlEncoded
@PUT("record/firebase_token")
@PUT("oksrz/hrmbcbdft")
Observable<ResponseBody> uploadFirebaseToken(@Field("firebase_token") String token);
@Multipart
@PUT("loanapp/contract/video")
@PUT("oksrz/hrmblpcovi")
Call<ResponseBody> uploadVideo(@Part MultipartBody.Part videoFile,
@Query("loanAppId") String loanAppId,
@Query("fileType") String fileType,
@Header("X-AUTH-TOKEN") String token);
@GET("record/files")
@GET("oksrz/hrmbcbdrf")
Call<RecordFilesResponse> recordFiles(@Header("X-AUTH-TOKEN") String token);
@Multipart
/*@PUT("/loanapp/verify/face") face++*/
@PUT("/loanapp/verify/yitu")
/*@PUT("/oksrz/hrmblpvfa") face++*/
@PUT("/oksrz/hrmblpvyi")
Observable<BasicAck> faceVerify(@Query("loanType") String loanType,
@Query("amount") double amount,
@Query("period") int period,
......@@ -78,7 +78,7 @@ public interface UploadApi {
* 身份证ocr识别
*/
@Multipart
@PUT("/record/ocr")
@PUT("/oksrz/hrmbcbdoc")
Observable<OcrResultBean> identityOcr(@Part MultipartBody.Part part, @Header("X-AUTH-TOKEN") String token);
......@@ -88,9 +88,9 @@ public interface UploadApi {
* @param action ADD:添加、 MODIFY：更新 、DELETE：删除
*/
@Multipart
@PUT("/record/files-extra")
@PUT("/oksrz/hrmbcbdrfe")
Observable<ResponseBody> uploadOtherPhoto(@Part MultipartBody.Part file, @Query("fileType") String fileType, @Query("fileIndex") int fileIndex, @Query("fileAction") String action);
@POST("/harvest/xtrace/upload/gzip")
@POST("/oksrz/hrmbaaxug")
Observable<ResponseBody> uploadContact(@Body UploadCollectionBean bean);
}
\ No newline at end of file
src/main/java/tech/starwin/mvp/api/UserApi.java
......@@ -56,14 +56,14 @@ public interface UserApi {
* 发送验证码
*/
@FormUrlEncoded
@POST("auth/login/sms")
@POST("oksrz/hrmbsls")
Observable<BasicAck> sendSms(@Field("mobile") String mobile);
/**
* 登录
*/
@FormUrlEncoded
@POST("auth/login")
@POST("oksrz/hrmbsli")
Observable<TokenInfoBean> login(@Header("X-SMS-CODE") String smsCode,
@Header("X-CAPTCHA-SID") String captchaSid,
@Header("X-CAPTCHA") String captcha,
......@@ -74,20 +74,20 @@ public interface UserApi {
* facebook accountKit登录
*/
@FormUrlEncoded
@POST("auth/login_account_kit")
@POST("oksrz/hrmbslak")
Observable<TokenInfoBean> accountKitLogin(@Field("mobile") String mobile, @Field("auth_code") String auth_code);
/**
* 退出登录
*/
@POST("auth/logout")
@POST("oksrz/hrmbslov")
Observable<ResponseBody> logout(@Query("token") String token,
@Query("tokenInvalid") String refreshToken);
/**
* 获取身份证照片
*/
@GET("record/ktp-photo")
@GET("oksrz/hrmbcbdkpo")
Observable<RecordFilesResponse> getKtpImg(@Header("X-AUTH-TOKEN") String token);
......@@ -95,26 +95,26 @@ public interface UserApi {
* 上传firebase 推送图片
*/
@FormUrlEncoded
@PUT("record/firebase_token")
@PUT("oksrz/hrmbcbdft")
Observable<ResponseBody> uploadFirebaseToken(@Field("firebase_token") String token);
/**
* 获取认证信息
*/
@GET("record/personalinfo")
@GET("oksrz/hrmbcbdpss")
Observable<PersonalInfoServerBean> getPersonalInfo(@Header("X-AUTH-TOKEN") String token);
/**
* 用户信息
*/
@GET("info/infocenter")
@GET("oksrz/hrmbnfcq")
Observable<UserBean> getUserInfo(@Header("X-AUTH-TOKEN") String token);
/**
* 埋点
*/
@GET("loanapp/point_report")
@GET("oksrz/hrmblpprq")
Observable<ResponseBody> trackEvent(@Query("reportType") String reportType,
@Query("actionType") String actionType,
@Query("comment") String comment
......@@ -124,14 +124,14 @@ public interface UserApi {
/**
* 学历列表
*/
@GET("sysdict/{type}")
@GET("oksrz/hrmbswk/{type}")
Observable<ArrayList<SysDictBean>> sysDict(@Path("type") String type);
/**
* 区域列表
*/
@GET("region/{level}/{id}")
@GET("oksrz/hrmblllp/{level}/{id}")
Observable<RegionBean> getRegion(@Path("level") String level,
@Path("id") int id
);
......@@ -147,7 +147,7 @@ public interface UserApi {
* 提交联系人信息
*/
@FormUrlEncoded
@PUT("record/contact")
@PUT("oksrz/hrmbcbdrct")
Observable<ResponseBody> submitContactInfo(@Field("parentName") String parentName,
@Field("parentMobile") String parentMobile,
@Field("friendName") String friendName,
......@@ -155,7 +155,7 @@ public interface UserApi {
@Header("X-AUTH-TOKEN") String token);
@FormUrlEncoded
@PUT("record/contact")
@PUT("oksrz/hrmbcbdrct")
Observable<ResponseBody> submitContactInfo(@Field("parentId") String parentId,
@Field("parentName") String parentName,
@Field("parentMobile") String parentMobile,
......@@ -171,11 +171,11 @@ public interface UserApi {
@Header("X-AUTH-TOKEN") String token);
@GET("/record/emergency/contact/list")
@GET("/oksrz/hrmbcbdrecl")
Observable<List<ContactBean>> getContactList();
@Headers("Content-Type: application/json")
@PUT("/record/emergency/contact")
@PUT("/oksrz/hrmbcbdrec")
Observable<BasicAck> submitContactList(@Body List<ContactBean> contactList);
......@@ -183,7 +183,7 @@ public interface UserApi {
* 提交工作认证信息
*/
@FormUrlEncoded
@PUT("record/employment")
@PUT("oksrz/hrmbcbdreem")
Observable<ResponseBody> submitEmploymentInfo(@Field("companyName") String companyName,
@Field("companyProvince") String companyProvince,
@Field("companyCity") String companyCity,
......@@ -201,7 +201,7 @@ public interface UserApi {
* 提交个人信息
*/
@FormUrlEncoded
@PUT("record/personalinfo")
@PUT("oksrz/hrmbcbdpss")
Observable<ResponseBody> submitPersonalInfo(@Field("fullName") String fullName,
@Field("credentialNo") String credentialNo,
@Field("familyNameInLaw") String familyNameInLaw,
......@@ -224,14 +224,14 @@ public interface UserApi {
* 退出登录
*/
@FormUrlEncoded
@POST("auth/logout")
@POST("oksrz/hrmbslov")
Observable<ResponseBody> logout(@Field("token") String token);
/**
* 消息列表
*/
@GET("info/inbox/all")
@GET("oksrz/hrmbnfall")
Observable<List<MsgInboxBean>> getMsgInbox(@Header("X-AUTH-TOKEN") String token);
......@@ -239,7 +239,7 @@ public interface UserApi {
* 已读消息列表
*/
@FormUrlEncoded
@POST("info/inbox/read")
@POST("oksrz/hrmbnfred")
Observable<ResponseBody> sendReadMsg(@Field("msgId") String msgId,
@Header("X-AUTH-TOKEN") String token);
......@@ -247,66 +247,66 @@ public interface UserApi {
/**
* 获取联系人信息
*/
@GET("record/contact")
@GET("oksrz/hrmbcbdrct")
Observable<ContactInfoBean> getContactInfo(@Header("X-AUTH-TOKEN") String token);
/**
* 获取工作认证信息
*/
@GET("record/employment")
@GET("oksrz/hrmbcbdreem")
Observable<EmploymentServerBean> getEmploymentInfo(@Header("X-AUTH-TOKEN") String token);
/**
* 最新版本号
*/
@GET("version/latest")
@GET("oksrz/hrmbrlsm")
Observable<ResponseBody> getVersionInfo();
/**
* 获取邀请码
*/
@GET("invitation/mine/code")
@GET("oksrz/hrmbvimck")
Observable<ResponseBody> getInviteCode(@Header("X-AUTH-TOKEN") String token);
@GET("invitation/mine/invitee")
@GET("oksrz/hrmbvimi")
Observable<InviteeBean> getInviteInfo(@Header("X-AUTH-TOKEN") String token);
/**
* 已邀请的用户
*/
@GET("invitation/mine/invitee/list")
@GET("oksrz/hrmbvimil")
Observable<ArrayList<InviteePersonBean>> getInvitedList(@Header("X-AUTH-TOKEN") String token);
/**
* 获取可用优惠券
*/
@GET("coupon/available")
@GET("oksrz/hrmbuaev")
Observable<List<CouponBean>> getAvailableCoupon(@Header("X-AUTH-TOKEN") String token);
/**
* 获取已使用的优惠券
*/
@GET("coupon/used")
@GET("oksrz/hrmbuuscq")
Observable<List<CouponBean>> getUsedCoupon(@Header("X-AUTH-TOKEN") String token);
/**
* 获取过期优惠券
*/
@GET("coupon/outdated")
@GET("oksrz/hrmbuout")
Observable<List<CouponBean>> getOutdatedCoupon(@Header("X-AUTH-TOKEN") String token);
/**
* 获取活动Bannder信息
*/
@GET("banner")
@GET("oksrz/hrmbbnhy")
Observable<List<ActivityInfoBean>> getActivityList();
/**
* 贷款详情
*/
@GET("loanapp/repayment-amount-detail")
@GET("oksrz/hrmblplrade")
Observable<LoaningAmoutBean> getLoanAmoutData(@Query("principal") double amount,
@Query("period") int day,
@Query("periodUnit") String periodUnit,
......@@ -315,32 +315,32 @@ public interface UserApi {
/**
* 客户服务热线、公司介绍
*/
@GET("loanapp/display")
@GET("oksrz/hrmblpldis")
Observable<DisplayBean> display();
@GET("record/employ-photo")
@GET("oksrz/hrmbcbdepho")
Observable<RecordFilesResponse> getJobImg(@Header("X-AUTH-TOKEN") String token);
@GET("record/bankcard")
@GET("oksrz/hrmbcbdfjd")
Observable<UserBankInfo> getBankCardInfo(@Header("X-AUTH-TOKEN") String token);
@GET("chat/account")
@GET("oksrz/hrmbavbz")
Observable<YWUser> getChatUserInfo(@Header("X-AUTH-TOKEN") String token);
/**
* 绑定的第三方账号
*/
@GET("record/thirdparty_data")
@GET("oksrz/hrmbcbdthda")
Observable<ThirdPartDataBean> getThirdPartAccount(@Header("X-AUTH-TOKEN") String token);
/**
* 同盾列表
*/
@GET("record/thirdparty_data_list")
@GET("oksrz/hrmbcbdthdl")
Observable<List<ThirdPartItemBean>> getThirdPartList(@Header("X-AUTH-TOKEN") String token);
......@@ -348,26 +348,26 @@ public interface UserApi {
/**
* 同盾列表V2
*/
@GET("record/thirdparty_data_list/v2")
@GET("oksrz/hrmbcbdthdlto")
Observable<ThirdPartListBean> getThirdPartListV2(@Header("X-AUTH-TOKEN") String token);
/**
* 公告
*/
@GET("banner/message")
@GET("oksrz/hrmbbnmsk")
Observable<List<BannerMessageDto>> getBannerMsg();
/**
* 获取其他证明图片列表
*/
@GET("/record/files-extra")
@GET("/oksrz/hrmbcbdrfe")
Observable<PhotoListBean> getPhotoList();
/**
* 提交第三方数据
*/
@PUT("record/thirdparty_data")
@PUT("oksrz/hrmbcbdthda")
Observable<ResponseBody> submitThirdPartData(@Header("X-AUTH-TOKEN") String token,
@Query("dataChannel") String dataChannel,
@Query("dataType") String dataType,
......
src/main/java/tech/starwin/network/DefaultHeaderAddInterceptor.java
......@@ -3,7 +3,6 @@ package tech.starwin.network;
import android.text.TextUtils;
import com.google.android.gms.ads.identifier.AdvertisingIdClient;
import com.google.android.gms.common.GooglePlayServicesNotAvailableException;
import com.google.android.gms.common.GooglePlayServicesRepairableException;
......@@ -72,7 +71,7 @@ class DefaultHeaderAddInterceptor implements Interceptor {
.header("thirdpartyDataFlag", String.valueOf(!TextUtils.isEmpty(LibConfig.TONGDUN_PARENT_KEY)))
// .header("X-APP-SIM-MOBILE", getSimInfo())
.header("X-AF-ID", LibConfig.APPSFLYER_DEV_KEY == null ? "" : LibConfig.APPSFLYER_DEV_KEY)
.header("X-GA-ID", getGAId())
// .header("X-GA-ID", getGAId())
.header("X-GP-PKG-FLAG", String.valueOf(!LibConfig.IS_COLLECT_MODE))
.header("X-APP-CODE-VERSION", "ID_V2");
......@@ -97,24 +96,24 @@ class DefaultHeaderAddInterceptor implements Interceptor {
// return SIM_INFO;
// }
private String getGAId() {
if (!TextUtils.isEmpty(GA_ID)) {
return GA_ID;
}
AdvertisingIdClient.Info adInfo = null;
try {
adInfo = AdvertisingIdClient.getAdvertisingIdInfo(LibConfig.getContext());
GA_ID = adInfo.getId();
} catch (IOException e) {
// Unrecoverable error connecting to Google Play services (e.g.,
// the old version of the service doesn't support getting AdvertisingId).
} catch (GooglePlayServicesNotAvailableException e) {
// Google Play services is not available entirely.
} catch (GooglePlayServicesRepairableException e) {
e.printStackTrace();
}
return GA_ID;
}
// private String getGAId() {
// if (!TextUtils.isEmpty(GA_ID)) {
// return GA_ID;
// }
// AdvertisingIdClient.Info adInfo = null;
// try {
// adInfo = AdvertisingIdClient.getAdvertisingIdInfo(LibConfig.getContext());
// GA_ID = adInfo.getId();
// } catch (IOException e) {
// // Unrecoverable error connecting to Google Play services (e.g.,
// // the old version of the service doesn't support getting AdvertisingId).
// } catch (GooglePlayServicesNotAvailableException e) {
// // Google Play services is not available entirely.
// } catch (GooglePlayServicesRepairableException e) {
// e.printStackTrace();
// }
// return GA_ID;
// }
}
src/main/res/layout/dialog_contact_desc.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="280dp"
android:layout_height="wrap_content"
android:layout_marginBottom="50dp"
android:background="@color/white"
android:padding="20dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:layout_width="280dp"
android:layout_height="wrap_content"
android:text="@string/btn_read_agreemment"
android:textSize="20dp"
android:textStyle="bold" />
<TextView
android:layout_width="280dp"
android:layout_height="1dp"
android:layout_marginTop="10dp"
android:background="@color/black_gray" />
<ScrollView
android:layout_width="280dp"
android:layout_height="200dp"
android:scrollbars="none">
<LinearLayout
android:layout_width="280dp"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingBottom="20dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="@string/upload_contact_desc" />
</LinearLayout>
</ScrollView>
<TextView
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/black_gray" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginTop="5dp"
android:gravity="right"
android:orientation="horizontal">
<Button
android:id="@+id/btn_left_dialog_upload_contact_desc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@color/white"
android:text="@string/text_cancel"
android:textColor="@color/qmui_config_color_gray_5" />
<Button
android:id="@+id/btn_right_dialog_upload_contact_desc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@color/white"
android:text="@string/text_sure"
android:textColor="@color/color_blue" />
</LinearLayout>
</LinearLayout>
</RelativeLayout>
\ No newline at end of file
src/main/res/layout/dialog_policy.xml
......@@ -23,7 +23,7 @@
<ScrollView
android:layout_width="280dp"
android:scrollbars="none"
android:layout_height="wrap_content">
android:layout_height="300dp">
<LinearLayout
android:layout_width="280dp"
......@@ -42,7 +42,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
/>
/>
<TextView
android:id="@+id/dialog_policy_ksp_tv"
......
src/main/res/values/strings.xml
......@@ -1171,5 +1171,6 @@
<string name="relationship_with_borrower_title_hint">Hubungan dengan peminjam</string>
<string name="emergency_contact_title">Kontak darurat</string>
<string name="upload_contact_desc">Harap konfirmasi bahwa kami berwenang untuk mengumpulkan informasi berikut, jika tidak, Anda tidak akan dapat terus menggunakan layanan kami.\n Jenis informasi apa yang kami kumpulkan?\n Buku alamat\n Bagaimana kami menggunakan informasi ini?\n Kami menggunakan informasi buku alamat yang dikumpulkan untuk layanan anti-penipuan dan layanan kontrol risiko untuk menentukan apakah pengguna adalah pengguna target kami, sehingga memastikan bahwa kami dapat memberikan layanan yang lebih baik kepada pengguna target.\n Apa gunanya informasi?\n Informasi buku alamat digunakan secara internal oleh sistem. Ketika ada kegiatan penipuan seperti terlambat, kami memiliki hak untuk membagikannya dengan mitra pihak ketiga untuk melindungi hak-hak kami.</string>
</resources>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment