iOS: add DoricPanelView to replace DoricPanel which is extended from UIViewController
This commit is contained in:
parent
22c47e379a
commit
e981944352
@ -89,7 +89,7 @@ - (CGSize)collectionViewContentSize {
|
|||||||
|
|
||||||
|
|
||||||
@interface MyCollectionViewCell : UICollectionViewCell
|
@interface MyCollectionViewCell : UICollectionViewCell
|
||||||
@property(nonatomic, strong) DoricPanel *panel;
|
@property(nonatomic, strong) DoricPanelView *panel;
|
||||||
@end
|
@end
|
||||||
|
|
||||||
@implementation MyCollectionViewCell
|
@implementation MyCollectionViewCell
|
||||||
@ -138,17 +138,17 @@ - (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collection
|
|||||||
@"content": [NSString stringWithFormat:@"第%@项\n++++++++可填充内容++++++++%@", @(indexPath.row + 1), (indexPath.row % 2 == 0) ? @"\n+++再加一行+++" : @""],
|
@"content": [NSString stringWithFormat:@"第%@项\n++++++++可填充内容++++++++%@", @(indexPath.row + 1), (indexPath.row % 2 == 0) ? @"\n+++再加一行+++" : @""],
|
||||||
};
|
};
|
||||||
if (cell.panel == nil) {
|
if (cell.panel == nil) {
|
||||||
cell.panel = [[DoricPanel new] also:^(DoricPanel *it) {
|
cell.panel = [[DoricPanelView new] also:^(DoricPanelView *it) {
|
||||||
it.view.width = self.view.width / 2;
|
it.width = self.view.width / 2;
|
||||||
it.view.height = 200;
|
it.height = 200;
|
||||||
NSString *scheme = (indexPath.row % 2 == 0) ? @"assets://src/CellModule1Demo.js" : @"assets://src/CellModule2Demo.js";
|
NSString *scheme = (indexPath.row % 2 == 0) ? @"assets://src/CellModule1Demo.js" : @"assets://src/CellModule2Demo.js";
|
||||||
NSString *alias = (indexPath.row % 2 == 0) ? @"CellModule1Demo.js" : @"CellModule2Demo.js";
|
NSString *alias = (indexPath.row % 2 == 0) ? @"CellModule1Demo.js" : @"CellModule2Demo.js";
|
||||||
[[DoricSingleton.instance.jsLoaderManager request:scheme]
|
[[DoricSingleton.instance.jsLoaderManager request:scheme]
|
||||||
setResultCallback:^(NSString *script) {
|
setResultCallback:^(NSString *script) {
|
||||||
[it config:script alias:alias extra:nil];
|
[it config:script alias:alias extra:nil];
|
||||||
}];
|
}];
|
||||||
[cell.panel.doricContext callEntity:@"setData", data, nil];
|
[it.doricContext callEntity:@"setData", data, nil];
|
||||||
cell.panel.doricContext.rootNode.reusable = YES;
|
it.doricContext.rootNode.reusable = YES;
|
||||||
}];
|
}];
|
||||||
}
|
}
|
||||||
if (cell.panel.doricContext != nil) {
|
if (cell.panel.doricContext != nil) {
|
||||||
@ -162,7 +162,7 @@ - (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collection
|
|||||||
c.contentView.width = c.width;
|
c.contentView.width = c.width;
|
||||||
c.contentView.height = c.height;
|
c.contentView.height = c.height;
|
||||||
};
|
};
|
||||||
[cell.contentView addSubview:cell.panel.view];
|
[cell.contentView addSubview:cell.panel];
|
||||||
return cell;
|
return cell;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -28,6 +28,7 @@
|
|||||||
#import "UIView+Doric.h"
|
#import "UIView+Doric.h"
|
||||||
#import "DoricUtil.h"
|
#import "DoricUtil.h"
|
||||||
#import "DoricPanel.h"
|
#import "DoricPanel.h"
|
||||||
|
#import "DoricPanelView.h"
|
||||||
#import "DoricJSLoaderManager.h"
|
#import "DoricJSLoaderManager.h"
|
||||||
#import "DoricNavigatorDelegate.h"
|
#import "DoricNavigatorDelegate.h"
|
||||||
#import "DoricNavBarDelegate.h"
|
#import "DoricNavBarDelegate.h"
|
||||||
|
31
doric-iOS/Pod/Classes/DoricPanelView.h
Normal file
31
doric-iOS/Pod/Classes/DoricPanelView.h
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
/*
|
||||||
|
* Copyright [2023] [Doric.Pub]
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
//
|
||||||
|
// Created by pengfei.zhou on 2023/6/27.
|
||||||
|
//
|
||||||
|
|
||||||
|
#import <Foundation/Foundation.h>
|
||||||
|
|
||||||
|
#import "DoricContext.h"
|
||||||
|
|
||||||
|
@interface DoricPanelView : UIView
|
||||||
|
@property(nonatomic, strong) DoricContext *doricContext;
|
||||||
|
@property(nonatomic, strong) void (^frameChangedBlock)(CGSize frameSize);
|
||||||
|
|
||||||
|
- (void)config:(NSString *)script alias:(NSString *)alias extra:(NSString *)extra;
|
||||||
|
|
||||||
|
- (void)renderSynchronously;
|
||||||
|
@end
|
72
doric-iOS/Pod/Classes/DoricPanelView.m
Normal file
72
doric-iOS/Pod/Classes/DoricPanelView.m
Normal file
@ -0,0 +1,72 @@
|
|||||||
|
/*
|
||||||
|
* Copyright [2023] [Doric.Pub]
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
//
|
||||||
|
// Created by pengfei.zhou on 2023/6/27.
|
||||||
|
//
|
||||||
|
|
||||||
|
#import "DoricPanelView.h"
|
||||||
|
#import "Doric.h"
|
||||||
|
|
||||||
|
@interface DoricPanelView ()
|
||||||
|
@property(nonatomic, assign) CGFloat renderedWidth;
|
||||||
|
@property(nonatomic, assign) CGFloat renderedHeight;
|
||||||
|
@end
|
||||||
|
|
||||||
|
@implementation DoricPanelView
|
||||||
|
- (void)config:(NSString *)script alias:(NSString *)alias extra:(NSString *)extra {
|
||||||
|
self.doricContext = [[[DoricContext alloc] initWithScript:script source:alias extra:extra] also:^(DoricContext *it) {
|
||||||
|
[it.rootNode setupRootView:[[DoricRootView new] also:^(DoricRootView *it) {
|
||||||
|
it.width = self.width;
|
||||||
|
it.height = self.height;
|
||||||
|
it.clipsToBounds = YES;
|
||||||
|
__weak typeof(self) __self = self;
|
||||||
|
it.frameChangedBlock = ^(CGSize oldSize, CGSize newSize) {
|
||||||
|
__strong typeof(__self) self = __self;
|
||||||
|
self.renderedWidth = newSize.width;
|
||||||
|
self.renderedHeight = newSize.height;
|
||||||
|
self.width = newSize.width;
|
||||||
|
self.height = newSize.height;
|
||||||
|
if (self.frameChangedBlock) {
|
||||||
|
self.frameChangedBlock(newSize);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
[self addSubview:it];
|
||||||
|
}]];
|
||||||
|
}];
|
||||||
|
[self build];
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
- (void)build {
|
||||||
|
[self.doricContext build:CGSizeMake(self.width, self.height)];
|
||||||
|
self.renderedWidth = self.width;
|
||||||
|
self.renderedHeight = self.height;
|
||||||
|
}
|
||||||
|
|
||||||
|
- (void)renderSynchronously {
|
||||||
|
[self.doricContext renderSynchronously];
|
||||||
|
CGSize newSize = self.doricContext.rootNode.view.frame.size;
|
||||||
|
if (self.renderedWidth != newSize.width || self.renderedWidth != newSize.height) {
|
||||||
|
self.renderedWidth = newSize.width;
|
||||||
|
self.renderedHeight = newSize.height;
|
||||||
|
self.width = newSize.width;
|
||||||
|
self.height = newSize.height;
|
||||||
|
if (self.frameChangedBlock) {
|
||||||
|
self.frameChangedBlock(newSize);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@end
|
Reference in New Issue
Block a user