|
|
@@ -92,7 +92,8 @@ public class AuthCtrl
|
|
92
|
92
|
String defaultdev =dataJson.getString("defaultdev");
|
|
93
|
93
|
if(Tools.isEmpty(defaultdev)) {
|
|
94
|
94
|
defaultdev = cursn;
|
|
95
|
|
- } else if(!Tools.isEmpty(defaultdev)&&getDevtype(defaultdev)==16) {
|
|
|
95
|
+ }
|
|
|
96
|
+ if(Tools.isEmpty(cursn)&&!Tools.isEmpty(defaultdev)&&getDevtype(defaultdev)==16) {
|
|
96
|
97
|
String url="http://dy.yunjia99.cn/user/index.do";
|
|
97
|
98
|
url = URLEncoder.encode(url);
|
|
98
|
99
|
log.info("url="+url);
|
|
|
@@ -103,7 +104,7 @@ public class AuthCtrl
|
|
103
|
104
|
/*if(Tools.isEmpty(defaultdev)) {
|
|
104
|
105
|
return new TextView("/device/getDevInfo.do");
|
|
105
|
106
|
} else {
|
|
106
|
|
- return new TextView("/consumer/getPkgsByDevId.do");
|
|
|
107
|
+ return new TextView("/consumer/getPkgsByDevId2.do");
|
|
107
|
108
|
}*/
|
|
108
|
109
|
return new TextView("/device/getDevInfo.do");
|
|
109
|
110
|
}
|
|
|
@@ -183,7 +184,8 @@ public class AuthCtrl
|
|
183
|
184
|
String defaultdev =dataJson.getString("defaultdev");
|
|
184
|
185
|
if(Tools.isEmpty(defaultdev)) {
|
|
185
|
186
|
defaultdev = cursn;
|
|
186
|
|
- } else if(!Tools.isEmpty(defaultdev)&&getDevtype(defaultdev)==16) {
|
|
|
187
|
+ }
|
|
|
188
|
+ if(Tools.isEmpty(cursn)&&!Tools.isEmpty(defaultdev)&&getDevtype(defaultdev)==16) {
|
|
187
|
189
|
String url="http://dy.yunjia99.cn/user/index.do";
|
|
188
|
190
|
url = URLEncoder.encode(url);
|
|
189
|
191
|
log.info("url="+url);
|
|
|
@@ -194,7 +196,7 @@ public class AuthCtrl
|
|
194
|
196
|
/*if(Tools.isEmpty(defaultdev)) {
|
|
195
|
197
|
return new TextView("/device/getDevInfo.do");
|
|
196
|
198
|
} else {
|
|
197
|
|
- return new TextView("/consumer/getPkgsByDevId.do");
|
|
|
199
|
+ return new TextView("/consumer/getPkgsByDevId2.do");
|
|
198
|
200
|
}*/
|
|
199
|
201
|
initWxJsApiSign(context);
|
|
200
|
202
|
return new TextView("/device/getDevInfo.do");
|