diff --git a/iOS/DoraemonKit/Resource/en.lproj/Doraemon.strings b/iOS/DoraemonKit/Resource/en.lproj/Doraemon.strings index f8ecc315457551f69c8343ec5d85ea9c2301448c..dca29b54e0dd2477a25afad0ef6108b6c409cbe2 100644 --- a/iOS/DoraemonKit/Resource/en.lproj/Doraemon.strings +++ b/iOS/DoraemonKit/Resource/en.lproj/Doraemon.strings @@ -1,151 +1,236 @@ -/* - Doraemon.strings - Pods - - Created by xgb on 2018/11/13. - -*/ +/* + Doraemon.strings + Pods + + Created by xgb on 2018/11/13. + + */ { - "H5任意门" = "H5 Opener"; - "测试Owner" = "Test Owner"; - "请您输入测试用户相关信息" = "Please enter tester account info"; - "子线程UI渲染操作" = "Thread UI"; - "沙盒浏览器" = "Sandbox"; - "麦克风权限" = "Microphone Privacy"; - "支持筛选" = "Filter"; - "请求头" = "Request Header"; - " 内存检测" = " Memory monitor"; - "经纬度不能为空" = "Please enter longitude and latitude"; - "响应头" = "Response Header"; - "子线程UI" = "Thread UI"; - "卡顿" = "ANR"; - "帧率监控" = "FPS monitor"; - "流量监控" = "Traffic monitor"; - "内存: " = "Memory: "; - "暂未开启流量监控" = "Traffic monitor is off"; - "提醒事项权限" = "Notes Privacy"; - "关闭" = "Close"; - "请选择操作方式" = "Choose Operation"; - "点击跳转" = "Click to jump"; - "请求" = "Request"; - "Memory使用量显示开关" = "Memory monitor switch"; - "该功能需要重启App才能生效" = "Reboot to work"; - "相册权限" = "Photos Privacy"; - "非主线程UI渲染检查" = "Thread UI monitor"; - "流量监控列表" = "Traffic monitor list"; - "流量: " = "Traffic: "; - "卡顿检测开关" = "ANR Switch"; - "经度不合法" = "Invalid longitude"; - "返回上一级" = "Back"; - "流量曲线开关: " = "Chart switch: "; - "本地预览" = "Preview"; - "请求行" = "Request Line"; - "手机型号" = "Mobile model"; - "检测列表" = "Monitor list"; - "数据大小 : %@B" = "Size : %@B"; - "开始测试" = "Start Testing"; - "颜色拾取器" = "Color Picker"; - "视觉工具" = "UI Tool"; - "用例名称" = "Case Name"; - "业务线" = "Business"; - "开始时间" = "Start Time"; - " 控件名称:%@" = " Widget:%@"; - " 帧率检测" = " FPS monitor"; - "流量监控概要" = "Traffic monitor info"; - "数据上传" = "Upload"; - "卡顿详情" = "ANR Detail"; - "View查看器" = "View viewer"; - "卡顿列表" = "ANR List"; - "结束测试" = "Stop Testing"; - "总计已为您抓包" = "Total capture"; - "数据下载" = "Download"; - "查看组件是否对齐" = "Check alignment"; - "点击输入经纬度" = "Enter"; - "手机信息" = "Mobile Info"; - "显示流量监控详情" = "Show detail"; - "卡顿中" = "ANR..."; - "确定" = "OK"; - "网络权限" = "Network Privacy"; - "卡顿检测" = "ANR Check"; - "流量" = "Traffic"; - "经度:" = "lng:"; - "组件检查" = "Module Check"; - "推送权限" = "Push Privacy"; - "通讯录权限" = "Contacts Privacy"; - "\n 控件位置:左:%0.1lf 上:%0.1lf 宽:%0.1lf 高:%0.1lf" = "\n Widget position:Left:%0.1lf Top:%0.1lf Width:%0.1lf Height:%0.1lf"; - "请在以下输入框输入网址，让走点击跳转按钮即可😘" = "Please enter link and click to jump😘"; - "响应行" = "Response Body"; - "H5通用跳转" = "H5 link"; - "点我右侧😘: " = "Click😘: "; - "常用工具集" = "Tool Box"; - "CPU监控" = "CPU monitor"; - "耗时" = "Time-consuming"; - "\n 背景色:%@ 字体颜色:%@ 字体大小:%.f" = "\n Background color:%@ Font color:%@ Font size:%.f"; - "日历权限" = "Calendar Privacy"; - "提示" = "Tip"; - "对齐标尺" = "Align Size"; - "系统版本" = "System Version"; - "FPS显示开关" = "FPS Switch"; - "纬度:" = "lat:"; - "地理位置权限" = "Location Privacy"; - "App的一些基本信息" = "App Info"; - "App基本信息" = "App Info"; - "根目录" = "Root path"; - "子线程渲染UI检查" = "Thread UI monitor"; - "链接" = "Link"; - "沙盒浏览" = "Sandbox"; - "颜色吸管" = "Color Picker"; - "mock开关没有打开" = "switch is not open"; - "帧率: " = "FPS: "; - "单色色彩空间模式" = "Color space"; - "你好" = "Hello"; - "CPU使用率显示开关" = "CPU monitor switch"; - "查看卡顿记录" = "View ANR"; - " 流量检测" = " Traffic monitor"; + //DoraemonKit + "常用工具" = "Common tools"; + "业务工具" = "Test tools"; + "自定义" = "Custom"; + "性能检测" = "Performance"; + "视觉工具" = "UI tools"; + "平台工具" = "Platform tool"; + "H5任意门" = "H5 Opener"; + "CocoaLumberjack日志记录" = "CocoaLumberjack Log"; + "用户没有选择" = "Not Determined"; + "Restricted" = "Restricted"; + "经纬度不能为空" = "Please enter longitude and latitude"; + "沙盒浏览器" = "Sandbox"; + "麦克风权限" = "Microphone Privacy"; + "CPU" = "CPU"; + "请求头" = "Request Header"; + "格式不正确" = "Invalid format"; + "帧率检测开关" = "FPS monitor switch"; + "位置：左%@ 右%@ 上%@ 下%@" = "Position：left%@ right%@ top%@ bottom%@"; + "控件名称" = "Widget"; + "MockGPS" = "MockGPS"; + "Unknown" = "Unknown"; + "Mock GPS" = "Mock GPS"; + "响应头" = "Response Header"; + "子线程UI" = "Thread UI"; + "Load方法消耗时间" = "Load time"; + "卡顿" = "ANR"; + "App基本信息" = "App Info"; + "帧率监控" = "FPS monitor"; + "NotDetermined" = "NotDetermined"; + "流量监控" = "Traffic monitor"; + "性能数据上传到服务器" = "Upload Data"; + "单色色彩空间模式" = "Color space"; + "暂未开启流量监控" = "Traffic monitor is off"; + "提醒事项权限" = "Notes Privacy"; + "总共耗时" = "Total cost"; + "打开Mock GPS" = "Open Mock GPS"; + "请选择操作方式" = "Choose Operation"; + "点击跳转" = "Click to jump"; + "请求" = "Request"; + "Load耗时检测记录" = "Load Detection Results"; + "WhenInUse" = "WhenInUse"; + "设备名称" = "Mobile Info"; + "HTTP方法" = "HTTP Method"; + "开关" = "On/Off"; + "相册权限" = "Photos Privacy"; + "非主线程UI渲染检查" = "Thread UI monitor"; + "流量监控列表" = "Traffic monitor list"; + "流量检测概要" = "Traffic monitor detail"; + "卡顿检测开关" = "ANR Switch"; + "对齐标尺" = "Align Size"; + "提示" = "Tip"; + "返回上一级" = "Back"; + "Load耗时" = "Load time"; + "Authorized" = "Authorized"; + "元素边框线" = "Widget Border"; + "本地预览" = "Preview"; + "请求行" = "Request Line"; + "手机型号" = "Mobile model"; + "检测列表" = "Monitor list"; + "数据大小 : %@" = "Size : %@"; + "NoEnabled" = "NoEnabled"; + "开始测试" = "Start Testing"; + "颜色拾取器" = "Color Picker"; + "%@\n触发时间: %@\n文件名称: %@\n所在行: %zi\n线程id: %@\n线程名称: %@ " = "%@\n触发时间: %@\n文件名称: %@\n所在行: %zi\n线程id: %@\n线程名称: %@ "; + "NSLog日志记录" = "NSLog Results"; + "NotRestricted" = "NotRestricted"; + "删除成功" = "Delete Success"; + "流量检测开关" = "Traffic monitor switch"; + "Load耗时检测" = "Load time monitor"; + "Lumberjack" = "Lumberjack"; + "(示例: 120.15 30.28)" = "(Like: 120.15 30.28)"; + "数据上传" = "Upload"; + "卡顿详情" = "ANR Detail"; + "View查看器" = "View viewer"; + "卡顿列表" = "ANR List"; + "结束测试" = "Stop Testing"; + "总计已为您抓包" = "Total capture"; + "数据下载" = "Download"; + "查看组件是否对齐" = "Check alignment"; + "Crash日志列表" = "Crash log list"; + "确定" = "OK"; + "网络权限" = "Network Privacy"; + "正在开发中,敬请期待" = "Developing"; + "卡顿检测" = "ANR Check"; + "流量" = "Traffic"; + "组件检查" = "Module Check"; + "请输入测试人员名称" = "Please enter tester name"; + "推送权限" = "Push Privacy"; + "关闭DoraemonKit" = "Close DoraemonKit"; + "该功能需要重启App才能生效" = "Reboot to work"; + "内存检测开关" = "Memory monitor switch"; + "查看Crash日志" = "View Crash log"; + "通讯录权限" = "Contacts Privacy"; + "流量监控摘要" = "Traffic monitor info"; + "手机信息" = "Mobile Info"; + "请输入您要搜索的关键字" = "Please enter search key"; + "响应行" = "Response Body"; + "\n背景颜色：%@" = "\nBackground Color：%@"; + "数据保存到Library/Caches/DoraemonPerformance中" = "Save in Library/Caches/DoraemonPerformance"; + "请输入经纬度" = "Enter"; + "Denied" = "Denied"; + "H5通用跳转" = "H5 link"; + "Crash日志收集开关" = "Crash log switch"; + "请输入网址" = "Please enter link"; + "\n背景颜色：%@ 字体颜色：%@ 字体大小：%.f" = "\nBackground Color：%@ Font Color：%@ Font Size：%.f"; + "CPU监控" = "CPU monitor"; + "耗时" = "Time-consuming"; + "用户已经授权" = "Authorized"; + "清除本地数据" = "Clear local data"; + "CPU检测" = "CPU monitor"; + "Load耗时检测开关" = "Load time switch"; + "请求mock数据列表失败" = "Request mock data fail"; + "流量检测" = "Traffic monitor"; + "经度不合法" = "Invalid longitude"; + "删除失败" = "Delete fail"; + "日历权限" = "Calendar Privacy"; + "确定要删除本地数据" = "Confirm to clear local data"; + "系统版本" = "System Version"; + "用户没有授权" = "Denied"; + "流量检测列表" = "Traffic monitor list"; + "地理位置权限" = "Location Privacy"; + "App的一些基本信息" = "App Info"; + "性能数据" = "Performance"; + "根目录" = "Root path"; + "子线程渲染UI检查" = "Thread UI monitor"; + "链接" = "Link"; + "沙盒浏览" = "Sandbox"; + "颜色吸管" = "Color Picker"; + "mock开关没有打开" = "switch is not open"; + "CPU检测开关" = "CPU monitor switch"; + "纬度不合法" = "Invalid latitude"; + "内存检测" = "Memory monitor"; + "你好" = "Hello"; + "NSLog" = "NSLog"; + "%@\n触发时间: %@" = "%@\nTrigger time: %@"; + "查看卡顿记录" = "View ANR"; "Doraemon关闭之后需要重启App才能重新打开" = "Reboot to open Doraemon"; - "性能监控" = "Performance Monitor"; - "Crash查看" = "View Crash"; - "数据大小 : %@" = "Size : %@"; - "隐藏Doraemon" = "Hide Doraemon"; - "子线程UI渲染检测开关" = "Thread UI switch"; - "文件不存在" = "File not exist"; - "Crash本地查看" = "Crash Viewer"; - "日志显示" = "Show Log"; - "请选择你要监控的项目" = "Choose project"; - "内存" = "Memory"; - "空的report" = "Empty report"; - "流量监控开关" = "Monitor Switch"; - "文件预览" = "File Preview"; - "检测详情" = "Monitor Info"; - "删除" = "Delete"; - "流量监控详情" = "Traffic monitor info"; - "\n 背景色:%@" = "\n Background color:%@"; - "其他" = "Other"; - "内存监控" = "Memory monitor"; - "抓包数量" = "Capture amount "; - "分享" = "Share"; - "权限信息" = "Privacy Info"; - "数据类型" = "Data Type"; - "流量监控开关: " = "Traffic monitor switch: "; - "h5链接不能为空" = "h5 url can not be nil"; - "查看检测记录" = "View monitor records"; - "取消" = "Cancel"; - "Crash拦截" = "Crash intercept"; - "响应" = "Response"; - "消息体" = "Message Body"; - "帧率" = "FPS"; - " CPU检测" = " CPU monitor"; - "是否打开Mock GPS开关（重启生效）⬇️:" = "Mock GPS Switch(reboot to work):"; - "相机权限" = "Camera Privacy"; - "App信息" = "App Info"; - "卡顿操作" = "ANR Operation"; - "HTTP方法" = "HTTP Method"; - "纬度不合法" = "Invalid latitude"; - "请输入您要搜索的关键字" = "Please enter search key"; - "日志显示开关" = "Log Switch"; - "清除本地数据" = "Clear local data"; - "NSLog" = "NSLog"; - "查看记录" = "View records"; - "开关" = "On/Off"; + "确认删除所有崩溃日志吗？" = "Confirm to delete all crash logs?"; + "Crash查看" = "View Crash"; + "显示元素边框线" = "Show widget border"; + "数据大小 : %@" = "Size : %@"; + "子线程UI渲染检测开关" = "Thread UI switch"; + "文件不存在" = "File not exist"; + "Crash本地查看" = "Crash Viewer"; + "一键清理Crash日志" = "Delete crash logs"; + "日志显示" = "Show Log"; + "内存" = "Memory"; + "空的report" = "Empty report"; + "元素边框线开关" = "Widget border switch"; + "数据库预览" = "DB preview"; + "\n控件位置：左%0.1lf 上%0.1lf 宽%0.1lf 高%0.1lf" = "\nPosition：left%0.1lf top%0.1lf width%0.1lf height%0.1lf"; + "Doraemon内置浏览器" = "Doraemon Built-in browser"; + "文件预览" = "File Preview"; + "显示流量检测详情" = "Show traffic monitor detail"; + "查看记录" = "View records"; + "检测详情" = "Monitor Info"; + "复制" = "Copy"; + "删除" = "Delete"; + "流量监控详情" = "Traffic monitor info"; + "正在清理中" = "Deleteing"; + "数据Mock" = "Mock Data"; + "内存监控" = "Memory monitor"; + "抓包数量" = "Capture amount "; + "Always" = "Always"; + "分享" = "Share"; + "权限信息" = "Privacy Info"; + "家长控制" = "Restricted"; + "数据类型" = "Data Type"; + "h5链接不能为空" = "h5 url can not be nil"; + "查看检测记录" = "View monitor records"; + "取消" = "Cancel"; + "%@\n触发时间: %@\n文件名称: %@\n所在行: %zi\n线程id: %@ \n线程名称: %@" = "%@\nTrigger time: %@\nFile name: %@\nline: %zi\nThread id: %@ \nThread name: %@"; + "响应" = "Response"; + "输入本次测试人员名称(必填)" = "Please enter tester name(Required)"; + "帧率" = "FPS"; + "卡顿监控" = "ANR Check"; + "相机权限" = "Camera Privacy"; + "App信息" = "App Info"; + "消息体" = "Message Body"; + "检测记录" = "Monitor results"; + "帧率检测" = "FPS monitor"; + + //DoraemonKitDemo + "测试工具集" = "Test tools"; + "视觉测试Demo" = "UI test Demo"; + "高流量操作打开" = "High traffic operation"; + "添加DB到沙盒中" = "Add DB into sandbox"; + "DoraemonKit" = "DoraemonKit"; + "日记测试Demo" = "Log test Demo"; + "添加html到沙盒中" = "Add html into sandbox"; + "WKWebView" = "WKWebView"; + "发送一条AFNetworking请求" = "Send AFNetworking request"; + "添加一条NSLog日志" = "Add NSLog log"; + "发送一条NSURLSession请求" = "Send NSURLSession request"; + "性能测试Demo" = "Performance Testing Demo"; + "添加一张图片到沙盒中" = "Add image into sandbox"; + "低FPS操作打开" = "Low FPS operation"; + "添加doc、xlsx、pdf到沙盒中" = "Add doc、xlsx、pdf into sandbox"; + "模拟位置" = "Mock GPS"; + "打开UIWebView" = "Open UIWebView"; + "打开WKWebView" = "Open WKWebView"; + "crash触发Demo" = "Crash Demo"; + "高内存操作关闭" = "High memory operation off"; + "测试插件" = "Test plugin"; + "高CPU操作打开" = "High CPU operation"; + "我是来测试的" = "Test"; + "添加一段mp4到沙盒中" = "add mp4 into sandbox"; + "模拟位置Demo" = "Mock GPS Demo"; + "发送一条URLConnection请求" = "Send URLConnection request"; + "crash查看" = "View crash"; + "添加一条CocoaLumberjack日志" = "Add CocoaLumberjack log"; + "通用测试Demo" = "General test Demo"; + "添加一条json到沙盒中" = "Add json into sandbox"; + "沙盒测试Demo" = "Sandbox test Demo"; + "网络测试Demo" = "Networking test Demo"; + "高内存操作打开" = "High memory operation"; + "signalException" = "signalException"; + "子线程UI操作" = "Thread UI"; + "高CPU操作关闭" = "High CPU operation off"; + "发送一条AFNetworking请求2" = "Send AFNetworking request2"; + "卡顿操作打开" = "ANR operation"; + "uncaughtException" = "uncaughtException"; + "UIWebView" = "UIWebView"; + "显示入口" = "Show Doraemon"; + "隐藏入口" = "Hidden Doraemon"; } diff --git a/iOS/DoraemonKit/Resource/zh-Hans.lproj/Doraemon.strings b/iOS/DoraemonKit/Resource/zh-Hans.lproj/Doraemon.strings index 892a703fe117f9b7fb613b62d14c7e49e2136217..d2862881b8bf651896c237fd3bc863c7030a4dfb 100644 --- a/iOS/DoraemonKit/Resource/zh-Hans.lproj/Doraemon.strings +++ b/iOS/DoraemonKit/Resource/zh-Hans.lproj/Doraemon.strings @@ -1,4 +1,4 @@ -/* +/* Doraemon.strings Pods @@ -7,145 +7,230 @@ */ { - "H5任意门" = "H5任意门"; - "测试Owner" = "测试Owner"; - "请您输入测试用户相关信息" = "请您输入测试用户相关信息"; - "子线程UI渲染操作" = "子线程UI渲染操作"; - "沙盒浏览器" = "沙盒浏览器"; - "麦克风权限" = "麦克风权限"; - "支持筛选" = "支持筛选"; - "请求头" = "请求头"; - " 内存检测" = " 内存检测"; - "经纬度不能为空" = "经纬度不能为空"; - "响应头" = "响应头"; - "子线程UI" = "子线程UI"; - "卡顿" = "卡顿"; - "帧率监控" = "帧率监控"; - "流量监控" = "流量监控"; - "内存: " = "内存: "; - "暂未开启流量监控" = "暂未开启流量监控"; - "提醒事项权限" = "提醒事项权限"; - "关闭" = "关闭"; - "请选择操作方式" = "请选择操作方式"; - "点击跳转" = "点击跳转"; - "请求" = "请求"; - "Memory使用量显示开关" = "Memory使用量显示开关"; - "该功能需要重启App才能生效" = "该功能需要重启App才能生效"; - "相册权限" = "相册权限"; - "非主线程UI渲染检查" = "非主线程UI渲染检查"; - "流量监控列表" = "流量监控列表"; - "流量: " = "流量: "; - "卡顿检测开关" = "卡顿检测开关"; - "经度不合法" = "经度不合法"; - "返回上一级" = "返回上一级"; - "流量曲线开关: " = "流量曲线开关: "; - "本地预览" = "本地预览"; - "请求行" = "请求行"; - "手机型号" = "手机型号"; - "检测列表" = "检测列表"; - "数据大小 : %@B" = "数据大小 : %@B"; - "开始测试" = "开始测试"; - "颜色拾取器" = "颜色拾取器"; - "视觉工具" = "视觉工具"; - "用例名称" = "用例名称"; - "业务线" = "业务线"; - "开始时间" = "开始时间"; - " 控件名称:%@" = " 控件名称:%@"; - " 帧率检测" = " 帧率检测"; - "流量监控概要" = "流量监控概要"; - "数据上传" = "数据上传"; - "卡顿详情" = "卡顿详情"; - "View查看器" = "View查看器"; - "卡顿列表" = "卡顿列表"; - "结束测试" = "结束测试"; - "总计已为您抓包" = "总计已为您抓包"; - "数据下载" = "数据下载"; - "查看组件是否对齐" = "查看组件是否对齐"; - "点击输入经纬度" = "点击输入经纬度"; - "手机信息" = "手机信息"; - "显示流量监控详情" = "显示流量监控详情"; - "卡顿中" = "卡顿中"; - "确定" = "确定"; - "网络权限" = "网络权限"; - "卡顿检测" = "卡顿检测"; - "流量" = "流量"; - "经度:" = "经度:"; - "组件检查" = "组件检查"; - "推送权限" = "推送权限"; - "通讯录权限" = "通讯录权限"; - "\n 控件位置:左:%0.1lf 上:%0.1lf 宽:%0.1lf 高:%0.1lf" = "\n 控件位置:左:%0.1lf 上:%0.1lf 宽:%0.1lf 高:%0.1lf"; - "请在以下输入框输入网址，让走点击跳转按钮即可😘" = "请在以下输入框输入网址，让走点击跳转按钮即可😘"; - "响应行" = "响应行"; - "H5通用跳转" = "H5通用跳转"; - "点我右侧😘: " = "点我右侧😘: "; - "常用工具集" = "常用工具集"; - "CPU监控" = "CPU监控"; - "耗时" = "耗时"; - "\n 背景色:%@ 字体颜色:%@ 字体大小:%.f" = "\n 背景色:%@ 字体颜色:%@ 字体大小:%.f"; - "日历权限" = "日历权限"; - "提示" = "提示"; - "对齐标尺" = "对齐标尺"; - "系统版本" = "系统版本"; - "FPS显示开关" = "FPS显示开关"; - "纬度:" = "纬度:"; - "地理位置权限" = "地理位置权限"; - "App的一些基本信息" = "App的一些基本信息"; - "App基本信息" = "App基本信息"; - "根目录" = "根目录"; - "子线程渲染UI检查" = "子线程渲染UI检查"; - "链接" = "链接"; - "沙盒浏览" = "沙盒浏览"; - "颜色吸管" = "颜色吸管"; - "mock开关没有打开" = "mock开关没有打开"; - "帧率: " = "帧率: "; - "单色色彩空间模式" = "单色色彩空间模式"; - "你好" = "你好"; - "CPU使用率显示开关" = "CPU使用率显示开关"; - "查看卡顿记录" = "查看卡顿记录"; - " 流量检测" = " 流量检测"; - "Doraemon关闭之后需要重启App才能重新打开" = "Doraemon关闭之后需要重启App才能重新打开"; - "性能监控" = "性能监控"; - "Crash查看" = "Crash查看"; - "数据大小 : %@" = "数据大小 : %@"; - "隐藏Doraemon" = "隐藏Doraemon"; - "子线程UI渲染检测开关" = "子线程UI渲染检测开关"; - "文件不存在" = "文件不存在"; - "Crash本地查看" = "Crash本地查看"; - "日志显示" = "日志显示"; - "请选择你要监控的项目" = "请选择你要监控的项目"; - "内存" = "内存"; - "空的report" = "空的report"; - "流量监控开关" = "流量监控开关"; - "文件预览" = "文件预览"; - "检测详情" = "检测详情"; - "删除" = "删除"; - "流量监控详情" = "流量监控详情"; - "\n 背景色:%@" = "\n 背景色:%@"; - "其他" = "其他"; - "内存监控" = "内存监控"; - "抓包数量" = "抓包数量"; - "分享" = "分享"; - "权限信息" = "权限信息"; - "数据类型" = "数据类型"; - "流量监控开关: " = "流量监控开关: "; - "h5链接不能为空" = "h5链接不能为空"; - "查看检测记录" = "查看检测记录"; - "取消" = "取消"; - "Crash拦截" = "Crash拦截"; - "响应" = "响应"; - "消息体" = "消息体"; - "帧率" = "帧率"; - " CPU检测" = " CPU检测"; - "是否打开Mock GPS开关（重启生效）⬇️:" = "是否打开Mock GPS开关（重启生效）⬇️:"; - "相机权限" = "相机权限"; - "App信息" = "App信息"; - "卡顿操作" = "卡顿操作"; - "HTTP方法" = "HTTP方法"; - "纬度不合法" = "纬度不合法"; - "请输入您要搜索的关键字" = "请输入您要搜索的关键字"; - "日志显示开关" = "日志显示开关"; - "清除本地数据" = "清除本地数据"; - "NSLog" = "NSLog"; - "查看记录" = "查看记录"; - "开关" = "开关"; + //DoraemonKit + "常用工具" = "常用工具"; + "业务工具" = "业务工具"; + "自定义" = "自定义"; + "性能检测" = "性能检测"; + "视觉工具" = "视觉工具"; + "平台工具" = "平台工具"; + "H5任意门" = "H5任意门"; + "CocoaLumberjack日志记录" = "CocoaLumberjack日志记录"; + "用户没有选择" = "用户没有选择"; + "Restricted" = "Restricted"; + "经纬度不能为空" = "经纬度不能为空"; + "沙盒浏览器" = "沙盒浏览器"; + "麦克风权限" = "麦克风权限"; + "CPU" = "CPU"; + "请求头" = "请求头"; + "格式不正确" = "格式不正确"; + "帧率检测开关" = "帧率检测开关"; + "位置：左%@ 右%@ 上%@ 下%@" = "位置：左%@ 右%@ 上%@ 下%@"; + "控件名称" = "控件名称"; + "MockGPS" = "MockGPS"; + "Unknown" = "Unknown"; + "Mock GPS" = "Mock GPS"; + "响应头" = "响应头"; + "子线程UI" = "子线程UI"; + "Load方法消耗时间" = "Load方法消耗时间"; + "卡顿" = "卡顿"; + "App基本信息" = "App基本信息"; + "帧率监控" = "帧率监控"; + "NotDetermined" = "NotDetermined"; + "流量监控" = "流量监控"; + "性能数据上传到服务器" = "性能数据上传到服务器"; + "单色色彩空间模式" = "单色色彩空间模式"; + "暂未开启流量监控" = "暂未开启流量监控"; + "提醒事项权限" = "提醒事项权限"; + "总共耗时" = "总共耗时"; + "打开Mock GPS" = "打开Mock GPS"; + "请选择操作方式" = "请选择操作方式"; + "点击跳转" = "点击跳转"; + "请求" = "请求"; + "Load耗时检测记录" = "Load耗时检测记录"; + "WhenInUse" = "WhenInUse"; + "设备名称" = "设备名称"; + "HTTP方法" = "HTTP方法"; + "开关" = "开关"; + "相册权限" = "相册权限"; + "非主线程UI渲染检查" = "非主线程UI渲染检查"; + "流量监控列表" = "流量监控列表"; + "流量检测概要" = "流量检测概要"; + "卡顿检测开关" = "卡顿检测开关"; + "对齐标尺" = "对齐标尺"; + "提示" = "提示"; + "返回上一级" = "返回上一级"; + "Load耗时" = "Load耗时"; + "Authorized" = "Authorized"; + "元素边框线" = "元素边框线"; + "本地预览" = "本地预览"; + "请求行" = "请求行"; + "手机型号" = "手机型号"; + "检测列表" = "检测列表"; + "数据大小 : %@B" = "数据大小 : %@B"; + "NoEnabled" = "NoEnabled"; + "开始测试" = "开始测试"; + "颜色拾取器" = "颜色拾取器"; + "%@\n触发时间: %@\n文件名称: %@\n所在行: %zi\n线程id: %@\n线程名称: %@ " = "%@\n触发时间: %@\n文件名称: %@\n所在行: %zi\n线程id: %@\n线程名称: %@ "; + "NSLog日志记录" = "NSLog日志记录"; + "NotRestricted" = "NotRestricted"; + "删除成功" = "删除成功"; + "流量检测开关" = "流量检测开关"; + "Load耗时检测" = "Load耗时检测"; + "Lumberjack" = "Lumberjack"; + "(示例: 120.15 30.28)" = "(示例: 120.15 30.28)"; + "数据上传" = "数据上传"; + "卡顿详情" = "卡顿详情"; + "View查看器" = "View查看器"; + "卡顿列表" = "卡顿列表"; + "结束测试" = "结束测试"; + "总计已为您抓包" = "总计已为您抓包"; + "数据下载" = "数据下载"; + "查看组件是否对齐" = "查看组件是否对齐"; + "Crash日志列表" = "Crash日志列表"; + "确定" = "确定"; + "网络权限" = "网络权限"; + "正在开发中,敬请期待" = "正在开发中,敬请期待"; + "卡顿检测" = "卡顿检测"; + "流量" = "流量"; + "组件检查" = "组件检查"; + "请输入测试人员名称" = "请输入测试人员名称"; + "推送权限" = "推送权限"; + "关闭DoraemonKit" = "关闭DoraemonKit"; + "该功能需要重启App才能生效" = "该功能需要重启App才能生效"; + "内存检测开关" = "内存检测开关"; + "查看Crash日志" = "查看Crash日志"; + "通讯录权限" = "通讯录权限"; + "流量监控摘要" = "流量监控摘要"; + "手机信息" = "手机信息"; + "请输入您要搜索的关键字" = "请输入您要搜索的关键字"; + "响应行" = "响应行"; + "\n背景颜色：%@" = "\n背景颜色：%@"; + "数据保存到Library/Caches/DoraemonPerformance中" = "数据保存到Library/Caches/DoraemonPerformance中"; + "请输入经纬度" = "请输入经纬度"; + "Denied" = "Denied"; + "H5通用跳转" = "H5通用跳转"; + "Crash日志收集开关" = "Crash日志收集开关"; + "请输入网址" = "请输入网址"; + "\n背景颜色：%@ 字体颜色：%@ 字体大小：%.f" = "\n背景颜色：%@ 字体颜色：%@ 字体大小：%.f"; + "CPU监控" = "CPU监控"; + "耗时" = "耗时"; + "用户已经授权" = "用户已经授权"; + "清除本地数据" = "清除本地数据"; + "CPU检测" = "CPU检测"; + "Load耗时检测开关" = "Load耗时检测开关"; + "请求mock数据列表失败" = "请求mock数据列表失败"; + "流量检测" = "流量检测"; + "经度不合法" = "经度不合法"; + "删除失败" = "删除失败"; + "日历权限" = "日历权限"; + "确定要删除本地数据" = "确定要删除本地数据"; + "系统版本" = "系统版本"; + "用户没有授权" = "用户没有授权"; + "流量检测列表" = "流量检测列表"; + "地理位置权限" = "地理位置权限"; + "App的一些基本信息" = "App的一些基本信息"; + "性能数据" = "性能数据"; + "根目录" = "根目录"; + "子线程渲染UI检查" = "子线程渲染UI检查"; + "链接" = "链接"; + "沙盒浏览" = "沙盒浏览"; + "颜色吸管" = "颜色吸管"; + "mock开关没有打开" = "mock开关没有打开"; + "CPU检测开关" = "CPU检测开关"; + "纬度不合法" = "纬度不合法"; + "内存检测" = "内存检测"; + "你好" = "你好"; + "NSLog" = "NSLog"; + "%@\n触发时间: %@" = "%@\n触发时间: %@"; + "查看卡顿记录" = "查看卡顿记录"; + "Doraemon关闭之后需要重启App才能重新打开" = "Doraemon关闭之后需要重启App才能重新打开"; + "确认删除所有崩溃日志吗？" = "确认删除所有崩溃日志吗？"; + "Crash查看" = "Crash查看"; + "显示元素边框线" = "显示元素边框线"; + "数据大小 : %@" = "数据大小 : %@"; + "子线程UI渲染检测开关" = "子线程UI渲染检测开关"; + "文件不存在" = "文件不存在"; + "Crash本地查看" = "Crash本地查看"; + "一键清理Crash日志" = "一键清理Crash日志"; + "日志显示" = "日志显示"; + "内存" = "内存"; + "空的report" = "空的report"; + "元素边框线开关" = "元素边框线开关"; + "数据库预览" = "数据库预览"; + "\n控件位置：左%0.1lf 上%0.1lf 宽%0.1lf 高%0.1lf" = "\n控件位置：左%0.1lf 上%0.1lf 宽%0.1lf 高%0.1lf"; + "Doraemon内置浏览器" = "Doraemon内置浏览器"; + "文件预览" = "文件预览"; + "显示流量检测详情" = "显示流量检测详情"; + "查看记录" = "查看记录"; + "检测详情" = "检测详情"; + "复制" = "复制"; + "删除" = "删除"; + "流量监控详情" = "流量监控详情"; + "正在清理中" = "正在清理中"; + "数据Mock" = "数据Mock"; + "内存监控" = "内存监控"; + "抓包数量" = "抓包数量"; + "Always" = "Always"; + "分享" = "分享"; + "权限信息" = "权限信息"; + "家长控制" = "家长控制"; + "数据类型" = "数据类型"; + "h5链接不能为空" = "h5链接不能为空"; + "查看检测记录" = "查看检测记录"; + "取消" = "取消"; + "%@\n触发时间: %@\n文件名称: %@\n所在行: %zi\n线程id: %@ \n线程名称: %@" = "%@\n触发时间: %@\n文件名称: %@\n所在行: %zi\n线程id: %@ \n线程名称: %@"; + "响应" = "响应"; + "输入本次测试人员名称(必填)" = "输入本次测试人员名称(必填)"; + "帧率" = "帧率"; + "卡顿监控" = "卡顿监控"; + "相机权限" = "相机权限"; + "App信息" = "App信息"; + "消息体" = "消息体"; + "检测记录" = "检测记录"; + "帧率检测" = "帧率检测"; + + //DoraemonKitDemo + "测试工具集" = "测试工具集"; + "视觉测试Demo" = "视觉测试Demo"; + "高流量操作打开" = "高流量操作打开"; + "添加DB到沙盒中" = "添加DB到沙盒中"; + "DoraemonKit" = "DoraemonKit"; + "日记测试Demo" = "日记测试Demo"; + "添加html到沙盒中" = "添加html到沙盒中"; + "WKWebView" = "WKWebView"; + "发送一条AFNetworking请求" = "发送一条AFNetworking请求"; + "添加一条NSLog日志" = "添加一条NSLog日志"; + "发送一条NSURLSession请求" = "发送一条NSURLSession请求"; + "性能测试Demo" = "性能测试Demo"; + "添加一张图片到沙盒中" = "添加一张图片到沙盒中"; + "低FPS操作打开" = "低FPS操作打开"; + "添加doc、xlsx、pdf到沙盒中" = "添加doc、xlsx、pdf到沙盒中"; + "模拟位置" = "模拟位置"; + "打开UIWebView" = "打开UIWebView"; + "打开WKWebView" = "打开WKWebView"; + "crash触发Demo" = "crash触发Demo"; + "高内存操作关闭" = "高内存操作关闭"; + "测试插件" = "测试插件"; + "高CPU操作打开" = "高CPU操作打开"; + "我是来测试的" = "我是来测试的"; + "添加一段mp4到沙盒中" = "添加一段mp4到沙盒中"; + "模拟位置Demo" = "模拟位置Demo"; + "发送一条URLConnection请求" = "发送一条URLConnection请求"; + "crash查看" = "crash查看"; + "添加一条CocoaLumberjack日志" = "添加一条CocoaLumberjack日志"; + "通用测试Demo" = "通用测试Demo"; + "添加一条json到沙盒中" = "添加一条json到沙盒中"; + "沙盒测试Demo" = "沙盒测试Demo"; + "网络测试Demo" = "网络测试Demo"; + "高内存操作打开" = "高内存操作打开"; + "signalException" = "signalException"; + "子线程UI操作" = "子线程UI操作"; + "高CPU操作关闭" = "高CPU操作关闭"; + "发送一条AFNetworking请求2" = "发送一条AFNetworking请求2"; + "卡顿操作打开" = "卡顿操作打开"; + "uncaughtException" = "uncaughtException"; + "UIWebView" = "UIWebView"; + "显示入口" = "显示入口"; + "隐藏入口" = "隐藏入口"; } diff --git a/iOS/DoraemonKit/Src/Core/Entry/Home/DoraemonHomeViewController.m b/iOS/DoraemonKit/Src/Core/Entry/Home/DoraemonHomeViewController.m index b31c7170d6722a1cc96a081af64a326491683b5f..f5415976192f39ae3131c65daac8b947934dc38a 100644 --- a/iOS/DoraemonKit/Src/Core/Entry/Home/DoraemonHomeViewController.m +++ b/iOS/DoraemonKit/Src/Core/Entry/Home/DoraemonHomeViewController.m @@ -63,7 +63,7 @@ UIButton *closeBtn = [[UIButton alloc] initWithFrame:CGRectMake(kDoraemonSizeFrom750(30), offsetY, self.view.doraemon_width-2*kDoraemonSizeFrom750(30), kDoraemonSizeFrom750(100))]; closeBtn.tag = scrollViewTagStartSubscript + _dataArray.count; closeBtn.backgroundColor = [UIColor whiteColor]; - [closeBtn setTitle:@"关闭DoraemonKit" forState:UIControlStateNormal]; + [closeBtn setTitle:DoraemonLocalizedString(@"关闭DoraemonKit") forState:UIControlStateNormal]; [closeBtn setTitleColor:[UIColor doraemon_colorWithString:@"#CC3A4B"] forState:UIControlStateNormal]; [closeBtn addTarget:self action:@selector(close) forControlEvents:UIControlEventTouchUpInside]; [_scrollView addSubview:closeBtn]; diff --git a/iOS/DoraemonKit/Src/Core/Manager/DoraemonManager.m b/iOS/DoraemonKit/Src/Core/Manager/DoraemonManager.m index 58d3314e4714d623e3d9f17fd134f7a344f0b80b..1f485f3f6c82a4762c4994f6a283aece8f37b650 100644 --- a/iOS/DoraemonKit/Src/Core/Manager/DoraemonManager.m +++ b/iOS/DoraemonKit/Src/Core/Manager/DoraemonManager.m @@ -318,148 +318,148 @@ typedef void (^DoraemonPerformanceBlock)(NSDictionary *); NSArray *dataArray = @{ // 常用工具 @(DoraemonManagerPluginType_DoraemonAppInfoPlugin) : @[ - @{kTitle:@"App信息"}, - @{kDesc:@"App的一些基本信息"}, + @{kTitle:DoraemonLocalizedString(@"App信息")}, + @{kDesc:DoraemonLocalizedString(@"App的一些基本信息")}, @{kIcon:@"doraemon_app_info"}, @{kPluginName:@"DoraemonAppInfoPlugin"}, - @{kAtModule:@"常用工具"} + @{kAtModule:DoraemonLocalizedString(@"常用工具")} ], @(DoraemonManagerPluginType_DoraemonSandboxPlugin) : @[ - @{kTitle:@"沙盒浏览"}, - @{kDesc:@"沙盒浏览"}, + @{kTitle:DoraemonLocalizedString(@"沙盒浏览")}, + @{kDesc:DoraemonLocalizedString(@"沙盒浏览")}, @{kIcon:@"doraemon_file"}, @{kPluginName:@"DoraemonSandboxPlugin"}, - @{kAtModule:@"常用工具"} + @{kAtModule:DoraemonLocalizedString(@"常用工具")} ], @(DoraemonManagerPluginType_DoraemonGPSPlugin) : @[ @{kTitle:@"MockGPS"}, @{kDesc:@"MockGPS"}, @{kIcon:@"doraemon_mock_gps"}, @{kPluginName:@"DoraemonGPSPlugin"}, - @{kAtModule:@"常用工具"} + @{kAtModule:DoraemonLocalizedString(@"常用工具")} ], @(DoraemonManagerPluginType_DoraemonH5Plugin) : @[ - @{kTitle:@"H5任意门"}, - @{kDesc:@"H5通用跳转"}, + @{kTitle:DoraemonLocalizedString(@"H5任意门")}, + @{kDesc:DoraemonLocalizedString(@"H5通用跳转")}, @{kIcon:@"doraemon_h5"}, @{kPluginName:@"DoraemonH5Plugin"}, - @{kAtModule:@"常用工具"} + @{kAtModule:DoraemonLocalizedString(@"常用工具")} ], @(DoraemonManagerPluginType_DoraemonCrashPlugin) : @[ - @{kTitle:@"Crash查看"}, - @{kDesc:@"Crash本地查看"}, + @{kTitle:DoraemonLocalizedString(@"Crash查看")}, + @{kDesc:DoraemonLocalizedString(@"Crash本地查看")}, @{kIcon:@"doraemon_crash"}, @{kPluginName:@"DoraemonCrashPlugin"}, - @{kAtModule:@"常用工具"} + @{kAtModule:DoraemonLocalizedString(@"常用工具")} ], @(DoraemonManagerPluginType_DoraemonSubThreadUICheckPlugin) : @[ - @{kTitle:@"子线程UI"}, - @{kDesc:@"非主线程UI渲染检查"}, + @{kTitle:DoraemonLocalizedString(@"子线程UI")}, + @{kDesc:DoraemonLocalizedString(@"非主线程UI渲染检查")}, @{kIcon:@"doraemon_ui"}, @{kPluginName:@"DoraemonSubThreadUICheckPlugin"}, - @{kAtModule:@"常用工具"} + @{kAtModule:DoraemonLocalizedString(@"常用工具")} ], @(DoraemonManagerPluginType_DoraemonDeleteLocalDataPlugin) : @[ - @{kTitle:@"清除本地数据"}, - @{kDesc:@"清除本地数据"}, + @{kTitle:DoraemonLocalizedString(@"清除本地数据")}, + @{kDesc:DoraemonLocalizedString(@"清除本地数据")}, @{kIcon:@"doraemon_qingchu"}, @{kPluginName:@"DoraemonDeleteLocalDataPlugin"}, - @{kAtModule:@"常用工具"} + @{kAtModule:DoraemonLocalizedString(@"常用工具")} ], @(DoraemonManagerPluginType_DoraemonNSLogPlugin) : @[ @{kTitle:@"NSLog"}, @{kDesc:@"NSLog"}, @{kIcon:@"doraemon_nslog"}, @{kPluginName:@"DoraemonNSLogPlugin"}, - @{kAtModule:@"常用工具"} + @{kAtModule:DoraemonLocalizedString(@"常用工具")} ], @(DoraemonManagerPluginType_DoraemonCocoaLumberjackPlugin) : @[ @{kTitle:@"Lumberjack"}, - @{kDesc:@"日志显示"}, + @{kDesc:DoraemonLocalizedString(@"日志显示")}, @{kIcon:@"doraemon_log"}, @{kPluginName:@"DoraemonCocoaLumberjackPlugin"}, - @{kAtModule:@"常用工具"} + @{kAtModule:DoraemonLocalizedString(@"常用工具")} ], // 性能检测 @(DoraemonManagerPluginType_DoraemonFPSPlugin) : @[ - @{kTitle:@"帧率"}, - @{kDesc:@"帧率监控"}, + @{kTitle:DoraemonLocalizedString(@"帧率")}, + @{kDesc:DoraemonLocalizedString(@"帧率监控")}, @{kIcon:@"doraemon_fps"}, @{kPluginName:@"DoraemonFPSPlugin"}, - @{kAtModule:@"性能检测"} + @{kAtModule:DoraemonLocalizedString(@"性能检测")} ], @(DoraemonManagerPluginType_DoraemonCPUPlugin) : @[ @{kTitle:@"CPU"}, - @{kDesc:@"CPU监控"}, + @{kDesc:DoraemonLocalizedString(@"CPU监控")}, @{kIcon:@"doraemon_cpu"}, @{kPluginName:@"DoraemonCPUPlugin"}, - @{kAtModule:@"性能检测"} + @{kAtModule:DoraemonLocalizedString(@"性能检测")} ], @(DoraemonManagerPluginType_DoraemonMemoryPlugin) : @[ - @{kTitle:@"内存"}, - @{kDesc:@"内存监控"}, + @{kTitle:DoraemonLocalizedString(@"内存")}, + @{kDesc:DoraemonLocalizedString(@"内存监控")}, @{kIcon:@"doraemon_memory"}, @{kPluginName:@"DoraemonMemoryPlugin"}, - @{kAtModule:@"性能检测"} + @{kAtModule:DoraemonLocalizedString(@"性能检测")} ], @(DoraemonManagerPluginType_DoraemonNetFlowPlugin) : @[ - @{kTitle:@"流量"}, - @{kDesc:@"流量监控"}, + @{kTitle:DoraemonLocalizedString(@"流量")}, + @{kDesc:DoraemonLocalizedString(@"流量监控")}, @{kIcon:@"doraemon_net"}, @{kPluginName:@"DoraemonNetFlowPlugin"}, - @{kAtModule:@"性能检测"} + @{kAtModule:DoraemonLocalizedString(@"性能检测")} ], @(DoraemonManagerPluginType_DoraemonANRPlugin) : @[ - @{kTitle:@"卡顿"}, - @{kDesc:@"卡顿监控"}, + @{kTitle:DoraemonLocalizedString(@"卡顿")}, + @{kDesc:DoraemonLocalizedString(@"卡顿监控")}, @{kIcon:@"doraemon_kadun"}, @{kPluginName:@"DoraemonANRPlugin"}, - @{kAtModule:@"性能检测"} + @{kAtModule:DoraemonLocalizedString(@"性能检测")} ], @(DoraemonManagerPluginType_DoraemonAllTestPlugin) : @[ - @{kTitle:@"自定义"}, - @{kDesc:@"性能数据保存到本地"}, + @{kTitle:DoraemonLocalizedString(@"自定义")}, + @{kDesc:DoraemonLocalizedString(@"性能数据保存到本地")}, @{kIcon:@"doraemon_default"}, @{kPluginName:@"DoraemonAllTestPlugin"}, - @{kAtModule:@"性能检测"} + @{kAtModule:DoraemonLocalizedString(@"性能检测")} ], @(DoraemonManagerPluginType_DoraemonMethodUseTimePlugin) : @[ - @{kTitle:@"Load耗时"}, - @{kDesc:@"Load方法消耗时间"}, + @{kTitle:DoraemonLocalizedString(@"Load耗时")}, + @{kDesc:DoraemonLocalizedString(@"Load方法消耗时间")}, @{kIcon:@"doraemon_method_use_time"}, @{kPluginName:@"DoraemonMethodUseTimePlugin"}, - @{kAtModule:@"性能检测"} + @{kAtModule:DoraemonLocalizedString(@"性能检测")} ], // 视觉工具 @(DoraemonManagerPluginType_DoraemonColorPickPlugin) : @[ - @{kTitle:@"颜色吸管"}, - @{kDesc:@"颜色拾取器"}, + @{kTitle:DoraemonLocalizedString(@"颜色吸管")}, + @{kDesc:DoraemonLocalizedString(@"颜色拾取器")}, @{kIcon:@"doraemon_straw"}, @{kPluginName:@"DoraemonColorPickPlugin"}, - @{kAtModule:@"视觉工具"} + @{kAtModule:DoraemonLocalizedString(@"视觉工具")} ], @(DoraemonManagerPluginType_DoraemonViewCheckPlugin) : @[ - @{kTitle:@"组件检查"}, - @{kDesc:@"View查看器"}, + @{kTitle:DoraemonLocalizedString(@"组件检查")}, + @{kDesc:DoraemonLocalizedString(@"View查看器")}, @{kIcon:@"doraemon_view_check"}, @{kPluginName:@"DoraemonViewCheckPlugin"}, - @{kAtModule:@"视觉工具"} + @{kAtModule:DoraemonLocalizedString(@"视觉工具")} ], @(DoraemonManagerPluginType_DoraemonViewAlignPlugin) : @[ - @{kTitle:@"对齐标尺"}, - @{kDesc:@"查看组件是否对齐"}, + @{kTitle:DoraemonLocalizedString(@"对齐标尺")}, + @{kDesc:DoraemonLocalizedString(@"查看组件是否对齐")}, @{kIcon:@"doraemon_align"}, @{kPluginName:@"DoraemonViewAlignPlugin"}, - @{kAtModule:@"视觉工具"} + @{kAtModule:DoraemonLocalizedString(@"视觉工具")} ], @(DoraemonManagerPluginType_DoraemonViewMetricsPlugin) : @[ - @{kTitle:@"元素边框线"}, - @{kDesc:@"显示元素边框线"}, + @{kTitle:DoraemonLocalizedString(@"元素边框线")}, + @{kDesc:DoraemonLocalizedString(@"显示元素边框线")}, @{kIcon:@"doraemon_viewmetrics"}, @{kPluginName:@"DoraemonViewMetricsPlugin"}, - @{kAtModule:@"视觉工具"} + @{kAtModule:DoraemonLocalizedString(@"视觉工具")} ] }[@(pluginType)]; diff --git a/iOS/DoraemonKit/Src/Core/Plugin/AllTest/DoraemonAllTestViewController.m b/iOS/DoraemonKit/Src/Core/Plugin/AllTest/DoraemonAllTestViewController.m index a110cc85c80b8cb20406f5a2c08f509870133230..88225932983f7248e8ea84e29f2cdb6e063468eb 100644 --- a/iOS/DoraemonKit/Src/Core/Plugin/AllTest/DoraemonAllTestViewController.m +++ b/iOS/DoraemonKit/Src/Core/Plugin/AllTest/DoraemonAllTestViewController.m @@ -31,10 +31,10 @@ - (void)viewDidLoad { [super viewDidLoad]; - self.title = @"自定义测试"; + self.title = DoraemonLocalizedString(@"自定义测试"); _fpsSwitchView = [[DoraemonCellSwitch alloc] initWithFrame:CGRectMake(0, self.bigTitleView.doraemon_bottom, self.view.doraemon_width, kDoraemonSizeFrom750(104))]; - [_fpsSwitchView renderUIWithTitle:@"帧率" switchOn:[DoraemonAllTestManager shareInstance].fpsSwitchOn]; + [_fpsSwitchView renderUIWithTitle:DoraemonLocalizedString(@"帧率") switchOn:[DoraemonAllTestManager shareInstance].fpsSwitchOn]; [_fpsSwitchView.switchView addTarget:self action:@selector(switchAction:) forControlEvents:UIControlEventValueChanged]; [self.view addSubview:_fpsSwitchView]; @@ -44,12 +44,12 @@ [self.view addSubview:_cpuSwitchView]; _memorySwitchView = [[DoraemonCellSwitch alloc] initWithFrame:CGRectMake(0, self.cpuSwitchView.doraemon_bottom, self.view.doraemon_width, kDoraemonSizeFrom750(104))]; - [_memorySwitchView renderUIWithTitle:@"内存" switchOn:[DoraemonAllTestManager shareInstance].memorySwitchOn]; + [_memorySwitchView renderUIWithTitle:DoraemonLocalizedString(@"内存") switchOn:[DoraemonAllTestManager shareInstance].memorySwitchOn]; [_memorySwitchView.switchView addTarget:self action:@selector(switchAction:) forControlEvents:UIControlEventValueChanged]; [self.view addSubview:_memorySwitchView]; _flowSwitchView = [[DoraemonCellSwitch alloc] initWithFrame:CGRectMake(0, self.memorySwitchView.doraemon_bottom, self.view.doraemon_width, kDoraemonSizeFrom750(104))]; - [_flowSwitchView renderUIWithTitle:@"流量" switchOn:[DoraemonAllTestManager shareInstance].flowSwitchOn]; + [_flowSwitchView renderUIWithTitle:DoraemonLocalizedString(@"流量") switchOn:[DoraemonAllTestManager shareInstance].flowSwitchOn]; [_flowSwitchView.switchView addTarget:self action:@selector(switchAction:) forControlEvents:UIControlEventValueChanged]; [self.view addSubview:_flowSwitchView]; diff --git a/iOS/DoraemonKit/Src/Core/Plugin/AppInfo/DoraemonAppInfoCell.m b/iOS/DoraemonKit/Src/Core/Plugin/AppInfo/DoraemonAppInfoCell.m index f8aeda06ff75e46e51128917c8958d247edf6f89..e9f83ad3f8e2534fd2a937291d88a44e146c2d44 100644 --- a/iOS/DoraemonKit/Src/Core/Plugin/AppInfo/DoraemonAppInfoCell.m +++ b/iOS/DoraemonKit/Src/Core/Plugin/AppInfo/DoraemonAppInfoCell.m @@ -45,13 +45,13 @@ NSString *cnValue = nil; if([value isEqualToString:@"NotDetermined"]){ - cnValue = @"用户没有选择"; + cnValue = DoraemonLocalizedString(@"用户没有选择"); }else if([value isEqualToString:@"Restricted"]){ - cnValue = @"家长控制"; + cnValue = DoraemonLocalizedString(@"家长控制"); }else if([value isEqualToString:@"Denied"]){ - cnValue = @"用户没有授权"; + cnValue = DoraemonLocalizedString(@"用户没有授权"); }else if([value isEqualToString:@"Authorized"]){ - cnValue = @"用户已经授权"; + cnValue = DoraemonLocalizedString(@"用户已经授权"); }else{ cnValue = value; } diff --git a/iOS/DoraemonKit/Src/Core/Plugin/CPU/List/DoraemonCPUListViewController.m b/iOS/DoraemonKit/Src/Core/Plugin/CPU/List/DoraemonCPUListViewController.m index 2771a05d81c95d7dd6dafea821417408be3b6335..49e6135ffcf00c8d2a138142989e47a663ed08e2 100644 --- a/iOS/DoraemonKit/Src/Core/Plugin/CPU/List/DoraemonCPUListViewController.m +++ b/iOS/DoraemonKit/Src/Core/Plugin/CPU/List/DoraemonCPUListViewController.m @@ -16,12 +16,12 @@ - (void)viewDidLoad { [super viewDidLoad]; - self.title = @"检测记录"; + self.title = DoraemonLocalizedString(@"检测记录"); UILabel *titleLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, IPHONE_NAVIGATIONBAR_HEIGHT+kDoraemonSizeFrom750(40), self.view.doraemon_width, kDoraemonSizeFrom750(40))]; titleLabel.font = [UIFont systemFontOfSize:kDoraemonSizeFrom750(32)]; titleLabel.textColor = [UIColor doraemon_black_1]; - titleLabel.text = @"正在开发中,敬请期待"; + titleLabel.text = DoraemonLocalizedString(@"正在开发中,敬请期待"); titleLabel.textAlignment = NSTextAlignmentCenter; [self.view addSubview:titleLabel]; } diff --git a/iOS/DoraemonKit/Src/Core/Plugin/DeleteLocalData/DoraemonDeleteLocalDataViewController.m b/iOS/DoraemonKit/Src/Core/Plugin/DeleteLocalData/DoraemonDeleteLocalDataViewController.m index 7428907d25c1f89d41696e9b21d85efb8c5fd659..57d8b1d7c5f48666a9f613842c9ef3e31c9851dd 100644 --- a/iOS/DoraemonKit/Src/Core/Plugin/DeleteLocalData/DoraemonDeleteLocalDataViewController.m +++ b/iOS/DoraemonKit/Src/Core/Plugin/DeleteLocalData/DoraemonDeleteLocalDataViewController.m @@ -24,7 +24,7 @@ self.title = DoraemonLocalizedString(@"清除本地数据"); _cellBtn = [[DoraemonCellButton alloc] initWithFrame:CGRectMake(0, self.bigTitleView.doraemon_bottom, self.view.doraemon_width, kDoraemonSizeFrom750(104))]; - [_cellBtn renderUIWithTitle:@"清除本地数据"]; + [_cellBtn renderUIWithTitle:DoraemonLocalizedString(@"清除本地数据")]; [_cellBtn renderUIWithRightContent:[self getHomeDirFileSize]]; _cellBtn.delegate = self; [_cellBtn needDownLine]; @@ -45,7 +45,7 @@ UIAlertController * alertController = [UIAlertController alertControllerWithTitle:DoraemonLocalizedString(@"提示") message:DoraemonLocalizedString(@"确定要删除本地数据") preferredStyle:UIAlertControllerStyleAlert]; UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:DoraemonLocalizedString(@"取消") style:UIAlertActionStyleCancel handler:nil]; UIAlertAction *okAction = [UIAlertAction actionWithTitle:DoraemonLocalizedString(@"确定") style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) { - [weakSelf.cellBtn renderUIWithRightContent:@"正在清理中"]; + [weakSelf.cellBtn renderUIWithRightContent:DoraemonLocalizedString(@"正在清理中")]; [DoraemonUtil clearLocalDatas]; dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ [weakSelf.cellBtn renderUIWithRightContent:[self getHomeDirFileSize]]; diff --git a/iOS/DoraemonKit/Src/Core/Plugin/FPS/List/DoraemonFPSListViewController.m b/iOS/DoraemonKit/Src/Core/Plugin/FPS/List/DoraemonFPSListViewController.m index 4a94db3df2ea81035961cbfe843b13b2ebdeb508..5afab8b63b4b46326ea5328d6b1e0b8681f1728f 100644 --- a/iOS/DoraemonKit/Src/Core/Plugin/FPS/List/DoraemonFPSListViewController.m +++ b/iOS/DoraemonKit/Src/Core/Plugin/FPS/List/DoraemonFPSListViewController.m @@ -16,12 +16,12 @@ - (void)viewDidLoad { [super viewDidLoad]; - self.title = @"检测记录"; + self.title = DoraemonLocalizedString(@"检测记录"); UILabel *titleLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, IPHONE_NAVIGATIONBAR_HEIGHT+kDoraemonSizeFrom750(40), self.view.doraemon_width, kDoraemonSizeFrom750(40))]; titleLabel.font = [UIFont systemFontOfSize:kDoraemonSizeFrom750(32)]; titleLabel.textColor = [UIColor doraemon_black_1]; - titleLabel.text = @"正在开发中,敬请期待"; + titleLabel.text = DoraemonLocalizedString(@"正在开发中,敬请期待"); titleLabel.textAlignment = NSTextAlignmentCenter; [self.view addSubview:titleLabel]; } diff --git a/iOS/DoraemonKit/Src/Core/Plugin/H5/DoraemonDefaultWebViewController.m b/iOS/DoraemonKit/Src/Core/Plugin/H5/DoraemonDefaultWebViewController.m index 290861f8d92399c2805157e586a5a1185d4b20be..1f65805fc4b52568b911fa6db0acc987b08be39f 100644 --- a/iOS/DoraemonKit/Src/Core/Plugin/H5/DoraemonDefaultWebViewController.m +++ b/iOS/DoraemonKit/Src/Core/Plugin/H5/DoraemonDefaultWebViewController.m @@ -15,7 +15,7 @@ - (void)viewDidLoad { [super viewDidLoad]; - self.title = @"Doraemon内置浏览器"; + self.title = DoraemonLocalizedString(@"Doraemon内置浏览器"); UIWebView * view = [[UIWebView alloc] initWithFrame:self.view.frame]; [view loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:self.h5Url]]]; [self.view addSubview:view]; diff --git a/iOS/DoraemonKit/Src/Core/Plugin/H5/DoraemonH5ViewController.m b/iOS/DoraemonKit/Src/Core/Plugin/H5/DoraemonH5ViewController.m index 8fb95f26a543ead1af86df54c9156774a296788c..33928691339a2762005030afbab20d09c55b62b7 100644 --- a/iOS/DoraemonKit/Src/Core/Plugin/H5/DoraemonH5ViewController.m +++ b/iOS/DoraemonKit/Src/Core/Plugin/H5/DoraemonH5ViewController.m @@ -30,7 +30,7 @@ _h5UrlTextView = [[UITextView alloc] initWithFrame:CGRectMake(0, self.bigTitleView.doraemon_bottom, self.view.doraemon_width, kDoraemonSizeFrom750(358))]; _h5UrlTextView.font = [UIFont systemFontOfSize:kDoraemonSizeFrom750(32)]; - _h5UrlTextView.placeholder = @"请输入网址"; + _h5UrlTextView.placeholder = DoraemonLocalizedString(@"请输入网址"); [self.view addSubview:_h5UrlTextView]; _h5UrlTextView.keyboardType = UIKeyboardTypeURL; _h5UrlTextView.autocorrectionType = UITextAutocorrectionTypeNo; diff --git a/iOS/DoraemonKit/Src/Core/Plugin/Memory/DoraemonMemoryViewController.m b/iOS/DoraemonKit/Src/Core/Plugin/Memory/DoraemonMemoryViewController.m index 065f1aedcb7b192c41216b0ba0769d7db2c13ce6..ec3239a358b4c34dd9a268a246c3c8a084e219d2 100644 --- a/iOS/DoraemonKit/Src/Core/Plugin/Memory/DoraemonMemoryViewController.m +++ b/iOS/DoraemonKit/Src/Core/Plugin/Memory/DoraemonMemoryViewController.m @@ -25,7 +25,7 @@ - (void)viewDidLoad { [super viewDidLoad]; - self.title = @"内存检测"; + self.title = DoraemonLocalizedString(@"内存检测"); _switchView = [[DoraemonCellSwitch alloc] initWithFrame:CGRectMake(0, self.bigTitleView.doraemon_bottom, self.view.doraemon_width, kDoraemonSizeFrom750(104))]; [_switchView renderUIWithTitle:DoraemonLocalizedString(@"内存检测开关") switchOn:[[DoraemonCacheManager sharedInstance] memorySwitch]]; diff --git a/iOS/DoraemonKit/Src/Core/Plugin/Memory/List/DoraemonMemoryListViewController.m b/iOS/DoraemonKit/Src/Core/Plugin/Memory/List/DoraemonMemoryListViewController.m index 6c3d8b7a032222b96833cf967cdc7d2c4a23418b..2165bd770e22cdda40f1263043aa3bc151572091 100644 --- a/iOS/DoraemonKit/Src/Core/Plugin/Memory/List/DoraemonMemoryListViewController.m +++ b/iOS/DoraemonKit/Src/Core/Plugin/Memory/List/DoraemonMemoryListViewController.m @@ -16,12 +16,12 @@ - (void)viewDidLoad { [super viewDidLoad]; - self.title = @"检测记录"; + self.title = DoraemonLocalizedString(@"检测记录"); UILabel *titleLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, IPHONE_NAVIGATIONBAR_HEIGHT+kDoraemonSizeFrom750(40), self.view.doraemon_width, kDoraemonSizeFrom750(40))]; titleLabel.font = [UIFont systemFontOfSize:kDoraemonSizeFrom750(32)]; titleLabel.textColor = [UIColor doraemon_black_1]; - titleLabel.text = @"正在开发中,敬请期待"; + titleLabel.text = DoraemonLocalizedString(@"正在开发中,敬请期待"); titleLabel.textAlignment = NSTextAlignmentCenter; [self.view addSubview:titleLabel]; } diff --git a/iOS/DoraemonKit/Src/Core/Plugin/NSLog/List/DoraemonNSLogListCell.m b/iOS/DoraemonKit/Src/Core/Plugin/NSLog/List/DoraemonNSLogListCell.m index 88d39513d33b65e183732bba2cb1d612b5e4ed85..1257c5dfae8e77360408282a2894aaea0c016bea 100644 --- a/iOS/DoraemonKit/Src/Core/Plugin/NSLog/List/DoraemonNSLogListCell.m +++ b/iOS/DoraemonKit/Src/Core/Plugin/NSLog/List/DoraemonNSLogListCell.m @@ -42,7 +42,7 @@ NSString *log = model.content; NSTimeInterval timeInterval = model.timeInterval; NSString *time = [DoraemonUtil dateFormatTimeInterval:timeInterval]; - content = [NSString stringWithFormat:@"%@\n触发时间: %@",log,time]; + content = [NSString stringWithFormat:DoraemonLocalizedString(@"%@\n触发时间: %@"),log,time]; _logLabel.numberOfLines = 0; _logLabel.text = content; CGSize size = [_logLabel sizeThatFits:CGSizeMake(DoraemonScreenWidth-kDoraemonSizeFrom750(32)*2-kDoraemonSizeFrom750(25)-kDoraemonSizeFrom750(12)*2, MAXFLOAT)]; @@ -66,7 +66,7 @@ NSString *log = model.content; NSTimeInterval timeInterval = model.timeInterval; NSString *time = [DoraemonUtil dateFormatTimeInterval:timeInterval]; - NSString *content = [NSString stringWithFormat:@"%@\n触发时间: %@",log,time]; + NSString *content = [NSString stringWithFormat:DoraemonLocalizedString(@"%@\n触发时间: %@"),log,time]; UILabel *logLabel = [[UILabel alloc] init]; logLabel.textColor = [UIColor doraemon_black_1]; diff --git a/iOS/DoraemonKit/Src/Core/Plugin/NSLog/List/DoraemonNSLogListViewController.m b/iOS/DoraemonKit/Src/Core/Plugin/NSLog/List/DoraemonNSLogListViewController.m index 840f8bdd7739f7ac247f2083ed19bdb59f4f1a73..fd0c143ef75854f091706a9fc376d3b429583850 100644 --- a/iOS/DoraemonKit/Src/Core/Plugin/NSLog/List/DoraemonNSLogListViewController.m +++ b/iOS/DoraemonKit/Src/Core/Plugin/NSLog/List/DoraemonNSLogListViewController.m @@ -25,7 +25,7 @@ - (void)viewDidLoad { [super viewDidLoad]; - self.title = @"NSLog日志记录"; + self.title = DoraemonLocalizedString(@"NSLog日志记录"); //按照时间倒序排列 self.dataArray = [[[DoraemonNSLogManager sharedInstance].dataArray reverseObjectEnumerator] allObjects]; diff --git a/iOS/DoraemonKit/Src/Core/Plugin/NSLog/List/DoraemonNSLogSearchView.m b/iOS/DoraemonKit/Src/Core/Plugin/NSLog/List/DoraemonNSLogSearchView.m index 7ffe713ee1383c813c723b6a34563b8f502ddcf5..cb5d436e0797e6dc2ba77f7df2db40849e6e27a4 100644 --- a/iOS/DoraemonKit/Src/Core/Plugin/NSLog/List/DoraemonNSLogSearchView.m +++ b/iOS/DoraemonKit/Src/Core/Plugin/NSLog/List/DoraemonNSLogSearchView.m @@ -29,7 +29,7 @@ [self addSubview:_searchIcon]; _textField = [[UITextField alloc] initWithFrame:CGRectMake(_searchIcon.doraemon_right+kDoraemonSizeFrom750(20), self.doraemon_height/2-kDoraemonSizeFrom750(50)/2, self.doraemon_width-_searchIcon.doraemon_right-kDoraemonSizeFrom750(20), kDoraemonSizeFrom750(50))]; - _textField.placeholder = @"请输入您要搜索的关键字"; + _textField.placeholder = DoraemonLocalizedString(@"请输入您要搜索的关键字"); [_textField addTarget:self action:@selector(textFieldDidChange:) forControlEvents:UIControlEventEditingChanged]; [self addSubview:_textField]; } diff --git a/iOS/DoraemonKit/Src/Core/Plugin/NetFlow/Detail/DoraemonNetFlowDetailSegment.m b/iOS/DoraemonKit/Src/Core/Plugin/NetFlow/Detail/DoraemonNetFlowDetailSegment.m index d7e33703392dfb0d2b04cc2c96d0e6383e553402..bd40ba8f79b39d62bb587985379732257c38b500 100644 --- a/iOS/DoraemonKit/Src/Core/Plugin/NetFlow/Detail/DoraemonNetFlowDetailSegment.m +++ b/iOS/DoraemonKit/Src/Core/Plugin/NetFlow/Detail/DoraemonNetFlowDetailSegment.m @@ -25,7 +25,7 @@ _leftLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, self.doraemon_width/2, self.doraemon_height)]; _leftLabel.textColor = [UIColor doraemon_colorWithHexString:@"337CC4"]; _leftLabel.font = [UIFont systemFontOfSize:kDoraemonSizeFrom750(32)]; - _leftLabel.text = @"请求"; + _leftLabel.text = DoraemonLocalizedString(@"请求"); _leftLabel.textAlignment = NSTextAlignmentCenter; [self addSubview:_leftLabel]; @@ -36,7 +36,7 @@ _rightLabel = [[UILabel alloc] initWithFrame:CGRectMake(self.doraemon_width/2, 0, self.doraemon_width/2, self.doraemon_height)]; _rightLabel.textColor = [UIColor doraemon_colorWithHexString:@"333333"]; _rightLabel.font = [UIFont systemFontOfSize:kDoraemonSizeFrom750(32)]; - _rightLabel.text = @"响应"; + _rightLabel.text = DoraemonLocalizedString(@"响应"); _rightLabel.textAlignment = NSTextAlignmentCenter; [self addSubview:_rightLabel]; diff --git a/iOS/DoraemonKit/Src/Core/Plugin/NetFlow/TestList/DoraemonNetFlowTestListViewController.m b/iOS/DoraemonKit/Src/Core/Plugin/NetFlow/TestList/DoraemonNetFlowTestListViewController.m index 76cf58514293146bc3620645c42b7df62368bb02..12eb03ca0dd835ed9cfd2cc55b90e741a20f66c6 100644 --- a/iOS/DoraemonKit/Src/Core/Plugin/NetFlow/TestList/DoraemonNetFlowTestListViewController.m +++ b/iOS/DoraemonKit/Src/Core/Plugin/NetFlow/TestList/DoraemonNetFlowTestListViewController.m @@ -16,12 +16,12 @@ - (void)viewDidLoad { [super viewDidLoad]; - self.title = @"检测记录"; + self.title = DoraemonLocalizedString(@"检测记录"); UILabel *titleLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, IPHONE_NAVIGATIONBAR_HEIGHT+kDoraemonSizeFrom750(40), self.view.doraemon_width, kDoraemonSizeFrom750(40))]; titleLabel.font = [UIFont systemFontOfSize:kDoraemonSizeFrom750(32)]; titleLabel.textColor = [UIColor doraemon_black_1]; - titleLabel.text = @"正在开发中,敬请期待"; + titleLabel.text = DoraemonLocalizedString(@"正在开发中,敬请期待"); titleLabel.textAlignment = NSTextAlignmentCenter; [self.view addSubview:titleLabel]; } diff --git a/iOS/DoraemonKit/Src/Core/Plugin/ViewAlign/Function/DoraemonViewAlignView.m b/iOS/DoraemonKit/Src/Core/Plugin/ViewAlign/Function/DoraemonViewAlignView.m index c971bee3bbc25188870b9419a6be48d3441f2286..7c57ef0be301f606619a06728ec6a9d4d7f46266 100644 --- a/iOS/DoraemonKit/Src/Core/Plugin/ViewAlign/Function/DoraemonViewAlignView.m +++ b/iOS/DoraemonKit/Src/Core/Plugin/ViewAlign/Function/DoraemonViewAlignView.m @@ -143,7 +143,7 @@ static CGFloat const kViewCheckSize = 62; } - (void)configInfoLblText { - _infoWindow.infoText = [NSString stringWithFormat:@"位置：左%@ 右%@ 上%@ 下%@", _leftLabel.text, _rightLabel.text, _topLabel.text, _bottomLabel.text]; + _infoWindow.infoText = [NSString stringWithFormat:DoraemonLocalizedString(@"位置：左%@ 右%@ 上%@ 下%@"), _leftLabel.text, _rightLabel.text, _topLabel.text, _bottomLabel.text]; } diff --git a/iOS/DoraemonKit/Src/Core/Plugin/ViewCheck/Function/DoraemonViewCheckView.m b/iOS/DoraemonKit/Src/Core/Plugin/ViewCheck/Function/DoraemonViewCheckView.m index 953cfc89878cc3145dcac19d55ac4a8ace1b5e1e..63b5f74aafb03d9e3eb9ba823cde3b4b592e0130 100644 --- a/iOS/DoraemonKit/Src/Core/Plugin/ViewCheck/Function/DoraemonViewCheckView.m +++ b/iOS/DoraemonKit/Src/Core/Plugin/ViewCheck/Function/DoraemonViewCheckView.m @@ -150,7 +150,7 @@ static CGFloat const kViewCheckSize = 62; -(NSMutableAttributedString *)viewInfo:(UIView *)view{ if (view) { NSMutableString *showString = [[NSMutableString alloc] init]; - NSString *tempString = [NSString stringWithFormat:DoraemonLocalizedString(@"控件名称：%@"),NSStringFromClass([view class])]; + NSString *tempString = [NSString stringWithFormat:@"%@:%@",DoraemonLocalizedString(@"控件名称"),NSStringFromClass([view class])]; [showString appendString:tempString]; tempString = [NSString stringWithFormat:DoraemonLocalizedString(@"\n控件位置：左%0.1lf 上%0.1lf 宽%0.1lf 高%0.1lf"),view.frame.origin.x,view.frame.origin.y,view.frame.size.width,view.frame.size.height]; diff --git a/iOS/DoraemonKit/Src/Core/Util/Doraemoni18NUtil.m b/iOS/DoraemonKit/Src/Core/Util/Doraemoni18NUtil.m index 1e62e662d60a0ceb8e10797c5e7628b58562cb37..6d92c87382ef77a84577330bb461622ca7242a1e 100644 --- a/iOS/DoraemonKit/Src/Core/Util/Doraemoni18NUtil.m +++ b/iOS/DoraemonKit/Src/Core/Util/Doraemoni18NUtil.m @@ -7,38 +7,17 @@ #import "Doraemoni18NUtil.h" -NSString *const DoraemonlanguageZHCN = @"zh-CN";/**< 中文(大陆) */ -NSString *const DoraemonlanguageZHHansCN = @"zh-Hans-CN";/**< 中文(大陆)简体中文 */ -NSString *const DoraemonlanguageENUS = @"en-US";/**< 英语(美国) */ -NSString *const DoraemonlanguageENCN = @"en-CN";/**< 英语(美国) */ -NSString *const DoraemonlanguageZHHK = @"zh-HK";/**< 中文(香港)*/ - -NSDictionary *DoraemonLanguageCode_ISO639CodeMap() { - NSDictionary *dict = @{DoraemonlanguageZHCN:@"zh-Hans" - ,DoraemonlanguageZHHansCN:@"zh-Hans" - ,DoraemonlanguageZHHK:@"zh-Han" - ,DoraemonlanguageENUS:@"en" - ,DoraemonlanguageENCN:@"en"}; - return dict; -} - @implementation Doraemoni18NUtil + (NSString *)localizedString:(NSString *)key { - return key; - //暂时不支持国际化 NSString *language = [[NSLocale preferredLanguages] firstObject]; if (language.length == 0) { return key; } - NSString *fileNamePrefix = DoraemonLanguageCode_ISO639CodeMap()[language]; - if (fileNamePrefix.length == 0) { - if ([language hasPrefix:@"zh-"]) { - fileNamePrefix = @"zh-Hans"; - } else if ([language hasPrefix:@"en-"]) { - fileNamePrefix = @"en"; - } + NSString *fileNamePrefix = @"zh-Hans"; + if([language hasPrefix:@"en"]) { + fileNamePrefix = @"en"; } NSBundle *tmp = [NSBundle bundleWithPath:[[[NSBundle mainBundle] resourcePath] stringByAppendingPathComponent:[NSString stringWithFormat:@"%@.bundle/", @"DoraemonKit"]]]; NSString *path = [tmp pathForResource:fileNamePrefix ofType:@"lproj"]; diff --git a/iOS/DoraemonKit/Src/GPS/DoraemonGPSViewController.m b/iOS/DoraemonKit/Src/GPS/DoraemonGPSViewController.m index bd9b088dd11e836385c56a69b582ec485d0e258c..ad12938bf66b69918679fab9e37a5ba09d9a43b4 100644 --- a/iOS/DoraemonKit/Src/GPS/DoraemonGPSViewController.m +++ b/iOS/DoraemonKit/Src/GPS/DoraemonGPSViewController.m @@ -137,7 +137,7 @@ CLLocation *loc = [[CLLocation alloc] initWithLatitude:coordinate.latitude longitude:coordinate.longitude]; [[DoraemonGPSMocker shareInstance] mockPoint:loc]; }else{ - [DoraemonToastUtil showToast:@"格式不正确"]; + [DoraemonToastUtil showToast:DoraemonLocalizedString(@"格式不正确")]; return; } diff --git a/iOS/DoraemonKit/Src/GPS/View/DoraemonMockGPSInputView.m b/iOS/DoraemonKit/Src/GPS/View/DoraemonMockGPSInputView.m index a934b58f29f4aaa109ca647bcb20decaa0704894..b05e11dec1578dfa5d0bb0187570d92ded5a738b 100644 --- a/iOS/DoraemonKit/Src/GPS/View/DoraemonMockGPSInputView.m +++ b/iOS/DoraemonKit/Src/GPS/View/DoraemonMockGPSInputView.m @@ -27,7 +27,7 @@ self.layer.cornerRadius = kDoraemonSizeFrom750(8); _textField = [[UITextField alloc] initWithFrame:CGRectMake(kDoraemonSizeFrom750(32), kDoraemonSizeFrom750(40), self.doraemon_width-2*kDoraemonSizeFrom750(32), kDoraemonSizeFrom750(45))]; - _textField.placeholder = @"请输入经纬度"; + _textField.placeholder = DoraemonLocalizedString(@"请输入经纬度"); [_textField addTarget:self action:@selector(textFieldDidChange:) forControlEvents:UIControlEventEditingChanged]; [self addSubview:_textField]; @@ -44,7 +44,7 @@ _exampleLabel = [[UILabel alloc] initWithFrame:CGRectMake(kDoraemonSizeFrom750(32),_lineView.doraemon_bottom+kDoraemonSizeFrom750(15), self.doraemon_width-kDoraemonSizeFrom750(32), kDoraemonSizeFrom750(33))]; _exampleLabel.textColor = [UIColor doraemon_black_3]; _exampleLabel.font = [UIFont systemFontOfSize:kDoraemonSizeFrom750(24)]; - _exampleLabel.text = @"(示例: 120.15 30.28)"; + _exampleLabel.text = DoraemonLocalizedString(@"(示例: 120.15 30.28)"); [self addSubview:_exampleLabel]; } return self; diff --git a/iOS/DoraemonKit/Src/GPS/View/DoraemonMockGPSOperateView.m b/iOS/DoraemonKit/Src/GPS/View/DoraemonMockGPSOperateView.m index 12d6996859dfc94d84d560557cad5f7c970cf136..22aa6c72dd12ec20811d0d273be889993f853f5b 100644 --- a/iOS/DoraemonKit/Src/GPS/View/DoraemonMockGPSOperateView.m +++ b/iOS/DoraemonKit/Src/GPS/View/DoraemonMockGPSOperateView.m @@ -25,7 +25,7 @@ _titleLabel = [[UILabel alloc] init]; _titleLabel.font = [UIFont systemFontOfSize:kDoraemonSizeFrom750(32)]; _titleLabel.textColor = [UIColor doraemon_black_1]; - _titleLabel.text = @"打开Mock GPS"; + _titleLabel.text = DoraemonLocalizedString(@"打开Mock GPS"); [self addSubview:_titleLabel]; [_titleLabel sizeToFit]; _titleLabel.frame = CGRectMake(kDoraemonSizeFrom750(32), self.doraemon_height/2-_titleLabel.doraemon_height/2, _titleLabel.doraemon_width, _titleLabel.doraemon_height); diff --git a/iOS/DoraemonKit/Src/Logger/List/DoraemonCocoaLumberjackListCell.m b/iOS/DoraemonKit/Src/Logger/List/DoraemonCocoaLumberjackListCell.m index ac78554fc93ef87f96fb8b321538eb26ad6936ef..80633e6aa04f296b253b6e5efc8e3d718eb0b568 100644 --- a/iOS/DoraemonKit/Src/Logger/List/DoraemonCocoaLumberjackListCell.m +++ b/iOS/DoraemonKit/Src/Logger/List/DoraemonCocoaLumberjackListCell.m @@ -41,7 +41,7 @@ if (model && model.expand){ NSString *log = model.message; NSString *time = [DoraemonUtil dateFormatNSDate:model.timestamp]; - content = [NSString stringWithFormat:@"%@\n触发时间: %@\n文件名称: %@\n所在行: %zi\n线程id: %@ \n线程名称: %@",log,time,model.fileName,model.line,model.threadId,model.threadName]; + content = [NSString stringWithFormat:DoraemonLocalizedString(@"%@\n触发时间: %@\n文件名称: %@\n所在行: %zi\n线程id: %@ \n线程名称: %@"),log,time,model.fileName,model.line,model.threadId,model.threadName]; _logLabel.numberOfLines = 0; _logLabel.text = content; CGSize size = [_logLabel sizeThatFits:CGSizeMake(DoraemonScreenWidth-kDoraemonSizeFrom750(32)*2-kDoraemonSizeFrom750(25)-kDoraemonSizeFrom750(12)*2, MAXFLOAT)]; @@ -64,7 +64,7 @@ if (model && model.expand) { NSString *log = model.message; NSString *time = [DoraemonUtil dateFormatNSDate:model.timestamp]; - NSString *content = [NSString stringWithFormat:@"%@\n触发时间: %@\n文件名称: %@\n所在行: %zi\n线程id: %@\n线程名称: %@ ",log,time,model.fileName,model.line,model.threadId,model.threadName]; + NSString *content = [NSString stringWithFormat:DoraemonLocalizedString(@"%@\n触发时间: %@\n文件名称: %@\n所在行: %zi\n线程id: %@\n线程名称: %@ "),log,time,model.fileName,model.line,model.threadId,model.threadName]; UILabel *logLabel = [[UILabel alloc] init]; logLabel.textColor = [UIColor doraemon_black_1]; diff --git a/iOS/DoraemonKit/Src/Logger/List/DoraemonCocoaLumberjackListViewController.m b/iOS/DoraemonKit/Src/Logger/List/DoraemonCocoaLumberjackListViewController.m index e0de5aa4db789129d6e98e628b768939b3638e9b..9025eba9044142cca4e2785b5f87b0c4e7773c60 100644 --- a/iOS/DoraemonKit/Src/Logger/List/DoraemonCocoaLumberjackListViewController.m +++ b/iOS/DoraemonKit/Src/Logger/List/DoraemonCocoaLumberjackListViewController.m @@ -28,7 +28,7 @@ - (void)viewDidLoad { [super viewDidLoad]; - self.title = @"CocoaLumberjack日志记录"; + self.title = DoraemonLocalizedString(@"CocoaLumberjack日志记录"); self.origArray = [NSArray arrayWithArray:[DoraemonCocoaLumberjackLogger sharedInstance].messages]; self.dataArray = [NSArray arrayWithArray:self.origArray]; diff --git a/iOS/DoraemonKitDemo/DoraemonKitDemo/AppDelegate.m b/iOS/DoraemonKitDemo/DoraemonKitDemo/AppDelegate.m index 59000e09a910dfc26beca97bbbf1ec100bb4bda1..423a96420080717aad50e1989846c487a3a6df3c 100644 --- a/iOS/DoraemonKitDemo/DoraemonKitDemo/AppDelegate.m +++ b/iOS/DoraemonKitDemo/DoraemonKitDemo/AppDelegate.m @@ -9,6 +9,7 @@ #import "AppDelegate.h" #import #import "DoraemonDemoHomeViewController.h" +#import "Doraemoni18NUtil.h" //#import @interface AppDelegate () @@ -25,7 +26,7 @@ for (int i=0; i<10; i++) { //DDLogInfo(@"点击添加埋点11111"); } - [[DoraemonManager shareInstance] addPluginWithTitle:@"测试插件" icon:@"doraemon_default" desc:@"测试插件" pluginName:@"TestPlugin" atModule:@"业务工具"]; + [[DoraemonManager shareInstance] addPluginWithTitle:DoraemonLocalizedString(@"测试插件") icon:@"doraemon_default" desc:DoraemonLocalizedString(@"测试插件") pluginName:@"TestPlugin" atModule:DoraemonLocalizedString(@"业务工具")]; [[DoraemonManager shareInstance] addStartPlugin:@"StartPlugin"]; [[DoraemonManager shareInstance] install]; diff --git a/iOS/DoraemonKitDemo/DoraemonKitDemo/DemoVC/Common/DoraemonDemoCommonViewController.m b/iOS/DoraemonKitDemo/DoraemonKitDemo/DemoVC/Common/DoraemonDemoCommonViewController.m index b0c2ac0a616d42f54a667652bdbd3d043b941326..b540421c1c76b6ec79581528020c8671ae72110d 100644 --- a/iOS/DoraemonKitDemo/DoraemonKitDemo/DemoVC/Common/DoraemonDemoCommonViewController.m +++ b/iOS/DoraemonKitDemo/DoraemonKitDemo/DemoVC/Common/DoraemonDemoCommonViewController.m @@ -18,11 +18,11 @@ - (void)viewDidLoad { [super viewDidLoad]; - self.title = @"通用测试"; + self.title = DoraemonLocalizedString(@"通用测试"); UIButton *btn0 = [[UIButton alloc] initWithFrame:CGRectMake(0, IPHONE_NAVIGATIONBAR_HEIGHT, self.view.doraemon_width, 60)]; btn0.backgroundColor = [UIColor orangeColor]; - [btn0 setTitle:@"子线程UI操作" forState:UIControlStateNormal]; + [btn0 setTitle:DoraemonLocalizedString(@"子线程UI操作") forState:UIControlStateNormal]; [btn0 addTarget:self action:@selector(addSubViewAtOtherThread) forControlEvents:UIControlEventTouchUpInside]; [self.view addSubview:btn0]; diff --git a/iOS/DoraemonKitDemo/DoraemonKitDemo/DemoVC/Crash/DoraemonDemoCrashViewController.m b/iOS/DoraemonKitDemo/DoraemonKitDemo/DemoVC/Crash/DoraemonDemoCrashViewController.m index 409b28382cbef4c886116a3db161c72484f29da0..a91c872bfb614908642e701e59de366f61961040 100644 --- a/iOS/DoraemonKitDemo/DoraemonKitDemo/DemoVC/Crash/DoraemonDemoCrashViewController.m +++ b/iOS/DoraemonKitDemo/DoraemonKitDemo/DemoVC/Crash/DoraemonDemoCrashViewController.m @@ -34,7 +34,7 @@ typedef struct Test [super viewDidLoad]; // Do any additional setup after loading the view. - self.title = @"crash查看"; + self.title = DoraemonLocalizedString(@"crash查看"); [self.view addSubview:self.uncaughtExceptionBtn]; [self.view addSubview:self.signalExceptionBtn]; diff --git a/iOS/DoraemonKitDemo/DoraemonKitDemo/DemoVC/Home/DoraemonDemoHomeViewController.m b/iOS/DoraemonKitDemo/DoraemonKitDemo/DemoVC/Home/DoraemonDemoHomeViewController.m index 262ab526502b0c1a7911b9192a91a8f22453069e..0b3a153a7968ecb705487693a96bea4cf397189f 100644 --- a/iOS/DoraemonKitDemo/DoraemonKitDemo/DemoVC/Home/DoraemonDemoHomeViewController.m +++ b/iOS/DoraemonKitDemo/DoraemonKitDemo/DemoVC/Home/DoraemonDemoHomeViewController.m @@ -16,6 +16,7 @@ #import "DoraemonDemoCrashViewController.h" #import "DoraemonDemoCommonViewController.h" #import +#import "Doraemoni18NUtil.h" @interface DoraemonDemoHomeViewController () @@ -25,7 +26,7 @@ - (void)viewDidLoad { [super viewDidLoad]; - self.title = @"DoraemonKit"; + self.title = DoraemonLocalizedString(@"DoraemonKit"); self.navigationItem.leftBarButtonItems = nil; UITableView *tableView = [[UITableView alloc] initWithFrame:self.view.bounds]; @@ -47,21 +48,21 @@ NSString *txt = nil; NSInteger row = indexPath.row; if (row==0) { - txt = @"沙盒测试Demo"; + txt = DoraemonLocalizedString(@"沙盒测试Demo"); }else if(row==1){ - txt = @"日记测试Demo"; + txt = DoraemonLocalizedString(@"日记测试Demo"); }else if(row==2){ - txt = @"性能测试Demo"; + txt = DoraemonLocalizedString(@"性能测试Demo"); }else if(row==3){ - txt = @"视觉测试Demo"; + txt = DoraemonLocalizedString(@"视觉测试Demo"); }else if(row==4){ - txt = @"网络测试Demo"; + txt = DoraemonLocalizedString(@"网络测试Demo"); }else if(row==5){ - txt = @"模拟位置Demo"; + txt = DoraemonLocalizedString(@"模拟位置Demo"); }else if(row==6){ - txt = @"crash触发Demo"; + txt = DoraemonLocalizedString(@"crash触发Demo"); }else if(row==7){ - txt = @"通用测试Demo"; + txt = DoraemonLocalizedString(@"通用测试Demo"); } cell.textLabel.text = txt; return cell; diff --git a/iOS/DoraemonKitDemo/DoraemonKitDemo/DemoVC/Logger/DoraemonDemoLoggerViewController.m b/iOS/DoraemonKitDemo/DoraemonKitDemo/DemoVC/Logger/DoraemonDemoLoggerViewController.m index 32f8d44a4cbec2532b875d8188765b8b2014b4ee..4cddcc2d5797d7a7591a5b99d4d9a31082963d28 100644 --- a/iOS/DoraemonKitDemo/DoraemonKitDemo/DemoVC/Logger/DoraemonDemoLoggerViewController.m +++ b/iOS/DoraemonKitDemo/DoraemonKitDemo/DemoVC/Logger/DoraemonDemoLoggerViewController.m @@ -19,17 +19,17 @@ - (void)viewDidLoad { [super viewDidLoad]; - self.title = @"日记测试Demo"; + self.title = DoraemonLocalizedString(@"日记测试Demo"); UIButton *btn = [[UIButton alloc] initWithFrame:CGRectMake(0, IPHONE_NAVIGATIONBAR_HEIGHT, self.view.doraemon_width, 60)]; btn.backgroundColor = [UIColor orangeColor]; - [btn setTitle:@"添加一条CocoaLumberjack日志" forState:UIControlStateNormal]; + [btn setTitle:DoraemonLocalizedString(@"添加一条CocoaLumberjack日志") forState:UIControlStateNormal]; [btn addTarget:self action:@selector(addLogger) forControlEvents:UIControlEventTouchUpInside]; [self.view addSubview:btn]; UIButton *btn_2 = [[UIButton alloc] initWithFrame:CGRectMake(0, btn.doraemon_bottom+20, self.view.doraemon_width, 60)]; btn_2.backgroundColor = [UIColor orangeColor]; - [btn_2 setTitle:@"添加一条NSLog日志" forState:UIControlStateNormal]; + [btn_2 setTitle:DoraemonLocalizedString(@"添加一条NSLog日志") forState:UIControlStateNormal]; [btn_2 addTarget:self action:@selector(addLogger2) forControlEvents:UIControlEventTouchUpInside]; [self.view addSubview:btn_2]; } diff --git a/iOS/DoraemonKitDemo/DoraemonKitDemo/DemoVC/MockGPS/DoraemonDemoMockGPSViewController.m b/iOS/DoraemonKitDemo/DoraemonKitDemo/DemoVC/MockGPS/DoraemonDemoMockGPSViewController.m index ac0f08f7bf796205e15d2c2004e75152fef05781..5d5670d3bdf01c6c2086476d6f7b4c43aa43d529 100644 --- a/iOS/DoraemonKitDemo/DoraemonKitDemo/DemoVC/MockGPS/DoraemonDemoMockGPSViewController.m +++ b/iOS/DoraemonKitDemo/DoraemonKitDemo/DemoVC/MockGPS/DoraemonDemoMockGPSViewController.m @@ -25,7 +25,7 @@ - (void)viewDidLoad { [super viewDidLoad]; - self.title = @"模拟位置"; + self.title = DoraemonLocalizedString(@"模拟位置"); //初始化地图 MKMapView *mapView = [[MKMapView alloc] initWithFrame:CGRectMake(0, IPHONE_NAVIGATIONBAR_HEIGHT, self.view.doraemon_width, self.view.doraemon_height)]; diff --git a/iOS/DoraemonKitDemo/DoraemonKitDemo/DemoVC/Net/DoraemonDemoNetViewController.m b/iOS/DoraemonKitDemo/DoraemonKitDemo/DemoVC/Net/DoraemonDemoNetViewController.m index f763e684174efa672ce45f6821ec91489601219a..eb96e4a7f34fa4cfb24f36d7ab184ca843f27f21 100644 --- a/iOS/DoraemonKitDemo/DoraemonKitDemo/DemoVC/Net/DoraemonDemoNetViewController.m +++ b/iOS/DoraemonKitDemo/DoraemonKitDemo/DemoVC/Net/DoraemonDemoNetViewController.m @@ -30,45 +30,45 @@ - (void)viewDidLoad { [super viewDidLoad]; - self.title = @"网络测试Demo"; + self.title = DoraemonLocalizedString(@"网络测试Demo"); UIButton *btn0 = [[UIButton alloc] initWithFrame:CGRectMake(0, IPHONE_NAVIGATIONBAR_HEIGHT, self.view.doraemon_width, 60)]; btn0.backgroundColor = [UIColor orangeColor]; - [btn0 setTitle:@"发送一条URLConnection请求" forState:UIControlStateNormal]; + [btn0 setTitle:DoraemonLocalizedString(@"发送一条URLConnection请求") forState:UIControlStateNormal]; [btn0 addTarget:self action:@selector(netForURLConnection) forControlEvents:UIControlEventTouchUpInside]; [self.view addSubview:btn0]; _btn0 = btn0; UIButton *btn1 = [[UIButton alloc] initWithFrame:CGRectMake(0, btn0.doraemon_bottom+20, self.view.doraemon_width, 60)]; btn1.backgroundColor = [UIColor orangeColor]; - [btn1 setTitle:@"发送一条NSURLSession请求" forState:UIControlStateNormal]; + [btn1 setTitle:DoraemonLocalizedString(@"发送一条NSURLSession请求") forState:UIControlStateNormal]; [btn1 addTarget:self action:@selector(netForNSURLSession) forControlEvents:UIControlEventTouchUpInside]; [self.view addSubview:btn1]; _btn1 = btn1; UIButton *btn2 = [[UIButton alloc] initWithFrame:CGRectMake(0, btn1.doraemon_bottom+20, self.view.doraemon_width, 60)]; btn2.backgroundColor = [UIColor orangeColor]; - [btn2 setTitle:@"发送一条AFNetworking请求" forState:UIControlStateNormal]; + [btn2 setTitle:DoraemonLocalizedString(@"发送一条AFNetworking请求") forState:UIControlStateNormal]; [btn2 addTarget:self action:@selector(netForAFNetworking) forControlEvents:UIControlEventTouchUpInside]; [self.view addSubview:btn2]; _btn2 = btn2; UIButton *btn3 = [[UIButton alloc] initWithFrame:CGRectMake(0, btn2.doraemon_bottom+20, self.view.doraemon_width, 60)]; btn3.backgroundColor = [UIColor orangeColor]; - [btn3 setTitle:@"发送一条AFNetworking请求2" forState:UIControlStateNormal]; + [btn3 setTitle:DoraemonLocalizedString(@"发送一条AFNetworking请求2") forState:UIControlStateNormal]; [btn3 addTarget:self action:@selector(netForAFNetworking2) forControlEvents:UIControlEventTouchUpInside]; [self.view addSubview:btn3]; _btn3 = btn3; UIButton *btn4 = [[UIButton alloc] initWithFrame:CGRectMake(0, btn3.doraemon_bottom+20, self.view.doraemon_width, 60)]; btn4.backgroundColor = [UIColor orangeColor]; - [btn4 setTitle:@"打开UIWebView" forState:UIControlStateNormal]; + [btn4 setTitle:DoraemonLocalizedString(@"打开UIWebView") forState:UIControlStateNormal]; [btn4 addTarget:self action:@selector(openUIWebView) forControlEvents:UIControlEventTouchUpInside]; [self.view addSubview:btn4]; UIButton *btn5 = [[UIButton alloc] initWithFrame:CGRectMake(0, btn4.doraemon_bottom+20, self.view.doraemon_width, 60)]; btn5.backgroundColor = [UIColor orangeColor]; - [btn5 setTitle:@"打开WKWebView" forState:UIControlStateNormal]; + [btn5 setTitle:DoraemonLocalizedString(@"打开WKWebView") forState:UIControlStateNormal]; [btn5 addTarget:self action:@selector(openWKWebView) forControlEvents:UIControlEventTouchUpInside]; [self.view addSubview:btn5]; diff --git a/iOS/DoraemonKitDemo/DoraemonKitDemo/DemoVC/Net/WebView/DoraemonUIWebViewViewController.m b/iOS/DoraemonKitDemo/DoraemonKitDemo/DemoVC/Net/WebView/DoraemonUIWebViewViewController.m index 65b4a87db968a063b7d21386dccb38bf72649564..a2fa1fe6477df41a366114d6f94b02d6c5882f12 100644 --- a/iOS/DoraemonKitDemo/DoraemonKitDemo/DemoVC/Net/WebView/DoraemonUIWebViewViewController.m +++ b/iOS/DoraemonKitDemo/DoraemonKitDemo/DemoVC/Net/WebView/DoraemonUIWebViewViewController.m @@ -7,6 +7,7 @@ // #import "DoraemonUIWebViewViewController.h" +#import "Doraemoni18NUtil.h" @interface DoraemonUIWebViewViewController () @@ -17,7 +18,7 @@ - (void)viewDidLoad { [super viewDidLoad]; - self.title = @"UIWebView"; + self.title = DoraemonLocalizedString(@"UIWebView"); UIWebView * view = [[UIWebView alloc] initWithFrame:self.view.frame]; [view loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:@"https://www.baidu.com"]]]; [self.view addSubview:view]; diff --git a/iOS/DoraemonKitDemo/DoraemonKitDemo/DemoVC/Net/WebView/DoraemonWKWebViewViewController.m b/iOS/DoraemonKitDemo/DoraemonKitDemo/DemoVC/Net/WebView/DoraemonWKWebViewViewController.m index 0ebba9c096770ac372919bbdf788a10f30dc1fef..ad50653b24cea32007326492842cbf3af74a7cd4 100644 --- a/iOS/DoraemonKitDemo/DoraemonKitDemo/DemoVC/Net/WebView/DoraemonWKWebViewViewController.m +++ b/iOS/DoraemonKitDemo/DoraemonKitDemo/DemoVC/Net/WebView/DoraemonWKWebViewViewController.m @@ -8,7 +8,7 @@ #import "DoraemonWKWebViewViewController.h" #import - +#import "Doraemoni18NUtil.h" @interface DoraemonWKWebViewViewController () @@ -19,7 +19,7 @@ - (void)viewDidLoad { [super viewDidLoad]; - self.title = @"WKWebView"; + self.title = DoraemonLocalizedString(@"WKWebView"); WKWebView *webView = [[WKWebView alloc]initWithFrame:self.view.frame]; [webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:@"https://www.baidu.com"]]]; [self.view addSubview:webView]; diff --git a/iOS/DoraemonKitDemo/DoraemonKitDemo/DemoVC/Performance/DoraemonDemoPerformanceViewController.m b/iOS/DoraemonKitDemo/DoraemonKitDemo/DemoVC/Performance/DoraemonDemoPerformanceViewController.m index 43d6a6cad77c34f1e20ab932cd4565793fe22bea..b7e89efc2c79c75b7c13fa92a58dde977b3fd57d 100644 --- a/iOS/DoraemonKitDemo/DoraemonKitDemo/DemoVC/Performance/DoraemonDemoPerformanceViewController.m +++ b/iOS/DoraemonKitDemo/DoraemonKitDemo/DemoVC/Performance/DoraemonDemoPerformanceViewController.m @@ -32,42 +32,42 @@ - (void)viewDidLoad { [super viewDidLoad]; - self.title = @"性能测试Demo"; + self.title = DoraemonLocalizedString(@"性能测试Demo"); _highCPU = NO; _highMemory = NO; UIButton *btn0 = [[UIButton alloc] initWithFrame:CGRectMake(0, IPHONE_NAVIGATIONBAR_HEIGHT, self.view.doraemon_width, 60)]; btn0.backgroundColor = [UIColor orangeColor]; - [btn0 setTitle:@"低FPS操作打开" forState:UIControlStateNormal]; + [btn0 setTitle:DoraemonLocalizedString(@"低FPS操作打开") forState:UIControlStateNormal]; [btn0 addTarget:self action:@selector(fpsClick) forControlEvents:UIControlEventTouchUpInside]; [self.view addSubview:btn0]; _btn0 = btn0; UIButton *btn1 = [[UIButton alloc] initWithFrame:CGRectMake(0, btn0.doraemon_bottom+20, self.view.doraemon_width, 60)]; btn1.backgroundColor = [UIColor orangeColor]; - [btn1 setTitle:@"高CPU操作打开" forState:UIControlStateNormal]; + [btn1 setTitle:DoraemonLocalizedString(@"高CPU操作打开") forState:UIControlStateNormal]; [btn1 addTarget:self action:@selector(cpuClick) forControlEvents:UIControlEventTouchUpInside]; [self.view addSubview:btn1]; _btn1 = btn1; UIButton *btn2 = [[UIButton alloc] initWithFrame:CGRectMake(0, btn1.doraemon_bottom+20, self.view.doraemon_width, 60)]; btn2.backgroundColor = [UIColor orangeColor]; - [btn2 setTitle:@"高内存操作打开" forState:UIControlStateNormal]; + [btn2 setTitle:DoraemonLocalizedString(@"高内存操作打开") forState:UIControlStateNormal]; [btn2 addTarget:self action:@selector(memoryClick) forControlEvents:UIControlEventTouchUpInside]; [self.view addSubview:btn2]; _btn2 = btn2; UIButton *btn3 = [[UIButton alloc] initWithFrame:CGRectMake(0, btn2.doraemon_bottom+20, self.view.doraemon_width, 60)]; btn3.backgroundColor = [UIColor orangeColor]; - [btn3 setTitle:@"高流量操作打开" forState:UIControlStateNormal]; + [btn3 setTitle:DoraemonLocalizedString(@"高流量操作打开") forState:UIControlStateNormal]; [btn3 addTarget:self action:@selector(flowClick) forControlEvents:UIControlEventTouchUpInside]; [self.view addSubview:btn3]; _btn3 = btn3; UIButton *btn4 = [[UIButton alloc] initWithFrame:CGRectMake(0, btn3.doraemon_bottom+20, self.view.doraemon_width, 60)]; btn4.backgroundColor = [UIColor orangeColor]; - [btn4 setTitle:@"卡顿操作打开" forState:UIControlStateNormal]; + [btn4 setTitle:DoraemonLocalizedString(@"卡顿操作打开") forState:UIControlStateNormal]; [btn4 addTarget:self action:@selector(anrClick) forControlEvents:UIControlEventTouchUpInside]; [self.view addSubview:btn4]; _btn4 = btn4; @@ -92,12 +92,12 @@ _cpuThread.name = @"HighCPUThread"; [_cpuThread start]; - [_btn1 setTitle:@"高CPU操作关闭" forState:UIControlStateNormal]; + [_btn1 setTitle:DoraemonLocalizedString(@"高CPU操作关闭") forState:UIControlStateNormal]; }else{ [_cpuThread cancel]; _cpuThread = nil; - [_btn1 setTitle:@"高CPU操作打开" forState:UIControlStateNormal]; + [_btn1 setTitle:DoraemonLocalizedString(@"高CPU操作打开") forState:UIControlStateNormal]; } } @@ -108,12 +108,12 @@ _memoryThread.name = @"HighMemoryThread"; [_memoryThread start]; - [_btn2 setTitle:@"高内存操作关闭" forState:UIControlStateNormal]; + [_btn2 setTitle:DoraemonLocalizedString(@"高内存操作关闭") forState:UIControlStateNormal]; }else{ [_memoryThread cancel]; _memoryThread = nil; - [_btn2 setTitle:@"高内存操作打开" forState:UIControlStateNormal]; + [_btn2 setTitle:DoraemonLocalizedString(@"高内存操作打开") forState:UIControlStateNormal]; } } diff --git a/iOS/DoraemonKitDemo/DoraemonKitDemo/DemoVC/Sanbox/DoraemonDemoSanboxViewController.m b/iOS/DoraemonKitDemo/DoraemonKitDemo/DemoVC/Sanbox/DoraemonDemoSanboxViewController.m index f1f3c716050ca57c9f1b890e78c09a2833e4def7..25e4be9b8ac4f0fdb276c6ce80e1594361db4904 100644 --- a/iOS/DoraemonKitDemo/DoraemonKitDemo/DemoVC/Sanbox/DoraemonDemoSanboxViewController.m +++ b/iOS/DoraemonKitDemo/DoraemonKitDemo/DemoVC/Sanbox/DoraemonDemoSanboxViewController.m @@ -19,41 +19,41 @@ - (void)viewDidLoad { [super viewDidLoad]; - self.title = @"沙盒测试Demo"; + self.title = DoraemonLocalizedString(@"沙盒测试Demo"); UIButton *btn = [[UIButton alloc] initWithFrame:CGRectMake(0, IPHONE_NAVIGATIONBAR_HEIGHT, self.view.doraemon_width, 60)]; btn.backgroundColor = [UIColor orangeColor]; - [btn setTitle:@"添加一条json到沙盒中" forState:UIControlStateNormal]; + [btn setTitle:DoraemonLocalizedString(@"添加一条json到沙盒中") forState:UIControlStateNormal]; [btn addTarget:self action:@selector(addFile) forControlEvents:UIControlEventTouchUpInside]; [self.view addSubview:btn]; UIButton *btn1 = [[UIButton alloc] initWithFrame:CGRectMake(0, btn.doraemon_bottom+20, self.view.doraemon_width, 60)]; btn1.backgroundColor = [UIColor orangeColor]; - [btn1 setTitle:@"添加一张图片到沙盒中" forState:UIControlStateNormal]; + [btn1 setTitle:DoraemonLocalizedString(@"添加一张图片到沙盒中") forState:UIControlStateNormal]; [btn1 addTarget:self action:@selector(addImageFile) forControlEvents:UIControlEventTouchUpInside]; [self.view addSubview:btn1]; UIButton *btn2 = [[UIButton alloc] initWithFrame:CGRectMake(0, btn1.doraemon_bottom+20, self.view.doraemon_width, 60)]; btn2.backgroundColor = [UIColor orangeColor]; - [btn2 setTitle:@"添加一段mp4到沙盒中" forState:UIControlStateNormal]; + [btn2 setTitle:DoraemonLocalizedString(@"添加一段mp4到沙盒中") forState:UIControlStateNormal]; [btn2 addTarget:self action:@selector(addMP4File) forControlEvents:UIControlEventTouchUpInside]; [self.view addSubview:btn2]; UIButton *btn3 = [[UIButton alloc] initWithFrame:CGRectMake(0, btn2.doraemon_bottom+20, self.view.doraemon_width, 60)]; btn3.backgroundColor = [UIColor orangeColor]; - [btn3 setTitle:@"添加doc、xlsx、pdf到沙盒中" forState:UIControlStateNormal]; + [btn3 setTitle:DoraemonLocalizedString(@"添加doc、xlsx、pdf到沙盒中") forState:UIControlStateNormal]; [btn3 addTarget:self action:@selector(addOtherFile) forControlEvents:UIControlEventTouchUpInside]; [self.view addSubview:btn3]; UIButton *btn4 = [[UIButton alloc] initWithFrame:CGRectMake(0, btn3.doraemon_bottom+20, self.view.doraemon_width, 60)]; btn4.backgroundColor = [UIColor orangeColor]; - [btn4 setTitle:@"添加html到沙盒中" forState:UIControlStateNormal]; + [btn4 setTitle:DoraemonLocalizedString(@"添加html到沙盒中") forState:UIControlStateNormal]; [btn4 addTarget:self action:@selector(addHtmlFile) forControlEvents:UIControlEventTouchUpInside]; [self.view addSubview:btn4]; UIButton *btn5 = [[UIButton alloc] initWithFrame:CGRectMake(0, btn4.doraemon_bottom+20, self.view.doraemon_width, 60)]; btn5.backgroundColor = [UIColor orangeColor]; - [btn5 setTitle:@"添加DB到沙盒中" forState:UIControlStateNormal]; + [btn5 setTitle:DoraemonLocalizedString(@"添加DB到沙盒中") forState:UIControlStateNormal]; [btn5 addTarget:self action:@selector(addDBFile) forControlEvents:UIControlEventTouchUpInside]; [self.view addSubview:btn5]; } diff --git a/iOS/DoraemonKitDemo/DoraemonKitDemo/DemoVC/UI/DoraemonDemoUIViewController.m b/iOS/DoraemonKitDemo/DoraemonKitDemo/DemoVC/UI/DoraemonDemoUIViewController.m index 4d0dc61afe1da29bb3618a35a6b7daf5eac959c6..0addc452d6f931fa08ddd45cc7867d273e145063 100644 --- a/iOS/DoraemonKitDemo/DoraemonKitDemo/DemoVC/UI/DoraemonDemoUIViewController.m +++ b/iOS/DoraemonKitDemo/DoraemonKitDemo/DemoVC/UI/DoraemonDemoUIViewController.m @@ -18,7 +18,7 @@ - (void)viewDidLoad { [super viewDidLoad]; - self.title = @"视觉测试Demo"; + self.title = DoraemonLocalizedString(@"视觉测试Demo"); UIView *redView = [[UIView alloc] initWithFrame:CGRectMake(100, 200, 60, 60)]; redView.backgroundColor = [UIColor redColor]; @@ -30,7 +30,7 @@ // [self.view addSubview:alphaView]; UILabel *titleLabel = [[UILabel alloc] initWithFrame:CGRectMake(100, 400, 200, 60)]; - titleLabel.text = @"我是来测试的"; + titleLabel.text = DoraemonLocalizedString(@"我是来测试的"); titleLabel.backgroundColor = [UIColor doraemon_colorWithString:@"#00FF00"]; titleLabel.textColor = [UIColor doraemon_colorWithString:@"#FF0000"]; [self.view addSubview:titleLabel];