Commit 8210ae26 by cuiliang.shi

v0.9 修改联系人上传错误 导致上传信息错误问题。

1 parent 05b9aeed
...@@ -15,8 +15,8 @@ android { ...@@ -15,8 +15,8 @@ android {
applicationId "com.toscl.turingos" applicationId "com.toscl.turingos"
minSdkVersion 15 minSdkVersion 15
targetSdkVersion 22 targetSdkVersion 22
versionCode 8 versionCode 9
versionName "0.8" versionName "0.9"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
ndk { ndk {
......
...@@ -1326,23 +1326,30 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe ...@@ -1326,23 +1326,30 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
protected void onDestroy() { protected void onDestroy() {
Log.d(TAG, "onDestroy"); Log.d(TAG, "onDestroy");
super.onDestroy(); super.onDestroy();
// if (mLoginSuccess) { if (mLoginSuccess) {
exitLogic(); exitLogic();
// } }
} }
@Override @Override
protected void onPause() { protected void onPause() {
AsrManager.getInstance().stop(); if (mLoginSuccess) {
TTSManager.getInstance().stopTTS(); try {
AsrManager.getInstance().stop();
TTSManager.getInstance().stopTTS();
playView.setChecked(false); playView.setChecked(false);
TuringMusic.getInstance().pause(); TuringMusic.getInstance().pause();
} catch (Exception e) {
}
}
super.onPause(); super.onPause();
} }
public void exitLogic() { public void exitLogic() {
try {
// if (AsrManager.getInstance() != null && AsrManager.getInstance().isRecording()) { // if (AsrManager.getInstance() != null && AsrManager.getInstance().isRecording()) {
AsrManager.getInstance().cancel(); AsrManager.getInstance().cancel();
// } // }
...@@ -1354,6 +1361,9 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe ...@@ -1354,6 +1361,9 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
playView.setChecked(false); playView.setChecked(false);
TuringMusic.getInstance().stop(); TuringMusic.getInstance().stop();
// } // }
}catch (Exception e){
}
} }
} }
...@@ -65,7 +65,7 @@ public class SkillsSlotUtil { ...@@ -65,7 +65,7 @@ public class SkillsSlotUtil {
arr[i] += " , 电话号码:" + num; arr[i] += " , 电话号码:" + num;
} while (phonesCusor.moveToNext()); } while (phonesCusor.moveToNext());
} }
num = num.replace(" ", "").replace("-", "");
contactMap.put(name, num); contactMap.put(name, num);
Log.d(TAG, "contact - arr[i]:" + arr[i]); Log.d(TAG, "contact - arr[i]:" + arr[i]);
i++; i++;
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!