Merge remote-tracking branch 'origin/master'

app/src/main/AndroidManifest.xml

@@ -119,7 +119,6 @@
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>

app/src/main/java/com/example/haiwei_mom/base/BaseActivity.java

@@ -27,6 +27,7 @@ import com.example.haiwei_mom.broadcast.MyScannerCall;
 import com.example.haiwei_mom.broadcast.MyScannerReceiver;
 import com.example.haiwei_mom.uitls.MyToastUitls;
 import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -58,7 +59,9 @@ public class BaseActivity extends AppCompatActivity implements MyScannerCall {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         Log.e("TAG", this.getLocalClassName() );
-        gson = new Gson();
+        gson = new GsonBuilder()
+                .setLenient()  // 对JSON语法更宽容
+                .create();
         this.context=this;
         initDialog();
         initSan();