Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[wip] new login method
  • Loading branch information
@wanggjghost
wanggjghost committed Apr 9, 2015
1 parent 758952d commit 758bdfb
Show file tree
Hide file tree
Showing 36 changed files with 441 additions and 128 deletions.
27 changes: 15 additions & 12 deletions qml/SailfishWeibo.qml
View file
Expand Up @@ -34,7 +34,7 @@ import "pages"
import "components"
import "ui"

import "js/Settings.js" as Settings
//import "js/Settings.js" as Settings

import harbour.sailfish_sinaweibo.sunrain 1.0

Expand All @@ -52,17 +52,19 @@ ApplicationWindow
initialPage: Component {
SplashesPage { //SplashesPage，同时用于初始化数据库和检测token值
id: splashes
property bool _settingsInitialized: false
// property bool _settingsInitialized: false
property int _delayType: -1; // 0 ==> start login page
// 1 ==> start index page
onStatusChanged: {
if (splashes.status === PageStatus.Active) {
if (!_settingsInitialized) {
Settings.initialize();
_settingsInitialized = true;
}
var token = Settings.getAccess_token();
if (token == "" ) {
// if (!_settingsInitialized) {
// Settings.initialize();
// _settingsInitialized = true;
// }
var token = settings.accessToken;//Settings.getAccess_token();

console.log("===== main view token is " + token);
if (token == "" || token == undefined) {
_delayType = 0;
delay.restart();
} else {
Expand All @@ -87,8 +89,8 @@ ApplicationWindow
onTokenExpired: {
if (!tokenExpired) {
console.log("==== !tokenExpired")
api.accessToken = Settings.getAccess_token();
api.uid = Settings.getUid();
api.accessToken = settings.accessToken;//Settings.getAccess_token();
api.uid = settings.uid//Settings.getUid();
_delayType = 1;
delay.restart();
} else {
Expand Down Expand Up @@ -231,7 +233,7 @@ ApplicationWindow
panelView.hidePanel();
}
onUserAvatarClicked: {
toUserPage(Settings.getUid());
toUserPage(settings.uid/*Settings.getUid()*/);
}

Component.onCompleted: {
Expand Down Expand Up @@ -438,7 +440,8 @@ ApplicationWindow
// }

function weiboLogout() {
Settings.setAccess_token("");
// Settings.setAccess_token("");
settings.accessToken = "";
toLoginPage();
}

Expand Down
4 changes: 2 additions & 2 deletions qml/components/AtUserComponent.qml
View file
Expand Up @@ -3,7 +3,7 @@ import Sailfish.Silica 1.0
import harbour.sailfish_sinaweibo.sunrain 1.0

import "../js/weiboapi.js" as WB
import "../js/Settings.js" as Settings
//import "../js/Settings.js" as Settings

Item {
id:atUserComponent
Expand Down Expand Up @@ -128,7 +128,7 @@ Item {
var q = encodeURIComponent(kw);
var method = WeiboMethod.WBOPT_GET_SEARCH_SUGGESTIONS_AT_USERS;
api.setWeiboAction(method, {
"access_token":Settings.getAccess_token(),
"access_token":settings.accessToken,
"q":q,
"type":0,
"range":2});
Expand Down
8 changes: 5 additions & 3 deletions qml/components/LoginComponent.qml
View file
@@ -1,7 +1,7 @@
import QtQuick 2.0
import Sailfish.Silica 1.0

import "../js/Settings.js" as Settings
//import "../js/Settings.js" as Settings

Item {
id:loginComponent
Expand Down Expand Up @@ -111,8 +111,10 @@ Item {
busyIndicator.running = false;
api.accessToken = accessToken;
api.uid = uid;
Settings.setAccess_token(accessToken);
Settings.setUid(uid);
// Settings.setAccess_token(accessToken);
settings.accessToken = accessToken;
// Settings.setUid(uid);
settings.uid = uid;
loginComponent.loginSucceed();
}
onLoginFail: {
Expand Down
2 changes: 1 addition & 1 deletion qml/components/RemindObject.qml
View file
Expand Up @@ -3,7 +3,7 @@ import Sailfish.Silica 1.0

import "../js/dateutils.js" as DateUtils
import "../js/weiboapi.js" as WB
import "../js/Settings.js" as Settings
//import "../js/Settings.js" as Settings
import "../components"

import harbour.sailfish_sinaweibo.sunrain 1.0
Expand Down
45 changes: 41 additions & 4 deletions qml/components/WebViewLoginComponent.qml
View file
@@ -1,13 +1,50 @@
import QtQuick 2.2
//import QtWebKit 3.0

import QtQuick 2.0
import Sailfish.Silica 1.0

SilicaWebView {
id:webViewLoginComponent
signal loginSucceed()


anchors.fill: parent
url: api.getLoginUrl()

Component.onCompleted: {
console.log("==== url is " + api.getLoginUrl());
}

onLoadingChanged: {
webViewLoginComponent.focus = true;
console.log("=== onLoadingChanged " + loadRequest.status);
console.log("=== onLoadingChanged ret " + loadRequest.url);

if (util.parseOauthTokenUrl(loadRequest.url)) {
api.accessToken = weiboSettings.accessToken;
api.uid = weiboSettings.uid;
loginSucceed();
}
// switch (loadRequest.status)
// {
// case webViewLoginComponent.LoadSucceededStatus:
//// opacity = 1
// var ret = loadRequest.url + ""
// console.log("===== " + ret);
//// var temp = url.split("code=")
//// if (temp[0].indexOf("https://api.weibo.com/oauth2/default.html") == 0) {
//// console.log("final code: ", temp[1])
//// loginComponent.loginSucceed(temp[1]);
//// }
// break
// case webViewLoginComponent.LoadFailedStatus:
// console.log(" onLoadingChanged LoadFailedStatus" + loadRequest.status);
//// opacity = 0
//// loginComponent.loginFailed(errorString);
// break
// default:
//// opacity = 0
//// loginComponent.loginFailed("");
// break
// }
}

// property alias menus: viewPullDownMenu._content
// //property alias header: webView.header
Expand Down
2 changes: 1 addition & 1 deletion qml/js/WeiboApiHandler.qml
View file
@@ -1,6 +1,6 @@
import QtQuick 2.0
//import "./weiboapi.js" as WB
import "../js/Settings.js" as Settings
//import "../js/Settings.js" as Settings
import harbour.sailfish_sinaweibo.sunrain 1.0

QtObject {
Expand Down
2 changes: 1 addition & 1 deletion qml/pages/CommentAllPage.qml
View file
Expand Up @@ -3,7 +3,7 @@ import Sailfish.Silica 1.0

import "../js/dateutils.js" as DateUtils
import "../js/weiboapi.js" as WB
import "../js/Settings.js" as Settings
//import "../js/Settings.js" as Settings
import "../js/getURL.js" as GetURL
import "../components"

Expand Down
2 changes: 1 addition & 1 deletion qml/pages/CommentMentioned.qml
View file
Expand Up @@ -3,7 +3,7 @@ import Sailfish.Silica 1.0

import "../js/dateutils.js" as DateUtils
import "../js/weiboapi.js" as WB
import "../js/Settings.js" as Settings
//import "../js/Settings.js" as Settings
import "../js/getURL.js" as GetURL
import "../components"

Expand Down
2 changes: 1 addition & 1 deletion qml/pages/FirstPage.qml
View file
Expand Up @@ -7,7 +7,7 @@ import harbour.sailfish_sinaweibo.sunrain 1.0
import "../ui"
import "../components"
import "../js"
import "../js/Settings.js" as Settings
//import "../js/Settings.js" as Settings


Page {
Expand Down
2 changes: 1 addition & 1 deletion qml/pages/FriendsPage.qml
View file
Expand Up @@ -3,7 +3,7 @@ import Sailfish.Silica 1.0

import "../js/dateutils.js" as DateUtils
import "../js/weiboapi.js" as WB
import "../js/Settings.js" as Settings
//import "../js/Settings.js" as Settings
import "../components"

import harbour.sailfish_sinaweibo.sunrain 1.0
Expand Down
9 changes: 7 additions & 2 deletions qml/pages/LoginPage.qml
View file
Expand Up @@ -2,14 +2,19 @@ import QtQuick 2.0
import Sailfish.Silica 1.0

import "../components"
import "../js/Settings.js" as Settings
//import "../js/Settings.js" as Settings

Page {
id: loginPage

signal logined

LoginComponent {
// LoginComponent {
// id:loginView
// anchors.fill: parent
// onLoginSucceed: {logined();}
// }
WebViewLoginComponent {
id:loginView
anchors.fill: parent
onLoginSucceed: {logined();}
Expand Down
4 changes: 2 additions & 2 deletions qml/pages/SecondPage.qml
View file
Expand Up @@ -31,7 +31,7 @@
import QtQuick 2.0
import Sailfish.Silica 1.0

import "../js/Settings.js" as Settings
//import "../js/Settings.js" as Settings
import "../components"
Page {
id: mainPage
Expand Down Expand Up @@ -107,7 +107,7 @@ Page {
console.log("click item " + title + "with targe " + page + " arg " + arg);
if (arg == "getUid") {
//pageStack.push(Qt.resolvedUrl(page))
var uid = Settings.getUid();
var uid = settings.uid; //Settings.getUid();
toUserPage(uid);
} else {
pageStack.push(Qt.resolvedUrl(page))
Expand Down
2 changes: 1 addition & 1 deletion qml/pages/SendPage.qml
View file
Expand Up @@ -3,7 +3,7 @@ import QtQuick 2.0
//import Ubuntu.Components.Popups 0.1
//import Ubuntu.Components.ListItems 0.1 as ListItem
import "../js/weiboapi.js" as WB
import "../js/Settings.js" as Settings
//import "../js/Settings.js" as Settings
import Sailfish.Silica 1.0

//import QtDocGallery 5.0
Expand Down
2 changes: 1 addition & 1 deletion qml/pages/SplashesPage.qml
View file
Expand Up @@ -7,7 +7,7 @@ import harbour.sailfish_sinaweibo.sunrain 1.0

import "../components"
import "../js"
import "../js/Settings.js" as Settings
//import "../js/Settings.js" as Settings


Page {
Expand Down
4 changes: 2 additions & 2 deletions qml/pages/UserPage.qml
View file
Expand Up @@ -4,7 +4,7 @@ import Sailfish.Silica 1.0

import "../js/dateutils.js" as DateUtils
import "../js/weiboapi.js" as WB
import "../js/Settings.js" as Settings
//import "../js/Settings.js" as Settings
import "../components"

import harbour.sailfish_sinaweibo.sunrain 1.0
Expand Down Expand Up @@ -408,7 +408,7 @@ Page {
left: parent.left
right: parent.right
}
visible: userInfoObject.usrInfo.id != Settings.getUid()
visible: userInfoObject.usrInfo.id != settings.uid //Settings.getUid()
Rectangle {
width: parent.width
height: parent.height
Expand Down
2 changes: 1 addition & 1 deletion qml/pages/WeiboFavorites.qml
View file
Expand Up @@ -3,7 +3,7 @@ import Sailfish.Silica 1.0

import "../js/dateutils.js" as DateUtils
import "../js/weiboapi.js" as WB
import "../js/Settings.js" as Settings
//import "../js/Settings.js" as Settings
import "../components"

import harbour.sailfish_sinaweibo.sunrain 1.0
Expand Down
2 changes: 1 addition & 1 deletion qml/pages/WeiboMentioned.qml
View file
Expand Up @@ -3,7 +3,7 @@ import Sailfish.Silica 1.0

import "../js/dateutils.js" as DateUtils
import "../js/weiboapi.js" as WB
import "../js/Settings.js" as Settings
//import "../js/Settings.js" as Settings
import "../components"

import harbour.sailfish_sinaweibo.sunrain 1.0
Expand Down
2 changes: 1 addition & 1 deletion qml/pages/WeiboPage.qml
View file
Expand Up @@ -2,7 +2,7 @@ import QtQuick 2.0
import Sailfish.Silica 1.0
import "../js/dateutils.js" as DateUtils
import "../js/weiboapi.js" as WB
import "../js/Settings.js" as Settings
//import "../js/Settings.js" as Settings
import "../js/getURL.js" as GetURL

import "../components"
Expand Down
8 changes: 4 additions & 4 deletions qml/ui/GroupItem.qml
View file
Expand Up @@ -2,7 +2,7 @@ import QtQuick 2.0
import Sailfish.Silica 1.0
import harbour.sailfish_sinaweibo.sunrain 1.0

import "../js/Settings.js" as Settings
//import "../js/Settings.js" as Settings
import "../components"

SilicaListView {
Expand All @@ -20,14 +20,14 @@ SilicaListView {
groupItem.fetchPending();
listModel.clear();
var method = WeiboMethod.WBOPT_GET_FRIENDSHIPS_GROUPS;
api.setWeiboAction(method, {'access_token':Settings.getAccess_token()});
api.setWeiboAction(method, {'access_token':settings.accessToken/*Settings.getAccess_token()*/});
}

function deleteGroup(idstr) {
groupItem.fetchPending();
var method = WeiboMethod.WBOPT_POST_FRIENDSHIPS_GROUPS_DESTROY;
api.setWeiboAction(method, {
"access_token":Settings.getAccess_token(),
"access_token":settings.accessToken,//Settings.getAccess_token(),
"list_id":idstr
});
}
Expand All @@ -37,7 +37,7 @@ SilicaListView {
groupItem.fetchPending();
var method = WeiboMethod.WBOPT_POST_FRIENDSHIPS_GROUPS_UPDATE;
api.setWeiboAction(method, {
"access_token":Settings.getAccess_token(),
"access_token":settings.accessToken,//Settings.getAccess_token(),
"list_id":_newGroupIdstr,
"name":_newGroupName
});
Expand Down
6 changes: 3 additions & 3 deletions qml/ui/LoginDialog.qml
View file
Expand Up @@ -2,7 +2,7 @@ import QtQuick 2.0
import Sailfish.Silica 1.0

import "../components"
import "../js/Settings.js" as Settings
//import "../js/Settings.js" as Settings

Dialog {
id: dialog
Expand Down Expand Up @@ -39,8 +39,8 @@ Dialog {
onTokenExpired: {
if (!tokenExpired) {
console.log("==== !tokenExpired")
api.accessToken = Settings.getAccess_token();
api.uid = Settings.getUid();
api.accessToken = settings.accessToken; //Settings.getAccess_token();
api.uid = settings.uid;//Settings.getUid();
timer.start();
} else {
_showLoginView = true;
Expand Down
7 changes: 5 additions & 2 deletions qml/ui/MessageTab.qml
View file
Expand Up @@ -3,7 +3,7 @@ import Sailfish.Silica 1.0

import "../js/dateutils.js" as DateUtils
import "../js/weiboapi.js" as WB
import "../js/Settings.js" as Settings
//import "../js/Settings.js" as Settings
import "../components"
import "../pages"

Expand Down Expand Up @@ -156,7 +156,10 @@ Page {
anchors.fill: parent
onClicked: {
if (model.toFunction === "1") {
pageStack.push(Qt.resolvedUrl("../pages/FriendsPage.qml"), { mode: "follower", uid: Settings.getUid() })
pageStack.push(Qt.resolvedUrl("../pages/FriendsPage.qml"),
{ mode: "follower",
uid: settings.uid//Settings.getUid()
})
} else {
//page
pageStack.push(Qt.resolvedUrl(model.page));
Expand Down

0 comments on commit 758bdfb

Please sign in to comment.