From: snicker Date: Sun, 19 Apr 2020 14:15:52 +0000 (+0800) Subject: release V406 X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=89eb007b2f4408d00ab1e5e61e44e7000749eb25;p=protocol_srv.git release V406 为L03 Tracker 添加LED控制，目前还不完善，不支持连续闪烁，临时版本。 --- diff --git a/app/release/ICSer_V388_2003311130_release.apk b/app/release/ICSer_V388_2003311130_release.apk deleted file mode 100644 index 78e3f0a1..00000000 Binary files a/app/release/ICSer_V388_2003311130_release.apk and /dev/null differ diff --git a/app/release/ICSer_V406_2004190520_release.apk b/app/release/ICSer_V406_2004190520_release.apk new file mode 100644 index 00000000..663f5311 Binary files /dev/null and b/app/release/ICSer_V406_2004190520_release.apk differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c77b132b..c9f87054 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -143,6 +143,9 @@ + + + diff --git a/app/src/main/assets/shutdownsound.mp3 b/app/src/main/assets/shutdownsound.mp3 new file mode 100644 index 00000000..a12dd111 Binary files /dev/null and b/app/src/main/assets/shutdownsound.mp3 differ diff --git a/app/src/main/java/com/enqualcomm/support/Config.java b/app/src/main/java/com/enqualcomm/support/Config.java index d7acd18a..66370acf 100644 --- a/app/src/main/java/com/enqualcomm/support/Config.java +++ b/app/src/main/java/com/enqualcomm/support/Config.java @@ -11,6 +11,8 @@ import com.enqualcomm.support.utils.SharPreferenceUtil; import org.json.JSONException; import org.json.JSONStringer; +import static com.enqualcomm.support.utils.Util.getSystemProperties; + public class Config { public static final boolean LOG_TOFILE=true; public static int antioff = 0; @@ -47,74 +49,6 @@ public class Config { .key("sw_version").value("eiot_V1.0.0") .key("protocol_version").value("2.0") .key("product").value(2L) - .key("sim").value(1L) - .key("connect").value(1L) - .key("work_mode").value(work_mode) - .key("phonebook").value(1L) - .key("wifi").value(2L) - .key("pedometer").value(1L) - .key("wechat").value(1L) - .key("shake").value(1L) - .key("antioff").value(antioff) - .key("key_num").value(1L) - .key("kindness_num").value(0L) - .key("sos_num").value(0L) - .key("monitor_num").value(0L) - .key("other_contact_num").value(30L) - .key("volume").value(0L) - .key("ring_vol").value(2L) - .key("call_vol").value(2L) - .key("Schedule_powonoff").value(0L) - .key("temperature").value(0L) - .key("air_pressure").value(0L) - .key("dampness").value(0L) - .key("BT").value("1@4.0") - .key("TP").value(1L) - .key("camera").value("1@200") - .key("T_Card").value(0L) - .key("NFC").value(0L) - .key("wireless_charge").value(0L) - .key("geomagnetic").value(0L) - .key("gyroscope").value(0L) - .key("behavior_mode").value(0L) - .key("LBS").value(1L) - .key("monitor").value(1L) - .key("check_bill").value(1L) - .key("sndrec").value(0L) - .key("voice_control").value(0L) - .key("market").value("domestic") - .key("platform").value("SC9820E") - .key("LCD").value("OLED@240X206") - .key("communication_standard").value(1L) - .key("time_set").value(0L) - .key("language").value("0@0") - .key("mcc_mnc").value("46000") - .key("end_call").value(0L) - .key("multi_point").value(0L) - .key("make_call").value(1L) - .key("search_terminal").value(1L) - .key("alarm").value(1L) - .key("silent").value(1L) - .key("weather").value(1L) - .key("url_download").value(1L) - .key("shutdown_hand").value(1L) - .key("relation").value(0L) - .key("voice_notice").value(1L) - .key("q_a").value(1L) - .key("gps").value(1L) - .key("gsensor").value(1L) - .key("reboot").value(1L) - .key("relatives").value(1L) - .key("heart_rate").value(heart_rate) - .key("sedentary_reminder").value(0L) - .key("fight_mode").value(0L) - .key("sleep_monitor").value(0L) - .key("sms_forward").value(0L) - .key("video_jf").value(1L) - .key("nickname").value(0L) - .key("wifi_setting").value(1L) - .key("yunosuuid").value(0L) - .key("oss_file").value(0L) .key("swReleaseNo").value(sw_release_no) .endObject().toString(); } catch (JSONException jSONException) { @@ -129,6 +63,7 @@ public class Config { return json; } + public final static boolean isL03Tracker=getIsL03tracker(); public final static boolean upload_logs_via_ftp=false; final static String KeyProtocolServerIP="ProtocolServerIP"; final static String KeyProtocolServerHOST="ProtocolServerHOST"; @@ -158,6 +93,11 @@ public class Config { final static String KeyWiFiPasswd="WiFiPWD"; final static String KeyWiFiEncyptType="WiFiEncryptType"; + + public static boolean getIsL03tracker(){ + boolean ret=getSystemProperties("persist.sys.isL03tracker").toLowerCase().equals("true"); + return ret; + } public static String getWiFiSSID(Context context){ return SharPreferenceUtil.getPrefString(context,KeyWiFiSSID,DefaultWiFiSSID); } diff --git a/app/src/main/java/com/enqualcomm/support/Constants.java b/app/src/main/java/com/enqualcomm/support/Constants.java index e7c131fb..51d412da 100644 --- a/app/src/main/java/com/enqualcomm/support/Constants.java +++ b/app/src/main/java/com/enqualcomm/support/Constants.java @@ -4,6 +4,12 @@ import android.net.Uri; public interface Constants { + public static final String ACTION_LED = "com.enqualcomm.support.ACTION_LED"; + + public static final String ACTION_SHUTDOWN = "com.ic.action.shutdown"; + + public static final String ACTION_PLAYTIME = "com.ic.action.playtime"; + public static final String ACTION_BROADCAST_PPG = "com.enqualcomm.support.ACTION_BROADCAST_PPG"; public static final String ACTION_ADDTEST_CONTACTS = "com.enqualcomm.imessage.ACTION_ADDTEST_CONTACTS"; diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java index e310472a..0bb854d9 100644 --- a/app/src/main/java/com/enqualcomm/support/CoreService.java +++ b/app/src/main/java/com/enqualcomm/support/CoreService.java @@ -22,6 +22,7 @@ import android.widget.Toast; import com.enqualcomm.support.bean.ICLocation; import com.enqualcomm.support.bean.StepCount; import com.enqualcomm.support.utils.DeviceInfoUtil; +import com.enqualcomm.support.utils.LedUtil; import com.enqualcomm.support.utils.ServiceUtil; import com.enqualcomm.support.utils.StorageUtils; import com.enqualcomm.support.utils.VibrateUtil; @@ -592,7 +593,15 @@ public class CoreService extends Service { boolean charging = batteryUtil.isPowerConnected(this); runtime.setPowerConnected(charging); ICLogger.i("Charging "+charging); +// LedUtil.setRedLedOn(false); + if (Config.isL03Tracker){ + if (runtime.isPowerConnected()) { + LedUtil.setRedLedOn(true); + }else{ + LedUtil.setRedLedOn(false); + } + } //api直接获取batterylevel取消注册 receiver， 需要重新注册一下。 batteryUtil.registerBroadReceiver(); diff --git a/app/src/main/java/com/enqualcomm/support/service/Deliver.java b/app/src/main/java/com/enqualcomm/support/service/Deliver.java index be2583bb..ae325e6d 100644 --- a/app/src/main/java/com/enqualcomm/support/service/Deliver.java +++ b/app/src/main/java/com/enqualcomm/support/service/Deliver.java @@ -358,14 +358,14 @@ public static void sendLocationMSG( String Msg){ paramRuntime.setShutdown(true); Observable.timer(60000L, TimeUnit.MILLISECONDS).subscribe(new Action1() { public void call(Long param1Long) { - paramRuntime.getContextProxy().shutdown(); + Util.shutdown(); } }); return true; } else if ("FactoryReset".equals(paramStringMessage.cmd())) { Observable.timer(5000L, TimeUnit.MILLISECONDS).subscribe(new Action1() { public void call(Long param1Long) { - paramRuntime.getContextProxy().doMasterClear(); + Util.doMasterClear(paramRuntime.getContextProxy().context); } }); return true; @@ -373,7 +373,7 @@ public static void sendLocationMSG( String Msg){ Observable.timer(5000L, TimeUnit.MILLISECONDS).subscribe(new Action1() { public void call(Long param1Long) { - paramRuntime.getContextProxy().reboot(); + Util.reboot(paramRuntime.getContextProxy().context); } }); return true; diff --git a/app/src/main/java/com/enqualcomm/support/utils/BatteryUtil.java b/app/src/main/java/com/enqualcomm/support/utils/BatteryUtil.java index 4e0ad431..5df9c171 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/BatteryUtil.java +++ b/app/src/main/java/com/enqualcomm/support/utils/BatteryUtil.java @@ -44,6 +44,10 @@ public class BatteryUtil { break; case BATTERY_STATUS_FULL: msg.append("BATTERY_STATUS_FULL "); + if (Config.isL03Tracker){ + LedUtil.setRedLedOn(false); + LedUtil.setBlueLedOn(true); + } break; case BATTERY_STATUS_NOT_CHARGING: msg.append("BATTERY_STATUS_NOT_CHARGING "); @@ -101,12 +105,18 @@ public class BatteryUtil { ICLogger.i("ACTION_POWER_CONNECTED !"); mRuntime.setPowerConnected(true); if (Config.LOG_TOFILE) ICLogger.logToFile("Battery","ACTION_POWER_CONNECTED!"); + if (Config.isL03Tracker){ + LedUtil.setRedLedOn(true); + } }else if (Intent.ACTION_POWER_DISCONNECTED.equals(intent.getAction())){ ICLogger.i("ACTION_POWER_DISCONNECTED!"); mRuntime.setPowerConnected(false); if (Config.LOG_TOFILE) ICLogger.logToFile("Battery","ACTION_POWER_DISCONNECTED !"); + if (Config.isL03Tracker){ + LedUtil.setRedLedOn(false); + } } } }; diff --git a/app/src/main/java/com/enqualcomm/support/utils/ContextProxy.java b/app/src/main/java/com/enqualcomm/support/utils/ContextProxy.java index 4840c926..92f9af99 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/ContextProxy.java +++ b/app/src/main/java/com/enqualcomm/support/utils/ContextProxy.java @@ -324,67 +324,6 @@ public class ContextProxy { this.context.sendBroadcast(intent, "com.eqc.broadcast.permission"); } - public void reboot() { - PowerManager powerManager = (PowerManager)this.context.getSystemService(Context.POWER_SERVICE); - try { - powerManager.reboot("remote reboot"); - ICLogger.i("命令重启"); - return; - } catch (Exception e) { - e.printStackTrace(); - return; - } - } - - - public void shutdown() { - try { - - //获得ServiceManagerç±» - Class ServiceManager = Class - .forName("android.os.ServiceManager"); - - //获得ServiceManager的getService方法 - Method getService = ServiceManager.getMethod("getService", java.lang.String.class); - - //调用getService获取RemoteService - Object oRemoteService = getService.invoke(null, Context.POWER_SERVICE); - - //获得IPowerManager.Stubç±» - Class cStub = Class - .forName("android.os.IPowerManager$Stub"); - //获得asInterface方法 - Method asInterface = cStub.getMethod("asInterface", android.os.IBinder.class); - //调用asInterface方法获取IPowerManager对象 - Object oIPowerManager = asInterface.invoke(null, oRemoteService); - //获得shutdown()方法 - Method shutdown = oIPowerManager.getClass().getMethod("shutdown",boolean.class,boolean.class); - //调用shutdown()方法 - shutdown.invoke(oIPowerManager,false,true); - - } catch (Exception e) { - e.printStackTrace(); - } - } - - public static final String ACTION_MASTER_CLEAR = "android.intent.action.MASTER_CLEAR"; - public static final String EXTRA_REASON = "android.intent.extra.REASON"; - public static final String EXTRA_WIPE_EXTERNAL_STORAGE = "android.intent.extra.WIPE_EXTERNAL_STORAGE"; - - public void doMasterClear() { - Intent intent = new Intent(ACTION_MASTER_CLEAR); - intent.setPackage("android"); - intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND); - intent.putExtra(EXTRA_REASON, "MasterClearConfirm"); - if (Environment.isExternalStorageRemovable()) { - intent.putExtra(EXTRA_WIPE_EXTERNAL_STORAGE, true); - }else - { - intent.putExtra(EXTRA_WIPE_EXTERNAL_STORAGE, false); - } - this.context.sendBroadcast(intent); - } - } diff --git a/app/src/main/java/com/enqualcomm/support/utils/DeviceInfoUtil.java b/app/src/main/java/com/enqualcomm/support/utils/DeviceInfoUtil.java index cab7a3bb..8214e1be 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/DeviceInfoUtil.java +++ b/app/src/main/java/com/enqualcomm/support/utils/DeviceInfoUtil.java @@ -2,11 +2,14 @@ package com.enqualcomm.support.utils; import android.app.ActivityManager; import android.content.Context; +import android.content.Intent; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.database.Cursor; import android.net.Uri; import android.os.Build; +import android.os.Environment; +import android.os.PowerManager; import android.provider.Settings; import android.telephony.TelephonyManager; @@ -18,6 +21,7 @@ import com.enqualcomm.support.service.KeepAlive; import com.ic.jni.ICJniUtils; import java.io.FileInputStream; +import java.lang.reflect.Method; import java.util.ArrayList; import chestnut.utils.PhoneUtils; @@ -318,4 +322,6 @@ public class DeviceInfoUtil { } return versions.toString(); } + + } diff --git a/app/src/main/java/com/enqualcomm/support/utils/LedUtil.java b/app/src/main/java/com/enqualcomm/support/utils/LedUtil.java new file mode 100644 index 00000000..0a3b3844 --- /dev/null +++ b/app/src/main/java/com/enqualcomm/support/utils/LedUtil.java @@ -0,0 +1,143 @@ +package com.enqualcomm.support.utils; + +import com.enqualcomm.support.bean.voicePacket; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; + +public class LedUtil { + private final static String RED_LED_PATH="/sys/class/leds/redled/brightness"; + private final static String BLUE_LED_PATH="/sys/class/leds/blueled/brightness"; + + private static File BlueLedFile=new File(BLUE_LED_PATH); + private static FileInputStream fisLedBlue =null; + private static FileOutputStream fosLedBlue=null; + + private static File RedLedFile=new File(RED_LED_PATH); + private static FileInputStream fisLedRed =null; + private static FileOutputStream fosLedRed=null; + + + /* + 1：长按按键开机。开机震动+铃声。 +2：联系按按键6次，关机。播放关机铃声 +3：开机后，长按3秒是SOS报警，循环拨打事先设置好的3个SOS号码。 +4：电量低时红灯闪烁 （2~3秒一次），充电时，红灯常亮。充满以后蓝灯常亮。 +5：SIM卡异常，没有连上后台等异常时，蓝灯闪烁。 +6：来电时，按键一次接听，连续2次按按键是拒接。 +7：待机时，按一次按键，语音播报当前时间。并且蓝灯闪烁一次。 + */ + enum LedChargeStatus{ + LED_CHARGE_ON_NOT_FULL, + LED_CHARGE_ON_FULL, + LED_CHARGE_OFF, + } + + enum LedSimServerStatus{ + LED_SERVER_CONNECTED, + LED_SERVER_DISCONNECTED, + } + + enum LedPlayTimeStatus{ + + } + public static int ChargeLEDStatus=0; + + + + public static boolean isRedLedExist(){ + + return RedLedFile.exists(); + } + public static boolean isBlueLedExist(){ + return BlueLedFile.exists(); + } + public static boolean isRedLedOn(){ + + int ledon; + if (isRedLedExist()) { + try { + fisLedRed=new FileInputStream(RedLedFile); + ledon= fisLedBlue.read(); + fisLedRed.close(); + if (ledon == '0'){ + return false; + }else{ + return true; + } + } catch (FileNotFoundException e) { + e.printStackTrace(); + return false; + } catch (IOException e) { + e.printStackTrace(); + return false; + } + + }else{ + + return false; + } + } + public static boolean isBlueLedOn(){ + + int ledon; + if (isBlueLedExist()) { + try { + fisLedBlue=new FileInputStream(BlueLedFile); + ledon= fisLedBlue.read(); + fisLedBlue.close(); + if (ledon == '0'){ + return false; + }else{ + return true; + } + } catch (FileNotFoundException e) { + e.printStackTrace(); + return false; + } catch (IOException e) { + e.printStackTrace(); + return false; + } + + }else{ + + return false; + } + } + public static void setRedLedOn(boolean ledon){ + if (isRedLedExist()) { + try { + fosLedRed=new FileOutputStream(RedLedFile); + if (ledon) + fosLedRed.write('1'); + else + fosLedRed.write('0'); + fosLedRed.close(); + } catch (FileNotFoundException e) { + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + + public static void setBlueLedOn(boolean ledon){ + if (isRedLedExist()) { + try { + fosLedBlue=new FileOutputStream(BlueLedFile); + if (ledon) + fosLedBlue.write('1'); + else + fosLedBlue.write('0'); + fosLedBlue.close(); + } catch (FileNotFoundException e) { + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } +} diff --git a/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java b/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java index a1873f9f..2e0c9f71 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java +++ b/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java @@ -41,9 +41,11 @@ import static android.os.PowerManager.ACQUIRE_CAUSES_WAKEUP; import static android.os.PowerManager.SCREEN_DIM_WAKE_LOCK; import static com.enqualcomm.support.Constants.ACTION_CLOSE_UNREAD_MSG; import static com.enqualcomm.support.Constants.ACTION_HEATR_RATE_START; +import static com.enqualcomm.support.Constants.ACTION_PLAYTIME; import static com.enqualcomm.support.Constants.ACTION_REMOTE_CAMERA; import static com.enqualcomm.support.Constants.ACTION_SEND_EMEGENCY_LOCATION_START; import static com.enqualcomm.support.Constants.ACTION_SEND_SOS_MSG; +import static com.enqualcomm.support.Constants.ACTION_SHUTDOWN; import static com.enqualcomm.support.Constants.DIALOG_ACTION; import static com.enqualcomm.support.Constants.RESUME_ACTION; import static com.enqualcomm.support.Constants.SOS_ACTION; @@ -180,7 +182,13 @@ public class ProcessReceiver extends BroadcastReceiver { this.mAudioService = new AudioService(); this.mAudioService.play(paramContext.getAssets(), "ring_msg.mp3"); } - + + private void playshutdownsound(Context paramContext) { + if (this.mAudioService == null) + this.mAudioService = new AudioService(); + this.mAudioService.play(paramContext.getAssets(), "shutdownsound.mp3"); + } + private void screenOn(Context paramContext) { final PowerManager.WakeLock wakelock = ((PowerManager)paramContext.getSystemService(Context.POWER_SERVICE)).newWakeLock(ACQUIRE_CAUSES_WAKEUP| SCREEN_DIM_WAKE_LOCK, ProcessReceiver.class.getSimpleName()); wakelock.acquire(); @@ -202,11 +210,26 @@ public class ProcessReceiver extends BroadcastReceiver { if (RESUME_ACTION.equals(str)) { SharPreferenceUtil.setPrefBoolean(paramContext, "key_is_resume", paramIntent.getBooleanExtra("is_resume", false)); return; - }else if (ACTION_REMOTE_CAMERA.equals(str)) { - String str1; - str1 = paramIntent.getStringExtra("key_remote_number"); - (new CameraUtil(paramContext)).getPictur(str1); + }else if (ACTION_SHUTDOWN.equals(str)) { + + playshutdownsound(paramContext); + + Util.shutdown(); + return; + }else if (ACTION_PLAYTIME.equals(str)) { + LedUtil.setBlueLedOn(true); + new Handler().postDelayed(new Runnable() { + @Override + public void run() { + LedUtil.setBlueLedOn(false); + } + },2000L); return; + }else if (ACTION_REMOTE_CAMERA.equals(str)) { + String str1; + str1 = paramIntent.getStringExtra("key_remote_number"); + (new CameraUtil(paramContext)).getPictur(str1); + return; }else if (DIALOG_ACTION.equals(str)) { if (paramIntent.hasExtra("contact")) { diff --git a/app/src/main/java/com/enqualcomm/support/utils/Util.java b/app/src/main/java/com/enqualcomm/support/utils/Util.java index ab7f5357..8cfd2d30 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/Util.java +++ b/app/src/main/java/com/enqualcomm/support/utils/Util.java @@ -2,6 +2,7 @@ package com.enqualcomm.support.utils; import android.annotation.TargetApi; import android.content.Context; +import android.content.Intent; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.media.MediaPlayer; @@ -10,8 +11,10 @@ import android.net.NetworkInfo; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiManager; import android.os.Build; +import android.os.Environment; import android.os.Handler; import android.os.Looper; +import android.os.PowerManager; import android.widget.Toast; @@ -809,5 +812,67 @@ public class Util { } return false; } + + + public static void reboot(Context context) { + PowerManager powerManager = (PowerManager)context.getSystemService(Context.POWER_SERVICE); + try { + powerManager.reboot("remote reboot"); + ICLogger.i("命令重启"); + return; + } catch (Exception e) { + e.printStackTrace(); + return; + } + } + + + public static void shutdown() { + try { + + //获得ServiceManagerç±» + Class ServiceManager = Class + .forName("android.os.ServiceManager"); + + //获得ServiceManager的getService方法 + Method getService = ServiceManager.getMethod("getService", java.lang.String.class); + + //调用getService获取RemoteService + Object oRemoteService = getService.invoke(null, Context.POWER_SERVICE); + + //获得IPowerManager.Stubç±» + Class cStub = Class + .forName("android.os.IPowerManager$Stub"); + //获得asInterface方法 + Method asInterface = cStub.getMethod("asInterface", android.os.IBinder.class); + //调用asInterface方法获取IPowerManager对象 + Object oIPowerManager = asInterface.invoke(null, oRemoteService); + //获得shutdown()方法 + Method shutdown = oIPowerManager.getClass().getMethod("shutdown",boolean.class,boolean.class); + //调用shutdown()方法 + shutdown.invoke(oIPowerManager,false,true); + + } catch (Exception e) { + e.printStackTrace(); + } + } + + public static final String ACTION_MASTER_CLEAR = "android.intent.action.MASTER_CLEAR"; + public static final String EXTRA_REASON = "android.intent.extra.REASON"; + public static final String EXTRA_WIPE_EXTERNAL_STORAGE = "android.intent.extra.WIPE_EXTERNAL_STORAGE"; + + public static void doMasterClear(Context context) { + Intent intent = new Intent(ACTION_MASTER_CLEAR); + intent.setPackage("android"); + intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND); + intent.putExtra(EXTRA_REASON, "MasterClearConfirm"); + if (Environment.isExternalStorageRemovable()) { + intent.putExtra(EXTRA_WIPE_EXTERNAL_STORAGE, true); + }else + { + intent.putExtra(EXTRA_WIPE_EXTERNAL_STORAGE, false); + } + context.sendBroadcast(intent); + } } diff --git a/app/version_code.properties b/app/version_code.properties index 2b8a5a36..9fceacda 100644 --- a/app/version_code.properties +++ b/app/version_code.properties @@ -1,2 +1,2 @@ -#Mon Apr 13 16:03:41 CST 2020 -VERSION_CODE=402 +#Sun Apr 19 05:20:52 CST 2020 +VERSION_CODE=406 diff --git a/local.properties b/local.properties index 1e8cdd37..218d050f 100644 --- a/local.properties +++ b/local.properties @@ -4,5 +4,5 @@ # Location of the SDK. This is only used by Gradle. # For customization when using a Version Control System, please read the # header note. -#Mon Mar 16 11:44:29 CST 2020 -sdk.dir=C\:\\Users\\incar\\AppData\\Local\\Android\\Sdk +#Sun Apr 12 23:38:56 CST 2020 +sdk.dir=E\:\\Android\\sdk