Browse Source

英文版

wzh 5 years atrás
parent
commit
72ac561216

+ 127 - 127
api/application/config/response.php

@@ -178,141 +178,141 @@ $config['response_en']['0014'] = 'The command is timed out, please try again lat
 $config['response_en']['0015'] = 'Oversize Upload Files';
 $config['response_en']['0016'] = 'Error uploading file type';
 //登录 0100-0199
-$config['response_en']['0100'] = '用户名或密码不能为空';
-$config['response_en']['0101'] = '用户名或密码错误';
-$config['response_en']['0102'] = '用户不存在';
-$config['response_en']['0103'] = '账户已被停用,请联系管理员';
-$config['response_en']['0104'] = '同级用户不能修改账户状态';
+$config['response_en']['0100'] = 'User name or password cannot be empty';
+$config['response_en']['0101'] = 'Wrong user name or password';
+$config['response_en']['0102'] = 'user does not exist';
+$config['response_en']['0103'] = 'The account has been deactivated. Please contact the administrator';
+$config['response_en']['0104'] = 'Account status cannot be modified by users of the same level';
 //项目 0200-0299
-$config['response_en']['0200'] = '项目id不能为空';
-$config['response_en']['0201'] = '项目编号已存在';
-$config['response_en']['0202'] = '该项目不存在';
-$config['response_en']['0203'] = '项目名称已存在';
-$config['response_en']['0204'] = '项目名称不能为空';
-$config['response_en']['0205'] = '项目编号不能为空';
-$config['response_en']['0206'] = '请选择区域';
-$config['response_en']['0207'] = '请选择省份';
-$config['response_en']['0208'] = '请选择时区';
-$config['response_en']['0209'] = '请选择公司';
-$config['response_en']['0210'] = '项目编号长度不能超过20位';
-$config['response_en']['0211'] = '项目名称长度不能超过40位';
-$config['response_en']['0212'] = '项目编号为数字或字母';
-$config['response_en']['0213'] = '命令已经下发,请稍后查看';
-$config['response_en']['0214'] = '请先删除项目下的设备';
-$config['response_en']['0215'] = '请先删除项目下的网关';
+$config['response_en']['0200'] = 'Item ID cannot be empty';
+$config['response_en']['0201'] = 'Project number already exists';
+$config['response_en']['0202'] = 'The project does not exist';
+$config['response_en']['0203'] = 'Project name already exists';
+$config['response_en']['0204'] = 'Project name cannot be empty';
+$config['response_en']['0205'] = 'Item No. cannot be empty';
+$config['response_en']['0206'] = 'Please select area';
+$config['response_en']['0207'] = 'Please select a province';
+$config['response_en']['0208'] = 'Please select a time zone';
+$config['response_en']['0209'] = 'Please select company';
+$config['response_en']['0210'] = 'The length of item number cannot exceed 20 digits';
+$config['response_en']['0211'] = 'Project name cannot exceed 40 digits in length';
+$config['response_en']['0212'] = 'Item number is number or letter';
+$config['response_en']['0213'] = 'The command has been issued. Please check later';
+$config['response_en']['0214'] = 'Please delete the device under the project first';
+$config['response_en']['0215'] = 'Please delete the gateway under the project first';
 //网络 0300-0399
-$config['response_en']['0300'] = '网络id不能为空';
-$config['response_en']['0301'] = '网络编号已存在';
-$config['response_en']['0302'] = '该网络不存在';
-$config['response_en']['0303'] = '网络名称已存在';
-$config['response_en']['0304'] = '协议类型为0-3';
-$config['response_en']['0305'] = '网络编号不能为空';
-$config['response_en']['0306'] = '网络名称不能为空';
-$config['response_en']['0307'] = '项目不能为空';
-$config['response_en']['0308'] = '请选择项目';
-$config['response_en']['0309'] = '网络编号为数字或字母';
+$config['response_en']['0300'] = 'Network ID cannot be empty';
+$config['response_en']['0301'] = 'Network number already exists';
+$config['response_en']['0302'] = 'The network does not exist';
+$config['response_en']['0303'] = 'Network name already exists';
+$config['response_en']['0304'] = 'Protocol type is 0-3';
+$config['response_en']['0305'] = 'Network number cannot be empty';
+$config['response_en']['0306'] = 'Network name cannot be empty';
+$config['response_en']['0307'] = 'Item cannot be empty';
+$config['response_en']['0308'] = 'Please select an item';
+$config['response_en']['0309'] = 'Network number is number or letter';
 //灯控 0400-0499
-$config['response_en']['0400'] = '灯控id不能为空';
-$config['response_en']['0401'] = '灯控编号已存在';
-$config['response_en']['0402'] = '该灯控不存在';
-$config['response_en']['0403'] = '灯控名称已存在';
-$config['response_en']['0404'] = '无线模块地址已被使用';
-$config['response_en']['0405'] = '请选择网络';
-$config['response_en']['0406'] = '后台正在更新,请两分钟后重试';
-$config['response_en']['0407'] = '手动更新已经发送';
-$config['response_en']['0408'] = '路灯编号不能超过六位数';
-$config['response_en']['0409'] = '请填写路灯编号';
-$config['response_en']['0410'] = '路灯编号为1-999999的数字';
-$config['response_en']['0411'] = '请选择需要更新的路灯';
-$config['response_en']['0412'] = '路灯不在线';
-$config['response_en']['0413'] = '路灯已存在';
-$config['response_en']['0414'] = '无线模块地址必须为十六进制';
-$config['response_en']['0415'] = '协议类型选项错误';
-$config['response_en']['0416'] = '指令已下发,请稍后查看结果';
-$config['response_en']['0417'] = '获取参数信息失败,请稍后重试';
-$config['response_en']['0418'] = '选择日期不能超过31天';
-$config['response_en']['0419'] = '设备未绑定路段信息';
-$config['response_en']['0420'] = '只有杀虫灯设备能设置策略';
-$config['response_en']['0421'] = '经度范围错误';
-$config['response_en']['0422'] = '纬度范围错误';
+$config['response_en']['0400'] = 'Lamp control ID cannot be empty';
+$config['response_en']['0401'] = 'Light control number already exists';
+$config['response_en']['0402'] = 'The light control does not exist';
+$config['response_en']['0403'] = 'The light control name already exists';
+$config['response_en']['0404'] = 'Wireless module address is in use';
+$config['response_en']['0405'] = 'Please select a network';
+$config['response_en']['0406'] = 'Background is updating. Please try again in two minutes';
+$config['response_en']['0407'] = 'Manual update sent';
+$config['response_en']['0408'] = 'Street lamp number cannot exceed six digits';
+$config['response_en']['0409'] = 'Please fill in the street lamp number';
+$config['response_en']['0410'] = 'Number of street lamp No. 1-999999';
+$config['response_en']['0411'] = 'Please select the street lamp to be updated';
+$config['response_en']['0412'] = 'Street light is not online';
+$config['response_en']['0413'] = 'Street light already exists';
+$config['response_en']['0414'] = 'Wireless module address must be hexadecimal';
+$config['response_en']['0415'] = 'Wrong protocol type option';
+$config['response_en']['0416'] = 'The instruction has been issued. Please check the result later';
+$config['response_en']['0417'] = 'Failed to get parameter information. Please try again later';
+$config['response_en']['0418'] = 'Selection date cannot exceed 31 days';
+$config['response_en']['0419'] = 'Section information not bound by equipment';
+$config['response_en']['0420'] = 'Only the insecticidal lamp device can set the strategy';
+$config['response_en']['0421'] = 'Longitude range error';
+$config['response_en']['0422'] = 'Latitude range error';
 //报表 0500-0599
-$config['response_en']['0500'] = "type不正确";
-$config['response_en']['0501'] = "show_type不正确";
-$config['response_en']['0502'] = "缺少item_ids";
+$config['response_en']['0500'] = "Incorrect type";
+$config['response_en']['0501'] = "show_type Incorrect";
+$config['response_en']['0502'] = "Missing item_ids";
 //告警维修 0600-0699
-$config['response_en']['0601'] = "维修人员不存在";
-$config['response_en']['0602'] = "维修人员已经存在";
-$config['response_en']['0603'] = "请选择要删除的故障";
-$config['response_en']['0604'] = "请选择故障";
-$config['response_en']['0605'] = "维修人员id不能为空";
-$config['response_en']['0606'] = "维修人员名称不能为空";
-$config['response_en']['0607'] = "手机号码不能为空";
-$config['response_en']['0608'] = "请选择要删除维修人员";
-$config['response_en']['0609'] = "请选择要删除的记录";
-$config['response_en']['0610'] = "请选择维修人员";
-$config['response_en']['0611'] = "计划完成时间不能为空";
-$config['response_en']['0612'] = "开始时间不能为空";
-$config['response_en']['0613'] = "请选择需要维修的故障";
-$config['response_en']['0614'] = "请选择路灯";
-$config['response_en']['0615'] = "同一路灯半个小时之内只能调度一次";
-$config['response_en']['0616'] = "暂无数据,请在维修记录页面添加";
-$config['response_en']['0617'] = "维修人员id为1-999999的数字";
+$config['response_en']['0601'] = "Maintenance personnel does not exist";
+$config['response_en']['0602'] = "Maintenance personnel already exist";
+$config['response_en']['0603'] = "Please select the fault to delete";
+$config['response_en']['0604'] = "Please select the fault";
+$config['response_en']['0605'] = "Maintenance personnel ID cannot be empty";
+$config['response_en']['0606'] = "Maintainer name cannot be empty";
+$config['response_en']['0607'] = "Mobile number cannot be empty";
+$config['response_en']['0608'] = "Please select the repairman to delete";
+$config['response_en']['0609'] = "Please select the record to delete";
+$config['response_en']['0610'] = "Please select maintenance personnel";
+$config['response_en']['0611'] = "Planned completion time cannot be empty";
+$config['response_en']['0612'] = "Start time cannot be empty";
+$config['response_en']['0613'] = "Please select the fault to be repaired";
+$config['response_en']['0614'] = "Please select street light";
+$config['response_en']['0615'] = "The same street lamp can only be dispatched once in half an hour";
+$config['response_en']['0616'] = "No data temporarily, please add it on the maintenance record page";
+$config['response_en']['0617'] = "Number with maintainer ID 1-999999";
 //个人中心 0700-0799
-$config['response_en']['0701'] = "确认密码错误";
-$config['response_en']['0702'] = "密码错误";
-$config['response_en']['0703'] = "密码长度为6-12位";
-$config['response_en']['0704'] = "密码修改失败,请稍后重试!";
-$config['response_en']['0705'] = "上传失败!";
-$config['response_en']['0706'] = "账号已经存在";
-$config['response_en']['0707'] = "用户名称不能为空";
-$config['response_en']['0708'] = "登录账号不能为空";
-$config['response_en']['0709'] = "新密码与旧密码不能相同";
-$config['response_en']['0710'] = "请选择上一级区域";
-$config['response_en']['0711'] = "区域名称不能为空";
-$config['response_en']['0712'] = "请选择所属公司";
-$config['response_en']['0713'] = "请输入密码";
-$config['response_en']['0714'] = "姓名不能为空";
-$config['response_en']['0715'] = "联系方式不能为空";
-$config['response_en']['0716'] = "反馈内容不能为空";
-$config['response_en']['0717'] = "请选择权限";
-$config['response_en']['0718'] = "手机格式错误";
-$config['response_en']['0719'] = "邮箱格式错误";
-$config['response_en']['0720'] = "密码长度最少六位";
-$config['response_en']['0721'] = "手机号码已经存在";
-$config['response_en']['0722'] = "E-mail已经存在";
-$config['response_en']['0723'] = "登录账号长度不能超过20位";
-$config['response_en']['0724'] = "请选择用户类型";
+$config['response_en']['0701'] = "Confirm password error";
+$config['response_en']['0702'] = "Password error";
+$config['response_en']['0703'] = "Password length is 6-12 bits";
+$config['response_en']['0704'] = "Password modification failed, please try again later!";
+$config['response_en']['0705'] = "Upload failed!";
+$config['response_en']['0706'] = "Account already exists";
+$config['response_en']['0707'] = "User name cannot be empty";
+$config['response_en']['0708'] = "Login account cannot be empty";
+$config['response_en']['0709'] = "The new password cannot be the same as the old password";
+$config['response_en']['0710'] = "Please select the upper level area";
+$config['response_en']['0711'] = "Area name cannot be empty";
+$config['response_en']['0712'] = "Please select your company";
+$config['response_en']['0713'] = "Please input a password";
+$config['response_en']['0714'] = "Name cannot be empty";
+$config['response_en']['0715'] = "Contact information cannot be empty";
+$config['response_en']['0716'] = "Feedback content cannot be empty";
+$config['response_en']['0717'] = "Please select permission";
+$config['response_en']['0718'] = "Phone format error";
+$config['response_en']['0719'] = "Mailbox format error";
+$config['response_en']['0720'] = "Password length of at least six digits";
+$config['response_en']['0721'] = "Mobile number already exists";
+$config['response_en']['0722'] = "E-mail already exists";
+$config['response_en']['0723'] = "Login account length cannot exceed 20";
+$config['response_en']['0724'] = "Please select user type";
 //监控 0800-0899
-$config['response_en']['0801'] = "监控名称已经存在";
-$config['response_en']['0802'] = "请选择路灯";
-$config['response_en']['0803'] = "监控名称不能为空";
-$config['response_en']['0804'] = "监控编号不能为空";
-$config['response_en']['0805'] = "无线模块地址不能为空";
-$config['response_en']['0806'] = "端口号不能为空";
-$config['response_en']['0807'] = "ip地址或域名不能为空";
-$config['response_en']['0808'] = "监控用户名不能为空";
-$config['response_en']['0809'] = "监控密码不能为空";
-$config['response_en']['0810'] = "请选择监控类型";
-$config['response_en']['0811'] = "通道不能为空";
-$config['response_en']['0812'] = "通道已被使用";
-$config['response_en']['0813'] = '监控编号为1-999999的数字';
-$config['response_en']['0814'] = '萤石云账号异常,请联系管理员';
+$config['response_en']['0801'] = "Monitoring name already exists";
+$config['response_en']['0802'] = "Please select street light";
+$config['response_en']['0803'] = "Monitoring name cannot be empty";
+$config['response_en']['0804'] = "Monitoring No. cannot be empty";
+$config['response_en']['0805'] = "Wireless module address cannot be empty";
+$config['response_en']['0806'] = "Port number cannot be empty";
+$config['response_en']['0807'] = "IP address or domain name cannot be empty";
+$config['response_en']['0808'] = "Monitoring user name cannot be empty";
+$config['response_en']['0809'] = "Monitoring password cannot be empty";
+$config['response_en']['0810'] = "Please select monitoring type";
+$config['response_en']['0811'] = "Channel cannot be empty";
+$config['response_en']['0812'] = "Channel is already in use";
+$config['response_en']['0813'] = 'Monitor numbers 1-999999';
+$config['response_en']['0814'] = 'Fluorite cloud account is abnormal, please contact the administrator';
 //策略分组 0900-0999
-$config['response_en']['0901'] = "策略名称已经存在";
-$config['response_en']['0902'] = "分组名称已经存在";
-$config['response_en']['0903'] = "缺少分组id";
-$config['response_en']['0904'] = "结束时间必须大于开始时间";
-$config['response_en']['0905'] = "结束日期必须大于开始日期";
-$config['response_en']['0906'] = "选择时间有重叠";
-$config['response_en']['0907'] = "选择日期有重叠";
-$config['response_en']['0908'] = "策略名称不能为空";
-$config['response_en']['0909'] = "策略内容不能为空";
-$config['response_en']['0910'] = "分组名称不能为空";
-$config['response_en']['0911'] = "请选择所属项目";
-$config['response_en']['0911'] = "请选择分组";
-$config['response_en']['0912'] = "请选择操作类型";
-$config['response_en']['0913'] = "请选择策略";
-$config['response_en']['0914'] = "请选择要删除的分组";
+$config['response_en']['0901'] = "Policy name already exists";
+$config['response_en']['0902'] = "Group name already exists";
+$config['response_en']['0903'] = "Missing group ID";
+$config['response_en']['0904'] = "End time must be greater than start time";
+$config['response_en']['0905'] = "End date must be greater than start date";
+$config['response_en']['0906'] = "Selection time overlaps";
+$config['response_en']['0907'] = "There are overlaps in the selection date";
+$config['response_en']['0908'] = "Policy name cannot be empty";
+$config['response_en']['0909'] = "Policy content cannot be empty";
+$config['response_en']['0910'] = "Group name cannot be empty";
+$config['response_en']['0911'] = "Please select the project";
+$config['response_en']['0911'] = "Please select a group";
+$config['response_en']['0912'] = "Please select operation type";
+$config['response_en']['0913'] = "Please select a policy";
+$config['response_en']['0914'] = "Please select the group to delete";
 
 
 

+ 6 - 0
api/application/controllers/Base_Controller.php

@@ -13,6 +13,12 @@ class Base_Controller extends CI_Controller {
         $this->os = intval($this->input->post('os',true));
 
         $this->response = $this->config->config['response_en'];
+
+        // $version = intval($this->input->post('version',true));
+        $version = 1;
+        $this->session->set_userdata('version', $version);
+        $this->version = $version;
+
         $this->load->model('User_model');
         $this->check_base_params();
 

+ 4 - 0
api/application/controllers/Common.php

@@ -10,6 +10,10 @@ class Common extends CI_Controller {
         parent::__construct();
         $this->load->model('User_model');
         $this->response = $this->config->config['response_en'];
+        
+        $version = 1;
+        $this->session->set_userdata('version', $version);
+        $this->version = $version;
     }
 
     public function login() {