Browse Source

合并版本

Xieshengqi 6 years ago
parent
commit
5bf601ad53

+ 0 - 1
.idea/modules.xml

5
       <module fileurl="file://$PROJECT_DIR$/MoneyMoreMoreNote.iml" filepath="$PROJECT_DIR$/MoneyMoreMoreNote.iml" />
5
       <module fileurl="file://$PROJECT_DIR$/MoneyMoreMoreNote.iml" filepath="$PROJECT_DIR$/MoneyMoreMoreNote.iml" />
6
       <module fileurl="file://$PROJECT_DIR$/MoneyNote.iml" filepath="$PROJECT_DIR$/MoneyNote.iml" />
6
       <module fileurl="file://$PROJECT_DIR$/MoneyNote.iml" filepath="$PROJECT_DIR$/MoneyNote.iml" />
7
       <module fileurl="file://$PROJECT_DIR$/MoneyNote_Sqlite/MoneyNote_Sqlite.iml" filepath="$PROJECT_DIR$/MoneyNote_Sqlite/MoneyNote_Sqlite.iml" />
7
       <module fileurl="file://$PROJECT_DIR$/MoneyNote_Sqlite/MoneyNote_Sqlite.iml" filepath="$PROJECT_DIR$/MoneyNote_Sqlite/MoneyNote_Sqlite.iml" />
8
-      <module fileurl="file://$PROJECT_DIR$/MoneyNote_Sqlite/MoneyNote_Sqlite.iml" filepath="$PROJECT_DIR$/MoneyNote_Sqlite/MoneyNote_Sqlite.iml" />
9
       <module fileurl="file://E:\moneymoremorenote\MoneyMoreMoreNote\MoneyNote_Sqlite\MoneyNote_Sqlite.iml" filepath="E:\moneymoremorenote\MoneyMoreMoreNote\MoneyNote_Sqlite\MoneyNote_Sqlite.iml" />
8
       <module fileurl="file://E:\moneymoremorenote\MoneyMoreMoreNote\MoneyNote_Sqlite\MoneyNote_Sqlite.iml" filepath="E:\moneymoremorenote\MoneyMoreMoreNote\MoneyNote_Sqlite\MoneyNote_Sqlite.iml" />
10
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
9
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
11
     </modules>
10
     </modules>

+ 9 - 1
app/src/main/java/com/kuxuan/moneynote/ui/activitys/LunchActivity.java

76
     private void goMain() {
76
     private void goMain() {
77
         //测试用
77
         //测试用
78
         initCateDbOpeator();
78
         initCateDbOpeator();
79
-        if ((Boolean) SPUtil.get(this, Constant.IsFirstWEiChatLogin.ISWEICHATLOGIN, false) && !(Boolean) SPUtil.get(this, Constant.IsFirstWEiChatLogin.ISFIRSTWEICHATLOGIN, false)) {
79
+//        if ((Boolean) SPUtil.get(this, Constant.IsFirstWEiChatLogin.ISWEICHATLOGIN, false) && !(Boolean) SPUtil.get(this, Constant.IsFirstWEiChatLogin.ISFIRSTWEICHATLOGIN, false)) {
80
+//            LoginStatusUtil.loginOut();
81
+//            //TODO 刷新数据(重写)
82
+//            //        EventBus.getDefault().post(new RefreshEvent());
83
+//            EventBus.getDefault().post(new LoginOutEvent());
84
+//        }
85
+
86
+        if((Boolean) SPUtil.get(this, Constant.IsFirstWEiChatLogin.ISWEICHATLOGIN,false)&&(Boolean) SPUtil.get(this,Constant.IsFirstWEiChatLogin.IsLoginOut,false)){
80
             LoginStatusUtil.loginOut();
87
             LoginStatusUtil.loginOut();
81
             //TODO 刷新数据(重写)
88
             //TODO 刷新数据(重写)
82
             //        EventBus.getDefault().post(new RefreshEvent());
89
             //        EventBus.getDefault().post(new RefreshEvent());
83
             EventBus.getDefault().post(new LoginOutEvent());
90
             EventBus.getDefault().post(new LoginOutEvent());
84
         }
91
         }
85
 
92
 
93
+
86
         UIHelper.openActivity(this, MainActivity.class);
94
         UIHelper.openActivity(this, MainActivity.class);
87
 
95
 
88
         finish();
96
         finish();

+ 1 - 0
app/src/main/java/com/kuxuan/moneynote/ui/activitys/login/LoginActivity.java

236
                         }
236
                         }
237
                         boolean flag = (boolean) SPUtil.get(getApplicationContext(),Constant.IsFirstWEiChatLogin.ISFIRSTWEICHATLOGIN,false);
237
                         boolean flag = (boolean) SPUtil.get(getApplicationContext(),Constant.IsFirstWEiChatLogin.ISFIRSTWEICHATLOGIN,false);
238
                         if(flag&&!newUser) {
238
                         if(flag&&!newUser) {
239
+
239
                             Toast.makeText(getApplicationContext(), "微信登录成功", Toast.LENGTH_SHORT).show();
240
                             Toast.makeText(getApplicationContext(), "微信登录成功", Toast.LENGTH_SHORT).show();
240
                         }
241
                         }
241
 
242