|
@@ -11,6 +11,7 @@ import android.util.Log
|
|
|
import android.view.Gravity
|
|
|
import android.view.View
|
|
|
import android.widget.TextView
|
|
|
+import com.alibaba.fastjson.JSON
|
|
|
import com.alibaba.fastjson.JSONObject
|
|
|
import com.enation.javashop.android.jrouter.external.annotation.Router
|
|
|
import com.enation.javashop.net.engine.model.NetState
|
|
@@ -191,8 +192,8 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
|
|
|
}
|
|
|
|
|
|
//设置默认时区为中国标准时间
|
|
|
- val alarmManager = getSystemService(ALARM_SERVICE) as AlarmManager
|
|
|
- alarmManager.setTimeZone("Asia/Shanghai")
|
|
|
+ //val alarmManager = getSystemService(ALARM_SERVICE) as AlarmManager
|
|
|
+ //alarmManager.setTimeZone("Asia/Shanghai")
|
|
|
}
|
|
|
|
|
|
//tts初始化
|
|
@@ -1222,16 +1223,24 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
|
|
|
callControl(tcpModel)
|
|
|
}
|
|
|
} else if(tcpModel.action == TcpAction.TimeAction.SYNC && tcpModel.type==TcpType.TIME){
|
|
|
- val time = tcpModel.data.toString().toLong()*1000
|
|
|
- //设置系统时间
|
|
|
+ var time = 0L
|
|
|
+ var timeZone="Asia/Shanghai"
|
|
|
+ if (canParseJson(tcpModel.data.toString())) {
|
|
|
+ val json = JSON.parseObject(tcpModel.data.toString())
|
|
|
+ time = json.getLong("time")*1000
|
|
|
+ timeZone = json.getString("time_zone")
|
|
|
+ } else {
|
|
|
+ time = tcpModel.data.toString().toLong() * 1000
|
|
|
+ }
|
|
|
+
|
|
|
try {
|
|
|
- AppUtil.setSystemTime(BaseApplication.appContext, time)
|
|
|
- Log.d(TAG, "set sys time1: $time")
|
|
|
+ AppUtil.setSystemTime(BaseApplication.appContext, time, timeZone)
|
|
|
+ Log.d("setTime", "set sys time1: $time, $timeZone")
|
|
|
} catch (e: Exception) {
|
|
|
//"20211213:092314"
|
|
|
- val timeStr = TimeHandle.getDateTime(time, "yyyyMMdd.hhmmss")
|
|
|
- AppUtil.setSysTime(timeStr)
|
|
|
- Log.d(TAG, "set sys time2: $timeStr")
|
|
|
+ val timeStr = TimeHandle.getDateTime(time, "yyyyMMdd.HHmmss")
|
|
|
+ AppUtil.setSysTime(timeStr, timeZone)
|
|
|
+ Log.d("setTime", "set sys time2: $timeStr, $timeZone")
|
|
|
}
|
|
|
} else if (tcpModel.action == TcpAction.ReinforceAction.RESPONSED) {
|
|
|
//SoundPoolManager.getInstance().playSound(4, 1.0f, 1.0f, 0)
|
|
@@ -1259,6 +1268,17 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ private fun canParseJson(str:String) : Boolean {
|
|
|
+ var result = false
|
|
|
+ try {
|
|
|
+ JSON.parseObject(str)
|
|
|
+ result=true
|
|
|
+ }catch (e:java.lang.Exception){
|
|
|
+ result=false
|
|
|
+ }
|
|
|
+ return result
|
|
|
+ }
|
|
|
+
|
|
|
private fun callControl(tcpModel: TcpModel) {
|
|
|
if (tcpModel.action == TcpAction.SideAction.CALL) {
|
|
|
SerialPortHelper.setDoorLight(1, "200")
|