liuzhenxing1118 4 ヶ月 前
コミット
7b67e989ae

+ 10 - 3
app/src/main/java/com/sikey/skphone/activity/CallActivity.java

@@ -26,20 +26,27 @@ public class CallActivity extends BaseActionActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_call);
         changeStatusBar(false);
-        initData();
-        initView();
+        boolean isOK = initData();
+        if (isOK) {
+            initView();
+        } else {
+            toast(getString(R.string.data_error));
+            finish();
+        }
     }
 
-    private void initData() {
+    private boolean initData() {
         Gson gson = new Gson();
         mType = getIntent().getIntExtra(Constant.INTENT_VIEW_TYPE, 0);
         String value = getIntent().getStringExtra(Constant.INTENT_VIEW_VALUE);
         Log.d(TAG, "initData: " + mType + " value:" + value);
         if (mType == 0) {
             mContactModel = gson.fromJson(value, ContactBean.class);
+            return mContactModel != null;
         } else {
             mRecentModel = gson.fromJson(value, RecentBean.class);
             mContactModel = mRecentModel.contactBean;
+            return mRecentModel != null;
         }
     }
 

BIN
app/src/main/res/drawable/ic_call.png


BIN
app/src/main/res/drawable/ic_videocall.png


+ 1 - 0
app/src/main/res/values-zh-rCN/strings.xml

@@ -7,4 +7,5 @@
     <string name="video_call">视频</string>
     <string name="call">电话</string>
     <string name="calling_interrupt">呼叫失败!</string>
+    <string name="data_error">参数错误</string>
 </resources>

+ 1 - 0
app/src/main/res/values-zh-rTW/strings.xml

@@ -7,4 +7,5 @@
     <string name="video_call">視頻</string>
     <string name="call">電話</string>
     <string name="calling_interrupt">呼叫失敗!</string>
+    <string name="data_error">參數錯誤</string>
 </resources>

+ 1 - 0
app/src/main/res/values/strings.xml

@@ -6,4 +6,5 @@
     <string name="video_call">video</string>
     <string name="call">phone</string>
     <string name="calling_interrupt">Call failed!</string>
+    <string name="data_error">parameter error</string>
 </resources>