|
|
@ -19,6 +19,7 @@ import android.view.Menu;
|
|
|
|
import android.view.MenuItem;
|
|
|
|
import android.view.MenuItem;
|
|
|
|
import android.widget.TextView;
|
|
|
|
import android.widget.TextView;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import com.dev.devapi.api.SysApi;
|
|
|
|
import com.xypower.common.MicroPhotoContext;
|
|
|
|
import com.xypower.common.MicroPhotoContext;
|
|
|
|
|
|
|
|
|
|
|
|
import java.text.SimpleDateFormat;
|
|
|
|
import java.text.SimpleDateFormat;
|
|
|
@ -182,7 +183,12 @@ public class MainActivity extends AppCompatActivity {
|
|
|
|
Context context = getApplicationContext();
|
|
|
|
Context context = getApplicationContext();
|
|
|
|
MicroPhotoContext.AppConfig appConfig = MicroPhotoContext.getMpAppConfig(context);
|
|
|
|
MicroPhotoContext.AppConfig appConfig = MicroPhotoContext.getMpAppConfig(context);
|
|
|
|
StringBuilder stringBuilder = new StringBuilder();
|
|
|
|
StringBuilder stringBuilder = new StringBuilder();
|
|
|
|
stringBuilder.append("CMDID:" + (TextUtils.isEmpty(appConfig.cmdid) ? "" : appConfig.cmdid));
|
|
|
|
if (TextUtils.isEmpty(appConfig.cmdid)) {
|
|
|
|
|
|
|
|
stringBuilder.append("CMDID:" + SysApi.getSerialNo(getApplicationContext()) + " (SN)");
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
stringBuilder.append("CMDID:"appConfig.cmdid);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
MicroPhotoContext.MasterConfig masterConfig = MicroPhotoContext.getMasterConfig(context);
|
|
|
|
MicroPhotoContext.MasterConfig masterConfig = MicroPhotoContext.getMasterConfig(context);
|
|
|
|
stringBuilder.append("\r\n");
|
|
|
|
stringBuilder.append("\r\n");
|
|
|
|