Calendar获取日期错误，a133改成使用sh来设置系统时间

android_door/src/main/h10_3128/java/com/wdkl/app/ncs/callingdoor/activity/CallingdoorActivity.kt

@@ -264,7 +264,6 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
             tv_room_name.setTextColor(Color.WHITE)
         }
 
-        //presenter.loadTcpServerHost()
         //注册广播
         regReceiver()
         RecordHelper.getInstance().init()
@@ -300,10 +299,6 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
                     DoorLightHelper.resetDoorLight()
                 }
             }
-
-            //设置默认时区为中国标准时间
-            //val alarmManager = getSystemService(ALARM_SERVICE) as AlarmManager
-            //alarmManager.setTimeZone("Asia/Shanghai")
         }
 
         //tts初始化
@@ -521,9 +516,6 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
     //测试模式
     fun startTestMode() {
         push("/callingdoor/text")
-//        if (!testFragment.equals(curFragment)) {
-//            switchFragment(R.id.callingdoor_main_frame, TestFragment(), testFragment)
-//        }
     }
 
     fun switchFragment(id: Int, fragment: Fragment, tag: String) {
@@ -1518,7 +1510,6 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
                             } else {
                                 showMessage(R.string.call_init_error)
                                 Constant.CALL_STATE = Constant.CALL_STANDBY
-                                //VoiceUtil.rejectAudioCall(Constant.DEVICE_ID, Constant.fromId, Constant.interactionId)
                                 val rejectTcp = VoiceUtil.voiceReject(tcpModel.tid, Constant.DEVICE_ID, Constant.fromId, Constant.interactionId)
                                 TcpClient.getInstance().sendMsg(rejectTcp.toJson())
                             }
@@ -1593,11 +1584,13 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
                         }
 
                         try {
-                            if ("mk_h10_a133_1".equals(BuildConfig.APP_DEVICE_TYPE)) {
+                            /*if ("mk_h10_a133_1".equals(BuildConfig.APP_DEVICE_TYPE)) {
                                 setTimeAndTimezone(time, timeZone)
                             } else {
                                 AppUtil.setSystemTime(BaseApplication.appContext, time, timeZone)
-                            }
+                            }*/
+
+                            AppUtil.setSystemTime(BaseApplication.appContext, time, timeZone)
                             Log.d("setTime", "set sys time1: $time, $timeZone")
                         } catch (e: Exception) {
                             //"20211213:092314"
@@ -1647,15 +1640,15 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
     }
 
     private fun setTimeAndTimezone(time: Long, timeZone: String) {
-        zhylManager.sys_setTimeZone(timeZone)
         val calendar = Calendar.getInstance()
-        calendar.time = Date(time)
+        calendar.timeInMillis = time
         val year = calendar.get(Calendar.YEAR)
         val month = calendar.get(Calendar.MONTH+1)
         val day = calendar.get(Calendar.DAY_OF_MONTH)
         val hour = calendar.get(Calendar.HOUR_OF_DAY)
         val minute = calendar.get(Calendar.MINUTE)
         zhylManager.sys_setTime(BaseApplication.appContext, year, month, day, hour, minute)
+        zhylManager.sys_setTimeZone(timeZone)
     }
 
     private fun callControl(tcpModel: TcpModel) {