调试阶段免登陆
chengzhenyu
5 zmienionych plików z 8 dodań i 14 usunięć
+ 1
- 1
.idea/misc.xml
@@ -37,7 +37,7 @@ |
||
| 37 | 37 |
<ConfirmationsSetting value="0" id="Add" /> |
| 38 | 38 |
<ConfirmationsSetting value="0" id="Remove" /> |
| 39 | 39 |
</component> |
| 40 |
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="JDK" project-jdk-type="JavaSDK"> |
|
| 40 |
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8 (1)" project-jdk-type="JavaSDK"> |
|
| 41 | 41 |
<output url="file://$PROJECT_DIR$/build/classes" /> |
| 42 | 42 |
</component> |
| 43 | 43 |
<component name="ProjectType"> |
+ 3
- 1
app/build.gradle
@@ -23,6 +23,7 @@ android {
|
||
| 23 | 23 |
versionCode 1030 |
| 24 | 24 |
versionName "1.0.30" |
| 25 | 25 |
buildConfigField "boolean", "isTestMode", "true" |
| 26 |
+ buildConfigField "boolean", "isJumpLogin", "false" |
|
| 26 | 27 |
manifestPlaceholders = [CHANNEL_NAME: "guanwang"] |
| 27 | 28 |
} |
| 28 | 29 |
|
@@ -60,7 +61,8 @@ android {
|
||
| 60 | 61 |
zipAlignEnabled false |
| 61 | 62 |
minifyEnabled false |
| 62 | 63 |
shrinkResources false |
| 63 |
- buildConfigField "boolean", "isTestMode", "true" |
|
| 64 |
+ buildConfigField "boolean", "isTestMode", "false" |
|
| 65 |
+ buildConfigField "boolean", "isJumpLogin", "true" |
|
| 64 | 66 |
signingConfig signingConfigs.releaseConfig |
| 65 | 67 |
} |
| 66 | 68 |
} |
+ 2
- 9
app/src/main/java/ai/pai/lensman/db/Preferences.java
@@ -4,6 +4,7 @@ import android.content.Context; |
||
| 4 | 4 |
import android.content.SharedPreferences; |
| 5 | 5 |
|
| 6 | 6 |
import ai.pai.lensman.App; |
| 7 |
+import ai.pai.lensman.BuildConfig; |
|
| 7 | 8 |
|
| 8 | 9 |
public class Preferences {
|
| 9 | 10 |
|
@@ -45,7 +46,7 @@ public class Preferences {
|
||
| 45 | 46 |
} |
| 46 | 47 |
|
| 47 | 48 |
public String getLensManId(){
|
| 48 |
- return mPrefs.getString("lensManId",NullStr);
|
|
| 49 |
+ return mPrefs.getString("lensManId",BuildConfig.isJumpLogin?"Cwi7HSh":NullStr);
|
|
| 49 | 50 |
} |
| 50 | 51 |
|
| 51 | 52 |
public String getWXCode(){
|
@@ -63,14 +64,6 @@ public class Preferences {
|
||
| 63 | 64 |
public void setCameraLibExist(boolean CameraLibExist){
|
| 64 | 65 |
mPrefs.edit().putBoolean("CameraLibExist",CameraLibExist).commit();
|
| 65 | 66 |
} |
| 66 |
- public String getCurrentSession(){
|
|
| 67 |
- return mPrefs.getString("currentSession", NullStr);
|
|
| 68 |
- } |
|
| 69 |
- |
|
| 70 |
- public void setCurrentSession(String currentSession){
|
|
| 71 |
- mPrefs.edit().putString("currentSession",currentSession).commit();
|
|
| 72 |
- } |
|
| 73 |
- |
|
| 74 | 67 |
|
| 75 | 68 |
public void setPatchUrl(String patchUrl){
|
| 76 | 69 |
mPrefs.edit().putString("patchUrl",patchUrl).commit();
|
+ 1
- 1
app/src/main/java/ai/pai/lensman/session/SessionInteractor.java
@@ -39,7 +39,7 @@ public class SessionInteractor implements Callback{
|
||
| 39 | 39 |
@Override |
| 40 | 40 |
public boolean handleMessage(Message message) {
|
| 41 | 41 |
if(message.what==MSG_CAMERA_INIT_EVENT){
|
| 42 |
- int result = CameraJNIInterface.getInstance().mygpcamerainit(); |
|
| 42 |
+ int result = CameraJNIInterface.getInstance().java_mygpcamerainit(); |
|
| 43 | 43 |
if(result>=0){
|
| 44 | 44 |
listener.onSessionStartSuccess(sessionBean.sessionId); |
| 45 | 45 |
isWorking = true; |
+ 1
- 2
app/src/main/java/ai/pai/lensman/session/SessionPresenter.java
@@ -62,14 +62,13 @@ public class SessionPresenter implements SessionContract.Presenter, SessionInter |
||
| 62 | 62 |
sessionView.refreshUploadTimeHint(); |
| 63 | 63 |
} |
| 64 | 64 |
},1000,1000); |
| 65 |
- Preferences.getInstance().setCurrentSession(sessionBean.sessionId); |
|
| 65 |
+ |
|
| 66 | 66 |
} |
| 67 | 67 |
|
| 68 | 68 |
@Override |
| 69 | 69 |
public void stop() {
|
| 70 | 70 |
interactor.endSession(); |
| 71 | 71 |
refreshTimer.cancel(); |
| 72 |
- Preferences.getInstance().setCurrentSession("");
|
|
| 73 | 72 |
isWorking = false; |
| 74 | 73 |
LogHelper.d(TAG,"stop"); |
| 75 | 74 |
} |