浏览代码

remove android licenses, now accepting using sdkmanager

Daniel Zlotin 6 年前
父节点
当前提交
788e5c0328

+ 2
- 4
lib/src/Navigation.ts 查看文件

6
 import { Commands } from './commands/Commands';
6
 import { Commands } from './commands/Commands';
7
 import { LayoutTreeParser } from './commands/LayoutTreeParser';
7
 import { LayoutTreeParser } from './commands/LayoutTreeParser';
8
 import { LayoutTreeCrawler } from './commands/LayoutTreeCrawler';
8
 import { LayoutTreeCrawler } from './commands/LayoutTreeCrawler';
9
-import { PrivateEventsListener } from './events/PrivateEventsListener';
10
 import { PublicEventsRegistry } from './events/PublicEventsRegistry';
9
 import { PublicEventsRegistry } from './events/PublicEventsRegistry';
11
 import { ComponentProvider } from 'react-native';
10
 import { ComponentProvider } from 'react-native';
12
 import { Element } from './adapters/Element';
11
 import { Element } from './adapters/Element';
12
+import { PrivateEventsListener } from './events/PrivateEventsListener';
13
 
13
 
14
 export class Navigation {
14
 export class Navigation {
15
   public readonly Element;
15
   public readonly Element;
23
   private readonly nativeCommandsSender;
23
   private readonly nativeCommandsSender;
24
   private readonly commands;
24
   private readonly commands;
25
   private readonly publicEventsRegistry;
25
   private readonly publicEventsRegistry;
26
-  private readonly privateEventsListener;
27
 
26
 
28
   constructor() {
27
   constructor() {
29
     this.Element = Element;
28
     this.Element = Element;
37
     this.nativeCommandsSender = new NativeCommandsSender();
36
     this.nativeCommandsSender = new NativeCommandsSender();
38
     this.commands = new Commands(this.nativeCommandsSender, this.layoutTreeParser, this.layoutTreeCrawler);
37
     this.commands = new Commands(this.nativeCommandsSender, this.layoutTreeParser, this.layoutTreeCrawler);
39
     this.publicEventsRegistry = new PublicEventsRegistry(this.nativeEventsReceiver);
38
     this.publicEventsRegistry = new PublicEventsRegistry(this.nativeEventsReceiver);
40
-    this.privateEventsListener = new PrivateEventsListener(this.nativeEventsReceiver, this.store);
41
 
39
 
42
-    this.privateEventsListener.listenAndHandlePrivateEvents();
40
+    new PrivateEventsListener(this.nativeEventsReceiver, this.store).listenAndHandlePrivateEvents();
43
   }
41
   }
44
 
42
 
45
   /**
43
   /**

+ 3
- 3
lib/src/components/Lifecycle.ts 查看文件

8
     this.onNavigationButtonPressed = this.onNavigationButtonPressed.bind(this);
8
     this.onNavigationButtonPressed = this.onNavigationButtonPressed.bind(this);
9
   }
9
   }
10
 
10
 
11
-  componentDidAppear(id) {
11
+  private componentDidAppear(id) {
12
     const ref = this.store.getRefForComponentId(id);
12
     const ref = this.store.getRefForComponentId(id);
13
     if (ref && ref.didAppear) {
13
     if (ref && ref.didAppear) {
14
       ref.didAppear();
14
       ref.didAppear();
15
     }
15
     }
16
   }
16
   }
17
 
17
 
18
-  componentDidDisappear(id) {
18
+  private componentDidDisappear(id) {
19
     const ref = this.store.getRefForComponentId(id);
19
     const ref = this.store.getRefForComponentId(id);
20
     if (ref && ref.didDisappear) {
20
     if (ref && ref.didDisappear) {
21
       ref.didDisappear();
21
       ref.didDisappear();
22
     }
22
     }
23
   }
23
   }
24
 
24
 
25
-  onNavigationButtonPressed(params) {
25
+  private onNavigationButtonPressed(params) {
26
     const ref = this.store.getRefForComponentId(params.componentId);
26
     const ref = this.store.getRefForComponentId(params.componentId);
27
     if (ref && ref.onNavigationButtonPressed) {
27
     if (ref && ref.onNavigationButtonPressed) {
28
       ref.onNavigationButtonPressed(params.buttonId);
28
       ref.onNavigationButtonPressed(params.buttonId);

+ 0
- 2
scripts/env/android-sdk-licenses/android-googletv-license 查看文件

1
-
2
-601085b94cd77f0b54ff86406957099ebe79c4d6

+ 0
- 2
scripts/env/android-sdk-licenses/android-sdk-license 查看文件

1
-
2
-d56f5187479451eabf01fb78af6dfcb131a6481e

+ 0
- 2
scripts/env/android-sdk-licenses/android-sdk-preview-license 查看文件

1
-
2
-84831b9409646a918e30573bab4c9c91346d8abd

+ 0
- 2
scripts/env/android-sdk-licenses/google-gdk-license 查看文件

1
-
2
-33b6a2b64607f11b759f320ef9dff4ae5c47d97a

+ 0
- 2
scripts/env/android-sdk-licenses/intel-android-extra-license 查看文件

1
-
2
-d975f751698a77b662f1254ddbeed3901e976f5a

+ 0
- 2
scripts/env/android-sdk-licenses/mips-android-sysimage-license 查看文件

1
-
2
-e9acab5b5fbb560a72cfaecce8946896ff6aab9d

+ 2
- 3
scripts/env/env.android.sh 查看文件

14
 echo "Downloading Android SDK"
14
 echo "Downloading Android SDK"
15
 curl --location https://dl.google.com/android/repository/sdk-tools-darwin-3859397.zip | tar -x -z -C $ANDROID_HOME
15
 curl --location https://dl.google.com/android/repository/sdk-tools-darwin-3859397.zip | tar -x -z -C $ANDROID_HOME
16
 
16
 
17
-echo "Copying Android Licenses"
18
-mkdir -p "${ANDROID_HOME}"/licenses
19
-cp "$scriptdir/android-sdk-licenses/"* "${ANDROID_HOME}"/licenses
17
+echo "Accepting Android Licenses"
18
+yes | sdkmanager --licenses