@ray-js/ipc-player-integration 0.0.1-beta-52 → 0.0.1-beta-53

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/lib/ctx/ctx.js CHANGED
@@ -81,9 +81,7 @@ export const createUseCtx = _ref => {
81
81
  eventRef.current = getEventInstance();
82
82
  }
83
83
  useEffect(() => {
84
- console.log('========================+++++');
85
84
  if (devId && _playState === PlayState.PLAYING) {
86
- console.log('===================');
87
85
  // 获取缓存的值且同步
88
86
  getMemoryState(devId).then(res => {
89
87
  console.log('==== getMemoryState ====', res);
@@ -223,30 +221,52 @@ export const createUseCtx = _ref => {
223
221
  }
224
222
  });
225
223
  },
226
- fail: err => {
227
- showModal({
228
- title: '',
229
- content: Strings.getLang('ipc_player_no_record_permission'),
230
- cancelText: Strings.getLang('ipc_player_authorize_cancel_text'),
231
- confirmText: Strings.getLang('ipc_player_authorize_confirm_text'),
232
- isShowGlobal: true,
233
- success: res => {
234
- if (res.confirm) {
235
- const {
236
- platform
237
- } = getSystemInfoSync();
238
- console.log(platform, 'platform');
239
- openAppSystemSettingPage({
240
- // scope: platform === 'ios' ? 'App-Settings' : 'App-Settings-Permission',
241
- scope: 'App-Settings',
242
- success: () => {
243
- console.log('跳转成功');
224
+ fail: () => {
225
+ ty.authorize({
226
+ // 麦克风权限
227
+ scope: 'scope.record',
228
+ success: () => {
229
+ IPCPlayerInstance.current.startTalk({
230
+ success: () => {
231
+ updateAtom(intercom, true);
232
+ resolve(true);
233
+ },
234
+ fail: err => {
235
+ const errObj = err.innerError || err || {};
236
+ const errMsg = errObj.errorMsg || Strings.getLang('ipc_player_error_intercom');
237
+ toast({
238
+ title: errMsg
239
+ });
240
+ reject(err);
241
+ }
242
+ });
243
+ },
244
+ fail: err => {
245
+ showModal({
246
+ title: '',
247
+ content: Strings.getLang('ipc_player_no_record_permission'),
248
+ cancelText: Strings.getLang('ipc_player_authorize_cancel_text'),
249
+ confirmText: Strings.getLang('ipc_player_authorize_confirm_text'),
250
+ isShowGlobal: true,
251
+ success: res => {
252
+ if (res.confirm) {
253
+ const {
254
+ platform
255
+ } = getSystemInfoSync();
256
+ console.log(platform, 'platform');
257
+ openAppSystemSettingPage({
258
+ // scope: platform === 'ios' ? 'App-Settings' : 'App-Settings-Permission',
259
+ scope: 'App-Settings',
260
+ success: () => {
261
+ console.log('跳转成功');
262
+ }
263
+ });
244
264
  }
245
- });
246
- }
265
+ }
266
+ });
267
+ reject(err);
247
268
  }
248
269
  });
249
- reject(err);
250
270
  }
251
271
  });
252
272
  } else {
@@ -278,7 +298,7 @@ export const createUseCtx = _ref => {
278
298
  }
279
299
  return new Promise((resolve, reject) => {
280
300
  if (target) {
281
- // 麦克风权限
301
+ // 写入相册
282
302
  ty.authorizeStatus({
283
303
  scope: 'scope.writePhotosAlbum',
284
304
  success: () => {
@@ -293,30 +313,46 @@ export const createUseCtx = _ref => {
293
313
  }
294
314
  });
295
315
  },
296
- fail: err => {
297
- showModal({
298
- title: '',
299
- content: Strings.getLang('ipc_player_no_album_permission'),
300
- cancelText: Strings.getLang('ipc_player_authorize_cancel_text'),
301
- confirmText: Strings.getLang('ipc_player_authorize_confirm_text'),
302
- isShowGlobal: true,
303
- success: res => {
304
- if (res.confirm) {
305
- const {
306
- platform
307
- } = getSystemInfoSync();
308
- console.log(platform, 'platform');
309
- openAppSystemSettingPage({
310
- // scope: platform === 'ios' ? 'App-Settings' : 'App-Settings-Permission',
311
- scope: 'App-Settings',
312
- success: () => {
313
- console.log('跳转成功');
316
+ fail: () => {
317
+ ty.authorize({
318
+ scope: 'scope.writePhotosAlbum',
319
+ success: () => {
320
+ IPCPlayerInstance.current.startRecord({
321
+ saveToAlbum,
322
+ success: () => {
323
+ updateAtom(recording, true);
324
+ resolve(true);
325
+ },
326
+ fail: err => {
327
+ reject(err);
328
+ }
329
+ });
330
+ },
331
+ fail: () => {
332
+ showModal({
333
+ title: '',
334
+ content: Strings.getLang('ipc_player_no_album_permission'),
335
+ cancelText: Strings.getLang('ipc_player_authorize_cancel_text'),
336
+ confirmText: Strings.getLang('ipc_player_authorize_confirm_text'),
337
+ isShowGlobal: true,
338
+ success: res => {
339
+ if (res.confirm) {
340
+ const {
341
+ platform
342
+ } = getSystemInfoSync();
343
+ console.log(platform, 'platform');
344
+ openAppSystemSettingPage({
345
+ // scope: platform === 'ios' ? 'App-Settings' : 'App-Settings-Permission',
346
+ scope: 'App-Settings',
347
+ success: () => {
348
+ console.log('跳转成功');
349
+ }
350
+ });
314
351
  }
315
- });
316
- }
352
+ }
353
+ });
317
354
  }
318
355
  });
319
- reject(err);
320
356
  }
321
357
  });
322
358
  } else {
@@ -18,6 +18,7 @@ declare const Strings: kit.I18N<{
18
18
  ipc_player_no_album_permission: string;
19
19
  ipc_player_authorize_cancel_text: string;
20
20
  ipc_player_authorize_confirm_text: string;
21
+ ipc_player_error_record_tip: string;
21
22
  };
22
23
  zh: {
23
24
  ipc_player_resolution_HD: string;
@@ -37,6 +38,7 @@ declare const Strings: kit.I18N<{
37
38
  ipc_player_no_album_permission: string;
38
39
  ipc_player_authorize_cancel_text: string;
39
40
  ipc_player_authorize_confirm_text: string;
41
+ ipc_player_error_record_tip: string;
40
42
  };
41
43
  }, {
42
44
  ipc_player_resolution_HD: string;
@@ -56,6 +58,7 @@ declare const Strings: kit.I18N<{
56
58
  ipc_player_no_album_permission: string;
57
59
  ipc_player_authorize_cancel_text: string;
58
60
  ipc_player_authorize_confirm_text: string;
61
+ ipc_player_error_record_tip: string;
59
62
  } | {
60
63
  ipc_player_resolution_HD: string;
61
64
  ipc_player_resolution_SD: string;
@@ -74,5 +77,6 @@ declare const Strings: kit.I18N<{
74
77
  ipc_player_no_album_permission: string;
75
78
  ipc_player_authorize_cancel_text: string;
76
79
  ipc_player_authorize_confirm_text: string;
80
+ ipc_player_error_record_tip: string;
77
81
  }>;
78
82
  export default Strings;
@@ -17,6 +17,7 @@ declare const _default: {
17
17
  ipc_player_no_album_permission: string;
18
18
  ipc_player_authorize_cancel_text: string;
19
19
  ipc_player_authorize_confirm_text: string;
20
+ ipc_player_error_record_tip: string;
20
21
  };
21
22
  zh: {
22
23
  ipc_player_resolution_HD: string;
@@ -36,6 +37,7 @@ declare const _default: {
36
37
  ipc_player_no_album_permission: string;
37
38
  ipc_player_authorize_cancel_text: string;
38
39
  ipc_player_authorize_confirm_text: string;
40
+ ipc_player_error_record_tip: string;
39
41
  };
40
42
  };
41
43
  export default _default;
@@ -16,7 +16,8 @@ export default {
16
16
  ipc_player_no_record_permission: 'The microphone permission is not enabled. Please go to the app settings to enable it first.',
17
17
  ipc_player_no_album_permission: 'You currently do not have access to the album or storage. Please enable this permission in the settings.',
18
18
  ipc_player_authorize_cancel_text: 'Cancel',
19
- ipc_player_authorize_confirm_text: 'Go to Settings'
19
+ ipc_player_authorize_confirm_text: 'Go to Settings',
20
+ ipc_player_error_record_tip: 'The recording has failed, please try again later.'
20
21
  },
21
22
  zh: {
22
23
  ipc_player_resolution_HD: '高清',
@@ -35,6 +36,7 @@ export default {
35
36
  ipc_player_no_record_permission: '您当前没有 麦克风 的访问权限, 请在设置中打开此权限',
36
37
  ipc_player_no_album_permission: '您当前没有 相册/存储 的访问权限, 请在设置中打开此权限',
37
38
  ipc_player_authorize_cancel_text: '取消',
38
- ipc_player_authorize_confirm_text: '去设置'
39
+ ipc_player_authorize_confirm_text: '去设置',
40
+ ipc_player_error_record_tip: '录制出错了,请稍后再试'
39
41
  }
40
42
  };
@@ -82,7 +82,8 @@ export function RecordVideo(props) {
82
82
  setRecording,
83
83
  setRecordingDisabled,
84
84
  devId,
85
- className
85
+ className,
86
+ toast
86
87
  } = props;
87
88
  const {
88
89
  recording,
@@ -260,10 +261,15 @@ export function RecordVideo(props) {
260
261
  } catch (err) {
261
262
  console.log('录制失败', err);
262
263
  if ((err === null || err === void 0 ? void 0 : err.errorCode) === 7) {
263
- ty.showToast({
264
- icon: 'none',
264
+ toast({
265
265
  title: Strings.getLang('ipc_player_require_record_permission')
266
266
  });
267
+ } else {
268
+ const errObj = err.innerError || err || {};
269
+ const errMsg = errObj.errorMsg || Strings.getLang('ipc_player_error_record_tip');
270
+ toast({
271
+ title: errMsg
272
+ });
267
273
  }
268
274
  setState({
269
275
  showTimer: false
@@ -131,25 +131,51 @@ export function Screenshot(props) {
131
131
  });
132
132
  },
133
133
  fail: () => {
134
- showModal({
135
- title: '',
136
- content: Strings.getLang('ipc_player_no_album_permission'),
137
- cancelText: Strings.getLang('ipc_player_authorize_cancel_text'),
138
- confirmText: Strings.getLang('ipc_player_authorize_confirm_text'),
139
- isShowGlobal: true,
140
- success: res => {
141
- if (res.confirm) {
142
- const {
143
- platform
144
- } = getSystemInfoSync();
145
- console.log(platform, 'platform');
146
- openAppSystemSettingPage({
147
- scope: 'App-Settings',
148
- success: () => {
149
- console.log('跳转成功');
134
+ ty.authorize({
135
+ scope: 'scope.writePhotosAlbum',
136
+ success: () => {
137
+ IPCPlayerContext.snapshot({
138
+ saveToAlbum,
139
+ // 保存到 IPC 相册
140
+ success: res => {
141
+ console.log(res, 'res');
142
+ setState({
143
+ showShot: true,
144
+ shotUrl: res.tempImagePath
145
+ });
146
+ },
147
+ fail: err => {
148
+ console.log(err, 'err');
149
+ const errObj = err.innerError || err || {};
150
+ const errMsg = errObj.errorMsg || Strings.getLang('ipc_player_error_screenshot_error_tip');
151
+ toast({
152
+ title: errMsg
153
+ });
154
+ }
155
+ });
156
+ },
157
+ fail: () => {
158
+ showModal({
159
+ title: '',
160
+ content: Strings.getLang('ipc_player_no_album_permission'),
161
+ cancelText: Strings.getLang('ipc_player_authorize_cancel_text'),
162
+ confirmText: Strings.getLang('ipc_player_authorize_confirm_text'),
163
+ isShowGlobal: true,
164
+ success: res => {
165
+ if (res.confirm) {
166
+ const {
167
+ platform
168
+ } = getSystemInfoSync();
169
+ console.log(platform, 'platform');
170
+ openAppSystemSettingPage({
171
+ scope: 'App-Settings',
172
+ success: () => {
173
+ console.log('跳转成功');
174
+ }
175
+ });
150
176
  }
151
- });
152
- }
177
+ }
178
+ });
153
179
  }
154
180
  });
155
181
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ray-js/ipc-player-integration",
3
- "version": "0.0.1-beta-52",
3
+ "version": "0.0.1-beta-53",
4
4
  "description": "IPC 播放器功能集成",
5
5
  "main": "lib/index",
6
6
  "files": [