go.sum

@@ -6,6 +6,7 @@ github.com/tidwall/gjson v1.17.0 h1:/Jocvlh98kcTfpN2+JzGQWQcqrPQwDrVEMApx/M5ZwM=
 github.com/tidwall/gjson v1.17.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
 github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
 github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
+github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs=
 github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
 github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4=
 github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=

mediastreammodel.go

@@ -58,39 +58,21 @@ func (e *Package) MediaRequestAliveVideo(token int, camNo int64, Sid string, ser
 
 // main server util
 func (e *Package) MediaRequestRemotePlayback(token int, serial string, session string, camNo int, date string, begin_time string, end_time string, serverId int) {
-	if end_time == "" {
+	e.Payload = map[string]any{
-		e.Payload = map[string]any{
+		"MODULE":    "MEDIASTREAMMODEL",
-			"MODULE":    "MEDIASTREAMMODEL",
+		"OPERATION": "REQUESTREMOTEPLAYBACK",
-			"OPERATION": "REQUESTREMOTEPLAYBACK",
+		"PARAMETER": map[string]any{
-			"PARAMETER": map[string]any{
+			"STREAMNAME": "PLAYBACK" + "_" + fmt.Sprint(serial) + "_" + fmt.Sprint(camNo) + "_" + fmt.Sprint(serverId),
-				"STREAMNAME": "PLAYBACK" + "_" + fmt.Sprint(serial) + "_" + fmt.Sprint(camNo) + "_" + fmt.Sprint(serverId),
+			"STREAMTYPE": 1, // main stream
-				"STREAMTYPE": 1, // main stream
+			"VIDEOTYPE":  2, // common files
-				"VIDEOTYPE":  2, // common files
+			"CHANNEL":    1 << (camNo - 1),
-				"CHANNEL":    1 << (camNo - 1),
+			"STARTTIME":  date + begin_time,
-				"STARTTIME":  date + begin_time,
+			// "ENDTIME":    date + end_time,
-				"IPANDPORT":  ip + ":12092",
+			"IPANDPORT": ip + ":12092",
-				"SERIAL":     token,
+			"SERIAL":    token,
-				"PBST":       0,
+			"PBST":      0,
-			},
+		},
-			"SESSION": session,
+		"SESSION": session,
-		}
-	} else {
-		e.Payload = map[string]any{
-			"MODULE":    "MEDIASTREAMMODEL",
-			"OPERATION": "REQUESTREMOTEPLAYBACK",
-			"PARAMETER": map[string]any{
-				"STREAMNAME": "PLAYBACK" + "_" + fmt.Sprint(serial) + "_" + fmt.Sprint(camNo) + "_" + fmt.Sprint(serverId),
-				"STREAMTYPE": 1, // main stream
-				"VIDEOTYPE":  2, // common files
-				"CHANNEL":    1 << (camNo - 1),
-				"STARTTIME":  date + begin_time,
-				"ENDTIME":    date + end_time,
-				"IPANDPORT":  ip + ":12092",
-				"SERIAL":     token,
-				"PBST":       0,
-			},
-			"SESSION": session,
-		}
 	}
 }