ソースを参照

app_dev

ji9r_works
jfinn 3年前
コミット
a75cdb3ae4
56個のファイルの変更1291行の追加36行の削除
  1. 4
    0
      dcc/rsto_refactor_dbg.py
  2. 71
    0
      dcc/rsto_refactor_dbg3.py
  3. 0
    0
      dcc/rsto_refactor_dbg_x4.py
  4. 3
    1
      dcc/rsto_rf7.py
  5. 212
    0
      dcc/rx4/x0.py
  6. 100
    0
      dcc/rx4/x1.py
  7. 9
    0
      dcc/rx4/x2.py
  8. 0
    0
      dcc/rx4/x3.py
  9. 0
    0
      dcc/rx4/x4.py
  10. 0
    0
      dcc/rx4/x5.py
  11. 15
    0
      indx/ws_dev2/wp0.js
  12. 37
    0
      indx/ws_dev2/wp1.js
  13. 0
    0
      indx/ws_dev2/wp2.js
  14. 0
    0
      indx/ws_dev2/wp3.js
  15. 0
    0
      indx/ws_dev2/wp4.js
  16. 0
    0
      indx/ws_dev2/wp5.js
  17. 72
    0
      indx/ws_dev2/ws_log.html
  18. 1
    1
      j7/rldjs/rld_dev/irld.html
  19. 1
    0
      j7/rldjs/rld_dev/irld.js
  20. 128
    4
      j8/ac0/a0/au0.js
  21. 19
    1
      j8/ac0/a0/au2.js
  22. 34
    0
      j8/ac0/a0/au3.js
  23. 41
    0
      j8/ac0/a0/au5.js
  24. 159
    0
      j8/ac0/a0/w0.js
  25. 15
    0
      j8/ac0/a0/w1.js
  26. 0
    0
      j8/ac0/a0/w2.js
  27. 0
    0
      j8/ac0/a0/w3.js
  28. 0
    0
      j8/ac0/a0/w4.js
  29. 0
    0
      j8/ac0/a0/w5.js
  30. 2
    0
      j8/ac0/a0/w5.n.js
  31. 0
    0
      j8/ac0/a0/w5.w.js
  32. 19
    0
      j8/ac0/rld/r0.js
  33. 28
    0
      j8/ac0/t0/j0.js
  34. 11
    0
      j8/ac0/t0/j1.js
  35. 0
    0
      j8/ac0/t0/j2.js
  36. 0
    0
      j8/ac0/t0/j3.js
  37. 0
    0
      j8/ac0/t0/j4.js
  38. 0
    0
      j8/ac0/t0/j5.js
  39. 0
    0
      j8/ac0/t0/j6.js
  40. 16
    2
      j8/ac0/t0/t0.js
  41. 2
    2
      j8/ac0/t0/t3.js
  42. 99
    12
      j8/ac0/t0/t4.js
  43. 2
    0
      j8/ac0/t0/t5.js
  44. 17
    4
      j8/ac0/t0/ut4.js
  45. 10
    0
      j8/ac0/t0/ut5.js
  46. 44
    0
      xf/inc/config_jx9.js
  47. 1
    0
      xf/nginx_tx/ifr_xcal/xc0.js
  48. 3
    3
      xf/nginx_tx/ifr_xcal/xc1.css
  49. 55
    0
      xf/nginx_tx/xcal/ux1.js
  50. 8
    1
      xf/nginx_tx/xcal/x0.js
  51. 23
    0
      xf/nginx_tx/xcal/x1.css
  52. 4
    2
      xf/nginx_tx/xcal/x5.js
  53. 2
    0
      xf/nginx_tx/xcal/xcal.html
  54. 11
    0
      xf/nginx_tx/xcal/xcal_ui.html
  55. 2
    1
      xf/o/fs_utils.js
  56. 11
    2
      xf/vc/vcon0.js

+ 4
- 0
dcc/rsto_refactor_dbg.py ファイルの表示

@@ -0,0 +1,4 @@
1
+p("rsto_refactor_dbg:")
2
+
3
+
4
+p(sys)

+ 71
- 0
dcc/rsto_refactor_dbg3.py ファイルの表示

@@ -0,0 +1,71 @@
1
+p("rsto_refactor_dbg3:")
2
+# import sys
3
+# p(sys)
4
+
5
+def mod_info():
6
+
7
+	cnt = 0
8
+	rcnt = {}
9
+	rlst = {}
10
+	# keys = sys.modules.keys()
11
+	for mkey,mod in sys.modules.items():
12
+		f = getattr(mod,"__file__","NO_ATTR")
13
+		if f != "NO_ATTR" and f != None:
14
+			pass
15
+			if "/usr/games/repos/dcc" in f:
16
+				p(mkey,f)
17
+		else:
18
+			pass
19
+			# p(mkey,type(f),f)
20
+		# if type(f) != str:
21
+		# if getattr()
22
+
23
+	# /usr/games/repos/dcc
24
+def mod_info00():
25
+	m = sys.modules["vfb"]
26
+	con_sto = sys.modules["vfb.con_sto"]
27
+	p(m.con_sto)
28
+	p(con_sto)
29
+	p(con_sto==m.con_sto)
30
+	# p(dir(m))
31
+	p()
32
+	p(con_sto.__file__)
33
+	# p(con_sto.__path__)
34
+	# con_sto
35
+	# __file__
36
+	# __path__
37
+
38
+def mod_info0():
39
+	# p(dir())
40
+	cnt = 0
41
+	rcnt = {}
42
+	rlst = {}
43
+	keys = sys.modules.keys()
44
+	for key in keys:
45
+		ks = key.split(".")
46
+		xk = ks[0]
47
+		rcnt.setdefault(xk,0)
48
+		rlst.setdefault(xk,[])
49
+		rcnt[xk] += 1
50
+		rlst[xk].append(key)
51
+		# if not "." in key:
52
+			# cnt +=1
53
+			# p(key)
54
+
55
+	p()
56
+	for key,val in rlst.items():
57
+		lv = len(val)
58
+		if (lv > 1):
59
+			p(key,len(val))
60
+	# p(cnt)
61
+	# p(sys.modules.keys())
62
+	# p(len(sys.modules.keys()))
63
+	# p(dir(""))
64
+	 # p(sys.modules)
65
+	# p(len(globals().keys()))
66
+
67
+
68
+# p(mod_info)
69
+# p(len(globals().keys()))
70
+mod_info()
71
+p()

+ 0
- 0
dcc/rsto_refactor_dbg_x4.py ファイルの表示


+ 3
- 1
dcc/rsto_rf7.py ファイルの表示

@@ -62,4 +62,6 @@ p("...")
62 62
 json_key_test()
63 63
 rsto_info()
64 64
 # '''
65
-# p(type([]) == list)
65
+# p(type([]) == list)
66
+
67
+# p(">>>>")

+ 212
- 0
dcc/rx4/x0.py ファイルの表示

@@ -0,0 +1,212 @@
1
+r'''
2
+import traceback
3
+import inspect
4
+import json
5
+from channels.exceptions import (
6
+    AcceptConnection,
7
+    DenyConnection,
8
+    InvalidChannelLayerError,
9
+    StopConsumer,
10
+)
11
+from . import con_sto
12
+def init_rglob():
13
+	# p()
14
+	if not "cls_e" in rglob:
15
+		rglob.cls_e = []
16
+		rglob.con_disp = {
17
+
18
+		}
19
+		rglob.fout = {}
20
+
21
+
22
+# cls
23
+init_rglob()
24
+# 
25
+
26
+
27
+
28
+# cls_
29
+
30
+from asgiref.sync import async_to_sync,sync_to_async
31
+'''
32
+
33
+# CustomEncoder
34
+# jclone
35
+group_prefix = "wsx_"
36
+def json_copy(obj):
37
+	return json.loads(json.dumps(obj))
38
+def deep_json_v1(obj,path,key="?",val="?"):
39
+	_obj = obj
40
+	is_dict = type({})
41
+	is_arr = type([])
42
+	try:
43
+
44
+		for k in path:
45
+			if type(_obj) == is_dict:
46
+				_obj = _obj[k]
47
+			elif type(_obj) == is_arr:
48
+				_k = int(k)
49
+				_obj = _obj[k]
50
+			else:
51
+				p("ELSE!")
52
+		
53
+	except Exception as e:
54
+		return {"o":{},"err":e}
55
+
56
+	return {"o":_obj}
57
+
58
+def deep_json(obj,path,key="?",val="?"):
59
+	_obj = obj
60
+	is_dict = type({})
61
+	is_arr = type([])
62
+	try:
63
+
64
+		for k in path:
65
+			if type(_obj) == is_dict:
66
+				_obj = _obj[k]
67
+			elif type(_obj) == is_arr:
68
+				_k = int(k)
69
+				_obj = _obj[k]
70
+			else:
71
+				p("ELSE!.")
72
+		
73
+	except Exception as e:
74
+		return {"o":{},"err":e}
75
+
76
+	return {"o":_obj}
77
+
78
+
79
+
80
+# json_copy
81
+def class_edit(klass,_klass):
82
+	print("\n")
83
+	print(klass,_klass)
84
+	for en in dir(_klass):
85
+		if en[:2]=="__":continue
86
+		attr = getattr(_klass,en,"NO ATTR")
87
+		print("\t",en)
88
+		setattr(klass,en,attr)
89
+
90
+def class_reset(klass):
91
+	print("\n")
92
+	# print(klass,_klass)
93
+	print("class reset:", klass)
94
+	for en in dir(klass):
95
+		if en[:2]=="__":continue
96
+		attr = getattr(klass,en,"NO ATTR")
97
+		# print("\t",en,attr)
98
+		# setattr(klass,en,attr)
99
+		delattr(klass,en)
100
+
101
+
102
+def mro_wo(klass):
103
+	ret = [*klass.__mro__]
104
+	if object in ret:
105
+		ret.remove(object)
106
+	return ret
107
+
108
+def class_reset_v0(klass):
109
+	# print("\n")
110
+	# print(klass,_klass)
111
+	n = klass.__name__
112
+	n2 = getattr(klass,"_rcls_name","NO ATTR")
113
+	# print("class reset:", klass,n,n2)
114
+	for en in dir(klass):
115
+		if en[:2]=="__":continue
116
+		# p("???")
117
+		attr = getattr(klass,en,"NO ATTR")
118
+		# p("???..",en,klass,attr)
119
+		# p*
120
+
121
+		# print("\t",en,attr)
122
+		# setattr(klass,en,attr)
123
+		if en == "_rcls_name":pass
124
+			# continue
125
+		setattr(klass,en,None)
126
+		delattr(klass,en)
127
+		r'''
128
+		try:
129
+			# z+1
130
+			setattr(klass,en,None)
131
+			p("DEL",en,attr,hasattr(klass,en))
132
+			delattr(klass,en)
133
+			pass
134
+		except Exception as e:
135
+			p("~~",e)
136
+			# inspect.
137
+			# p(dir(inspect))
138
+			# p(dir(e))
139
+			tx= traceback.print_tb(e.__traceback__)
140
+			# traceback.print_tb(e)
141
+			# p()
142
+			p(tx)
143
+			# p(.print_tb())
144
+			raise e
145
+		# '''
146
+
147
+
148
+def get_class_by_name(klass,_klass,dec_c1):
149
+	rcls = None
150
+	# _rcls_name
151
+	__rcls_name = _klass.__name__
152
+	mro = mro_wo(klass)
153
+	if klass in mro and not dec_c1:
154
+		mro.remove(klass)
155
+
156
+	for cls in mro:
157
+		# _rcls_name = getattr(cls,"rcls_name_a",None)
158
+		_rcls_name = getattr(cls,"_rcls_name",None)
159
+		if not rcls and not _rcls_name:
160
+			rcls=cls
161
+		if _rcls_name == __rcls_name:
162
+			rcls=cls
163
+	if not rcls:
164
+		p("OUT OF EMPTY CLASSES")
165
+		raise "class_rld_ERR"
166
+	return rcls
167
+
168
+
169
+def class_reset_mro(klass):
170
+	for cls in mro_wo(klass):
171
+		class_reset_v0(cls)
172
+	
173
+	
174
+def class_edit_v2(__klass,_klass,reset=0,dec_c1=0):
175
+	# print("\n")
176
+	# rglob.cls_e.append((__klass.__name__,_klass.__name__))
177
+	klass = get_class_by_name(__klass,_klass,dec_c1)
178
+	cls_name = _klass.__name__
179
+
180
+	# klass._rcls_name=cls_name
181
+	# setattr(klass,"rcls_name_a",cls_name)
182
+	print(klass,_klass)
183
+	
184
+	if reset:
185
+		class_reset_v0(klass)
186
+	if reset == "rmv":
187
+		return
188
+
189
+	setattr(klass,"_rcls_name",cls_name)
190
+
191
+	for en in dir(_klass):
192
+		if en[:2]=="__":continue
193
+		attr = getattr(_klass,en,"NO ATTR")
194
+		# print("\t",en)
195
+		setattr(klass,en,attr)
196
+
197
+
198
+class_edit = class_edit_v2
199
+class_reset = class_reset_mro
200
+
201
+
202
+# p("")
203
+# p(dir())
204
+
205
+
206
+def nxq(o):
207
+	for en in o:
208
+		p(en)
209
+	# p(dir())
210
+# nxq(dir())
211
+
212
+p(".")

+ 100
- 0
dcc/rx4/x1.py ファイルの表示

@@ -0,0 +1,100 @@
1
+
2
+# class_edit
3
+
4
+room_group_prefix = "x4-"
5
+room_group_prefix2 = "x4b-"
6
+
7
+def scope_info(self):
8
+		# r'''
9
+		p(":::",self.scope["url_route"])
10
+		# self.scope["url_route"]["kwargs"]["room_name"].split("/")
11
+		for k,v in self.scope.items():
12
+			p("\t",k)
13
+			p(v)
14
+			p()
15
+		# '''
16
+class rld_jpsMixin_1():
17
+	# def __init__(self, *a,**kw):
18
+		# self.scope = scope
19
+		# p("_ConsumerSto INIT:",self,a,kw)
20
+		# super().__init__(*a,**kw)
21
+		# self.j = {}
22
+
23
+	async def pub_log_msg(self, text_data):
24
+		pass
25
+		p("pub_log_msg :rld_jpsMixin_1: jpsMixin_VX4")
26
+	async def ws_conn0(self):
27
+		pass
28
+		# self.room_name_kw = self.scope["url_route"]["kwargs"]["room_name"]
29
+		self.j = DCls()
30
+		self.j.qsd = make_qsd(self.scope["query_string"])
31
+		self.j.room_name_kw = self.scope["url_route"]["kwargs"]["room_name"]
32
+		self.j.room_name = self.j.room_name_kw.split("/")[0]
33
+		self.j.rn1 = room_group_prefix+self.j.room_name
34
+		self.j.rn1b = room_group_prefix2+self.j.room_name
35
+		if "log_ch" in self.j.qsd:
36
+			await self.channel_layer.group_add(
37
+				room_group_prefix2+self.j.room_name,
38
+				self.channel_name
39
+			)			
40
+
41
+
42
+		# self.qsd
43
+		await self.channel_layer.group_add(
44
+			room_group_prefix+self.j.room_name,
45
+			self.channel_name
46
+		)
47
+
48
+		await self.channel_layer.group_add(
49
+			# group_prefix+"sto",
50
+			"x4_all",
51
+			self.channel_name
52
+		)
53
+
54
+		# make_qsd("'z?room=udef/z'")
55
+		# p(":jps_consumer:ws_conn2 ~~1")
56
+	async def ws_conn1(self):
57
+		pass
58
+		# p(":jps_consumer:ws_conn2 ~~1")
59
+	async def ws_conn2(self):
60
+		p(":jps_consumer:ws_conn2 ~~1")
61
+
62
+class rld_jpsMixin_1b():
63
+	async def pub_log_msg2(self, text_data):
64
+		# p("pub_log_msg2",self.channel_name)
65
+		print(end="",flush=True)
66
+	async def pub_log_msg(self, text_data):
67
+		# p(text_data,type(text_data))
68
+		# await self.channel_layer.group_send("x4_all",{"a":1,'type': 'pub_log_msg_b'})
69
+		# p(dir(self))
70
+		# await self.channel_layer.group_send("x4_all",text_data)
71
+		text_data["type"]="pub_log_msg_b"
72
+		# if ()
73
+		await self.channel_layer.group_send(self.j.rn1b,text_data)
74
+
75
+	async def pub_log_msg_b(self, text_data):
76
+		await self.send(json.dumps(text_data))
77
+		# self.j.rn1b
78
+	async def pub_log_msg0(self, text_data):
79
+		pass
80
+		p("::",text_data)
81
+		r'''
82
+		p("pub_log_msg :rld_jpsMixin_1b: jpsMixin_VX4")
83
+		p(dir(self))
84
+
85
+		self.scope["query_string"]
86
+		self.scope["path"]
87
+		# '''
88
+		# scope_info(self)
89
+		await self.channel_layer.group_send("x4_all",{"a":1,'type': 'pub_log_msg2'})
90
+
91
+
92
+	async def ws_conn2(self):
93
+		p(":jps_consumer:ws_conn2 ~~1b")
94
+
95
+# class_edit(DevMixin,rldDevMixin_2,reset=1)
96
+# class_edit(vfb.l_task_x4.glob_cl_vx4.jpsMixin_VX4,rld_jpsMixin_1,reset=1)
97
+class_edit(glob_cl_vx4.jpsMixin_VX4,rld_jpsMixin_1,reset=1)
98
+class_edit(glob_cl_vx4.jpsMixin_VX4b,rld_jpsMixin_1b,reset=1)
99
+
100
+# scope_info

+ 9
- 0
dcc/rx4/x2.py ファイルの表示

@@ -0,0 +1,9 @@
1
+
2
+
3
+# p("make_qsd:",make_qsd)
4
+
5
+def prs_qsd1():
6
+	ret = make_qsd("'z?room=udef/z'")
7
+	p(":",ret)
8
+
9
+# prs_qsd1()

+ 0
- 0
dcc/rx4/x3.py ファイルの表示


+ 0
- 0
dcc/rx4/x4.py ファイルの表示


+ 0
- 0
dcc/rx4/x5.py ファイルの表示


+ 15
- 0
indx/ws_dev2/wp0.js ファイルの表示

@@ -0,0 +1,15 @@
1
+
2
+
3
+
4
+function onmessage2(){
5
+	onmessage3.call(this,...arguments)
6
+
7
+}
8
+function onmessage3(m,m2){
9
+	// clog("zz",this,m)
10
+	// clog("zz",m.data)
11
+	var o = JSON.parse(m.data)
12
+	clog(":",o.o)
13
+}
14
+
15
+dev_glob.fns.connect_ws({socket:"ws2",roomName:"udef",qs:"log_ch=1",onmessage:onmessage2})

+ 37
- 0
indx/ws_dev2/wp1.js ファイルの表示

@@ -0,0 +1,37 @@
1
+function replacer(key,val,a3,a4){
2
+	clog({that:this,key,val,a3,a4})
3
+	return val
4
+
5
+}
6
+function reviver(key,val,a3){
7
+	// reviver
8
+	clog({that:this,key,val,a3})
9
+	return val
10
+}
11
+
12
+function json_prs_dev(){
13
+	var o = {
14
+		a:1,
15
+		ay:Symbol("add_module"),
16
+		b:2,
17
+		c:{x:1},
18
+		d:["I","J","K"],
19
+	}
20
+	var str_o = JSON.stringify(o,replacer)
21
+	// var str_o = JSON.stringify(o)
22
+	var o2 = JSON.parse(str_o,reviver)
23
+
24
+var ar = ['apple', 'orange', 'banana', 'strawberry'];
25
+
26
+// var json = JSON.stringify(ar, [0, 2] );
27
+// var json2 = JSON.stringify(ar );
28
+// console.log(json);
29
+// console.log(json2);
30
+console.log("o:",o);
31
+console.log("o2:",o2);
32
+
33
+
34
+}
35
+json_prs_dev()
36
+// clog("reviver:",reviver)
37
+clog("replacer:",replacer)

+ 0
- 0
indx/ws_dev2/wp2.js ファイルの表示


+ 0
- 0
indx/ws_dev2/wp3.js ファイルの表示


+ 0
- 0
indx/ws_dev2/wp4.js ファイルの表示


+ 0
- 0
indx/ws_dev2/wp5.js ファイルの表示


+ 72
- 0
indx/ws_dev2/ws_log.html ファイルの表示

@@ -0,0 +1,72 @@
1
+<html itemscope itemtype="http://schema.org/Product" prefix="og: http://ogp.me/ns#" xmlns="http://www.w3.org/1999/html">
2
+  <head>
3
+	  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0" />
4
+<!--#set var="rtqs" value="c=$request_id"-->
5
+
6
+<script src="/ign/libs/jquery-3.5.1.min.js"></script>
7
+<script class="rld" src="/ign/libs/mustache.js?c=002"></script>
8
+
9
+
10
+
11
+
12
+
13
+
14
+
15
+
16
+
17
+<script class="rld" src="/ign/rf/u/universals.js?c=00x"></script>
18
+<script class="" src="/ign/rf/u/proto_ext.js?c=00x"></script>
19
+<script class="rld" src="/ign/ldev/rndr_eng/implicit_dependencies.js?<!--#echo var="rtqs"-->"></script>
20
+
21
+<script class="rld" src="/ign/j7/udev/u_ld.js?c=00x"></script>
22
+
23
+
24
+
25
+	<script src="/ign/j7/rldjs/rldjs5.js?v=139"></script>
26
+  	<script class="rld rrld" src="/ign/rls.js?<!--#echo var="rtqs"-->"></script>
27
+  	<script class="rld rrld_u" src="/ign/rls_u.js?<!--#echo var="rtqs"-->"></script>
28
+
29
+
30
+
31
+
32
+	<script class="rld" src="/ign/xf/nginx_td/td_t/ti_t2.js?<!--#echo var="rtqs"-->"></script>
33
+
34
+	<script class="rld" src="/ign/rf/m/m_api_v2.js?c=00x"></script>
35
+
36
+<!--
37
+-->
38
+	<script class="rld" src="/ign/xf/nginx_tx/dev_sto/v.js?<!--#echo var="rtqs" -->"></script>
39
+	<script class="rld" type="module" src="/ign/xf/nginx_tx/dev_sto/ws0.js?<!--#echo var="rtqs" -->"></script>
40
+
41
+
42
+
43
+
44
+	<script class="rld" src="/ign/j8/ac0/a0/w0.js?<!--#echo var="rtqs"-->"></script>
45
+	<script class="rld" src="/ign/j8/ac0/a0/w1.js?<!--#echo var="rtqs"-->"></script>
46
+
47
+	<script class="rld" src="/ign/indx/ws_dev2/wp0.js?<!--#echo var="rtqs"-->"></script>
48
+	<script class="rld" src="/ign/indx/ws_dev2/wp1.js?<!--#echo var="rtqs"-->"></script>
49
+	<script class="rld" src="/ign/indx/ws_dev2/wp2.js?<!--#echo var="rtqs"-->"></script>
50
+	<script class="rld" src="/ign/indx/ws_dev2/wp3.js?<!--#echo var="rtqs"-->"></script>
51
+	<script class="rld" src="/ign/indx/ws_dev2/wp4.js?<!--#echo var="rtqs"-->"></script>
52
+	<script class="rld" src="/ign/indx/ws_dev2/wp5.js?<!--#echo var="rtqs"-->"></script>
53
+
54
+
55
+<script class="rld" src="/ign/xf/inspect/rld_info.js?c=002"></script>
56
+
57
+<script type="text/javascript">
58
+	nginx_u = {
59
+		rtqs:`<!--#echo var="rtqs" -->`,
60
+	}
61
+
62
+</script>
63
+
64
+
65
+
66
+<link class="rld" rel="stylesheet" href="/ign/indx/maf_deal/m0.css?<!--#echo var="rtqs"-->">
67
+
68
+  </head>
69
+  <body>
70
+
71
+  </body>
72
+  </html>

+ 1
- 1
j7/rldjs/rld_dev/irld.html ファイルの表示

@@ -89,7 +89,7 @@
89 89
 
90 90
 
91 91
 
92
-
92
+<script class="rld" src="/ign/xf/o/fs_utils.js?c=00x"></script>
93 93
 
94 94
 
95 95
 

+ 1
- 0
j7/rldjs/rld_dev/irld.js ファイルの表示

@@ -31,6 +31,7 @@ function manual_shallow_clone(n0){
31 31
 }
32 32
 
33 33
 function gen_html_snipit3() {
34
+	console.log("gen_html_snipit3")
34 35
 
35 36
 	var n = document.createElement("div")
36 37
 	var nx = document.getElementsByTagName("head")[0]

+ 128
- 4
j8/ac0/a0/au0.js ファイルの表示

@@ -1,4 +1,18 @@
1 1
 clog("AU0",typeof(document))
2
+clog("AU0?",typeof(document))
3
+// window.idk123 =1
4
+
5
+function mute_audio_events(volume=0){
6
+	var audios = $(`audio[preload]`)
7
+	var k,v
8
+	for (v of audios){
9
+		v.volume = volume
10
+	}
11
+
12
+
13
+}
14
+window.mute_audio_events=mute_audio_events
15
+
2 16
 function isReact(){
3 17
 	return typeof(navigator != 'undefined') && navigator.product == 'ReactNative'
4 18
 }
@@ -30,10 +44,12 @@ window.tglob_au = window.tglob_au || {flags:{}}
30 44
 function middleware_ord_cb(o){
31 45
 	if (o.action.type){
32 46
 
47
+		clog("middleware_ord_cb:",o.action.type)
33 48
 	// clog("\n================ middleware_ord_cb:",o.action.type)
34 49
 	}
35 50
 	switch(o.action.type){
36 51
 		/**/
52
+		// clog("middleware_ord_cb:",o)
37 53
 		// case "PARTICIPANT_UPDATED":
38 54
 		// break;
39 55
 		// break;
@@ -43,6 +59,11 @@ function middleware_ord_cb(o){
43 59
 		case "PARTICIPANT_JOINED":
44 60
 		case "CONFERENCE_JOINED":
45 61
 		case "CONFERENCE_LEFT":
62
+
63
+		case "SET_TILE_VIEW_DIMENSIONS":
64
+		case "SET_ASPECT_RATIO":
65
+		case "CLIENT_RESIZED":
66
+
46 67
 	// clog("middleware_ord_cb:",o)
47 68
 	tglob_au.run_qxi_cbs(o.action.type)
48 69
 		// clog()
@@ -50,6 +71,33 @@ function middleware_ord_cb(o){
50 71
 	}
51 72
 	
52 73
 }
74
+
75
+function middleware_ord_sync_cb(o){
76
+	if (o.action.type){
77
+
78
+	// clog("\n================ middleware_ord_cb:",o.action.type)
79
+	}
80
+	switch(o.action.type){
81
+		/**/
82
+		// case "PARTICIPANT_UPDATED":
83
+		// break;
84
+		// break;
85
+		// break;
86
+
87
+		case "PARTICIPANT_LEFT":
88
+		case "PARTICIPANT_JOINED":
89
+		case "CONFERENCE_JOINED":
90
+		case "CONFERENCE_LEFT":
91
+
92
+
93
+	// clog("middleware_ord_cb:",o)
94
+	tglob_au.run_qxi_sync_cbs(o.action.type)
95
+		// clog()
96
+		break;
97
+	}
98
+	
99
+}
100
+
53 101
 function get_reg_cb_ord(){
54 102
 	if (isReact()){
55 103
 		return tmp_dev_sto.reg_cb_ord
@@ -63,6 +111,7 @@ function get_reg_cb_ord(){
63 111
 function init_test_au_ord(){
64 112
 	if (isReact()){
65 113
 		window.glob_vhook.fns.middleware_ord_cb = middleware_ord_cb
114
+		window.glob_vhook.fns.middleware_ord_sync_cb = middleware_ord_sync_cb
66 115
 	} else {
67 116
 		window.middleware_ord_cb = middleware_ord_cb
68 117
 	}
@@ -87,26 +136,51 @@ function init_test_au_ord(){
87 136
 
88 137
 
89 138
 function init_test_au_ord2(){
90
-	ord_fns = gen_ord_decs(tglob_au.ord,"QXI.")
139
+	var ord_fns = gen_ord_decs(tglob_au.ord,"QXI.")
91 140
 	tglob_au.reg_qxi_cb = ord_fns.reg_cb
92 141
 	tglob_au.run_qxi_cbs = ord_fns.run_cbs
93 142
 
94
-}
143
+	ord_fns = gen_ord_decs(tglob_au.ord,"QXI_SYNC.")
144
+	tglob_au.reg_qxi_sync_cb = ord_fns.reg_cb
145
+	tglob_au.run_qxi_sync_cbs = ord_fns.run_cbs
146
+
147
+	ord_fns = gen_ord_decs(tglob_au.ord,"STO.")
148
+	tglob_au.reg_sto_cb = ord_fns.reg_cb
149
+	tglob_au.run_sto_cbs = ord_fns.run_cbs
150
+
95 151
 
152
+	ord_fns = gen_ord_decs(tglob_au.ord,"DEV.")
153
+	tglob_au.reg_dev_cb = ord_fns.reg_cb
154
+	tglob_au.run_dev_cbs = ord_fns.run_cbs
155
+
156
+
157
+
158
+}
96 159
 
97 160
 
98 161
 
99 162
 
100 163
 
164
+function am_i_in_conf(){
165
+		var state = window.glob_vhook.fns.getState()
166
+	var conference_0 = state["features/base/conference"]
167
+	var conference = conference_0.conference
168
+	return {room0:conference_0.room,room:conference.room}
169
+}
101 170
 
102 171
 init_test_au_ord()
103 172
 init_test_au_ord2()
104 173
 
105 174
 function QXI_PARTICIPANT_JOINED(){
106 175
 	if (glob_vhook.data.dev_sto_state.db != "connected"){
107
-		glob_vhook.fns.tmsgx3({type:"db_sync_request"})
176
+
177
+		glob_vhook.fns.tmsgx3({type:"NO_TYPE_DBG3"})
178
+
179
+		// glob_vhook.fns.tmsgx3({type:"db_sync_request"})
108 180
 
109 181
 	}
182
+	// clog("QXI_PARTICIPANT_JOINED",am_i_in_conf(),{arguments,that:this})
183
+	clog("QXI_PARTICIPANT_JOINED",{arguments,that:this})
110 184
 }
111 185
 function QXI_CONFERENCE_LEFT(){
112 186
 	if (isReact()){
@@ -114,30 +188,80 @@ function QXI_CONFERENCE_LEFT(){
114 188
 	}
115 189
 
116 190
 }
117
-function QXI_CONFERENCE_JOINED(){
191
+function QXI_CONFERENCE_JOINED(args,obj,ord_that){
118 192
 	if (isReact()){
193
+		if (!ord_that.that.rnd_id){
194
+			ord_that.that.rnd_id = Math.floor(Math.random() * 1000)
195
+			clog("!!!!!!!!!!!!!!!!!!!!!!!!\n\n","new rnd_id:",ord_that.that.rnd_id)
196
+		}
119 197
 		glob_vhook.data.dev_sto_state.db = ""
120 198
 
121 199
 		glob_vhook.fns.init_mx()
200
+		clog("~~~~~~~~              ++       QXI_CONFERENCE_JOINED",ord_that.that.rnd_id)
201
+		glob_vhook.fns.tmsgx3({type:"NO_TYPE_DBG4"})
122 202
 		glob_vhook.fns.tmsgx3({type:"db_sync_request"})
123 203
 
124 204
 			// {type:"db_sync_request"}
125 205
 	}
206
+	// clog("QXI_CONFERENCE_JOINED",{arguments,that:this})
126 207
 	clog("QXI_CONFERENCE_JOINED",{arguments,that:this})
208
+	// clog("QXI_CONFERENCE_JOINED",am_i_in_conf(),{arguments,that:this})
209
+}
210
+// function QXI_SYNC_CONFERENCE_JOINED(){
211
+function QXI_SYNC_db_sync(){
212
+	// clog(this.fn_key,am_i_in_conf())
213
+	// clog("###### QXI_SYNC",this.fn_key,this)
214
+	clog("###### QXI_SYNC",this.hkey)
215
+	// clog("QXI_CONFERENCE_JOINED",am_i_in_conf()
127 216
 }
217
+
218
+
219
+function QXI_MULTI_RS(args,obj,ord_that){
220
+	// clog("QXI_MULTI_RS!",this,args,obj,ord_that)
221
+	clog("QXI_MULTI_RS!",args,obj,ord_that)
222
+}
223
+
128 224
 if (isReact()){
129 225
 
130 226
 tglob_au.reg_qxi_cb(QXI_PARTICIPANT_JOINED,"PARTICIPANT_JOINED","QXI_PARTICIPANT_JOINED")
131 227
 tglob_au.reg_qxi_cb(QXI_CONFERENCE_JOINED,"CONFERENCE_JOINED","QXI_CONFERENCE_JOINED")
132 228
 tglob_au.reg_qxi_cb(QXI_CONFERENCE_LEFT,"CONFERENCE_LEFT","QXI_CONFERENCE_LEFT")
229
+
230
+tglob_au.reg_qxi_sync_cb(QXI_SYNC_db_sync,"PARTICIPANT_JOINED","QXI_SYNC_db_sync")
231
+tglob_au.reg_qxi_sync_cb(QXI_SYNC_db_sync,"CONFERENCE_JOINED","QXI_SYNC_db_sync")
232
+// glob_vhook.fns.tmsgx3({type:"db_sync_request"})
233
+
234
+
235
+
236
+
237
+// tglob_au.reg_qxi_cb(QXI_MULTI_RS,"SET_ASPECT_RATIO","QXI_SET_ASPECT_RATIO")
238
+tglob_au.reg_qxi_cb(QXI_MULTI_RS,"SET_TILE_VIEW_DIMENSIONS","FNCB")
239
+tglob_au.reg_qxi_cb(QXI_MULTI_RS,"CLIENT_RESIZED","FNCB")
240
+tglob_au.reg_qxi_cb(nop,"SET_TILE_VIEW_DIMENSIONS","FNCB")
241
+tglob_au.reg_qxi_cb(nop,"SET_ASPECT_RATIO","FNCB")
242
+tglob_au.reg_qxi_cb(nop,"CLIENT_RESIZED","FNCB")
243
+// tglob_au.reg_qxi_cb(QXI_MULTI_RS,"SET_ASPECT_RATIO","FNCB")
244
+
245
+
246
+ // SET_TILE_VIEW_DIMENSIONS
247
+ // SET_ASPECT_RATIO
248
+ // CLIENT_RESIZED
249
+
250
+
251
+glob_vhook.fns.isReact=isReact
252
+// isReact
253
+
133 254
 }
134 255
 // 
256
+
135 257
 // glob_tx.fn.reg_cb_ord
136 258
 // tmp_dev_sto.reg_cb_ord
137 259
 
138 260
 
139 261
 
140 262
 
263
+
264
+
141 265
 // if (typeof document != 'undefined' && 0) {
142 266
 //   // I'm on the web!
143 267
 //   clog(`I'm on the web!`)

+ 19
- 1
j8/ac0/a0/au2.js ファイルの表示

@@ -1,4 +1,22 @@
1 1
 // clog(window.mhndlr_rld)
2 2
 
3 3
 
4
-clog(">>")
4
+function ab_z2(){
5
+	clog("ab_z2")
6
+	var z = window.tglob_au.run_sto_cbs
7
+	var z2
8
+	// var z2 = window.tglob_au.run_sto_cbs.a.b
9
+	// z2 = window.tglob_au && window.tglob_au.run_sto_cbs && window.tglob_au.run_sto_cbs.a && window.tglob_au.run_sto_cbs.a.b || "1"
10
+	z2 = window.tglob_au && window.tglob_au.run_sto_cbs && tglob_au.run_sto_cbs.a || nop
11
+	clog("ab_z2:",z,z2)
12
+
13
+}
14
+// clog(">>.",window.dbg_hk)
15
+
16
+// clog(">>.",window.tmp_dev_sto.sto_inst,glob_vhook.fns.create_proxy_db_connected_2)
17
+
18
+// tglob_au.reg_dev_cb
19
+
20
+
21
+
22
+ab_z2()

+ 34
- 0
j8/ac0/a0/au3.js ファイルの表示

@@ -0,0 +1,34 @@
1
+// clog(isReact)
2
+
3
+
4
+
5
+function native_large_vid(){
6
+	// clog(glob_vhook.imps)
7
+	clog(Object.keys(glob_vhook.imps))
8
+}
9
+function lv_style_tmp_dev(fn_name,o,zz,zz2,zz3){
10
+	// clog(fn_name,"?.-+~!")
11
+	// clog(fn_name,"lv_style_tmp_dev:",{o})
12
+	clog(fn_name,"lv_style_tmp_dev:",{
13
+		o:Object.keys(o)
14
+		zz:Object.keys(zz)
15
+	})
16
+	// clog(fn_name,"lv_style_tmp_dev:",o)
17
+}
18
+
19
+
20
+try {
21
+
22
+glob_vhook.fns.lv_style_tmp_dev = lv_style_tmp_dev
23
+if (glob_vhook.fns.isReact()){
24
+	native_large_vid()
25
+}
26
+
27
+} catch (err){
28
+
29
+}
30
+
31
+
32
+// function isReact(){
33
+	// return typeof(navigator != 'undefined') && navigator.product == 'ReactNative'
34
+// }

+ 41
- 0
j8/ac0/a0/au5.js ファイルの表示

@@ -0,0 +1,41 @@
1
+clog("::")
2
+
3
+// dev_glob.fns.s({key:"pub_log_msg",o:{clog,a:1,z:JSON.stringify({a:1})}},"ws2")
4
+
5
+
6
+function btn_info(){
7
+	clog(glob_vhook.btns)
8
+
9
+}
10
+function au_info(){
11
+	clog(Object.keys(tglob_au))
12
+	clog(tglob_au.ord_fns)
13
+	clog(tglob_au.r1)
14
+	clog(tglob_au.ord)
15
+	clog(tglob_au.ord.cb_sto)
16
+	// dev_glob.fns.s({key:"pub_log_msg",o:{tglob_au}},"ws2")
17
+	dev_glob.fns.s({key:"pub_log_msg",o:{z:tglob_au.ord.cb_sto}},"ws2")
18
+
19
+}
20
+function ws_log_dev(){
21
+	var state = window.glob_vhook.fns.getState()
22
+	var rui = state[`features/base/responsive-ui`]
23
+	clog({},"?",rui)
24
+
25
+	// dev_glob.fns.s({key:"pub_log_msg",o:{clog,a:1,state}},"ws2")
26
+	dev_glob.fns.s({key:"pub_log_msg",o:{rui}},"ws2")
27
+}
28
+
29
+// ws_log_dev()
30
+// au_info()
31
+btn_info()
32
+// tglob_au.run_dev_cbs("rerender_Wview_v1")
33
+
34
+
35
+function render_vvx_db(a1,a2,a3,a4){
36
+	// clog("vvx",{that:this,a1,a2,a3,a4})
37
+	// clog("vvx",">>?")
38
+	clog("vvx",a1.that.props)
39
+}
40
+
41
+tglob_au.reg_dev_cb(render_vvx_db,"render_vvx")

+ 159
- 0
j8/ac0/a0/w0.js ファイルの表示

@@ -0,0 +1,159 @@
1
+window.dev_glob =window.dev_glob || {}
2
+
3
+$.extend(true,window.dev_glob,{v:{}})
4
+
5
+
6
+
7
+var cls = {}
8
+var fns = {}
9
+var inst = {}
10
+var ws = {
11
+	sockets:{}
12
+}
13
+
14
+
15
+
16
+
17
+
18
+
19
+
20
+class WS_MAN {
21
+	constructor(o){
22
+
23
+	}
24
+}
25
+
26
+
27
+// cls.WS_MAN = WS_MAN
28
+
29
+
30
+
31
+
32
+
33
+function onclose(){
34
+	clog("WS_CLOSE",{that:this,args:[...arguments]})
35
+}
36
+
37
+function onmessage(){
38
+	clog("WS_MESSAGE",{that:this,args:[...arguments]})
39
+}
40
+
41
+function onerror(){
42
+	clog("WS_ERROR",{that:this,args:[...arguments]})
43
+
44
+}
45
+function onopen(){
46
+	clog("WS_OPEN",{that:this,args:[...arguments]})
47
+}
48
+
49
+// ws.wsfn
50
+
51
+var socket_ext = {
52
+	s(o,socket_name="ws0"){
53
+		var socket = dev_glob.ws.sockets[socket_name]
54
+		// clog("socket_name",socket_name,socket)
55
+		socket.wSocket.send(JSON.stringify(o));
56
+	},
57
+	tmp_send(o,socket_name="ws0"){
58
+		dev_glob.fns.s(o,socket_name)
59
+
60
+	},
61
+
62
+}
63
+fns.s = socket_ext.s
64
+fns.tmp_send = socket_ext.tmp_send
65
+var default_ws_obj = {
66
+	// hostname:window.location.hostname,
67
+	// hostname:window.glob_const.host,
68
+	hostname:"vb.videocorners.com",
69
+	url:"",
70
+	qs:"",
71
+	ws_path:`/ws/jsto4/`,
72
+	// ws_path:`/ws/jsto3/`,
73
+	roomName:"udef2",
74
+	socket:"ws0",
75
+	onmessage,
76
+	onclose,
77
+	onerror,
78
+	onopen,
79
+
80
+}
81
+
82
+
83
+
84
+
85
+
86
+function connect_ws(o_={}) {
87
+	var sockets = dev_glob.ws.sockets
88
+	var o = $.extend(true,{},default_ws_obj,o_)
89
+	// var o2 = $.extend(true,o,default_ws_obj,o)
90
+	// var o2 = $.extend(true,o,default_ws_obj,o)
91
+	// return {o,default_ws_obj,o2}
92
+	var url
93
+	if (o.url){url=o.url} else {
94
+
95
+	url = 'wss://' + o.hostname + ":8943" +
96
+        // '/ws/chat/' + window.roomName + `/?room=${window.roomName}`);
97
+        // o.ws_path + o.roomName + `/?room=${o.roomName}`
98
+        // o.ws_path + o.roomName + `?room=${o.roomName}`
99
+        o.ws_path + o.roomName + `?${o.qs}`
100
+	}
101
+
102
+	if (sockets[o.socket] && sockets[o.socket].wSocket.readyState < 2){
103
+    clog("WSS ALLREADY CONNECTED!",o.socket)
104
+        return
105
+	}
106
+
107
+	var chatSocket = new WebSocket(url)
108
+	/*
109
+    var chatSocket = new WebSocket(
110
+        'wss://' + window.location.hostname + ":8943" +
111
+        // '/ws/chat/' + window.roomName + `/?room=${window.roomName}`);
112
+        ws_path + window.roomName + `/?room=${window.roomName}`);
113
+	*/
114
+	clog({
115
+
116
+onmessage:chatSocket.onmessage,
117
+onclose:chatSocket.onclose,
118
+onerror:chatSocket.onerror,
119
+onopen:chatSocket.onopen,
120
+
121
+	})
122
+
123
+
124
+	sockets[o.socket] = {
125
+		wSocket:chatSocket,
126
+		o,
127
+	}
128
+	chatSocket.socket_container = sockets[o.socket]
129
+
130
+	o.onmessage ? chatSocket.onmessage = o.onmessage: 0
131
+	o.onclose ?   chatSocket.onclose = o.onclose: 0
132
+	o.onerror ?   chatSocket.onerror = o.onerror: 0
133
+	o.onopen ?    chatSocket.onopen = o.onopen: 0
134
+
135
+	// wsfn.onmessage
136
+    // window.chatSocket =chatSocket
137
+    // chatSocket.onmessage = wsfn.onmessage
138
+    // chatSocket.onclose = wsfn.onclose
139
+
140
+
141
+	// body...
142
+}
143
+
144
+fns.connect_ws = connect_ws
145
+
146
+// dev_glob.fns.connect_ws
147
+clog(".",onmessage)
148
+
149
+$.extend(true,window.dev_glob,{
150
+	cls:{...cls},
151
+	fns:{...fns},
152
+	inst:{...inst},
153
+	ws:{...ws},
154
+})
155
+
156
+
157
+
158
+// dev_glob.fns.tmp_send
159
+// clog(":::")

+ 15
- 0
j8/ac0/a0/w1.js ファイルの表示

@@ -0,0 +1,15 @@
1
+// connect_ws_sto({
2
+// 	ws_path:`/ws/jsto4/`,
3
+// 	roomName:"",
4
+// })
5
+
6
+
7
+// clog(window.location)
8
+
9
+
10
+// clog(">>")
11
+
12
+// dev_glob.fns.connect_ws({socket:"ws1",roomName:"udef/a/b",})
13
+// dev_glob.fns.connect_ws({socket:"ws2",roomName:"udef/z",})
14
+
15
+// dev_glob.fns.connect_ws({socket:"ws3",roomName:"udef/z",qs:"log_ch=1"})

+ 0
- 0
j8/ac0/a0/w2.js ファイルの表示


+ 0
- 0
j8/ac0/a0/w3.js ファイルの表示


+ 0
- 0
j8/ac0/a0/w4.js ファイルの表示


+ 0
- 0
j8/ac0/a0/w5.js ファイルの表示


+ 2
- 0
j8/ac0/a0/w5.n.js ファイルの表示

@@ -0,0 +1,2 @@
1
+dev_glob.fns.connect_ws({socket:"ws2",roomName:"udef",})
2
+

+ 0
- 0
j8/ac0/a0/w5.w.js ファイルの表示


+ 19
- 0
j8/ac0/rld/r0.js ファイルの表示

@@ -43,6 +43,14 @@ function trld(){
43 43
 	reg_pexe(`${base0}t3.js`,px_eval,"t3",1)
44 44
 	reg_pexe(`${base0}t4.js`,px_eval,"t4",1)
45 45
 	reg_pexe(`${base0}t5.js`,px_eval,"t5",1)
46
+
47
+	reg_pexe(`${base0}j0.js`,px_eval,"j0",1)
48
+	reg_pexe(`${base0}j1.js`,px_eval,"j1",1)
49
+	reg_pexe(`${base0}j2.js`,px_eval,"j2",1)
50
+	reg_pexe(`${base0}j3.js`,px_eval,"j3",1)
51
+	reg_pexe(`${base0}j4.js`,px_eval,"j4",1)
52
+	reg_pexe(`${base0}j5.js`,px_eval,"j5",1)
53
+	reg_pexe(`${base0}j6.js`,px_eval,"j6",1)
46 54
 	
47 55
 	reg_pexe(`${base0}ut0.js`,px_eval,"ut0",1)
48 56
 	reg_pexe(`${base0}ut1.js`,px_eval,"ut1",1)
@@ -51,6 +59,7 @@ function trld(){
51 59
 	reg_pexe(`${base0}ut4.js`,px_eval,"ut4",1)
52 60
 	reg_pexe(`${base0}ut5.js`,px_eval,"ut5",1)
53 61
 
62
+
54 63
 	reg_pexe(`${base1}au0.n.js`,px_eval,"au0.n",1)
55 64
 	reg_pexe(`${base1}au0.js`,px_eval,"au0",1)
56 65
 	reg_pexe(`${base1}au1.js`,px_eval,"au1",1)
@@ -58,6 +67,16 @@ function trld(){
58 67
 	reg_pexe(`${base1}au3.js`,px_eval,"au3",1)
59 68
 	reg_pexe(`${base1}au4.js`,px_eval,"au4",1)
60 69
 	reg_pexe(`${base1}au5.js`,px_eval,"au5",1)
70
+
71
+	reg_pexe(`${base1}w0.js`,px_eval,"w0",1)
72
+	reg_pexe(`${base1}w1.js`,px_eval,"w1",1)
73
+	reg_pexe(`${base1}w2.js`,px_eval,"w2",1)
74
+	reg_pexe(`${base1}w3.js`,px_eval,"w3",1)
75
+	reg_pexe(`${base1}w4.js`,px_eval,"w4",1)
76
+	reg_pexe(`${base1}w5.js`,px_eval,"w5",1)
77
+	reg_pexe(`${base1}w5.n.js`,px_eval,"w5.n",1)
78
+
79
+
61 80
 	// reg_pexe(`${base0}au0.js`,px_eval,"au0",1)
62 81
 
63 82
 	// reg_pexe(`${base0}owalk_t.js`,px_eval,"owalk_t",1)

+ 28
- 0
j8/ac0/t0/j0.js ファイルの表示

@@ -0,0 +1,28 @@
1
+
2
+
3
+
4
+
5
+
6
+function dev_t1(args,obj,ord_that){
7
+	try {
8
+
9
+	var o = {that:this,args,obj,ord_that}
10
+	clog("dev_t1",o)
11
+	var o2 ={args,obj,ord_that}
12
+	o2 ={ord_that}
13
+	dev_glob.fns.s({key:"pub_log_msg",o:{o:"z4"}},"ws2")
14
+	// var s = JSON.stringify(o2)
15
+	// clog("ERR?")
16
+	// dev_glob.fns.s({key:"pub_log_msg",o:{s}},"ws2")
17
+	// dev_glob.fns.s({key:"pub_log_msg",o:{a:"s"}},"ws2")
18
+	} catch (err){
19
+		// console.log(err)
20
+		clog(err)
21
+	}
22
+
23
+}
24
+
25
+tglob_au.reg_dev_cb(dev_t1,"dev_t1")
26
+// tglob_au.run_dev_cbs("dev_t1")
27
+
28
+// tglob_au.reg_dev_cb(nop,"CLIENT_RESIZED","FNCB")

+ 11
- 0
j8/ac0/t0/j1.js ファイルの表示

@@ -0,0 +1,11 @@
1
+
2
+
3
+// dev_glob.fns.connect_ws({socket:"ws2",roomName:"udef",})
4
+function dev_t1r(){
5
+	var ret = tglob_au.run_dev_cbs("dev_t1")
6
+	clog("RET:",ret)
7
+}
8
+
9
+
10
+
11
+dev_t1r()

+ 0
- 0
j8/ac0/t0/j2.js ファイルの表示


+ 0
- 0
j8/ac0/t0/j3.js ファイルの表示


+ 0
- 0
j8/ac0/t0/j4.js ファイルの表示


+ 0
- 0
j8/ac0/t0/j5.js ファイルの表示


+ 0
- 0
j8/ac0/t0/j6.js ファイルの表示


+ 16
- 2
j8/ac0/t0/t0.js ファイルの表示

@@ -82,10 +82,24 @@ function root_info(){
82 82
 }
83 83
 function root_info2(){
84 84
 	var state = app_t.state.store.getState()
85
-	clog("root_info2,",{root,app_t:window.app_t,app_r:window.app_r,state})
85
+	clog("root_info2,",{root,app_t:window.app_t,app_r:window.app_r,state,rui:state[`features/base/responsive-ui`]})
86 86
 
87 87
 }
88
-root_info2()
88
+
89
+function rui_info(){
90
+	var state = app_t.state.store.getState()
91
+	var rui = state[`features/base/responsive-ui`]
92
+
93
+	// clog("rui_info",rui.clientWidth/rui.clientHeight,rui,{state})
94
+	clog("rui_info",rui.clientWidth/rui.clientHeight,rui)
95
+
96
+}
97
+window.glob_vhook.fns.rui_info = rui_info
98
+
99
+
100
+
101
+// root_info2()
102
+rui_info()
89 103
 // rn_x1z()
90 104
 
91 105
 // clog("app:",window.app,window.App,window.APP)

+ 2
- 2
j8/ac0/t0/t3.js ファイルの表示

@@ -5,7 +5,7 @@ function gen_xcal_room3(){
5 5
 	var state = window.glob_vhook.fns.getState()
6 6
 	roomName = state["features/base/conference"].room
7 7
 	// roomName = "maf7"
8
-	clog("gen_xcal_room3")
8
+	// clog("gen_xcal_room3")
9 9
 	var ret = {}
10 10
 	ret.room_prefix  = roomName.length + "z" +roomName.toLowerCase()
11 11
 	ret.name=  ret.room_prefix + "d5jtcx4pqgrubarrt358"
@@ -27,4 +27,4 @@ function getState(){
27 27
 
28 28
 window.glob_vhook.fns.getState = getState
29 29
 window.glob_vhook.fns.gen_xcal_room3 = gen_xcal_room3
30
-// fns
30
+// fns

+ 99
- 12
j8/ac0/t0/t4.js ファイルの表示

@@ -13,10 +13,25 @@ function print_kv(o){
13 13
 }
14 14
 // window.glob_vhook.data ={}
15 15
  window.glob_vhook.rcb.lv_style = function(fn_name,o,zz){
16
+    try {
17
+
18
+    if (glob_vhook.fns.lv_style_tmp_dev){
19
+        glob_vhook.fns.lv_style_tmp_dev(fn_name,o,zz,{that:this,args:arguments})
20
+    }
21
+    } catch (err){clog("lv_style_tmp_dev ERR:")}
22
+
23
+
16 24
  	// clog(fn_name,"???")
17 25
  	var aspect_ratio = 16/9
26
+    // 2960 x 1440
27
+    // aspect_ratio = 1
28
+    // aspect_ratio = 2960/1440
18 29
  	// aspect_ratio = 4/3
30
+    // aspect_ratio =  2.05
19 31
     // aspect_ratio = 17/9
32
+
33
+
34
+
20 35
  	o.that.props._height
21 36
  	o.that.props._width
22 37
  	var v_h,v_w,h,w,bc
@@ -26,7 +41,14 @@ function print_kv(o){
26 41
     var scale = 1
27 42
  	f_w = Math.floor(o.that.props._width * scale) 
28 43
  	f_h = Math.floor(o.that.props._height * scale) 
29
- 	if (f_w > f_h){
44
+    var aspect_f = f_w/f_h
45
+
46
+
47
+
48
+    
49
+ 	// if (f_w > f_h){
50
+    if (aspect_f > aspect_ratio){
51
+    // if (aspect_ratio > aspect_f){
30 52
  	w = f_h * aspect_ratio
31 53
  	h = f_h
32 54
  	bc = "#00ffff"
@@ -46,6 +68,7 @@ function print_kv(o){
46 68
 
47 69
 
48 70
  	// print_kv(o.that.props)
71
+
49 72
  	window.glob_vhook.data.lv_style = {
50 73
  		 		width: w,
51 74
  		height: h,
@@ -60,6 +83,7 @@ function print_kv(o){
60 83
         // alignSelf:"center",
61 84
         // justifyContent:"",
62 85
         // margin:20,
86
+        // padding:20,
63 87
         // padding:"auto",
64 88
  		borderColor: bc,
65 89
  		// borderColor: '#00ff00',
@@ -70,7 +94,7 @@ function print_kv(o){
70 94
  	}
71 95
  }
72 96
 
73
-window.glob_vhook.data.rnd_t0 = Math.random()
97
+// window.glob_vhook.data.rnd_t0 = Math.random()
74 98
  window.glob_vhook.rcb.onMsg = function(fn_name,o,zz){
75 99
     clog("\n\nonMsg!",o)
76 100
  }
@@ -82,16 +106,22 @@ window.glob_vhook.data.rnd_t0 = Math.random()
82 106
  }
83 107
 
84 108
  window.glob_vhook.rcb.wv0_dev = function(fn_name,o,zz){
85
- 	// clog("...")
109
+ 	// clog("...",this)
110
+        var state = app_t.state.store.getState()
111
+    var rui = state[`features/base/responsive-ui`]
112
+
86 113
  	return {
87 114
  		// ret: "does not display.",
88
- 		ret: window.glob_vhook.data.rnd_t0,
115
+        ret: rui.clientWidth + ":" + rui.clientHeight,
116
+ 		// ret: window.glob_vhook.data.rnd_t0,
89 117
  	}
90 118
  }
91 119
 
120
+
92 121
  window.glob_vhook.rcb.wv0_styles = function(fn_name,o,zz){
93 122
  	// clog("wv0_styles~,,.\n\n")
94 123
  	// return {
124
+        // window.glob_vhook.data.wb_vis
95 125
  		var wh = {
96 126
  			width:200,
97 127
  			height:150,
@@ -100,7 +130,8 @@ window.glob_vhook.data.rnd_t0 = Math.random()
100 130
  			wh = window.glob_vhook.data.lv_style
101 131
  		}
102 132
         var scale = 1
103
-        // scale = .9
133
+        // scale = .5
134
+        scale = .9
104 135
         var w = Math.floor(wh.width * scale)
105 136
         var h = Math.floor(wh.height * scale)
106 137
  	var ret = {
@@ -123,24 +154,59 @@ window.glob_vhook.data.rnd_t0 = Math.random()
123 154
             // backgroundColor:"#0ff8",
124 155
 
125 156
         },
126
- 		v1:{
157
+ 		vb1_txt:"ABC2",
158
+        vb1_color:"#44a",
159
+        vb1_color:"#08f",
160
+        vb1_color:"#000",
161
+        vb1:{
162
+            // backgroundColor:"#ff0",
163
+            backgroundColor:"#aa2",
164
+            backgroundColor:"#ff0",
165
+            backgroundColor:"#0f8",
166
+            backgroundColor:"#0fb",
167
+            position:"absolute",
168
+            // height:24,
169
+            // padding:1,
170
+
171
+            // height:46,
172
+            top:"100%",
173
+            width:"70%",
174
+        },
175
+        vvx:{
176
+            backgroundColor:"#0ff",
177
+position: 'absolute',
178
+
179
+        },
180
+        v1:{
127 181
  			// width:wh.width,
128 182
             width:w,
129 183
  			// width:200,
184
+            // top:200,
130 185
  			// pointerEvents:"None",
131 186
  			// zIndex:-1,
132 187
             // backgroundColor:"#0ff",
133 188
  			// "pointer-events": "none";
189
+            // display:"none",
134 190
 
135 191
  			// height:wh.height,
136 192
             height:h,
137 193
 position: 'absolute',
138 194
  			// positio
139 195
  		},
196
+        vx_v:{
197
+            // zIndex:-1,
198
+            width:w,
199
+            height:h,
200
+        backgroundColor: '#8f00ff88',
201
+
202
+        },
140 203
  		webview_style: {
141
-            zIndex:-1,
204
+            // zIndex:-1,
205
+            // display:"none",
142 206
  		// backgroundColor: '#00ffff88',
143
- 		backgroundColor: '#0000ff00',
207
+        // backgroundColor: '#ff00ff88',
208
+        backgroundColor: '#8f00ff88',
209
+ 		// backgroundColor: '#0000ff00',
144 210
  		},
145 211
  	}
146 212
  	o.that.wv0_styles_dev = ret
@@ -150,16 +216,35 @@ position: 'absolute',
150 216
 window.glob_vhook.rcb.prt_view = function(fn_name,o,zz){
151 217
     // clog("prt_view")
152 218
     // clog(fn_name,Object.keys(o.that.props))
153
-    clog(fn_name,o.c)
219
+    // clog(fn_name,o.c)
154 220
 }
155 221
 
222
+window.glob_vhook.rcb.vb1_press = function(fn_name,o,zz){
223
+    // clog("vb1_press",this)
224
+     var s = this.state
225
+     window.glob_vhook.data.wb_vis = !window.glob_vhook.data.wb_vis
226
+
227
+    // clog("vb1_press",arguments.length,{fn_name},this)
228
+    // var s = this.getState()
229
+    // clog("vb1_press",fn_name)
230
+    clog("vb1_press",s)
231
+    
232
+            this.setState(() => {
233
+                // console.log('setting state');
234
+                    // var wv0_dev = window.glob_vhook.fns.glob_dev_fncb ? window.glob_vhook.fns.glob_dev_fncb("wv0_dev",{that:this},{}) : {}
235
+                // return { unseen: "does not display" }
236
+                return { wb_vis: window.glob_vhook.data.wb_vis }
237
+            });
238
+    
239
+
240
+}
156 241
 window.glob_vhook.rcb.avt_style = function(fn_name,o,zz){
157 242
     clog("avt_style")
158 243
     return {
159 244
         "info_var":1,
160 245
         // padding:10,
161 246
 
162
-        // margin:10,
247
+        // margin:20,
163 248
         borderColor: '#00ff00',
164 249
         borderRadius: 10,
165 250
         borderStyle: 'solid',
@@ -167,13 +252,14 @@ window.glob_vhook.rcb.avt_style = function(fn_name,o,zz){
167 252
 
168 253
         // flex:"unset",
169 254
         // top:100,
255
+
170 256
         // width:200,
171 257
         // maxWidth:200,
172 258
         // minWidth:200,
173 259
     }
174 260
 }
175 261
 window.glob_vhook.rcb.video_info = function(fn_name,o,zz){
176
-    clog(fn_name,o.vc)
262
+    // clog(fn_name,o.vc)
177 263
     return {
178 264
 
179 265
         "info_var_v2":1,
@@ -217,4 +303,5 @@ window.glob_vhook.rcb.avt = function(fn_name,o,zz){
217 303
  }
218 304
 
219 305
 
220
- window.glob_vhook.rcb.fn = window.glob_vhook.rcb.lv_style
306
+ window.glob_vhook.rcb.fn = window.glob_vhook.rcb.lv_style
307
+tglob_au.run_dev_cbs("rerender_Wview_v1")

+ 2
- 0
j8/ac0/t0/t5.js ファイルの表示

@@ -15,6 +15,8 @@ clog(Object.keys(window.app_t._reactInternalFiber))
15 15
 
16 16
 
17 17
 function log_dev0(){
18
+clog(Object.keys(glob_vhook.nodes))
19
+return
18 20
 // clog("glob_vhook:",glob_vhook.imps.PureComponent +"?")
19 21
 // clog("glob_vhook:",glob_vhook.imps.PureComponent.prototype.constructor + "")
20 22
 // clog("glob_vhook:",glob_vhook.imps.PureComponent.prototype.constructor )

+ 17
- 4
j8/ac0/t0/ut4.js ファイルの表示

@@ -102,12 +102,17 @@ function rnx_info(){
102 102
 
103 103
 
104 104
 glob_vhook.fns.init_mx = init_mx
105
-var create_proxy_db_connected_2 = glob_vhook.fns.create_proxy_db_connected_2
105
+// var create_proxy_db_connected_2 = glob_vhook.fns.create_proxy_db_connected_2
106 106
 var Proxy_Permissions = tmp_dev_sto.Proxy_Permissions
107 107
 
108 108
 
109 109
 function mhndlr_rld(that,m){
110
+
110 111
 	try {
112
+		var run_sto_cbs = window.tglob_au && tglob_au.run_sto_cbs || nop
113
+		// if (window.tglob_au.run_sto_cbs)
114
+		// window?.tglob_au.run_sto_cbs
115
+
111 116
 		// clog("mhndlr_rld2.",m,parsed,n,n.dataset)
112 117
 		window.mx=m
113 118
 		var n = m.querySelector(`code`)
@@ -152,17 +157,24 @@ function mhndlr_rld(that,m){
152 157
 			case "db_sync_request":
153 158
 				// tmsgx3({type:"db_sync_response",payload:pf.root})
154 159
 				// dlog("db_sync_request",parsed)
155
-				
160
+				// run_sto_cbs(parsed.type,{that:this,m,n,o,ai,id})
156 161
 
157 162
 				// tmsgx3({type:"db_sync_response",payload:pf.root},{to:ai.from})
158 163
 				clog("db_sync_request NOT IMPLEMENTED",parsed,ai.from,"\n")
159 164
 			break;
165
+			case "NO_TYPE_DBG":
166
+			case "NO_TYPE_DBG2":
167
+			case "NO_TYPE_DBG3":
168
+			case "NO_TYPE_DBG4":
169
+			// clog()
170
+			clog("NO_TYPE_DBG:",parsed,ai.from)
171
+			break;
160 172
 			case "db_sync_response":
161
-			clog("db_sync_response:",ai.from)
162 173
 			// window.glob_vhook.fns.create_proxy_db_connected_2 = create_proxy_db_connected_2
163 174
 			// window.glob_vhook.fns.create_proxy_db_connected_2(Proxy_Permissions,parsed.payload,"pf3","base_n","ws0")
164 175
 			glob_vhook.data.dev_sto_state.db="connected"
165
-			create_proxy_db_connected_2(Proxy_Permissions,parsed.payload,"pf3","base_n","ws0")
176
+			// create_proxy_db_connected_2(Proxy_Permissions,parsed.payload,"pf3","base_n","ws0")
177
+			window.glob_vhook.fns.create_proxy_db_connected_2(Proxy_Permissions,parsed.payload,"pf3","base_n","ws0")
166 178
 
167 179
 			break;
168 180
 			case "db_sync_response0":
@@ -184,6 +196,7 @@ function mhndlr_rld(that,m){
184 196
 			break;
185 197
 
186 198
 		}
199
+				run_sto_cbs(parsed.type,{that:this,m,n,o,ai,id})
187 200
 		/*
188 201
 
189 202
 

+ 10
- 0
j8/ac0/t0/ut5.js ファイルの表示

@@ -3,6 +3,14 @@
3 3
 function dev_middleware_listner_sync(o){
4 4
 	// clog("SYNC",o.action.type,o)
5 5
 	// clog(o)
6
+
7
+	if (window.glob_vhook && window.glob_vhook.fns && window.glob_vhook.fns.middleware_ord_sync_cb){
8
+	// window?.glob_vhook?.fns?.middleware_ord_cb?.(o)
9
+	// window?.glob_vhook?.fns?.middleware_ord_cb(o)
10
+	window.glob_vhook.fns.middleware_ord_sync_cb(o)
11
+	}
12
+
13
+	
6 14
 }
7 15
 function dev_middleware_listner(o){
8 16
 	// clog(o.action.type,o)
@@ -24,3 +32,5 @@ window.dev_middleware_listner = dev_middleware_listner
24 32
 // glob_vhook.fns.tmsgx3({type:"db_sync_request"})
25 33
 
26 34
 // clog(JSON.stringify(jc(window.tmp_dev_sto.sto_inst["ws0"].prx)))
35
+
36
+

+ 44
- 0
xf/inc/config_jx9.js ファイルの表示

@@ -670,3 +670,47 @@ var config = {
670 670
 };
671 671
 }
672 672
 /* eslint-enable no-unused-vars, no-var */
673
+
674
+
675
+
676
+
677
+
678
+if (0){
679
+/* eslint-disable no-unused-vars, no-var */
680
+var config = {
681
+    hosts: {
682
+        domain: 'meet.jit.si',
683
+        muc: 'conference.meet.jit.si'
684
+        // domain: 'vbsrv.videocorners.com',
685
+        // muc: 'conference.vbsrv.videocorners.com'
686
+    },
687
+    // bosh: '//vbsrv.videocorners.com/http-bind',
688
+    bosh: '//meet.jit.si/http-bind',
689
+    clientNode: 'http://jitsi.org/jitsimeet',
690
+    testing: {
691
+        p2pTestMode: false
692
+    },
693
+    enableNoAudioDetection: true,
694
+    enableNoisyMicDetection: true,
695
+    startWithAudioMuted: true,
696
+    startWithVideoMuted: true,
697
+    channelLastN: -1,
698
+    useStunTurn: true,
699
+    enableWelcomePage: true,
700
+    enableUserRolesBasedOnToken: false,
701
+    p2p: {
702
+        enabled: true,
703
+        useStunTurn: true,
704
+        stunServers: [
705
+            { urls: 'stun:meet-jit-si-turnrelay.jitsi.net:443' }
706
+        ]
707
+    },
708
+    analytics: {
709
+        rtcstatsEnabled: false,
710
+    },
711
+    deploymentInfo: {
712
+    },
713
+    makeJsonParserHappy: 'even if last key had a trailing comma'
714
+};
715
+/* eslint-enable no-unused-vars, no-var */
716
+}

+ 1
- 0
xf/nginx_tx/ifr_xcal/xc0.js ファイルの表示

@@ -7,6 +7,7 @@ clog(">>>..")
7 7
 
8 8
 function reg_xcal_msto_init(){
9 9
 	clog("XCAL dev_xcal reg_xcal_msto_init")
10
+	glob_mx.flags.XCAL = 1
10 11
 
11 12
 	if (!glob_mx.flags["init_db"]) {
12 13
 

+ 3
- 3
xf/nginx_tx/ifr_xcal/xc1.css ファイルの表示

@@ -13,9 +13,9 @@
13 13
 
14 14
 .videocontainer__background{
15 15
 	/* background: #004; */
16
-	background: #fff;
17
-	background: #ffffff;
18
-	background: #eff;
16
+	/* background: #fff; */
17
+	/* background: #ffffff; */
18
+	/* background: #eff; */
19 19
 	/* background: #ffe; */
20 20
 }
21 21
 

+ 55
- 0
xf/nginx_tx/xcal/ux1.js ファイルの表示

@@ -0,0 +1,55 @@
1
+
2
+
3
+clog("AA~")
4
+// window.ReactNativeWebView.postMessage("Hello!")
5
+// window.ReactNativeWebView.postMessage({})
6
+// glob_mx.flags.XCAL = 1
7
+
8
+
9
+function add_node(n,rn,i) {
10
+	$(rn)[i](n)
11
+}
12
+function xcal_ld_state(s){
13
+	try {
14
+
15
+		clog("xcal_dbg",s,{$:window.$})
16
+
17
+	} catch (err){
18
+		clog("xcal_dbg err:",s,err)
19
+	}
20
+}
21
+
22
+
23
+function place_xcal_ui(){
24
+	// clog(saftly_remove)
25
+	saftly_remove(".xcal_wv_ifr_ui_root_v1")
26
+	var xcal_ui = templates_td.xcal_ui_parsed.find(".xcal_wv_ifr_ui_root_v1").clone()
27
+	add_node(xcal_ui,".excalidraw.excalidraw-container","append")
28
+
29
+}
30
+
31
+
32
+
33
+// z61t=1
34
+
35
+
36
+templates_td.xcal_ui = `<!--#include virtual="/ign/xf/nginx_tx/xcal/xcal_ui.html" -->`
37
+templates_td.xcal_ui_parsed = $(`<span>${templates_td.xcal_ui}</span>`)
38
+
39
+
40
+onload.fno.arr.push(xcal_ld_state.bind(window.zz2,"FNO"))
41
+xcal_ld_state("RN1")
42
+place_xcal_ui()
43
+
44
+
45
+
46
+
47
+
48
+
49
+//
50
+
51
+
52
+
53
+
54
+// clog("Z61T:",z61t)
55
+// clog("Z61T:",window)

+ 8
- 1
xf/nginx_tx/xcal/x0.js ファイルの表示

@@ -10,8 +10,11 @@ function xcal_init_dbg(a) {
10 10
 // xcal_init_dbg("NOW")
11 11
 // setTimeout(xcal_init_dbg,1000,"TIME")
12 12
 
13
+
14
+
13 15
 function xcal_init() {
14 16
 	clog("XCAL dev_xcal")
17
+
15 18
 	init_cnv_background()
16 19
 	// reg_xcal_msto_init()
17 20
 	// setTimeout(init_cnv_background,500)
@@ -20,7 +23,8 @@ function xcal_init() {
20 23
 function init_cnv_background(){
21 24
 	// clog("XCAL dev_xcal BACKGROUND",rhooks.rn.app)
22 25
 	// tmp_hooks.ColorInput_args.onChange("#0f00")
23
-	tmp_hooks.ColorInput_args.onChange("#fff8")
26
+	// tmp_hooks.ColorInput_args.onChange("#fff8")
27
+	// tmp_hooks.ColorInput_args.onChange("#0ff8")
24 28
 }
25 29
 
26 30
 init_cnv_background()
@@ -29,3 +33,6 @@ init_cnv_background()
29 33
 // clog("........")
30 34
 onload.fno.arr.push(xcal_init)
31 35
 clog("X0")
36
+// clog("dbg_ord ux1")
37
+
38
+// glob_mx.flags.XCAL = 1

+ 23
- 0
xf/nginx_tx/xcal/x1.css ファイルの表示

@@ -10,3 +10,26 @@
10 10
 div.dev {
11 11
 	/* background-color: red; */
12 12
 }
13
+
14
+
15
+.xcal_wv_ifr_ui_root_v1 button:hover {
16
+	outline: 3px solid blue;
17
+
18
+}
19
+.button_cont{
20
+	padding: 5px;
21
+	position: relative;
22
+	outline: 6px solid blue;
23
+	left: 20px;
24
+	top: 30%;
25
+	z-index: 2;
26
+
27
+
28
+}
29
+.xcal_wv_ifr_ui_root_v1 button {
30
+	outline: 3px solid red;
31
+	padding: 5px;
32
+	/* top: 70px; */
33
+	position: relative;
34
+	/* sicerb */
35
+}

+ 4
- 2
xf/nginx_tx/xcal/x5.js ファイルの表示

@@ -8,11 +8,13 @@ function isReact_ifr(){
8 8
 
9 9
 function send_msg_wr(){
10 10
 	var o = {isReact_ifr:isReact_ifr(),ReactNativeWebView:window.ReactNativeWebView}
11
+	o.z=1
11 12
 	var s = JSON.stringify(o)
13
+	o.z=2
12 14
 	try {
13 15
 
14
-		window.ReactNativeWebView.postMessage(o)
15
-		// window.ReactNativeWebView.postMessage(s)
16
+		// window.ReactNativeWebView.postMessage(o)
17
+		window.ReactNativeWebView.postMessage(s)
16 18
 
17 19
 	} catch (err){}
18 20
 	try {

+ 2
- 0
xf/nginx_tx/xcal/xcal.html ファイルの表示

@@ -4,7 +4,9 @@
4 4
 <script class="rld" src="<!--#echo var="tx_dir" -->/x3.js?<!--#echo var="rtqs" -->"></script>
5 5
 <script class="rld" src="<!--#echo var="tx_dir" -->/x4.js?<!--#echo var="rtqs" -->"></script>
6 6
 <script class="rld" src="<!--#echo var="tx_dir" -->/x5.js?<!--#echo var="rtqs" -->"></script>
7
+
7 8
 <script class="rld" src="<!--#echo var="tx_dir" -->/ux1.js?<!--#echo var="rtqs" -->"></script>
8 9
 <script class="rld" src="<!--#echo var="tx_dir" -->/ux2.js?<!--#echo var="rtqs" -->"></script>
10
+
9 11
 <link class="rld" rel="stylesheet" href="<!--#echo var="tx_dir" -->/x0.css?<!--#echo var="rtqs" -->">
10 12
 <link class="rld" rel="stylesheet" href="<!--#echo var="tx_dir" -->/x1.css?<!--#echo var="rtqs" -->">

+ 11
- 0
xf/nginx_tx/xcal/xcal_ui.html ファイルの表示

@@ -0,0 +1,11 @@
1
+
2
+
3
+
4
+
5
+
6
+<div class="xcal_wv_ifr_ui_root_v1">
7
+<<div class="button_cont">
8
+
9
+<button type="button" name="button">X1</button>
10
+</div>
11
+</div>

+ 2
- 1
xf/o/fs_utils.js ファイルの表示

@@ -1,4 +1,5 @@
1 1
 
2
+// window.html_hooks = {
2 3
 html_hooks = {
3 4
 	create_video_tile(n){
4 5
 		add_node(n,`#localVideoTileViewContainer`,"before")
@@ -46,4 +47,4 @@ function saftly_remove(n,remove_nodes=true){
46 47
 }
47 48
 
48 49
 
49
-
50
+// window.saftly_remove =saftly_remove

+ 11
- 2
xf/vc/vcon0.js ファイルの表示

@@ -498,7 +498,11 @@ function place_remote_vids(){
498 498
 		// clog(":-:",k,retx[k],v)
499 499
 		var vloc
500 500
 			// clog("vcon_qxi !.")
501
-		if (!v.corner){
501
+
502
+
503
+
504
+		// if (!v.corner){
505
+		if (!v.corner && glob_mx.flags.XCAL){
502 506
 			clog("!v.corner",{v,ik,iv})
503 507
 			// clog("vcon_qxi !")
504 508
 			// continue
@@ -515,9 +519,14 @@ function place_remote_vids(){
515 519
 			vloc = msto.conference.corners.default_corner
516 520
 			}
517 521
 			// continue
522
+		} else if (glob_mx.flags.XCAL) {
523
+			vloc = msto.conference.corners.default_corner
524
+
525
+		} else if (!v.corner){
526
+			vloc = msto.conference.corners.default_corner
527
+
518 528
 		} else {
519 529
 		vloc = v.corner.loc
520
-			vloc = msto.conference.corners.default_corner
521 530
 
522 531
 		}
523 532
 

読み込み中…
キャンセル
保存