add database (#33)

keefo · Nov 11, 2023 · 56e726a · 56e726a
1 parent 3670a90
commit 56e726a
Show file tree

Hide file tree

Showing 38 changed files with 73 additions and 173 deletions.
diff --git a/Database/light_images/cb60-rgb.png b/Database/light_images/cb60-rgb.png
diff --git a/Database/light_images/gl1-pro.png b/Database/light_images/gl1-pro.png
diff --git a/Database/light_images/gl1.png b/Database/light_images/gl1.png
diff --git a/Database/light_images/gl1c.png b/Database/light_images/gl1c.png
diff --git a/Database/light_images/rgb1.png b/Database/light_images/rgb1.png
diff --git a/Database/light_images/rgb168.png b/Database/light_images/rgb168.png
diff --git a/...s/light-rgb176.imageset/neewer-rgb176.png → Database/light_images/rgb176.png b/...s/light-rgb176.imageset/neewer-rgb176.png → Database/light_images/rgb176.png
diff --git a/Database/light_images/rgb62.png b/Database/light_images/rgb62.png
diff --git a/Database/light_images/rgb660-pro.png b/Database/light_images/rgb660-pro.png
diff --git a/Database/light_images/sl90-pro.png b/Database/light_images/sl90-pro.png
diff --git a/Database/light_images/snl530.png b/Database/light_images/snl530.png
diff --git a/Database/lights.json b/Database/lights.json
@@ -0,0 +1,45 @@
+{
+    "version": 1,
+    "lights": [
+        {
+            "type": 3,
+            "image": "https://github.com/keefo/NeewerLite/blob/main/Database/light_images/rgb660-pro.png?raw=true "
+        },
+        {
+            "type": 4,
+            "image": "https://github.com/keefo/NeewerLite/blob/main/Database/light_images/gl1.png?raw=true"
+        },
+        {
+            "type": 7,
+            "image": "https://github.com/keefo/NeewerLite/blob/main/Database/light_images/snl530.png?raw=true"
+        },
+        {
+            "type": 8,
+            "image": "https://github.com/keefo/NeewerLite/blob/main/Database/light_images/rgb1-stick.png?raw=true"
+        },
+        {
+            "type": 20,
+            "image": "https://github.com/keefo/NeewerLite/blob/main/Database/light_images/rgb176-a1.png?raw=true"
+        },
+        {
+            "type": 22,
+            "image": "https://github.com/keefo/NeewerLite/blob/main/Database/light_images/cb60-rgb.png?raw=true"
+        },
+        {
+            "type": 33,
+            "image": "https://github.com/keefo/NeewerLite/blob/main/Database/light_images/gl1-pro.png?raw=true"
+        },
+        {
+            "type": 34,
+            "image": "https://github.com/keefo/NeewerLite/blob/main/Database/light_images/sl90-pro.png?raw=true"
+        },
+        {
+            "type": 39,
+            "image": "https://github.com/keefo/NeewerLite/blob/main/Database/light_images/gl1.png?raw=true"
+        },
+        {
+            "type": 40,
+            "image": "https://github.com/keefo/NeewerLite/blob/main/Database/light_images/rgb62.png?raw=true"
+        }
+    ]
+}
diff --git a/...ets/scene_1.imageset/scene_1_squadcar.jpg → Database/scene_images/scene_1_squadcar.jpg b/...ets/scene_1.imageset/scene_1_squadcar.jpg → Database/scene_images/scene_1_squadcar.jpg
diff --git a/...ts/scene_2.imageset/scene_2_ambulance.jpg → Database/scene_images/scene_2_ambulance.jpg b/...ts/scene_2.imageset/scene_2_ambulance.jpg → Database/scene_images/scene_2_ambulance.jpg
diff --git a/.../scene_3.imageset/scene_3_fire_engine.jpg → ...base/scene_images/scene_3_fire_engine.jpg b/.../scene_3.imageset/scene_3_fire_engine.jpg → ...base/scene_images/scene_3_fire_engine.jpg
diff --git a/...ts/scene_4.imageset/scene_4_fireworks.jpg → Database/scene_images/scene_4_fireworks.jpg b/...ts/scene_4.imageset/scene_4_fireworks.jpg → Database/scene_images/scene_4_fireworks.jpg
diff --git a/...assets/scene_5.imageset/scene_5_party.jpg → Database/scene_images/scene_5_party.jpg b/...assets/scene_5.imageset/scene_5_party.jpg → Database/scene_images/scene_5_party.jpg
diff --git a/.../scene_6.imageset/scene_6_candlelight.jpg → ...base/scene_images/scene_6_candlelight.jpg b/.../scene_6.imageset/scene_6_candlelight.jpg → ...base/scene_images/scene_6_candlelight.jpg
diff --git a/...ets/scene_7.imageset/scene_7_lighting.jpg → Database/scene_images/scene_7_lighting.jpg b/...ets/scene_7.imageset/scene_7_lighting.jpg → Database/scene_images/scene_7_lighting.jpg
diff --git a/...ets/scene_8.imageset/scene_8_paprazzi.jpg → Database/scene_images/scene_8_paprazzi.jpg b/...ets/scene_8.imageset/scene_8_paprazzi.jpg → Database/scene_images/scene_8_paprazzi.jpg
diff --git a/...ene_9.imageset/scene_9_display_screen.jpg → ...e/scene_images/scene_9_display_screen.jpg b/...ene_9.imageset/scene_9_display_screen.jpg → ...e/scene_images/scene_9_display_screen.jpg
diff --git a/Docs/research.md b/Docs/research.md
@@ -1,11 +1,26 @@
-# How to research Neewer phone app
+- How to research Neewer phone app
 
-Download a latest apk package from apkcombo website. https://apkcombo.com/neewer/neewer.nginx.annularlight/download/apk
+0. Download a latest apk package from apkcombo website. 
+https://apkcombo.com/neewer/neewer.nginx.annularlight/download/apk
 
+1. Unpack apk file.
+```
+unzip Neewer_5.0.5_Apkpure.apk
+```
+
+2. Unpack dex files.
 Then use [jadx](brew install jadx) to get java code from dex file in the apk.
 
 `brew install jadx`
 
+```
+jadx classes.dex
+jadx classes2.dex
+jadx classes3.dex
+jadx classes4.dex
+jadx classes5.dex
+```
+
 # How to do bluetooth packet logging on Neewer iOS app
 
 Install neewer iOS app, and Connect your iPhone your dev macbook.
@@ -75,3 +90,5 @@ Color 01
 Nov 07 00:58:30.744  ATT Send         0x0040  DF:24:3A:B4:46:5D  Write Command - Handle:0x000E - Value: 7891 0BDF 243A B446 5D8B 0A32 0105 75  SEND  
 ```
 
+CB60 RGB
+NW-20210012&FFFFFFFF
diff --git a/NeewerLite/NeewerLite/ImageManager.swift b/NeewerLite/NeewerLite/ImageManager.swift
@@ -0,0 +1,8 @@
+//
+//  ImageManager.swift
+//  NeewerLite
+//
+//  Created by Xu Lian on 11/10/23.
+//
+
+import Foundation
diff --git a/NeewerLite/NeewerLite/Resources/Assets.xcassets/light-cb60-rgb.imageset/Contents.json b/NeewerLite/NeewerLite/Resources/Assets.xcassets/light-cb60-rgb.imageset/Contents.json
diff --git a/NeewerLite/NeewerLite/Resources/Assets.xcassets/light-cb60-rgb.imageset/bK.png b/NeewerLite/NeewerLite/Resources/Assets.xcassets/light-cb60-rgb.imageset/bK.png
diff --git a/NeewerLite/NeewerLite/Resources/Assets.xcassets/light-rgb176.imageset/Contents.json b/NeewerLite/NeewerLite/Resources/Assets.xcassets/light-rgb176.imageset/Contents.json
diff --git a/NeewerLite/NeewerLite/Resources/Assets.xcassets/light-rgb660-pro.imageset/Contents.json b/NeewerLite/NeewerLite/Resources/Assets.xcassets/light-rgb660-pro.imageset/Contents.json
diff --git a/...e/NeewerLite/Resources/Assets.xcassets/light-rgb660-pro.imageset/Untitled-3.png b/...e/NeewerLite/Resources/Assets.xcassets/light-rgb660-pro.imageset/Untitled-3.png
diff --git a/NeewerLite/NeewerLite/Resources/Assets.xcassets/scene_1.imageset/Contents.json b/NeewerLite/NeewerLite/Resources/Assets.xcassets/scene_1.imageset/Contents.json
diff --git a/NeewerLite/NeewerLite/Resources/Assets.xcassets/scene_2.imageset/Contents.json b/NeewerLite/NeewerLite/Resources/Assets.xcassets/scene_2.imageset/Contents.json
diff --git a/NeewerLite/NeewerLite/Resources/Assets.xcassets/scene_3.imageset/Contents.json b/NeewerLite/NeewerLite/Resources/Assets.xcassets/scene_3.imageset/Contents.json
diff --git a/NeewerLite/NeewerLite/Resources/Assets.xcassets/scene_4.imageset/Contents.json b/NeewerLite/NeewerLite/Resources/Assets.xcassets/scene_4.imageset/Contents.json
diff --git a/NeewerLite/NeewerLite/Resources/Assets.xcassets/scene_5.imageset/Contents.json b/NeewerLite/NeewerLite/Resources/Assets.xcassets/scene_5.imageset/Contents.json
diff --git a/NeewerLite/NeewerLite/Resources/Assets.xcassets/scene_6.imageset/Contents.json b/NeewerLite/NeewerLite/Resources/Assets.xcassets/scene_6.imageset/Contents.json
diff --git a/NeewerLite/NeewerLite/Resources/Assets.xcassets/scene_7.imageset/Contents.json b/NeewerLite/NeewerLite/Resources/Assets.xcassets/scene_7.imageset/Contents.json
diff --git a/NeewerLite/NeewerLite/Resources/Assets.xcassets/scene_8.imageset/Contents.json b/NeewerLite/NeewerLite/Resources/Assets.xcassets/scene_8.imageset/Contents.json
diff --git a/NeewerLite/NeewerLite/Resources/Assets.xcassets/scene_9.imageset/Contents.json b/NeewerLite/NeewerLite/Resources/Assets.xcassets/scene_9.imageset/Contents.json
diff --git a/README.md b/README.md
@@ -116,6 +116,7 @@ Now, when you say “Meow” voice control will switch on/off your LED lights.
 * [Neewer 480 RGB Led Light](https://neewer.com/collections/rgb-led-panel-light/products/neewer-led-light-10096594)
 * [Neewer RGB176 Led Light](https://neewer.com/products/neewer-rgb176-video-light-with-app-control-10098961)
 * [Neewer RGB 530PRO Led Light](https://neewer.com/products/neewer-led-light-10096806)
+* [Neewer RGB1-A Stick Light](https://ca.neewer.com/products/neewer-cri98-rgb1-handheld-led-video-light-66601508)
 
 # TO DO LIST