e-view code-diff">
@@ -15,6 +15,7 @@ import java.io.File; |
||
| 15 | 15 |
import ai.pai.lensman.App; |
| 16 | 16 |
import ai.pai.lensman.bean.PhotoBean; |
| 17 | 17 |
import ai.pai.lensman.bean.SessionBean; |
| 18 |
+import ai.pai.lensman.db.Preferences; |
|
| 18 | 19 |
import ai.pai.lensman.dslr.CameraService; |
| 19 | 20 |
import ai.pai.lensman.service.Constants; |
| 20 | 21 |
|
@@ -145,6 +146,7 @@ public class SessionInteractor implements Callback{
|
||
| 145 | 146 |
bean.sessionDate = sessionBean.sessionDate; |
| 146 | 147 |
bean.sessionCreateTime = sessionBean.createTime; |
| 147 | 148 |
bean.photoPath = sessionWorkingDirPath+File.separator+eventMsg; |
| 149 |
+ bean.lensmanType = Preferences.getInstance().getLensManType(); |
|
| 148 | 150 |
listener.onSessionPhotoCaptured(bean); |
| 149 | 151 |
LogHelper.d("czy","手机收到新照片 "+ bean);
|
| 150 | 152 |
} |
@@ -57,6 +57,7 @@ public class SettingsActivity extends BaseActivity {
|
||
| 57 | 57 |
@OnClick(R.id.btn_user_logout) |
| 58 | 58 |
void logout(){
|
| 59 | 59 |
Preferences.getInstance().setLensManId("");
|
| 60 |
+ Preferences.getInstance().setLensManType("");
|
|
| 60 | 61 |
Intent intent = new Intent(this, LoginActivity.class); |
| 61 | 62 |
intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK); |
| 62 | 63 |
startActivity(intent); |